CI/CD rework to drop netlify

.dockerignore

@@ -0,0 +1,11 @@
+.previewConfigs
+.eslintrc.js
+.gitignore
+CONTRIBUTING.md
+netlify.toml
+RASPBERRY.md
+README.md
+.github
+node_modules
+compose.yaml
+DOCKERFILE

.github/workflows/deploy-main.yml

@@ -0,0 +1,36 @@
+name: Deploy over SSH
+on: 
+  push:
+    branches:
+      - main
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    steps:
+      - name: executing remote ssh commands using password
+        uses: appleboy/ssh-action@v1.2.0
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          port: ${{ secrets.PORT }}
+          script: |
+            echo "Using correct folder..."
+            cd info
+            echo "Pulling changes..."
+            git pull
+            echo "Building container image..."
+            podman build -t onboarding-info:latest .
+            if [[ $? -ne 0 ]] ; then
+              echo "Failed, Cleaning up..."
+              podman image ls -a | grep '<none>' | awk '{print $3}' | xargs podman rmi -f
+              exit 1
+            fi
+            echo "Shutting down and deleting old containers..."
+            podman-compose down
+            echo "Bringing up new containers with the latest released code..."
+            podman-compose up -d
+            echo "Cleaning up..."
+            podman image ls -a | grep '<none>' | awk '{print $3}' | xargs podman rmi -f

.github/workflows/deploy-preview.yml

@@ -0,0 +1,49 @@
+name: Deploy preview over SSH
+on: [pull_request]
+jobs:
+  deploy:
+    name: Deploy preview
+    runs-on: ubuntu-latest
+    steps:
+      - name: executing remote ssh commands using password
+        uses: appleboy/ssh-action@v1.2.0
+        env:
+          PR_NUMBER: ${{ github.event.number }}
+        with:
+          host: ${{ secrets.HOST }}
+          username: ${{ secrets.USERNAME }}
+          key: ${{ secrets.KEY }}
+          passphrase: ${{ secrets.PASSPHRASE }}
+          port: ${{ secrets.PORT }}
+          envs: PR_NUMBER
+          script: |
+            echo "Removing previous preview data..."
+            rm -rf preview-info
+            podman image rm 
+            echo "Cloning preview..."
+            git clone https://github.com/Xabi08YT/iut-onboarding.git preview-info
+            echo "Using correct folder..."
+            cd preview-info
+            echo "Switching to right PR..."
+            git fetch origin pull/$PR_NUMBER/head:PREVIEW
+            git switch PREVIEW
+            echo "Copying .env file..."
+            cp ../../.env.info ../.env
+            echo "Using preview config for nuxt..."
+            rm nuxt.config.js
+            cp .previewConfigs/devnuxt.config.js ./nuxt.config.js
+            echo "Building container image..."
+            podman build -t onboarding-info-preview:latest .
+            if [[ $? -ne 0 ]] ; then
+              echo "Failed, Cleaning up..."
+              podman image ls -a | grep '<none>' | awk '{print $3}' | xargs podman rmi -f
+              exit 1
+            fi
+            echo "Using preview podman configs..."
+            cd .previewConfigs
+            echo "Shutting down and deleting old previews..."
+            podman-compose down
+            echo "Bringing up new preview..."
+            podman-compose up -d
+            echo "Cleaning up..."
+            podman image ls -a | grep '<none>' | awk '{print $3}' | xargs podman rmi -f

.previewConfigs/compose.yaml

@@ -0,0 +1,12 @@
+networks:
+  proxy:
+    external: true
+
+services:
+  previewInfo:
+    container_name: infopreview
+    image: onboarding-info-preview:latest
+    restart: unless-stopped
+    networks:
+      proxy:
+        ipv4_address: 10.89.1.151

.previewConfigs/devnuxt.config.js

@@ -0,0 +1,29 @@
+// https://nuxt.com/docs/api/configuration/nuxt-config
+export default {
+    compatibilityDate: '2024-04-03',
+    devtools: { enabled: true },
+    modules: ['@nuxtjs/google-fonts'],
+
+    app: {
+      baseURL: '/preview/info/'
+    },
+
+    googleFonts: {
+      display: 'swap',
+      outputDir: 'assets/fonts/',
+      families: {
+        Fredoka: {
+          wght: ["75..125",500]
+        },
+        Poppins: {
+          wght: 300
+        }
+      }
+    },
+
+    routeRules: {
+      "/api/hp/**": {
+        proxy: "https://hyperplanning.iut.u-bordeaux.fr/Telechargements/ical/**"
+      }
+    }
+  };

Dockerfile

@@ -0,0 +1,6 @@
+FROM docker.io/node:20-alpine
+WORKDIR /server
+COPY . /server
+RUN npm ci
+RUN npm run build
+CMD node .output/server/index.mjs

api.js

@@ -79,15 +79,6 @@ export const getTBMLineWaitInterval = async (stopId, lineId) => {
   }
 };
 
