UX-improvements (#165)

* Updates Strapi, NextJS and more * Improves navigation bar * Combines Word lid and Steun ons * Improvements to the footer * Improves home page layout * Removes panning and zooming controls from map on home page * Resolves console warnings * Improves posts design * Fixes bug in posts search * Resolves bug where 'meer laden' on home would retrieve non-frontpage posts * Improves markdown rendering * Improves design of werkgroepen page * Fixes prettier config
roodjong · Apr 4, 2023 · ec90663 · ec90663
1 parent c01f35f
commit ec90663
Show file tree

Hide file tree

Showing 77 changed files with 3,225 additions and 3,890 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,18 +1,18 @@
 version: 2
 updates:
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/frontend" # Location of package manifests
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "npm" # See documentation for possible values
-    directory: "/backend" # Location of package manifests
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "/frontend"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "docker"
-    directory: "/backend"
-    schedule:
-      interval: "weekly"
+    - package-ecosystem: "npm" # See documentation for possible values
+      directory: "/frontend" # Location of package manifests
+      schedule:
+          interval: "weekly"
+    - package-ecosystem: "npm" # See documentation for possible values
+      directory: "/backend" # Location of package manifests
+      schedule:
+          interval: "weekly"
+    - package-ecosystem: "docker"
+      directory: "/frontend"
+      schedule:
+          interval: "weekly"
+    - package-ecosystem: "docker"
+      directory: "/backend"
+      schedule:
+          interval: "weekly"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,35 +1,35 @@
 name: Lint
 
 on:
-  push:
-    branches:
-      - main
-  pull_request:
+    push:
+        branches:
+            - main
+    pull_request:
 
 jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+    lint:
+        name: Lint
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v3
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          cache: "yarn"
+            - name: Setup Node.js
+              uses: actions/setup-node@v3
+              with:
+                  cache: "yarn"
 
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
+            - name: Install dependencies
+              run: yarn install --frozen-lockfile
 
-      - name: Lint Prettier
-        run: yarn lint:prettier
+            - name: Lint Prettier
+              run: yarn lint:prettier
 
-      - name: Install frontend dependencies
-        run: cd frontend && yarn install --frozen-lockfile
+            - name: Install frontend dependencies
+              run: cd frontend && yarn install --frozen-lockfile
 
-      - name: Run next lint on frontend
-        run: cd frontend && yarn lint --max-warnings=0
+            - name: Run next lint on frontend
+              run: cd frontend && yarn lint --max-warnings=0
 
-      - name: Typecheck frontend
-        run: cd frontend && yarn ts-lint
+            - name: Typecheck frontend
+              run: cd frontend && yarn ts-lint
diff --git a/.prettierignore b/.prettierignore
@@ -3,4 +3,4 @@ frontend/.next
 docker
 backend/build
 backend/.strapi-updater.json
-*.md
+*.md
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -0,0 +1,2 @@
+tabWidth: 4
+printWidth: 90
diff --git a/backend/.eslintrc b/backend/.eslintrc
@@ -1,27 +1,27 @@
 {
-  "parser": "babel-eslint",
-  "extends": "eslint:recommended",
-  "env": {
-    "commonjs": true,
-    "es6": true,
-    "node": true,
-    "browser": false
-  },
-  "parserOptions": {
-    "ecmaFeatures": {
-      "experimentalObjectRestSpread": true,
-      "jsx": false
+    "parser": "babel-eslint",
+    "extends": "eslint:recommended",
+    "env": {
+        "commonjs": true,
+        "es6": true,
+        "node": true,
+        "browser": false
     },
-    "sourceType": "module"
-  },
-  "globals": {
-    "strapi": true
-  },
-  "rules": {
-    "indent": ["error", 2, { "SwitchCase": 1 }],
-    "linebreak-style": ["error", "unix"],
-    "no-console": 0,
-    "quotes": ["error", "single"],
-    "semi": ["error", "always"]
-  }
+    "parserOptions": {
+        "ecmaFeatures": {
+            "experimentalObjectRestSpread": true,
+            "jsx": false
+        },
+        "sourceType": "module"
+    },
+    "globals": {
+        "strapi": true
+    },
+    "rules": {
+        "indent": ["error", 2, { "SwitchCase": 1 }],
+        "linebreak-style": ["error", "unix"],
+        "no-console": 0,
+        "quotes": ["error", "single"],
+        "semi": ["error", "always"]
+    }
 }
diff --git a/backend/config/admin.js b/backend/config/admin.js
@@ -1,5 +1,5 @@
 module.exports = ({ env }) => ({
-  auth: {
-    secret: env("ADMIN_JWT_SECRET"),
-  },
+    auth: {
+        secret: env("ADMIN_JWT_SECRET"),
+    },
 });
diff --git a/backend/config/api.js b/backend/config/api.js
@@ -1,7 +1,7 @@
 module.exports = {
-  rest: {
-    defaultLimit: 1000,
-    maxLimit: 1000,
-    withCount: true,
-  },
+    rest: {
+        defaultLimit: 1000,
+        maxLimit: 1000,
+        withCount: true,
+    },
 };
diff --git a/backend/config/database.js b/backend/config/database.js
@@ -1,14 +1,14 @@
 const path = require("path");
 
 module.exports = ({ env }) => ({
-  connection: {
-    client: "postgres",
     connection: {
-      host: env("DATABASE_HOST"),
-      port: env("DATABASE_PORT"),
-      database: env("DATABASE_NAME"),
-      user: env("DATABASE_USER"),
-      password: env("DATABASE_PASSWORD"),
+        client: "postgres",
+        connection: {
+            host: env("DATABASE_HOST"),
+            port: env("DATABASE_PORT"),
+            database: env("DATABASE_NAME"),
+            user: env("DATABASE_USER"),
+            password: env("DATABASE_PASSWORD"),
+        },
     },
-  },
 });
diff --git a/backend/config/middlewares.js b/backend/config/middlewares.js
@@ -1,12 +1,12 @@
 module.exports = [
-  "strapi::errors",
-  "strapi::security",
-  "strapi::cors",
-  "strapi::poweredBy",
-  "strapi::logger",
-  "strapi::query",
-  "strapi::body",
-  "strapi::session",
-  "strapi::favicon",
-  "strapi::public",
+    "strapi::errors",
+    "strapi::security",
+    "strapi::cors",
+    "strapi::poweredBy",
+    "strapi::logger",
+    "strapi::query",
+    "strapi::body",
+    "strapi::session",
+    "strapi::favicon",
+    "strapi::public",
 ];
diff --git a/backend/config/plugins.js b/backend/config/plugins.js
@@ -1,23 +1,23 @@
 module.exports = ({ env }) => ({
-  i18n: true,
-  "users-permissions": {
-    jwtSecret: env("JWT_SECRET"),
-  },
-  email: {
-    config: {
-      provider: "nodemailer",
-      providerOptions: {
-        host: env("SMTP_HOST", "mail.zxcs.nl"),
-        port: env("SMTP_PORT", 465),
-        auth: {
-          user: env("SMTP_USERNAME"),
-          pass: env("SMTP_PASSWORD"),
+    i18n: true,
+    "users-permissions": {
+        jwtSecret: env("JWT_SECRET"),
+    },
+    email: {
+        config: {
+            provider: "nodemailer",
+            providerOptions: {
+                host: env("SMTP_HOST", "mail.zxcs.nl"),
+                port: env("SMTP_PORT", 465),
+                auth: {
+                    user: env("SMTP_USERNAME"),
+                    pass: env("SMTP_PASSWORD"),
+                },
+            },
+            settings: {
+                defaultFrom: "[email protected]",
+                defaultReplyTo: "[email protected]",
+            },
         },
-      },
-      settings: {
-        defaultFrom: "[email protected]",
-        defaultReplyTo: "[email protected]",
-      },
     },
-  },
 });
diff --git a/backend/config/server.js b/backend/config/server.js
@@ -1,8 +1,11 @@
 module.exports = ({ env }) => ({
-  host: env("HOST"),
-  port: env.int("PORT"),
-  url: env("URL"),
-  app: {
-    keys: env.array("APP_KEYS"),
-  },
+    host: env("HOST"),
+    port: env.int("PORT"),
+    url: env("URL"),
+    app: {
+        keys: env.array("APP_KEYS"),
+    },
+    webhooks: {
+        populateRelations: false,
+    },
 });
diff --git a/backend/package.json b/backend/package.json
@@ -1,33 +1,33 @@
 {
-  "name": "backend",
-  "private": true,
-  "version": "0.1.0",
-  "description": "Backend for roodjongeren.nl",
-  "scripts": {
-    "dev": "strapi develop",
-    "start": "strapi start",
-    "build": "strapi build",
-    "start-prod": "strapi build && strapi start",
-    "strapi": "strapi"
-  },
-  "devDependencies": {},
-  "dependencies": {
-    "@strapi/plugin-i18n": "4.5.4",
-    "@strapi/plugin-users-permissions": "4.5.5",
-    "@strapi/provider-email-nodemailer": "^4.5.4",
-    "@strapi/strapi": "4.5.5",
-    "crypto-random-string": "^5.0.0",
-    "pg": "^8.8.0"
-  },
-  "author": {
-    "name": "Jordi van Os"
-  },
-  "strapi": {
-    "uuid": "e7e79fab-5830-48d6-a35f-c4e1440e1955"
-  },
-  "engines": {
-    "node": ">=12.x.x <=16.x.x",
-    "npm": ">=6.0.0"
-  },
-  "license": "MIT"
+    "name": "backend",
+    "private": true,
+    "version": "0.1.0",
+    "description": "Backend for roodjongeren.nl",
+    "scripts": {
+        "dev": "strapi develop",
+        "start": "strapi start",
+        "build": "strapi build",
+        "start-prod": "strapi build && strapi start",
+        "strapi": "strapi"
+    },
+    "devDependencies": {},
+    "dependencies": {
+        "@strapi/plugin-i18n": "4.8.2",
+        "@strapi/plugin-users-permissions": "4.8.2",
+        "@strapi/provider-email-nodemailer": "^4.8.2",
+        "@strapi/strapi": "4.8.2",
+        "crypto-random-string": "^5.0.0",
+        "pg": "^8.10.0"
+    },
+    "author": {
+        "name": "Jordi van Os"
+    },
+    "strapi": {
+        "uuid": "e7e79fab-5830-48d6-a35f-c4e1440e1955"
+    },
+    "engines": {
+        "node": ">=12.x.x <=16.x.x",
+        "npm": ">=6.0.0"
+    },
+    "license": "MIT"
 }