Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Spring2021-SellPoint
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

TDT4140-Group 58
Spring2021-SellPoint
Commits
138d8c54

Commit 138d8c54 authored Apr 7, 2021 by Tormod Nygård

Downloads
- Plain Diff

Merge branch '18-se-en-bruker-sin-lokasjon' into 'master'

Resolve "Se en bruker sin lokasjon"

Closes #18

See merge request !30

parents 5cfac964 0676a191

Branches

No related tags found

1 merge request!30Resolve "Se en bruker sin lokasjon"

Pipeline #126025 passed Apr 7, 2021

Stage: build_and_test

Changes 11
Pipelines 1

Show whitespace changes

Inline Side-by-side

Showing

client/src/app/models/user.model.ts 13 additions, 2 deletions

client/src/app/models/user.model.ts
client/src/app/posts/post-details/post-details.component.html 1 addition, 3 deletions

...nt/src/app/posts/post-details/post-details.component.html
client/src/app/posts/post-details/post-details.component.scss 6 additions, 0 deletions

...nt/src/app/posts/post-details/post-details.component.scss
client/src/app/posts/post-details/post-details.component.ts 10 additions, 3 deletions

client/src/app/posts/post-details/post-details.component.ts
client/src/app/users/user-guest-profile/user-guest-profile.component.html 2 additions, 2 deletions

...sers/user-guest-profile/user-guest-profile.component.html
client/src/app/users/user-profile/user-profile.component.html 2 additions, 2 deletions

...nt/src/app/users/user-profile/user-profile.component.html
client/src/app/users/user-registration-form/user-registration-form.component.html 14 additions, 0 deletions

...r-registration-form/user-registration-form.component.html
client/src/app/users/user-registration-form/user-registration-form.component.ts 6 additions, 0 deletions

...ser-registration-form/user-registration-form.component.ts
server/src/controllers/authController/index.ts 4 additions, 3 deletions

server/src/controllers/authController/index.ts
server/src/controllers/userController/index.ts 5 additions, 4 deletions

server/src/controllers/userController/index.ts
server/src/models/user.ts 1 addition, 0 deletions

server/src/models/user.ts

with 64 additions and 19 deletions

Loading

0% Loading or .

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

Finish editing this message first!

Please sign in to comment