Merge pull request #4 from vatger/dev

Merge dev into main

.dockerignore

@@ -1,2 +1,5 @@
 node_modules
-dist
+dist
+
+README.md
+CONTRIBUTING.md

.github/workflows/dev.yml

@@ -0,0 +1,32 @@
+name: Docker CI/CD
+
+on:
+  push:
+    branches: [ "dev" ]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        run: |
+          docker build --pull -t ${{ env.REGISTRY }}/${{ github.repository }}:latest .
+          docker push ${{ env.REGISTRY }}/${{ github.repository }}:latest

.prettierignore

@@ -1,5 +1,6 @@
 node_modules
 dist
+.github
 
 package.json
 package-lock.json
@@ -14,6 +15,7 @@ docker-compose.yml
 .prettierignore
 .gitlab-ci.yml
 
+CONTRIBUTING.md
 README.md
 .env
 .env.example

Dockerfile

@@ -13,4 +13,6 @@ RUN npm install --quiet --unsafe-perm --no-progress --no-audit --include=dev
 
 COPY . .
 
-CMD npm run dev
+RUN npm run build
+
+CMD npm run run

db/config/config.js

@@ -1,4 +1,4 @@
-const dotenv = require('dotenv');
+const dotenv = require("dotenv");
 
 dotenv.config();
 
@@ -15,16 +15,16 @@ module.exports = {
         username: process.env.CI_DB_USERNAME,
         password: process.env.CI_DB_PASSWORD,
         database: process.env.CI_DB_NAME,
-        host: '127.0.0.1',
+        host: "127.0.0.1",
         port: 3306,
-        dialect: 'mysql',
+        dialect: "mysql",
     },
     production: {
         username: process.env.PROD_DB_USERNAME,
         password: process.env.PROD_DB_PASSWORD,
         database: process.env.PROD_DB_NAME,
         host: process.env.PROD_DB_HOSTNAME,
         port: process.env.PROD_DB_PORT,
-        dialect: 'mysql',
-    }
-};
+        dialect: "mysql",
+    },
+};

db/migrations/20221115171242-create-user-table.js

@@ -1,5 +1,7 @@
 const { DataType } = require("sequelize-typescript");
 
+//TODO: Check relationships (explicitly on delete and on update). These should not all be cascade!
+
 const DataModelAttributes = {
     id: {
         type: DataType.INTEGER,

db/migrations/20221115171243-create-user-session-table.js

@@ -10,6 +10,14 @@ const DataModelAttributes = {
         type: DataType.UUID,
         allowNull: false,
     },
+    browser_uuid: {
+        type: DataType.UUID,
+        allowNull: false,
+    },
+    client: {
+        type: DataType.STRING(100),
+        allowNull: true,
+    },
     user_id: {
         type: DataType.INTEGER,
         allowNull: false,

db/migrations/20221115171256-create-training-requests-table.js

@@ -50,7 +50,7 @@ const DataModelAttributes = {
             key: "id",
         },
         onUpdate: "cascade",
-        onDelete: "cascade",
+        onDelete: "set null",
     },
     comment: {
         type: DataType.TEXT,
@@ -73,7 +73,7 @@ const DataModelAttributes = {
             key: "id",
         },
         onUpdate: "cascade",
-        onDelete: "cascade",
+        onDelete: "set null",
     },
     createdAt: DataType.DATE,
     updatedAt: DataType.DATE,

db/migrations/20221115171265-create-notification-tables.js

@@ -0,0 +1,70 @@
+const { DataType } = require("sequelize-typescript");
+
+const CourseInformationModelAttributes = {
+    id: {
+        type: DataType.INTEGER,
+        primaryKey: true,
+        autoIncrement: true,
+    },
+    uuid: {
+        type: DataType.UUID,
+        allowNull: false,
+    },
+    user_id: {
+        type: DataType.INTEGER,
+        allowNull: false,
+        references: {
+            model: "users",
+            key: "id",
+        },
+        onUpdate: "cascade",
+        onDelete: "cascade",
+    },
+    author_id: {
+        type: DataType.INTEGER,
+        allowNull: true,
+        references: {
+            model: "users",
+            key: "id",
+        },
+        onUpdate: "cascade",
+        onDelete: "set null",
+    },
+    content_de: {
+        type: DataType.TEXT("medium"),
+        allowNull: false,
+    },
+    content_en: {
+        type: DataType.TEXT("medium"),
+        allowNull: false,
+    },
+    link: {
+        type: DataType.STRING(255),
+        allowNull: true,
+    },
+    icon: {
+        type: DataType.STRING(50),
+        allowNull: true,
+    },
+    severity: {
+        type: DataType.ENUM("default", "info", "success", "danger"),
+        allowNull: true,
+    },
+    read: {
+        type: DataType.BOOLEAN,
+        allowNull: false,
+        default: true,
+    },
+    createdAt: DataType.DATE,
+    updatedAt: DataType.DATE,
+};
+
+module.exports = {
+    async up(queryInterface) {
+        await queryInterface.createTable("notifications", CourseInformationModelAttributes);
+    },
+
+    async down(queryInterface) {
+        await queryInterface.dropTable("notifications");
+    },
+};

docker-compose.yml

@@ -1,16 +1,14 @@
 version: "3.9"
 services:
   backend:
-    build: .
+    image: ghcr.io/vatger/trainingcenter-backend:latest
     depends_on:
       mysql:
         condition: service_started
-    env_file:
-      - .env
     environment:
       - APP_DEBUG
       - APP_LOG_SQL
-      - APP_PORT=8001
+      - APP_PORT=80
       - APP_HOST
       - APP_KEY
       - APP_VERSION
@@ -32,13 +30,17 @@ services:
       - DB_USERNAME
       - DB_PASSWORD
     ports:
-      - "8001:8001"
+      - "5001:80"
 
+  frontend:
+    image: ghcr.io/vatger/trainingcenter-frontend:latest
+    ports:
+      - "5002:80"
   mysql:
     image: mysql
     restart: always
     ports:
-      - "3306:3306"
+      - "5000:3306"
     environment:
       MYSQL_ROOT_PASSWORD: example
       MYSQL_USER: trainingcenter