production deployment

bin/deploy.sh

@@ -2,12 +2,7 @@
 
 D="~/rsync/mdr-simulator2/"
 
-rm -rf dist/*
-npm run server:build
-rm -rf public/*
-npm run client:build
-
-rsync -rvLz -e ssh bin dist node_modules public rob@ccmi.fit.cvut.cz:$D
+rsync -rvLz -e ssh bin server node_modules rob@ccmi.fit.cvut.cz:$D
 #rsync -rvLz -e ssh data rob@ccmi.fit.cvut.cz:$D
-rsync -rvLz --ignore-existing -e ssh data rob@ccmi.fit.cvut.cz:$D
+#rsync -rvLz --ignore-existing -e ssh data rob@ccmi.fit.cvut.cz:$D
 

package.json

@@ -8,8 +8,8 @@
     "server:watch": "nodemon --watch shared --watch server/app --ext ts,js,ejs --exec npm run server:build\\;npm run server:run",
     "server:build": "cd server; rm -rf dist/*; tsc; cp -r app/views dist/",
     "server:run": "cd server/dist; node server",
-    "client:watch": "rm -rf server/public/*; webpack  --watch --progress",
-    "client:build": "rm -rf server/public/*; webpack --progress",
+    "client:watch": "rm -rf server/public/*; webpack  --watch --progress --config webpack.dev.js",
+    "client:build": "rm -rf server/public/*; webpack --progress --config webpack.prod.js",
     "clean": "npm cache clean --force"
   },
   "devDependencies": {
@@ -23,7 +23,8 @@
     "@types/proper-lockfile": "^4.1.1",
     "copy-webpack-plugin": "^5.0.4",
     "ts-loader": "^6.0.4",
-    "typescript": "^3.6.2"
+    "typescript": "^3.6.2",
+    "webpack-merge": "^4.2.2"
   },
   "repository": {
     "type": "git",

server/app/views/blocks/navbar.ejs

@@ -1,5 +1,5 @@
 <nav class="navbar navbar-expand-lg fixed-top wmda-color" id="navbar-main" style="padding-right: 10px">
-  <a class="navbar-brand" href="#">Marrow Donor Registry Simulator 2 v1.3</a>
+  <a class="navbar-brand" href="#">Marrow Donor Registry Simulator v2.4</a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>

webpack.config.js → webpack.common.js

@@ -3,8 +3,6 @@
 const CopyPlugin = require('copy-webpack-plugin');
 
 module.exports = {
-  mode: "development",
-  devtool: "inline-source-map",
   entry: "./app/main.ts",
   output: {
     path: __dirname + "/server/public",

webpack.dev.js

@@ -0,0 +1,9 @@
+"use strict";
+
+const merge = require('webpack-merge');
+const common = require('./webpack.common.js');
+
+module.exports = merge(common, {
+  mode: 'development',
+  devtool: 'inline-source-map'
+});

webpack.prod.js

@@ -0,0 +1,8 @@
+"use strict";
+
+const merge = require('webpack-merge');
+const common = require('./webpack.common.js');
+
+module.exports = merge(common, {
+  mode: 'production',
+});