Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

teknikattan-scoring-system
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

8426bb18

Commit 8426bb18 authored 4 years ago by robban64

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 115-restructure-api-routes

parents ffb2f8bb 4a1807e2

Branches

Tags

2 merge requests!92Resolve "Refactor/minimize editor code",!88Resolve "Restructure api routes"

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

client/src/pages/presentationEditor/components/RndComponent.tsx 89 additions, 0 deletions

.../src/pages/presentationEditor/components/RndComponent.tsx
client/src/pages/presentationEditor/components/SlideEditor.tsx 2 additions, 18 deletions

...t/src/pages/presentationEditor/components/SlideEditor.tsx
client/src/pages/presentationEditor/components/SlideSettings.tsx 19 additions, 12 deletions

...src/pages/presentationEditor/components/SlideSettings.tsx
client/src/pages/presentationEditor/components/TextComponentDisplay.test.tsx 0 additions, 18 deletions

...esentationEditor/components/TextComponentDisplay.test.tsx
client/src/pages/presentationEditor/components/TextComponentEdit.tsx 78 additions, 0 deletions

...pages/presentationEditor/components/TextComponentEdit.tsx
client/src/pages/presentationEditor/components/styled.tsx 21 additions, 1 deletion

client/src/pages/presentationEditor/components/styled.tsx
client/src/pages/views/PresenterViewPage.tsx 1 addition, 1 deletion

client/src/pages/views/PresenterViewPage.tsx

with 210 additions and 50 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment