From 103dcea95b2f66f2a33859920a502fec42282f5c Mon Sep 17 00:00:00 2001
From: Eugene Pankov <john.pankov@gmail.com>
Date: Mon, 26 Jul 2021 18:34:18 +0200
Subject: [PATCH] .

---
 frontend/src/interceptor.ts       | 2 --
 frontend/src/server.ts            | 4 ++--
 frontend/webpack.config.server.js | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/frontend/src/interceptor.ts b/frontend/src/interceptor.ts
index 04366d3..d6814f8 100644
--- a/frontend/src/interceptor.ts
+++ b/frontend/src/interceptor.ts
@@ -8,10 +8,8 @@ export class UniversalInterceptor implements HttpInterceptor {
     constructor (private commonService: CommonService) { }
 
     intercept (request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-        console.log(request.url)
         if (!request.url.startsWith('//') && request.url.startsWith('/')) {
             const endpoint = request.url
-            console.log(this.commonService.backendURL, request.url)
             request = request.clone({
                 url: `${this.commonService.backendURL}${endpoint}`,
                 withCredentials: true,
diff --git a/frontend/src/server.ts b/frontend/src/server.ts
index 58577c9..82025c0 100644
--- a/frontend/src/server.ts
+++ b/frontend/src/server.ts
@@ -31,11 +31,11 @@ function start () {
     app.set('view engine', 'html')
     app.set('views', DIST_FOLDER)
 
-    app.get('*.*', express.static(join(DIST_FOLDER, 'static'), {
+    app.use('/static', express.static(DIST_FOLDER, {
         maxAge: '1y',
     }))
 
-    app.get('*', (req, res) => {
+    app.get(['/', '/app', '/login'], (req, res) => {
         res.render('index', { req })
     })
 
diff --git a/frontend/webpack.config.server.js b/frontend/webpack.config.server.js
index 4c3ad35..34c532a 100644
--- a/frontend/webpack.config.server.js
+++ b/frontend/webpack.config.server.js
@@ -34,7 +34,7 @@ module.exports = {
         // libraryTarget: 'commonjs',
         path: outputPath,
         pathinfo: true,
-        publicPath: '/',
+        publicPath: '/static/',
         filename: '[name].js',
         chunkFilename: '[name].bundle.js',
     },