Merge pull request #71 from Pollak-Projects/development/AdminPage

Merge admin into landing for design

Author: OHOKs

.github/workflows/build.yml

@@ -8,8 +8,8 @@ on:
 
 
 jobs:
-  build:
-    name: Build and analyze
+  analyze:
+    name: Analyze
     runs-on: ubuntu-latest
 
     steps:
@@ -26,3 +26,80 @@ jobs:
       #   timeout-minutes: 5
       #   env:
       #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  build-frontend:
+    name: Build Frontend Docker Image 🏗️
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository code 🛎️
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: CourseController
+
+      - name: Set up QEMU 🐳
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx 🚀
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Registry 🚢
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push 🏗️
+        uses: docker/build-push-action@v2
+        with:
+          context: ./CourseController
+          platforms: linux/amd64
+          file: ./CourseController/Dockerfile
+          push: true
+          tags: ghcr.io/pollak-projects/szf1_13_frontend_coursecontroller/app:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  build-backend:
+    name: Build Backend Docker Image 🏗️
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository code 🛎️
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: server
+
+      - name: Set up QEMU 🐳
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx 🚀
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Registry 🚢
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push 🏗️
+        uses: docker/build-push-action@v2
+        with:
+          context: ./server
+          platforms: linux/amd64
+          file: ./server/Dockerfile
+          push: true
+          tags: ghcr.io/pollak-projects/szf1_13_frontend_coursecontroller/api:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  triggerUpdate:
+    name: Trigger Update 🔄
+    runs-on: ubuntu-latest
+    needs: [build-backend, build-frontend]
+    steps:
+      - name: Call Webhook
+        uses: distributhor/workflow-webhook@v3
+        with:
+          webhook_url: ${{ secrets.WEBHOOK_URL }}

CourseController/.env.example

@@ -0,0 +1 @@
+VITE_API_URL=http://localhost:3300

CourseController/.gitignore

@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
+.env
 
 # Editor directories and files
 .vscode/*

CourseController/.run/dev.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="dev" type="js.build_tools.npm" nameIsGenerated="true">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="dev" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>

CourseController/Dockerfile

@@ -0,0 +1,34 @@
+# it's a good idea to pin this, but for demo purposes we'll leave it as is
+FROM node:latest as builder
+
+# automatically creates the dir and sets it as the current working dir
+WORKDIR /usr/src/app
+# this will allow us to run vite and other tools directly
+ENV PATH /usr/src/node_modules/.bin:$PATH
+
+# inject all environment vars we'll need
+ARG VITE_BACKEND_URL
+# expose the variable to the finished cotainer
+ENV VITE_BACKEND_URL=$VITE_BACKEND_URL
+
+COPY ./package.json ./
+
+RUN npm install
+
+# use a more specific COPY, as this will include files like `Dockerfile`, we don't really need inside our containers.
+COPY ./ ./
+
+FROM builder as dev
+CMD ["npm", "run", "dev"]
+
+FROM builder as prod-builder
+RUN npm run build
+
+# it's a good idea to pin this, but for demo purposes we'll leave it as is
+FROM nginx:latest as prod
+
+COPY --from=prod-builder /usr/src/app/dist /usr/share/nginx/html
+
+COPY ./config/nginx.conf /etc/nginx/conf.d/default.conf
+
+CMD ["nginx", "-g", "daemon off;"]

CourseController/components.d.ts

@@ -7,13 +7,16 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    AdminModule: typeof import('./src/components/AdminModule.vue')['default']
-    AdminNavbar: typeof import('./src/components/AdminNavbar.vue')['default']
+    AdminModule: typeof import('./src/components/AdminComponents/AdminModule.vue')['default']
+    AdminNavbar: typeof import('./src/components/AdminComponents/AdminNavbar.vue')['default']
     Button: typeof import('primevue/button')['default']
+    Toast: typeof import('primevue/toast')['default']
+    Feladatsor: typeof import('./src/components/ViewComponents/Feladatsor.vue')['default']
     Menu: typeof import('primevue/menu')['default']
-    Navigation: typeof import('./src/components/Navigation.vue')['default']
+    Navigation: typeof import('./src/components/NavigationComponents/Navigation.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    UserIcon: typeof import('./src/components/UserIcon.vue')['default']
+    UserIcon: typeof import('./src/components/NavigationComponents/UserIcon.vue')['default']
+    View: typeof import('./src/components/ViewComponents/View.vue')['default']
   }
 }

CourseController/config/nginx.conf

@@ -0,0 +1,9 @@
+server {
+    listen 80;
+
+    location / {
+        root /usr/share/nginx/html;
+        index index.html index.htm;
+        try_files $uri $uri/ /index.html;
+    }
+}