Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

75286c3c

Commit 75286c3c authored 3 years ago by Victor Löfgren

Downloads
- Plain Diff

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

Merge branch 'dev' of gitlab.liu.se:tddd96-grupp11/teknikattan-scoring-system into 161-fix-move-slides-on-backend

parents a3cefaa0 6697d93c

No related branches found

No related tags found

Loading

Changes 104

Hide whitespace changes

Inline Side-by-side

Showing

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

.gitlab/client.gitlab-ci.yml
.vscode/tasks.json 108 additions, 101 deletions

.vscode/tasks.json
README.md 0 additions, 6 deletions

README.md
client/package-lock.json 204 additions, 0 deletions

client/package-lock.json
client/package.json 5 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/actions/competitionLogin.test.ts 76 additions, 0 deletions

client/src/actions/competitionLogin.test.ts
client/src/actions/presentation.test.ts 2 additions, 2 deletions

client/src/actions/presentation.test.ts
client/src/actions/presentation.ts 1 addition, 1 deletion

client/src/actions/presentation.ts
client/src/components/TestConnection.tsx 0 additions, 18 deletions

client/src/components/TestConnection.tsx
client/src/e2e/AdminPage.test.tsx 176 additions, 0 deletions

client/src/e2e/AdminPage.test.tsx
client/src/e2e/LoginPage.test.tsx 70 additions, 0 deletions

client/src/e2e/LoginPage.test.tsx
client/src/e2e/TestingConstants.ts 6 additions, 0 deletions

client/src/e2e/TestingConstants.ts
client/src/enum/ComponentTypes.ts 1 addition, 1 deletion

client/src/enum/ComponentTypes.ts
client/src/index.tsx 0 additions, 6 deletions

client/src/index.tsx
client/src/interfaces/ApiModels.ts 11 additions, 1 deletion

client/src/interfaces/ApiModels.ts
client/src/logo.svg 0 additions, 1 deletion

client/src/logo.svg
client/src/middleware/Middleware_Explanation.txt 0 additions, 6 deletions

client/src/middleware/Middleware_Explanation.txt

with 663 additions and 158 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