Leaderboard & Friends #13

zelytra · May 28, 2024 · 34c187c · 34c187c
1 parent 6c13c63
commit 34c187c
Show file tree

Hide file tree

Showing 49 changed files with 1,201 additions and 84 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,10 +15,10 @@ jobs:
         working-directory: 'backend'
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Build with Maven
         run: mvn quarkus:build package
@@ -36,10 +36,10 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Build and Run Tests
         run: mvn test --batch-mode --fail-at-end

diff --git a/backend/.dockerignore b/backend/.dockerignore
@@ -1,4 +1,3 @@
-*
 !target/*-runner
 !target/*-runner.jar
 !target/lib/*

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -0,0 +1,19 @@
+# Build stage
+FROM maven:3.8.3-openjdk-17 AS build
+WORKDIR /app
+COPY . .
+RUN mvn quarkus:build package -Dmaven.test.skip=true -Dquarkus.profile=prod
+
+# Package stage
+FROM registry.access.redhat.com/ubi8/openjdk-17:latest
+ENV LANGUAGE='en_US:en'
+# We make four distinct layers so if there are application changes the library layers can be re-used
+COPY --from=build --chown=185 /app/target/quarkus-app/lib/ /deployments/lib/
+COPY --from=build --chown=185 /app/target/quarkus-app/*.jar /deployments/
+COPY --from=build --chown=185 /app/target/quarkus-app/app/ /deployments/app/
+COPY --from=build --chown=185 /app/target/quarkus-app/quarkus/ /deployments/quarkus/
+
+EXPOSE 8080
+USER 185
+ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
diff --git a/webapp/index.html b/webapp/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/logo-back.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>OnePool</title>
   </head>

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -1,18 +1,20 @@
 {
   "name": "onepool",
   "private": false,
-  "version": "0.1.0",
+  "version": "0.1.0-alpha",
   "type": "module",
   "scripts": {
     "dev": "vite --host",
     "build": "vue-tsc && vite build",
     "preview": "vite preview"
   },
   "dependencies": {
+    "keycloak-js": "^24.0.3",
+    "pinia": "^2.1.7",
     "sass": "^1.76.0",
     "vue": "^3.4.21",
     "vue-i18n": "^9.13.1",
-    "keycloak-js": "^24.0.3"
+    "vue-smooth-reflow": "^0.1.12"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.4",

diff --git a/webapp/public/logo-back.svg b/webapp/public/logo-back.svg
diff --git a/webapp/src/App.vue b/webapp/src/App.vue
@@ -1,4 +1,5 @@
 <template>
+  <AlertFactory/>
   <router-view v-slot="{ Component }">
     <transition mode="out-in">
       <component :is="Component"/>
@@ -8,8 +9,19 @@
 
 <script setup lang="ts">
 
+import AlertFactory from "@/vue/alerts/AlertFactory.vue";
+import {onMounted} from "vue";
+import {AlertType, useAlertStore} from "@/vue/alerts/AlertStore.ts";
+
+
+onMounted(() => {
+  setInterval(() => {
+    useAlertStore().send({
+      content: "", timeout: 1000, title: "Une alerte", type: AlertType.VALID
+    })
+  }, 3000)
+})
 </script>
 
 <style scoped lang="scss">
-
 </style>
diff --git a/webapp/src/assets/font.scss b/webapp/src/assets/font.scss
@@ -1,50 +1,5 @@
 /* Jost font import */
 @font-face {
-  font-family: "Jost-Light";
-  src: url("@assets/fonts/jost/Jost-Light.ttf");
-}
-
-@font-face {
-  font-family: "Jost-Medium";
-  src: url("@assets/fonts/jost/Jost-Medium.ttf");
-}
-
-@font-face {
-  font-family: "Jost-MediumItalic";
-  src: url("@assets/fonts/jost/Jost-MediumItalic.ttf");
-}
-
-@font-face {
-  font-family: "Jost-Regular";
-  src: url("@assets/fonts/jost/Jost-Regular.ttf");
-}
-
-@font-face {
-  font-family: "Jost-SemiBold";
-  src: url("@assets/fonts/jost/Jost-SemiBold.ttf");
-}
-
-@font-face {
-  font-family: "PlusJakarta";
-  src: url("@assets/fonts/PlusJakartaSans-VariableFont_wght.ttf");
-}
-
-@font-face {
-  font-family: "RobotoMono";
-  src: url("@assets/fonts/RobotoMono-VariableFont_wght.ttf");
-}
-
-@font-face {
-  font-family: "Manrop";
-  src: url("@assets/fonts/Manrope-VariableFont_wght.ttf");
-}
-
-@font-face {
-  font-family: "Rubik";
-  src: url("@assets/fonts/Rubik-VariableFont_wght.ttf");
-}
-
-@font-face {
-  font-family: "BrushTip";
-  src: url("@assets/fonts/brushTipTexe.ttf");
+  font-family: "Matter";
+  src: url("@assets/fonts/MatterGX.woff2");
 }
diff --git a/webapp/src/assets/fonts/Manrope-VariableFont_wght.ttf b/webapp/src/assets/fonts/Manrope-VariableFont_wght.ttf
diff --git a/webapp/src/assets/fonts/ManuskriptAntiquaD.ttf b/webapp/src/assets/fonts/ManuskriptAntiquaD.ttf
diff --git a/webapp/src/assets/fonts/MatterGX.woff2 b/webapp/src/assets/fonts/MatterGX.woff2
diff --git a/webapp/src/assets/fonts/PlusJakartaSans-VariableFont_wght.ttf b/webapp/src/assets/fonts/PlusJakartaSans-VariableFont_wght.ttf
diff --git a/webapp/src/assets/fonts/RobotoMono-VariableFont_wght.ttf b/webapp/src/assets/fonts/RobotoMono-VariableFont_wght.ttf
diff --git a/webapp/src/assets/fonts/Rubik-VariableFont_wght.ttf b/webapp/src/assets/fonts/Rubik-VariableFont_wght.ttf
diff --git a/webapp/src/assets/fonts/WindlassExtended.ttf b/webapp/src/assets/fonts/WindlassExtended.ttf
diff --git a/webapp/src/assets/fonts/brushTipTexe.ttf b/webapp/src/assets/fonts/brushTipTexe.ttf
diff --git a/webapp/src/assets/fonts/jost/Jost-Light.ttf b/webapp/src/assets/fonts/jost/Jost-Light.ttf
diff --git a/webapp/src/assets/fonts/jost/Jost-Medium.ttf b/webapp/src/assets/fonts/jost/Jost-Medium.ttf
diff --git a/webapp/src/assets/fonts/jost/Jost-MediumItalic.ttf b/webapp/src/assets/fonts/jost/Jost-MediumItalic.ttf
diff --git a/webapp/src/assets/fonts/jost/Jost-Regular.ttf b/webapp/src/assets/fonts/jost/Jost-Regular.ttf
diff --git a/webapp/src/assets/fonts/jost/Jost-SemiBold.ttf b/webapp/src/assets/fonts/jost/Jost-SemiBold.ttf
diff --git a/webapp/src/assets/icons/add-friend.svg b/webapp/src/assets/icons/add-friend.svg
diff --git a/webapp/src/assets/icons/friends.svg b/webapp/src/assets/icons/friends.svg