.

.gitignore

@@ -1,15 +1,6 @@
-node_modules
+__pycache__
-*.ignore.js
+.vscode
-*.ignore.js.map
+.env
-dist
 .mypy_cache
 app-dist
 db.sqlite3
-__pycache__
-.vscode
-build
-build-server
-*.d.ts
-.env
-yarn-error.log
-static

frontend/.gitignore

@@ -0,0 +1,8 @@
+node_modules
+*.ignore.js
+*.ignore.js.map
+build
+build-server
+*.d.ts
+yarn-error.log
+static

frontend/package.json

@@ -7,22 +7,21 @@
     "watch": "DEV=1 webpack --progress --watch",
     "build:server": "webpack --progress -c webpack.config.server.js",
     "watch:server": "DEV=1 webpack --progress --watch -c webpack.config.server.js",
-    "start": "./manage.py runserver 8001",
+    "start": "node build-server/server.js"
-    "start:server": "PORT=8000 node build-server/server.js"
   },
   "private": true,
   "devDependencies": {
-    "@angular/animations": "^11.0.0",
+    "@angular/animations": "^11.2.14",
     "@angular/cdk": "^12.1.3",
-    "@angular/common": "^11.0.0",
+    "@angular/common": "^11.2.14",
-    "@angular/compiler": "^11.0.0",
+    "@angular/compiler": "^11.2.14",
-    "@angular/compiler-cli": "^11.0.0",
+    "@angular/compiler-cli": "^11.2.14",
-    "@angular/core": "^11.0.0",
+    "@angular/core": "^11.2.14",
-    "@angular/forms": "^11.0.0",
+    "@angular/forms": "^11.2.14",
-    "@angular/platform-browser": "^11.0.0",
+    "@angular/platform-browser": "^11.2.14",
-    "@angular/platform-browser-dynamic": "^11.0.0",
+    "@angular/platform-browser-dynamic": "^11.2.14",
     "@angular/platform-server": "^11.2.14",
-    "@angular/router": "^11.0.0",
+    "@angular/router": "^11.2.14",
     "@fontsource/fira-code": "^4.5.0",
     "@fortawesome/angular-fontawesome": "0.8",
     "@fortawesome/fontawesome-free": "^5.7.2",
@@ -36,7 +35,6 @@
     "@typescript-eslint/eslint-plugin": "^4.28.4",
     "@typescript-eslint/parser": "^4.28.4",
     "apply-loader": "^2.0.0",
-    "awesome-typescript-loader": "^5.2.1",
     "bootstrap": "^5.0.1",
     "buffer": "^6.0.3",
     "core-js": "^3.14.0",
@@ -69,15 +67,10 @@
     "webpack": "^5.38.1",
     "webpack-bundle-analyzer": "^4.4.2",
     "webpack-cli": "^4.7.2",
-    "webpack-node-externals": "^3.0.0",
+    "zone.js": "^0.11.4",
-    "zone.js": "^0.11.4"
-  },
-  "dependencies": {
     "@nguniversal/express-engine": "^11.1.0",
     "domino": "^2.1.6",
     "express": "^4.17.1",
-    "express-http-proxy": "^1.6.2",
-    "mock-browser": "^0.92.14",
     "source-map-support": "^0.5.19"
   }
 }

frontend/src/server.ts

@@ -23,7 +23,7 @@ const engine = ngExpressEngine({
 function start () {
     const app = express()
 
-    const PORT = process.env.PORT || 4000
+    const PORT = process.env.PORT || 8000
     const DIST_FOLDER = join(process.cwd(), 'build')
 
     app.engine('html', engine)

tabby/settings.py

@@ -190,7 +190,6 @@ for key in [
     'CONNECTION_GATEWAY_AUTH_KEY',
     'GITHUB_ELIGIBLE_SPONSORSHIPS',
     'GITHUB_SPONSORS_MIN_PAYMENT',
-    'GITHUB_TOKEN',
     'ENABLE_LOGIN',
     'GA_ID',
     'GA_DOMAIN',

tabby/urls.py

@@ -8,7 +8,7 @@ urlpatterns = [
     path('', include(app_urlpatterns)),
     path('api/1/auth/social/', include('social_django.urls', namespace='social')),
     path('admin/', admin.site.urls),
-    path(f'{settings.STATIC_URL}<path:path>', serve, kwargs={
+    path(f'{settings.STATIC_URL.strip("/")}/<path:path>', serve, kwargs={
         'document_root': settings.STATIC_ROOT,
     }),
 ]