From 269faca609b7c14c45d9290111bde82de3173809 Mon Sep 17 00:00:00 2001
From: j-weissen <jweissen@htl-steyr.ac.at>
Date: Fri, 20 Jan 2023 15:52:47 +0100
Subject: [PATCH] minor changes

---
 frontend/public/game.js                 | 2 +-
 frontend/public/index.html              | 2 +-
 frontend/src/App.vue                    | 9 +++++----
 frontend/src/components/Leaderboard.vue | 3 ---
 frontend/src/components/Login.vue       | 6 ++++--
 5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/frontend/public/game.js b/frontend/public/game.js
index e7f0b77..4d1a861 100644
--- a/frontend/public/game.js
+++ b/frontend/public/game.js
@@ -43,7 +43,7 @@ function preload() {
     floorImage = loadImage(FLOOR_IMAGE_PATH);
 }
 function setup() {
-    createCanvas(2000, 1000);
+    createCanvas(1085, 600);
     floorHeight = height / 5;
     setupObstacleConsts();
     setupFont();
diff --git a/frontend/public/index.html b/frontend/public/index.html
index ead5f8f..fb663ea 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -10,8 +10,8 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
 
     <title><%= htmlWebpackPlugin.options.title %></title>
-      <script src="./game.js"></script>
       <script src="https://cdn.jsdelivr.net/npm/p5@1.5.0/lib/p5.js"></script>
+      <script src="./game.js"></script>
   </head>
   <body style="background-color: beige;">
     <noscript>
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 0901f30..baa9b1b 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -7,10 +7,10 @@
       <UserScores :userScores="userScores"></UserScores>
     </div>
     <div class="row">
-      <Game v-if="user" v-bind:user-id=this.userId class="col"
+      <Game :class="user ? '' : 'hidden'" v-bind:user-id=this.userId class="col"
             @gameFinished="this.updateUserScores()">
       </Game>
-      <Login v-else @userChange="(event) => {this.user = event; this.userId = this.user.id}">
+      <Login v-if="!user" @userChange="(event) => {this.user = event; this.userId = this.user.id}">
       </Login>
     </div>
     <div class="row">
@@ -52,8 +52,6 @@ export default defineComponent({
       user: null,
     }
   },
-
-
   methods: {
     async fetchFromApi(path: string, method: "GET" | "POST") {
       let res: Response = await fetch(Rest.URL + path, {method: method,});
@@ -86,4 +84,7 @@ export default defineComponent({
 .everything {
   margin-bottom: 4em;
 }
+.hidden {
+  visibility: hidden;
+}
 </style>
diff --git a/frontend/src/components/Leaderboard.vue b/frontend/src/components/Leaderboard.vue
index 1b492c1..33257ef 100644
--- a/frontend/src/components/Leaderboard.vue
+++ b/frontend/src/components/Leaderboard.vue
@@ -40,9 +40,6 @@ export default {
   created() {
     this.updatePage();
   },
-  updated() {
-    this.updatePage()
-  },
   methods: {
     async fetchPage() {
       let res = await fetch(`${Rest.URL}/leaderboard/${this.type}?pagination=true&entriesPerPage=${this.entriesPerPage}&page=${this.pageNumber}`, {method: "GET"});
diff --git a/frontend/src/components/Login.vue b/frontend/src/components/Login.vue
index f0aed83..e08e449 100644
--- a/frontend/src/components/Login.vue
+++ b/frontend/src/components/Login.vue
@@ -25,8 +25,10 @@ export default {
   emits: ['userChange'],
   methods: {
     async setUser() {
-      let user = await User.getByName(this.username);
-      if (user.errors) {
+      let user;
+      try {
+        user = await User.getByName(this.username);
+      } catch (e) {
         user = await User.create(this.username);
       }
 
