Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

51a65f4e

Commit 51a65f4e authored 3 years ago by Josef Olsson

Downloads
- Plain Diff

Merge branch 'dev' of gitlab.liu.se:tddd96-grupp11/teknikattan-scoring-system into dev

parents 8b50cff4 61cbf775

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

client/src/actions/cities.ts 2 additions, 2 deletions

client/src/actions/cities.ts
client/src/actions/user.test.ts 3 additions, 0 deletions

client/src/actions/user.test.ts
client/src/actions/user.ts 8 additions, 6 deletions

client/src/actions/user.ts
client/src/pages/admin/dashboard/components/NumberOfCompetitions.tsx 8 additions, 8 deletions

...pages/admin/dashboard/components/NumberOfCompetitions.tsx
client/src/pages/admin/dashboard/components/NumberOfRegions.tsx 8 additions, 8 deletions

.../src/pages/admin/dashboard/components/NumberOfRegions.tsx
client/src/pages/admin/users/UserManager.tsx 1 addition, 1 deletion

client/src/pages/admin/users/UserManager.tsx
client/src/pages/presentationEditor/components/SlideEditor.tsx 18 additions, 14 deletions

...t/src/pages/presentationEditor/components/SlideEditor.tsx
client/src/pages/presentationEditor/components/styled.tsx 18 additions, 0 deletions

client/src/pages/presentationEditor/components/styled.tsx
client/src/utils/checkAuthentication.test.ts 12 additions, 2 deletions

client/src/utils/checkAuthentication.test.ts
client/src/utils/checkAuthentication.ts 3 additions, 3 deletions

client/src/utils/checkAuthentication.ts

with 81 additions and 44 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