- setup webpack

- setup docker-compose - setup django correctly
iTBH · Aug 2, 2019 · 5e48312 · 5e48312
1 parent b84bb72
commit 5e48312
Show file tree

Hide file tree

Showing 15 changed files with 10,879 additions and 65 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,23 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "browsers": [
+            "last 2 versions",
+            "safari >= 7",
+            "ie >= 8"
+          ]
+        }
+      }
+    ]
+  ],
+  "ignore": [
+    "node_modules/",
+    "dist/"
+  ],
+  "plugins": [
+    "@babel/plugin-proposal-object-rest-spread"
+  ]
+}
diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,7 @@
-FROM node:12.7.0-alpine
-RUN mkdir /deps
-WORKDIR /deps
-COPY package.json /deps
-COPY package-lock.json /deps
-RUN npm install
-
-
 FROM python:3
 ENV PYTHONUNBUFFERED 1
 RUN mkdir /code
 WORKDIR /code
 COPY requirements.txt /code/
 RUN pip install -r requirements.txt
-COPY . /code/
+COPY . /code/
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -0,0 +1,7 @@
+FROM node:12.7.0
+RUN mkdir /node_deps
+COPY package.json /node_deps/
+COPY package-lock.json /node_deps/
+WORKDIR /node_deps
+RUN npm install
+COPY webpack.config.js /node_deps/
diff --git a/dll/settings.py → dll/configuration/settings.py b/dll/settings.py → dll/configuration/settings.py
@@ -50,12 +50,12 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-ROOT_URLCONF = 'dll.urls'
+ROOT_URLCONF = 'dll.configuration.urls'
 
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, 'templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -68,7 +68,7 @@
     },
 ]
 
-WSGI_APPLICATION = 'dll.wsgi.application'
+WSGI_APPLICATION = 'dll.configuration.wsgi.application'
 
 
 # Database
@@ -123,26 +123,22 @@
 
 STATIC_URL = '/static/'
 
-STATICFILES_DIRS = (
-    os.path.join(BASE_DIR, 'assets'),
+STATICFILES_FINDERS = (
+    'django.contrib.staticfiles.finders.FileSystemFinder',
+    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
 )
 
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, "static"),
+]
+
 WEBPACK_LOADER = {
     'DEFAULT': {
         'CACHE': not DEBUG,
-        'BUNDLE_DIR_NAME': 'webpack_bundles/', # must end with slash
-        'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats.json'),
+        'BUNDLE_DIR_NAME': 'dist/', # must end with slash
+        'STATS_FILE': os.path.join(BASE_DIR, './static/dist/webpack-stats.json'),
         'POLL_INTERVAL': 0.1,
         'TIMEOUT': None,
         'IGNORE': [r'.+\.hot-update.js', r'.+\.map']
     }
-}
-
-WEBPACK_LOADER = {
-    'DEFAULT': {
-        'CACHE': not DEBUG,
-        'BUNDLE_DIR_NAME': 'bundles/', # end with slash
-        'STATS_FILE': os.path.join(BASE_DIR, 'webpack-stats.json')
-    }
-}
-
+}
diff --git a/dll/urls.py → dll/configuration/urls.py b/dll/urls.py → dll/configuration/urls.py
@@ -13,9 +13,17 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+from django.conf import settings
+from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path
+from django.views.generic import TemplateView
+
+
+class TestView(TemplateView):
+    template_name = 'dll/base.html'
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-]
+    path('', TestView.as_view())
+]  + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/dll/wsgi.py → dll/configuration/wsgi.py b/dll/wsgi.py → dll/configuration/wsgi.py
diff --git a/dll/static/src/js/index.js b/dll/static/src/js/index.js
diff --git a/dll/static/src/scss/main.scss b/dll/static/src/scss/main.scss
diff --git a/dll/templates/dll/base.html b/dll/templates/dll/base.html
@@ -8,6 +8,7 @@
 
 </head>
 <body>
+{% render_bundle 'vendor' 'js' %}
 {% render_bundle 'main' 'js' %}
 </body>
 </html>
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -3,6 +3,13 @@ version: '3'
 services:
   db:
     image: postgres
+  webpack:
+    command: npm run start
+    volumes:
+      - ./dll/static:/node_deps/static
+    build:
+      context: .
+      dockerfile: Dockerfile.build
   web:
     build: .
     command: python manage.py runserver 0.0.0.0:8000

diff --git a/manage.py b/manage.py
@@ -5,7 +5,7 @@
 
 
 def main():
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dll.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dll.configuration.settings')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc: