Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

tdt4242-group16
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

3e9ef7cf

Commit 3e9ef7cf authored 3 years ago by Simen Frium Opedal

Downloads
- Plain Diff

Merge branch 'feat/34-fitnessProfile' into 'master'

Merge 34-fitnessProfile into master

See merge request !2

parents ebc2ecb7 268325b2

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

backend/.gitignore 1 addition, 0 deletions

backend/.gitignore
backend/secfit/users/models.py 4 additions, 0 deletions

backend/secfit/users/models.py
backend/secfit/users/serializers.py 28 additions, 2 deletions

backend/secfit/users/serializers.py
backend/secfit/users/urls.py 1 addition, 0 deletions

backend/secfit/users/urls.py
backend/secfit/users/views.py 13 additions, 1 deletion

backend/secfit/users/views.py
frontend/www/profile.html 57 additions, 0 deletions

frontend/www/profile.html
frontend/www/scripts/navbar.js 1 addition, 0 deletions

frontend/www/scripts/navbar.js
frontend/www/scripts/profile.js 139 additions, 0 deletions

frontend/www/scripts/profile.js
frontend/www/scripts/scripts.js 4 additions, 0 deletions

frontend/www/scripts/scripts.js

with 248 additions and 3 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