Merge pull request #5 from hotosm/feat/set-up-frontend

Created frontend folder for npm + tailwind config

.gitignore

@@ -5,4 +5,4 @@
 **/.pytest_cache/
 **/.venv/
 node_modules
-/dist/
+**/dist/

Dockerfile

@@ -3,10 +3,9 @@ ARG NODE_IMG_TAG=20.5.1
 
 FROM node:${NODE_IMG_TAG}-bookworm-slim as frontend-base
 WORKDIR /app
-COPY package*.json ./
-RUN npm install
-COPY . .
-RUN npm run build
+COPY ./frontend ./frontend
+RUN cd frontend && npm install
+RUN cd frontend && npm run build
 
 # Define the base stage
 FROM docker.io/python:${PYTHON_IMG_TAG}-slim-bookworm as base
@@ -101,8 +100,8 @@ COPY --from=build \
     /home/wagtail/.local
 # Copy compiled css from frontend stage
 COPY --from=frontend-base \
-    /app/dist \
-    /app/dist
+    /app/frontend/dist \
+    /app/frontend/dist
 # Use /app folder as a directory where the source code is stored.
 WORKDIR /app
 # Copy project

package.json → frontend/package.json

@@ -11,8 +11,8 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "for file in ./*/static/css/*.css; do postcss $file -o ./dist/css/$(basename $file .css)_processed.css; done",
-    "start": "postcss ./*/static/css/*.css -d ./dist/css/ --watch"
+    "build": "for file in ../*/static/css/*.css; do postcss $file -o ./dist/css/$(basename $file .css)_processed.css; done",
+    "start": "for file in ../*/static/css/*.css; do postcss $file -o ./dist/css/$(basename $file .css)_processed.css --watch; done"
   },
   "repository": {
     "type": "git",

hot_osm/settings/base.py

@@ -142,7 +142,7 @@
 ]
 
 STATICFILES_DIRS = [
-    "dist",
+    os.path.join(BASE_DIR, "frontend", "dist"),
 ]
 
 # Djang Compressor settings