-export const getAllRestaurantsMenus = async () => {
-  try {
-    const result = await fetch(".netlify/functions/getCrousMenus");
-    return await result.json();
-  } catch (e) {
-    throw `Erreur de récupération des menus CROUS : ${e}`;
-  }
-};
-
 const transformDesc = (desc) => {
   if(desc.length === 0) {
     return ;

app.vue

@@ -28,9 +28,9 @@
       :isActive="currentView == 'menus'"
     />
     <Planning
-        v-if="Object.keys(views).includes('planning')"
-        :isActive="currentView == 'planning'"
-      />
+      v-if="Object.keys(views).includes('planning')"
+      :isActive="currentView == 'planning'"
+    />
     <client-only>
       <Transport
         v-if="Object.keys(views).includes('transport')"

components/Background.vue

@@ -19,6 +19,18 @@
 </template>
 
 <script>
+import circle from "../public/assets/circle.svg";
+import path1 from "../public/assets/path1.svg";
+import path2 from "../public/assets/path2.svg";
+import path3 from "../public/assets/path3.svg";
+import snow1 from "../public/assets/snow1.svg";
+import snow2 from "../public/assets/snow2.svg";
+import snow3 from "../public/assets/snow3.svg";
+import wave1 from "../public/assets/wave1.svg";
+import wave2 from "../public/assets/wave2.svg";
+import wave3 from "../public/assets/wave3.svg";
+import wave4 from "../public/assets/wave4.svg";
+
 export default {
   data() {
     return {
@@ -28,35 +40,35 @@ export default {
       decorations: {
         circles: [
           {
-            svg: "/assets/circle.svg",
+            svg: circle,
             posStyle: "left: 500px; width: 100px",
             transition: "slide-left",
             show: false,
             class: "full-height",
           },
           {
-            svg: "/assets/circle.svg",
+            svg: circle,
             posStyle: "top: 10px; left: 100px; width: 300px",
             transition: "slide-top",
             show: false,
             class: "full-width",
           },
           {
-            svg: "/assets/circle.svg",
+            svg: circle,
             posStyle: "right: 100px; width: 200px",
             transition: "slide-right",
             show: false,
             class: "full-height",
           },
           {
-            svg: "/assets/circle.svg",
+            svg: circle,
             posStyle: "bottom: 10px; right: 100px; width: 300px",
             transition: "slide-bottom",
             show: false,
             class: "full-width",
           },
           {
-            svg: "/assets/circle.svg",
+            svg: circle,
             posStyle: "bottom: 100px; left: 50px; width: 60px",
             transition: "slide-bottom",
             show: false,
@@ -65,21 +77,21 @@ export default {
         ],
         lines: [
           {
-            svg: "/assets/path1.svg",
+            svg: path1,
             posStyle: "left: -300px;",
             transition: "slide-left",
             show: false,
             class: "full-height",
           },
           {
-            svg: "/assets/path2.svg",
+            svg: path2,
             posStyle: "right: -300px; bottom: -50vh;",
             transition: "slide-right",
             show: false,
             class: "full-height",
           },
           {
-            svg: "/assets/path3.svg",
+            svg: path3,
             posStyle: "right: -300px;",
             transition: "slide-right",
             show: false,
@@ -88,28 +100,28 @@ export default {
         ],
         waves: [
           {
-            svg: "/assets/wave2.svg",
+            svg: wave2,
             posStyle: "bottom: 0",
             transition: "slide-bottom",
             show: false,
             class: "full-width opaque",
           },
           {
-            svg: "/assets/wave1.svg",
+            svg: wave1,
             posStyle: "bottom: 0;",
             transition: "slide-bottom",
             show: false,
             class: "full-width opaque",
           },
           {
-            svg: "/assets/wave3.svg",
+            svg: wave3,
             posStyle: "top: 0;",
             transition: "slide-top",
             show: false,
             class: "full-width opaque",
           },
           {
-            svg: "/assets/wave4.svg",
+            svg: wave4,
             posStyle: "top: 0;",
             transition: "slide-top",
             show: false,
@@ -118,21 +130,21 @@ export default {
         ],
         snow: [
           {
-            svg: "/assets/snow1.svg",
+            svg: snow1,
             posStyle: "height: 40vh; position: absolute; left: 0; top: 0;",
             transition: "slide-left",
             show: false,
             class: "snow",
           },
           {
-            svg: "/assets/snow2.svg",
+            svg: snow2,
             posStyle: "right: 0; bottom: 0;",
             transition: "slide-right",
             show: false,
             class: "snow",
           },
           {
-            svg: "/assets/snow3.svg",
+            svg: snow3,
             posStyle: "right: 0; top: 0;",
             transition: "slide-top",
             show: false,

components/DateHourHeader.vue

@@ -2,7 +2,7 @@
   <div id="header">
     <p>{{ currentDate }}</p>
     <p>{{ currentTime }}</p>
-    <img style="width: 150px; margin-left: 150px;" src="/assets/logo_iut_noel.png" />
+    <img style="width: 150px; margin-left: 150px;" src="/assets/logo_iut_nouvelan.png" />
   </div>
 </template>
 

components/DiscordCard.vue

@@ -10,11 +10,14 @@
 </template>
 
 <script>
+import qrCode from "@/public/assets/Jeudi.png";
+import logoDiscord from "@/public/assets/logo_discord.png";
+
 export default {
   data() {
     return {
-      qrCode: "/assets/asso/qrcode.png",
-      logoDiscord: "/assets/logo_discord.png"
+      qrCode: qrCode,
+      logoDiscord: logoDiscord
     };
   }
 };

components/PlanningCard.vue

@@ -43,6 +43,7 @@
 </template>
 
 <script>
+import robot from "@/public/assets/robot.png";
 export default {
   props: {
     data: {
@@ -52,7 +53,7 @@ export default {
   },
   data() {
     return {
-      noClassLogo: "/assets/robot.png",
+      noClassLogo: robot,
     };
   },
   methods: {

components/TransitionOverlay.vue

@@ -5,13 +5,16 @@
 </template>
 
 <script>
+import logoIUT from "../public/assets/logo_iut_nouvelan_NOTEXT.png";
+import logoGP from "../public/assets/gitpoule.png"
+
 export default {
   data() {
     return {
       active: false,
       duration: 3000,
-      logoIut: "/assets/logo_iut_noel.png",
-      logoGP: "/assets/gitpoule.png",
+      logoIut: logoIUT,
+      logoGP: logoGP,
       currentLogo: null
     };
   },