Merge branch 'frontend' into leaderboard-pagination

# Conflicts:
#	frontend/game/tsconfig.json
#	frontend/package-lock.json
#	frontend/package.json
#	frontend/public/index.html
#	frontend/src/App.vue
#	frontend/src/components/Game.vue
#	frontend/src/components/Leaderboard.vue
This commit is contained in:
j-weissen 2023-01-20 14:01:10 +01:00
commit 91fd54a97f
4 changed files with 26 additions and 5 deletions

View file

@ -42,8 +42,6 @@ export default defineComponent({
data() {
return {
userScores: {},
highscoreLeaderboard: [],
totalPlaytimeLeaderboard: [],
userId: 1,
}
},

View file

@ -1,7 +1,7 @@
<template>
<div>
<main></main>
</div>
<div class="wrapper">
<main></main>
</div>
</template>
<script lang="ts">