Transition branch to node.js express.js app

2025-10-29 16:56:34 +00:00 · 2023-01-11 08:10:58 +01:00 · 2023-01-11 08:10:58 +01:00 · 91433eedc6
commit 91433eedc6
parent 0f689810d7
16 changed files with 4911 additions and 1573 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,9 +4,7 @@ bin
 x64
 core.user
 core.vcxproj.user
-.vscode
 *.user
 Output
 server
-/www/js
-/www/node_modules
+node_modules
--- a/client/.vscode/launch.json
+++ b/client/.vscode/launch.json
@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:3000",
+            "webRoot": "${workspaceFolder}\\.."
+        }
+    ]
+}
--- a/client/.vscode/tasks.json
+++ b/client/.vscode/tasks.json
@ -0,0 +1,41 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+	  {
+		"type": "npm",
+		"script": "start",
+		"isBackground": true,
+		"presentation": {
+		  "focus": true,
+		  "panel": "dedicated"
+		},
+		"group": {
+		  "kind": "build",
+		  "isDefault": true
+		},
+		"problemMatcher": {
+		  "owner": "typescript",
+		  "source": "ts",
+		  "applyTo": "closedDocuments",
+		  "fileLocation": [
+			"relative",
+			"${cwd}"
+		  ],
+		  "pattern": "$tsc",
+		  "background": {
+			"activeOnStart": true,
+			"beginsPattern": {
+			  "regexp": "(.*?)"
+			},
+			"endsPattern": {
+			  "regexp": "Compiled |Failed to compile."
+			}
+		  }
+		},
+		"options": {
+		  "cwd": "${workspaceFolder}"
+		}
+	  }
+	]
+  }
+  
--- a/client/app.js
+++ b/client/app.js
@ -0,0 +1,20 @@
+var express = require('express');
+var path = require('path');
+var cookieParser = require('cookie-parser');
+var logger = require('morgan');
+
+var indexRouter = require('./routes/index');
+var usersRouter = require('./routes/users');
+
+var app = express();
+
+app.use(logger('dev'));
+app.use(express.json());
+app.use(express.urlencoded({ extended: false }));
+app.use(cookieParser());
+app.use(express.static(path.join(__dirname, 'public')));
+
+app.use('/', indexRouter);
+app.use('/users', usersRouter);
+
+module.exports = app;
--- a/client/debug.bat
+++ b/client/debug.bat
@ -0,0 +1,2 @@
+start cmd /k "npm run start"
+start cmd /k "watchify .\index.ts --debug -p [ tsify --noImplicitAny ] -o .\public\javascripts\bundle.js"
--- a/client/index.ts
+++ b/client/index.ts
@ -0,0 +1 @@
+console.log("Hellorld!!!")
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@ -0,0 +1,23 @@
+{
+  "name": "client",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "start": "node ./bin/www"
+  },
+  "dependencies": {
+    "@types/geojson": "^7946.0.10",
+    "@types/leaflet": "^1.9.0",
+    "cookie-parser": "~1.4.4",
+    "debug": "~2.6.9",
+    "express": "~4.16.1",
+    "leaflet": "^1.9.3",
+    "morgan": "~1.9.1"
+  },
+  "devDependencies": {
+    "browserify": "^17.0.0",
+    "tsify": "^5.0.4",
+    "typescript": "^4.9.4",
+    "watchify": "^4.0.0"
+  }
+}
--- a/client/public/index.html
+++ b/client/public/index.html
@ -0,0 +1,14 @@
+<html>
+
+<head>
+  <title>Express</title>
+  <link rel="stylesheet" href="/stylesheets/style.css">
+</head>
+
+<body>
+  <h1>Express</h1>
+  <p>Welcome to Express</p>
+  <script src="javascripts/bundle.js"></script>
+</body>
+
+</html>
--- a/client/public/javascripts/bundle.js
+++ b/client/public/javascripts/bundle.js
@ -0,0 +1,4 @@
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+console.log("Hellorld!!!");
+},{}]},{},[1])
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL0FwcERhdGEvUm9hbWluZy9ucG0vbm9kZV9tb2R1bGVzL3dhdGNoaWZ5L25vZGVfbW9kdWxlcy9icm93c2VyLXBhY2svX3ByZWx1ZGUuanMiLCJpbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtBQ0FBLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUEiLCJmaWxlIjoiZ2VuZXJhdGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXNDb250ZW50IjpbIihmdW5jdGlvbigpe2Z1bmN0aW9uIHIoZSxuLHQpe2Z1bmN0aW9uIG8oaSxmKXtpZighbltpXSl7aWYoIWVbaV0pe3ZhciBjPVwiZnVuY3Rpb25cIj09dHlwZW9mIHJlcXVpcmUmJnJlcXVpcmU7aWYoIWYmJmMpcmV0dXJuIGMoaSwhMCk7aWYodSlyZXR1cm4gdShpLCEwKTt2YXIgYT1uZXcgRXJyb3IoXCJDYW5ub3QgZmluZCBtb2R1bGUgJ1wiK2krXCInXCIpO3Rocm93IGEuY29kZT1cIk1PRFVMRV9OT1RfRk9VTkRcIixhfXZhciBwPW5baV09e2V4cG9ydHM6e319O2VbaV1bMF0uY2FsbChwLmV4cG9ydHMsZnVuY3Rpb24ocil7dmFyIG49ZVtpXVsxXVtyXTtyZXR1cm4gbyhufHxyKX0scCxwLmV4cG9ydHMscixlLG4sdCl9cmV0dXJuIG5baV0uZXhwb3J0c31mb3IodmFyIHU9XCJmdW5jdGlvblwiPT10eXBlb2YgcmVxdWlyZSYmcmVxdWlyZSxpPTA7aTx0Lmxlbmd0aDtpKyspbyh0W2ldKTtyZXR1cm4gb31yZXR1cm4gcn0pKCkiLCJjb25zb2xlLmxvZyhcIkhlbGxvcmxkISEhXCIpIl19
--- a/client/public/stylesheets/style.css
+++ b/client/public/stylesheets/style.css
@ -0,0 +1,8 @@
+body {
+  padding: 50px;
+  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
+}
+
+a {
+  color: #00B7FF;
+}
--- a/client/routes/index.js
+++ b/client/routes/index.js
@ -0,0 +1,9 @@
+var express = require('express');
+var router = express.Router();
+
+/* GET home page. */
+router.get('/', function(req, res, next) {
+  res.render('index', { title: 'Express' });
+});
+
+module.exports = router;
--- a/client/routes/users.js
+++ b/client/routes/users.js
@ -0,0 +1,9 @@
+var express = require('express');
+var router = express.Router();
+
+/* GET users listing. */
+router.get('/', function(req, res, next) {
+  res.send('respond with a resource');
+});
+
+module.exports = router;
--- a/www/package-lock.json
+++ b/www/package-lock.json
--- a/www/package.json
+++ b/www/package.json
@ -1,24 +0,0 @@
-{
-  "name": "olympus",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "start": "npm run build && npm run dev",
-    "build": "npm run clean && npm run mkdir && npm run build:html && npm run build:css && npm run build:js",
-    "dev": "webpack-dev-server --inline --hot --content-base build --history-api-fallback"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@types/leaflet": "^1.9.0",
-    "express": "^4.18.2",
-    "leaflet": "^1.9.3"
-  },
-  "devDependencies": {
-    "@types/express": "^4.17.15",
-    "@types/node": "^18.11.18",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.4"
-  }
-}
--- a/www/tsconfig.json
+++ b/www/tsconfig.json
@ -1,22 +0,0 @@
-{
-    "compilerOptions": {
-      "typeRoots": ["node_modules/@types"],
-      "outDir": "./js",
-      "target": "es2018",
-      "lib": [
-        "es2018",
-        "dom"
-      ],
-      "types": [
-        "leaflet",
-        "geojson"
-      ]
-    },
-    "include": [
-      "src/**/*",
-      "src/*"
-    ],
-    "exclude": [
-      "node_modules"
-    ]
-  }