From 013c007bb084b17c919358922ec109a9a4605e46 Mon Sep 17 00:00:00 2001
From: Daoud Clarke <daoud.clarke@gmail.com>
Date: Thu, 12 Oct 2023 17:38:19 +0100
Subject: [PATCH] Serve front end

---
 front-end/package-lock.json     | 50 ++++++++++++++++++++-------------
 front-end/src/components/app.js |  2 +-
 front-end/src/index.html        |  2 +-
 front-end/vite.config.js        |  1 +
 manage.py                       |  2 +-
 mwmbl/settings_common.py        |  7 ++---
 mwmbl/settings_dev.py           |  3 ++
 mwmbl/settings_prod.py          |  2 ++
 8 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/front-end/package-lock.json b/front-end/package-lock.json
index af0e754..285df52 100644
--- a/front-end/package-lock.json
+++ b/front-end/package-lock.json
@@ -598,10 +598,16 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -622,9 +628,9 @@
       "dev": true
     },
     "node_modules/postcss": {
-      "version": "8.4.19",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
-      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "funding": [
         {
@@ -634,10 +640,14 @@
         {
           "type": "tidelift",
           "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -755,9 +765,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.5.tgz",
-      "integrity": "sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.7.tgz",
+      "integrity": "sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.15.9",
@@ -1135,9 +1145,9 @@
       }
     },
     "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
       "dev": true
     },
     "path-parse": {
@@ -1153,12 +1163,12 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.4.19",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.19.tgz",
-      "integrity": "sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==",
+      "version": "8.4.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
       "dev": true,
       "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
@@ -1242,9 +1252,9 @@
       }
     },
     "vite": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.5.tgz",
-      "integrity": "sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.7.tgz",
+      "integrity": "sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==",
       "dev": true,
       "requires": {
         "esbuild": "^0.15.9",
diff --git a/front-end/src/components/app.js b/front-end/src/components/app.js
index 9bc8dc5..9644a6b 100644
--- a/front-end/src/components/app.js
+++ b/front-end/src/components/app.js
@@ -3,7 +3,7 @@ import define from '../utils/define.js';
 const template = () => /*html*/`
   <header class="search-menu">
     <div class="branding">
-      <img class="brand-icon" src="/images/logo.svg" width="40" height="40" alt="mwmbl logo">
+      <img class="brand-icon" src="/static/images/logo.svg" width="40" height="40" alt="mwmbl logo">
       <span class="brand-title">MWMBL</span>
     </div>
     <mwmbl-search-bar></mwmbl-search-bar>
diff --git a/front-end/src/index.html b/front-end/src/index.html
index dee847d..23c0b52 100644
--- a/front-end/src/index.html
+++ b/front-end/src/index.html
@@ -42,7 +42,7 @@
   <mwmbl-app></mwmbl-app>
   <noscript>
     <main class="noscript">
-      <img class="brand-icon" src="/images/logo.svg" width="40" height="40" alt="mwmbl logo">
+      <img class="brand-icon" src="/static/images/logo.svg" width="40" height="40" alt="mwmbl logo">
       <h1>
         Welcome to mwmbl, the free, open-source and non-profit search engine.
       </h1>
diff --git a/front-end/vite.config.js b/front-end/vite.config.js
index 74d6829..bc9cdfc 100644
--- a/front-end/vite.config.js
+++ b/front-end/vite.config.js
@@ -3,6 +3,7 @@ import { resolve } from 'path'
 
 export default {
   root: './src',
+  base: '/static',
   publicDir: '../assets',
   build: {
     outDir: '../dist',
diff --git a/manage.py b/manage.py
index 4931389..91ff951 100755
--- a/manage.py
+++ b/manage.py
@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mwmbl.settings_dev')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:
diff --git a/mwmbl/settings_common.py b/mwmbl/settings_common.py
index ac5d426..35b2ffb 100644
--- a/mwmbl/settings_common.py
+++ b/mwmbl/settings_common.py
@@ -22,9 +22,6 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = 'django-insecure-qqr#f(i3uf%m8%8u35vn=ov-uk(*8!a&1t-hxa%ev2^t1%j&sm'
 
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
-
 ALLOWED_HOSTS = ["api.mwmbl.org"]
 
 
@@ -117,8 +114,8 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/4.2/howto/static-files/
 
 STATIC_URL = 'static/'
-STATICFILES_DIRS = [Path(__file__).parent.parent / "front-end" / "dist"]
-
+STATICFILES_DIRS = [str(Path(__file__).parent.parent / "front-end" / "dist")]
+print("Static files", STATICFILES_DIRS)
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
diff --git a/mwmbl/settings_dev.py b/mwmbl/settings_dev.py
index fe07890..68d01b0 100644
--- a/mwmbl/settings_dev.py
+++ b/mwmbl/settings_dev.py
@@ -1,5 +1,8 @@
 from mwmbl.settings_common import *
 
+DEBUG = True
+
 DATA_PATH = "./devdata"
 RUN_BACKGROUND_PROCESSES = False
 NUM_PAGES = 2560
+
diff --git a/mwmbl/settings_prod.py b/mwmbl/settings_prod.py
index f7c50ee..780309c 100644
--- a/mwmbl/settings_prod.py
+++ b/mwmbl/settings_prod.py
@@ -1,5 +1,7 @@
 from mwmbl.settings_common import *
 
+DEBUG = False
+
 DATA_PATH = "/app/storage"
 RUN_BACKGROUND_PROCESSES = True
 NUM_PAGES = 10240000