root: move webapp to /web (#347)

* root: move webapp to /web

* root: fix static build

* root: fix static files not being served for e2e tests

.dockerignore

@@ -1,6 +1,6 @@
 env
 helm
-passbook-ui
 static
+htmlcov
 *.env.yml
-**/node_modules
+node_modules/**

.github/dependabot.yml

@@ -9,7 +9,7 @@ updates:
   assignees:
   - BeryJu
 - package-ecosystem: npm
-  directory: "/passbook/static/static"
+  directory: "/web"
   schedule:
     interval: daily
     time: "04:00"

Makefile

@@ -31,3 +31,8 @@ local-stack:
 	docker build -t beryju/passbook:testng .
 	docker-compose up -d
 	docker-compose run --rm server migrate
+
+build-static:
+	docker-compose -f scripts/ci.docker-compose.yml up -d
+	docker build -t beryju/passbook-static -f static.Dockerfile --network=scripts_default .
+	docker-compose -f scripts/ci.docker-compose.yml down -v

azure-pipelines.yml

@@ -272,7 +272,7 @@ stages:
             displayName: Build static files for e2e
             inputs:
               script: |
-                cd passbook/static/static
+                cd web
                 npm i
                 npm run build
           - task: CmdLine@2

passbook/root/settings.py

@@ -48,12 +48,9 @@ LOGGER = structlog.get_logger()
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 STATIC_ROOT = BASE_DIR + "/static"
+STATICFILES_DIRS = [BASE_DIR + "/web"]
 MEDIA_ROOT = BASE_DIR + "/media"
 
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = CONFIG.y(
     "secret_key", "9$@r!d^1^jrn#fk#1#@ks#9&i$^s#1)_13%$rwjrhd=e8jfi_s"
 )  # noqa Debug
@@ -124,7 +121,6 @@ INSTALLED_APPS = [
     "passbook.stages.otp_time.apps.PassbookStageOTPTimeConfig",
     "passbook.stages.otp_validate.apps.PassbookStageOTPValidateConfig",
     "passbook.stages.password.apps.PassbookStagePasswordConfig",
-    "passbook.static.apps.PassbookStaticConfig",
     "rest_framework",
     "django_filters",
     "drf_yasg2",

passbook/root/urls.py

@@ -65,6 +65,7 @@ if settings.DEBUG:
         [
             path("-/debug/", include(debug_toolbar.urls)),
         ]
+        + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
         + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
         + urlpatterns
     )

passbook/static/apps.py

@@ -1,10 +0,0 @@
-"""passbook static app config"""
-from django.apps import AppConfig
-
-
-class PassbookStaticConfig(AppConfig):
-    """passbook static app config"""
-
-    name = "passbook.static"
-    label = "passbook_static"
-    verbose_name = "passbook Static"

static.Dockerfile

@@ -34,21 +34,18 @@ ENV PASSBOOK_REDIS__HOST=redis
 ENV PASSBOOK_POSTGRESQL__USER=passbook
 # CI Password, same as in .github/workflows/ci.yml
 ENV PASSBOOK_POSTGRESQL__PASSWORD="EK-5jnKfjrGRm<77"
-RUN ./manage.py collectstatic --no-input
+RUN mkdir -p /app/web && \
+    ./manage.py collectstatic --no-input
 
 FROM node as npm-builder
 
-COPY --from=static-build /app/static/src /static/src
-COPY --from=static-build /app/static/rollup.config.js /static/rollup.config.js
-COPY --from=static-build /app/static/tsconfig.json /static/tsconfig.json
-COPY --from=static-build /app/static/package.json /static/package.json
-COPY --from=static-build /app/static/package-lock.json /static/package-lock.json
+COPY ./web /static/
 
 RUN cd /static && npm i && npm run build
 
 FROM nginx
 
 COPY --from=static-build /app/static /usr/share/nginx/html/static
-COPY --from=static-build /app/static/robots.txt /usr/share/nginx/html/robots.txt
+COPY --from=npm-builder /static/robots.txt /usr/share/nginx/html/robots.txt
 COPY --from=npm-builder /static/node_modules /usr/share/nginx/html/static/node_modules
 COPY --from=npm-builder /static/dist/* /usr/share/nginx/html/static/dist/