Merge branch 'logout-button' into develop

frontend/package-lock.json

@@ -8,9 +8,7 @@
       "name": "raspberryrocketeer",
       "version": "0.1.0",
       "dependencies": {
-        "@types/p5": "^1.4.3",
         "bootstrap": "^5.2.3",
-        "p5": "^1.5.0",
         "vue": "^3.2.13"
       },
       "devDependencies": {
@@ -831,11 +829,6 @@
       "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
-    "node_modules/@types/p5": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@types/p5/-/p5-1.4.3.tgz",
-      "integrity": "sha512-UjgBi1/VU0Dz1/JxzRZrDKlC54rMELWW+6oHx1pRKzKkVgwzvP+dEjZ1JbeMjK12VJMUjDx4lhGUmnUL2jBASQ=="
-    },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.0.tgz",
@@ -6194,11 +6187,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/p5": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/p5/-/p5-1.5.0.tgz",
-      "integrity": "sha512-zZFMVUmGkXe2G5H6Sw7xsVhgdxMyEN/6SZnZqYdQ51513kTqPslLnukkwTbGf8YtW0RetTU0FTjYQMXnFD7KnQ=="
-    },
     "node_modules/param-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmmirror.com/param-case/-/param-case-3.0.4.tgz",
@@ -9881,11 +9869,6 @@
       "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
-    "@types/p5": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/@types/p5/-/p5-1.4.3.tgz",
-      "integrity": "sha512-UjgBi1/VU0Dz1/JxzRZrDKlC54rMELWW+6oHx1pRKzKkVgwzvP+dEjZ1JbeMjK12VJMUjDx4lhGUmnUL2jBASQ=="
-    },
     "@types/parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.0.tgz",
@@ -14205,11 +14188,6 @@
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true
     },
-    "p5": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/p5/-/p5-1.5.0.tgz",
-      "integrity": "sha512-zZFMVUmGkXe2G5H6Sw7xsVhgdxMyEN/6SZnZqYdQ51513kTqPslLnukkwTbGf8YtW0RetTU0FTjYQMXnFD7KnQ=="
-    },
     "param-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmmirror.com/param-case/-/param-case-3.0.4.tgz",

frontend/package.json

@@ -9,9 +9,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@types/p5": "^1.4.3",
     "bootstrap": "^5.2.3",
-    "p5": "^1.5.0",
     "vue": "^3.2.13"
   },
   "devDependencies": {

frontend/src/App.vue

@@ -7,11 +7,14 @@
       <UserScores :userScores="userScores"></UserScores>
     </div>
     <div class="row">
-      <Game :class="user ? '' : 'hidden'" v-bind:user-id=this.userId class="col"
+      <Game :class="user ? '' : 'hidden'" :user-id="this.user?.id"
             @gameFinished="this.updateUserScores()" ref="game">
       </Game>
       <Login v-if="!user" @userChange="(event) => {this.updateUser(event);}">
       </Login>
+      <div v-if="user" class="logout-wrapper offset-10 col-2">
+        <RRButton @click="this.user = null; this.userId = -1;" text="Logout"></RRButton>
+      </div>
     </div>
     <div class="row">
       <div class="col-4">
@@ -36,10 +39,12 @@ import "bootstrap/dist/js/bootstrap.min.js";
 import Login from "@/components/Login.vue";
 import {Rest} from "@/model/Rest";
 import {User} from "@/model/User";
+import RRButton from "@/components/RRButton.vue";
 
 export default defineComponent({
   name: 'App',
   components: {
+    RRButton,
     Login,
     UserScores,
     Leaderboard,
@@ -97,4 +102,8 @@ export default defineComponent({
 .hidden {
   visibility: hidden;
 }
+.logout-wrapper {
+  display: flex;
+  justify-content: right;
+}
 </style>

frontend/src/model/Rest.ts

@@ -1,3 +1,3 @@
 export class Rest {
-    static readonly URL = 'http://139.144.178.216:3000';
+    static readonly URL = 'http://localhost:3000';
 }