Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
idatt2106-2024-07
frontend
Commits
a98793cf
Commit
a98793cf
authored
11 months ago
by
Viktor Gunnar Grevskott
Browse files
Options
Downloads
Plain Diff
Merge branch 'LeaderboardView' into 'main'
feat: Adding leaderboard See merge request
!17
parents
2066a311
38bc43a5
No related branches found
Branches containing commit
No related tags found
1 merge request
!17
feat: Adding leaderboard
Pipeline
#274469
failed
11 months ago
Stage: install_dependencies
Stage: lint
Stage: build_project
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/LeaderboardComponents/Leaderboard.vue
+1
-1
1 addition, 1 deletion
src/components/LeaderboardComponents/Leaderboard.vue
src/views/LeaderboardView.vue
+50
-3
50 additions, 3 deletions
src/views/LeaderboardView.vue
with
51 additions
and
4 deletions
src/components/LeaderboardComponents/Leaderboard.vue
+
1
−
1
View file @
a98793cf
...
...
@@ -131,7 +131,7 @@
top
:
-0.5rem
;
background-color
:
#0A58CA
;
position
:
absolute
;
left
:
-1rem
;
/**
left: -1rem;
*/
box-shadow
:
0px
15px
11px
-6px
#7a7a7d
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/LeaderboardView.vue
+
50
−
3
View file @
a98793cf
<
template
>
<div
id=
"dropdownContainer"
>
<Button
class=
"btn btn-primary text-white leaderBoardButton"
>
Global
</Button>
<Button
class=
"btn btn-primary text-white leaderBoardButton"
>
Friends
</Button>
</div>
<main>
<div
id=
"leaderboard"
>
<h1>
Ranking
</h1>
<h1><img
src=
"@/assets/items/v-buck.png"
style=
"width: 2rem"
>
Total points
</h1>
<Leaderboard
:leaderboard=
"leaderboardData"
@
navigateToUserProfile=
"navigateToUserProfile"
/>
</div>
<div
id=
"leaderboard"
>
<h1><img
src=
"@/assets/icons/fire.png"
style=
"width: 2rem"
>
Current streak
</h1>
<Leaderboard
:leaderboard=
"leaderboardData"
@
navigateToUserProfile=
"navigateToUserProfile"
/>
</div>
<div
id=
"leaderboard"
>
<h1><img
src=
"@/assets/icons/fire.png"
style=
"width: 2rem"
>
Highest streak
</h1>
<Leaderboard
:leaderboard=
"leaderboardData"
@
navigateToUserProfile=
"navigateToUserProfile"
/>
</div>
</main>
<div
id =
"communityContainer"
>
<h1>
Total points earned as a community
</h1>
<h2>
1000000
<img
src=
"@/assets/items/v-buck.png"
style=
"width: 2rem"
></h2>
</div>
</
template
>
<
script
setup
lang=
"ts"
>
...
...
@@ -31,18 +47,49 @@ const navigateToUserProfile = (userId: number) => {
<
style
scoped
>
main
{
margin-top
:
2rem
;
margin-bottom
:
4rem
;
width
:
100%
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
space-around
;
align-items
:
center
;
flex-wrap
:
wrap
;
flex-direction
:
row
;
}
#leaderboard
{
width
:
60%
;
width
:
400px
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
justify-content
:
center
;
margin-bottom
:
3rem
;
}
h1
{
font-weight
:
500
;
margin-bottom
:
1rem
;
}
#dropdownContainer
{
display
:
flex
;
justify-content
:
center
;
margin-bottom
:
2rem
;
margin-top
:
3rem
;
}
#communityContainer
{
display
:
flex
;
justify-content
:
center
;
align-items
:
center
;
flex-direction
:
column
;
margin-bottom
:
5rem
;
}
.leaderBoardButton
{
padding
:
1rem
4rem
;
font-weight
:
700
;
border-radius
:
2rem
;
margin
:
1rem
;
}
</
style
>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment