Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bd37e569

Commit bd37e569 authored 3 years ago by Sebastian Karlsson

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 129-fix-image-uploading-bug

parents f65c82bf ef15108e

No related branches found

No related tags found

Loading

Changes 254

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 6 deletions

.gitignore
.gitlab/client.gitlab-ci.yml 1 addition, 1 deletion

.gitlab/client.gitlab-ci.yml
.vscode/settings.json 3 additions, 2 deletions

.vscode/settings.json
.vscode/tasks.json 108 additions, 85 deletions

.vscode/tasks.json
LICENSE 22 additions, 0 deletions

LICENSE
README.md 6 additions, 14 deletions

README.md
client/.gitignore 3 additions, 0 deletions

client/.gitignore
client/README.md 2 additions, 2 deletions

client/README.md
client/package-lock.json 394 additions, 9 deletions

client/package-lock.json
client/package.json 8 additions, 2 deletions

client/package.json
client/public/logo192.png 0 additions, 0 deletions

client/public/logo192.png
client/public/logo512.png 0 additions, 0 deletions

client/public/logo512.png
client/public/manifest.json 2 additions, 12 deletions

client/public/manifest.json
client/src/App.tsx 1 addition, 0 deletions

client/src/App.tsx
client/src/Main.tsx 18 additions, 9 deletions

client/src/Main.tsx
client/src/actions/cities.ts 10 additions, 5 deletions

client/src/actions/cities.ts
client/src/actions/competitionLogin.test.ts 76 additions, 0 deletions

client/src/actions/competitionLogin.test.ts
client/src/actions/competitionLogin.ts 47 additions, 8 deletions

client/src/actions/competitionLogin.ts
client/src/actions/competitions.test.ts 21 additions, 22 deletions

client/src/actions/competitions.test.ts
client/src/actions/competitions.ts 16 additions, 3 deletions

client/src/actions/competitions.ts

with 741 additions and 180 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