feat: 43 consider directus

.devcontainer/docker-compose.yaml

@@ -4,43 +4,40 @@
 name: clic-website-devcontainer
 
 services:
-  # Custom strapi service
-  strapi:
-    # Build the strapi service from its folder
-    container_name: clic-strapi
-    build:
-      # Build context, relative to the current file
-      context: ../strapi/.devcontainer
-      # Path to Dockerfile, relative to context
-      dockerfile: Dockerfile
-      args:
-        VARIANT: ${VARIANT:-18-bullseye}
+  # Directus service
+  directus:
+    image: directus/directus
+    container_name: clic-directus
     environment:
-      DATABASE_CLIENT: postgres
-      DATABASE_HOST: strapi-postgres
-      DATABASE_PORT: 5432
-      DATABASE_NAME: strapi_data
-      DATABASE_USER: strapi_user
-      DATABASE_PASSWORD: strapi_pw
-      NODE_ENV: development
-    volumes:
-      # Bind-mount the strapi project folder into the container
-      - type: bind
-        source: ../strapi
-        target: /app
+      SECRET: secret
+      KEY: key
+      DB_CLIENT: postgres
+      DB_HOST: directus-postgres
+      DB_PORT: 5432
+      DB_DATABASE: directus_data
+      DB_USER: directus_user
+      DB_PASSWORD: directus_pw
+      PUBLIC_URL: http://localhost/directus
+      ROOT_REDIRECT: /directus/admin
+      ADMIN_EMAIL: clic@epfl.ch
+      ADMIN_PASSWORD: 1234
     depends_on:
-      - strapi-postgres
+      - directus-postgres
+    volumes:
+      - ../directus:/share
+      - directus-uploads:/directus/uploads
+      - directus-extensions:/directus-extensions
 
-  # Database service for strapi
-  strapi-postgres:
+  # Database for directus
+  directus-postgres:
     container_name: clic-postgres
     image: postgres
     environment:
-      POSTGRES_DB: strapi_data
-      POSTGRES_USER: strapi_user
-      POSTGRES_PASSWORD: strapi_pw
+      POSTGRES_DB: directus_data
+      POSTGRES_USER: directus_user
+      POSTGRES_PASSWORD: directus_pw
     volumes:
-      - "strapi-data:/var/lib/postgresql/data"
+      - "directus-data:/var/lib/postgresql/data"
 
   app:
     # Build the app service from its folder
@@ -67,5 +64,7 @@ services:
       - "80:80"
 
 volumes:
-  # Persist strapi database
-  strapi-data:
+  # Persist directus database
+  directus-data:
+  directus-uploads:
+  directus-extensions:

.github/workflows/docker-build.yml

@@ -26,9 +26,6 @@ env:
 
 jobs:
   build:
-    strategy:
-      matrix:
-        directory: [strapi, app]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -77,7 +74,7 @@ jobs:
         id: build-and-push
         uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
         with:
-          context: ${{ matrix.directory }}
+          context: app
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -1 +1,2 @@
-node_modules/
+node_modules/
+oas.json

.prettierignore

@@ -7,5 +7,4 @@
 
 app/.next
 
-strapi/.strapi-updater.json
-strapi/src/api
+oas.json

.vscode/settings.json

@@ -18,9 +18,9 @@
   },
   "todohighlight.keywordsPattern": "(todo|TODO|fixme|FIXME)(:?)",
   "terminal.integrated.profiles.linux": {
-    "strapi": {
+    "directus": {
       "path": "docker",
-      "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
+      "args": ["exec", "-it", "clic-directus", "/bin/bash"],
       "overrideName": true
     },
     "postgres": {
@@ -35,9 +35,9 @@
     }
   },
   "terminal.integrated.profiles.windows": {
-    "strapi": {
+    "directus": {
       "path": "docker",
-      "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
+      "args": ["exec", "-it", "clic-directus", "/bin/bash"],
       "overrideName": true
     },
     "postgres": {
@@ -52,9 +52,9 @@
     }
   },
   "terminal.integrated.profiles.osx": {
-    "strapi": {
+    "directus": {
       "path": "docker",
-      "args": ["exec", "-it", "clic-strapi", "/bin/bash"],
+      "args": ["exec", "-it", "clic-directus", "/bin/bash"],
       "overrideName": true
     },
     "postgres": {

app/.devcontainer/devcontainer.json

@@ -1,4 +1,3 @@
-// strapi service devcontainer
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.238.0/containers/typescript-node
 {

app/.env.example

@@ -1 +1,3 @@
-STRAPI_TOKEN=1234
+DIRECTUS_URL=http://localhost/directus
+NEXT_PUBLIC_DIRECTUS_URL=http://localhost/directus
+DIRECTUS_TOKEN=1234

app/next.config.js

@@ -2,7 +2,7 @@
 
 const path = require("path");
 
-const nextConfig = {
+module.exports = {
   reactStrictMode: true,
   sassOptions: {
     includePaths: [path.join(__dirname, "styles")],
@@ -39,5 +39,3 @@ const nextConfig = {
     defaultLocale: "en",
   },
 };
-
-module.exports = nextConfig;