Conversion to typescript

* Init

Docker/Dockerfile

@@ -1,24 +0,0 @@
-# FROM node:current-slim
-FROM martind2000/node-python3:16-slim
-ARG VERSION
-ENV VERSION ${VERSION:-development}
-
-WORKDIR /app
-
-COPY ./Docker/start.sh ./package*.json ./server.js /app/
-
-COPY ./dist /app/dist
-
-COPY ./server /app/server
-
-copy ./menu.db /app/db/
-
-RUN npm install
-
-# RUN ls -lh .
-
-EXPOSE 3000
-
-RUN chmod +x /app/start.sh
-
-ENTRYPOINT ["/app/start.sh"]

Docker/ecosystem.config.json

@@ -1,12 +0,0 @@
-[
-  {
-    "name": "Slack",
-    "script": "app/predict.js",
-    "env": {
-      "NODE_ENV": "production"
-    },
-    "autorestart": false,
-    "instances": 1,
-    "cron_restart": "10 15 * * 2,5"
-  }
-]

Docker/start.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-set -ex
-
-node server.js

Makefile

@@ -1,33 +0,0 @@
-PROJECT = menuserver
-
-VERSION = latest
-
-
-ECR_REPO = git.caliban.io/martin
-# APP_IMAGE = 482681734622.dkr.ecr.eu-west-1.amazonaws.com/$(PROJECT):$(VERSION)
-APP_IMAGE = $(ECR_REPO)/$(PROJECT):$(VERSION)
-# APP_IMAGE = $(PROJECT):$(VERSION)
-NO_CACHE = true
-
-.PHONY: build
-build:
-
-# docker build ./docker/. -t $(APP_IMAGE) --build-arg VERSION=$(VERSION) --no-cache=$(NO_CACHE) --compress=true
-	docker build --platform linux/amd64 --no-cache -force-rm --tag ${APP_IMAGE} --file ./Docker/Dockerfile .
-
-
-#push docker image to registry
-.PHONY: push
-push: build
-	docker push $(APP_IMAGE)
-
-
-#push docker image to registry
-.PHONY: run
-run: build
-	docker run $(APP_IMAGE)
-
-ver:
-	@echo '$(VERSION)'
-	#echo $ERSION
-.PHONY: ver

backup.sh

@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-function targz() {
-
-  DNOW=$( date '+%F-%H-%M')
-
-
-        local tmpFile="${@%/}-${DNOW}.tar";
-
-tar -cvf "${tmpFile}" --exclude-vcs-ignores --exclude-vcs --exclude-backups --exclude-caches --exclude=".DS_Store" --exclude="node_modules" --exclude=".idea"  "${@}" || return 1;
-
-        size=$(
-                stat -f"%z" "${tmpFile}" 2> /dev/null; # macOS `stat`
-                stat -c"%s" "${tmpFile}" 2> /dev/null;  # GNU `stat`
-        );
-
-        local cmd="";
-        if (( size < 52428800 )) && hash zopfli 2> /dev/null; then
-                # the .tar file is smaller than 50 MB and Zopfli is available; use it
-                cmd="zopfli";
-        else
-                if hash pigz 2> /dev/null; then
-                        cmd="pigz";
-                else
-                        cmd="gzip";
-                fi;
-        fi;
-
-        echo "Compressing .tar ($((size / 1000)) kB) using \`${cmd}\`…";
-        "${cmd}" -v "${tmpFile}" || return 1;
-        [ -f "${tmpFile}" ] && rm "${tmpFile}";
-
-        zippedSize=$(
-                stat -f"%z" "${tmpFile}.gz" 2> /dev/null; # macOS `stat`
-                stat -c"%s" "${tmpFile}.gz" 2> /dev/null; # GNU `stat`
-        );
-
-        echo "${tmpFile}.gz ($((zippedSize / 1000)) kB) created successfully.";
-
-}
-
-targz db/menu.db

db.docker-compose.yml

@@ -1,15 +0,0 @@
-version: '3.5'
-
-services:
-  db:
-    build: dbDocker
-    ports:
-      - "5432:5432"
-    volumes:
-      - postgres:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB=${POSTGRES_DB}
-volumes:
-  postgres:

dbDocker/Dockerfile

@@ -1,5 +0,0 @@
-FROM postgres:alpine
-# ADD scripts/1_init.sql /docker-entrypoint-initdb.d
-# ADD scripts/2_copy.sql /docker-entrypoint-initdb.d
-# RUN chmod a+r /docker-entrypoint-initdb.d/*
-EXPOSE 6666

dist/build/bundle.css

@@ -1 +1,4 @@
-.filterBar.svelte-17lzm0a{background:var(--medium-color);margin-bottom:1rem;padding:10px 5px}.recipeItem.svelte-qibu9a{display:flex;padding:0.1rem;border-bottom:1px #ccc dotted}.recipeItem.svelte-qibu9a:nth-of-type(odd){background-color:rgba(0, 0, 0, 0.04)}.listItemSix.svelte-qibu9a{flex:6}.listItemThree.svelte-qibu9a{flex:3}.chicken.svelte-qibu9a{background:#8e5241;color:#fff}.beef.svelte-qibu9a{background:#d72414;color:#fff}.pork.svelte-qibu9a{background:#ef96d9;color:#fff}.fish.svelte-qibu9a{background:#005ba0;color:#fff}.egg.svelte-qibu9a{background:#fbc003;color:#000}.vegetable.svelte-qibu9a{background:#00903e;color:#fff}
+.filterBar.svelte-17lzm0a{background:var(--medium-color);margin-bottom:1rem;padding:10px 5px}
+.recipeItem.svelte-qibu9a{display:flex;padding:0.1rem;border-bottom:1px #ccc dotted}.recipeItem.svelte-qibu9a:nth-of-type(odd){background-color:rgba(0, 0, 0, 0.04)}.listItemSix.svelte-qibu9a{flex:6}.listItemThree.svelte-qibu9a{flex:3}.chicken.svelte-qibu9a{background:#8e5241;color:#fff}.beef.svelte-qibu9a{background:#d72414;color:#fff}.pork.svelte-qibu9a{background:#ef96d9;color:#fff}.fish.svelte-qibu9a{background:#005ba0;color:#fff}.egg.svelte-qibu9a{background:#fbc003;color:#000}.vegetable.svelte-qibu9a{background:#00903e;color:#fff}
+
+/*# sourceMappingURL=bundle.css.map */

docker-compose.yml

@@ -1,14 +0,0 @@
-version: '3.5'
-
-services:
-  menuserver:
-    container_name: menuserver
-    build:
-      context: .
-      dockerfile: ./Docker/Dockerfile
-    image: menuserver_docker
-    restart: always
-    ports:
-      - "3000:3000"
-    volumes:
-      - ./dist:/app/dist

package.json

@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "axios": "^0.19.0",
+    "backbone": "^1.4.0",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dateformat": "^3.0.3",
@@ -29,17 +30,20 @@
     "smtp-email-sender": "^1.0.0",
     "sqlite3": "^4.1.1",
     "tape": "^4.13.2",
-    "tape-promise": "^4.0.0"
+    "tape-promise": "^4.0.0",
+    "ultrases": "^0.1.3"
   },
   "devDependencies": {
     "browserify": "^16.5.0",
-    "cz-conventional-changelog": "^3.3.0",
     "eslint": "^6.6.0",
-    "require-dir": "^1.2.0"
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
-    }
+    "gulp": "^3.9.1",
+    "gulp-rename": "^2.0.0",
+    "gulp-sourcemaps": "^2.6.5",
+    "gulp-strip-debug": "^3.0.0",
+    "gulp-uglify-es": "^2.0.0",
+    "gulp-util": "^3.0.8",
+    "require-dir": "^1.2.0",
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0"
   }
 }

pg.docker-compose.yml

@@ -1,25 +0,0 @@
-version: '3.5'
-
-services:
-  menuserver:
-    container_name: menuserver
-    build:
-      context: .
-      dockerfile: ./Docker/Dockerfile
-    image: menuserver_docker
-    restart: always
-    ports:
-      - "3000:3000"
-
-  postgres:
-    image: "postgres:${POSTGRES_VERSION}"
-    ports:
-      - "5432:5432"
-    volumes:
-      - postgres:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB=${POSTGRES_DB}
-volumes:
-  postgres:

preload.js

@@ -1,5 +1,5 @@
 var sqlite3 = require('sqlite3').verbose();
-var db = new sqlite3.Database('./menu.dbDocker');
+var db = new sqlite3.Database('./menu.db');
 
 const _ = require('lodash');
 const shortHash = require('short-hash');
@@ -297,15 +297,15 @@ getOne('eac12bae')
 
 // console.log(obj);
 
-//  dbDocker.insert(obj);
+//  db.insert(obj);
 /*
-dbDocker.insert({ name: 'Peter ' });
-dbDocker.insert({ name: 'Lucia' });
-dbDocker.insert({ name: 'Igor' });
-dbDocker.insert({ name: 'Stano' });
-dbDocker.insert({ name: 'Jozef' });
+db.insert({ name: 'Peter ' });
+db.insert({ name: 'Lucia' });
+db.insert({ name: 'Igor' });
+db.insert({ name: 'Stano' });
+db.insert({ name: 'Jozef' });
 */
 
 // console.log(r);
 
-// dbDocker.update({ name: 'Jozef', age: 33 }).where('name', 'Jozef');
+// db.update({ name: 'Jozef', age: 33 }).where('name', 'Jozef');

server.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 require('dotenv').config();
 const express = require('express');
 const bodyParser = require('body-parser');
@@ -13,73 +13,60 @@ const checkAuth = require('./server/middle/checkAuth');
 const app = express();
 require('dotenv').config();
 const serverPort = process.env.PORT || 3000;
-const localHost = process.env.LOCAL || false;
 const sitePath = 'dist';
 app.use(cors());
 app.use(helmet());
 app.use(session({
-  'secret': 'rBLH5#Q89Z4',
-  'resave': true,
-  'saveUninitialized': true
+    'secret': 'rBLH5#Q89Z4',
+    'resave': true,
+    'saveUninitialized': true
 }));
 app.get('/', (request, response) => {
- /* if (request.session.auth)
-    response.redirect('/menu');
-  else
-  if (!localHost)
-    response.sendFile(path.join(`${__dirname}/server/static/login.html`));
-  else {
-    // fix auth.
-    request.session.username = 'martin';
-    request.session.auth = 'jhgkjgkjhgkjhgjkhgjkhgfhghfjgfjhgf';
-    response.redirect('/menu');
-  }*/
-
-  request.session.username = 'martin';
-  request.session.auth = 'jhgkjgkjhgkjhgjkhgjkhgfhghfjgfjhgf';
-  response.redirect('/menu');
+    if (request.session.auth)
+        response.redirect('/menu');
+    else
+        response.sendFile(path.join(`${__dirname}/server/static/login.html`));
 });
 app.get('/menu', checkAuth, (req, res) => {
-  res.sendFile(path.join(`${__dirname}/dist/index.html`));
+    res.sendFile(path.join(`${__dirname}/dist/index.html`));
 });
 app.use(express.static(path.join(__dirname, sitePath)));
 app.use(bodyParser.urlencoded({ 'extended': true }));
 app.use(bodyParser.json());
 app.post('/auth', (request, response) => {
-  const username = request.body.u;
-  const password = request.body.p;
-  if (username && password)
-    db.getOne(username, password)
-      .then((data) => {
-        if (!data)
-          response.redirect('/');
-        else {
-          request.session.username = username;
-          request.session.auth = 'jhgkjgkjhgkjhgjkhgjkhgfhghfjgfjhgf';
-          response.redirect('/menu');
-        }
-      })
-      .catch((err) => {
-        console.log(err);
-        response.status(500).send({
-          'message': err.message || 'Some error occurred while querying the database.'
+    const username = request.body.u;
+    const password = request.body.p;
+    if (username && password)
+        db.getOne(username, password)
+            .then((data) => {
+            if (!data)
+                response.redirect('/');
+            else {
+                request.session.username = username;
+                request.session.auth = 'jhgkjgkjhgkjhgjkhgjkhgfhghfjgfjhgf';
+                response.redirect('/menu');
+            }
+        })
+            .catch((err) => {
+            console.log(err);
+            response.status(500).send({
+                'message': err.message || 'Some error occurred while querying the database.'
+            });
         });
-      });
-  else {
-    response.send('Please enter Username and Password!');
-    response.end();
-  }
+    else {
+        response.send('Please enter Username and Password!');
+        response.end();
+    }
 });
 require('./server/routes/recipe.routes')(app);
 require('./server/routes/view.routes')(app);
 app.listen(serverPort, () => {
-  console.log(`Server is listening on port ${serverPort}`);
+    console.log(`Server is listening on port ${serverPort}`);
 });
 ((() => {
-  console.log('Menuserver 2.0 started');
+    console.log('Menuserver 2.0 started');
 })());
 cron.schedule('0 8 * * 6', function () {
-  doJob();
-
-  return -1;
+    doJob();
+    return -1;
 });

server.ts

@@ -0,0 +1,98 @@
+require('dotenv').config();
+const express = require('express');
+const bodyParser = require('body-parser');
+const session = require('express-session');
+const path = require('path');
+const helmet = require('helmet');
+const cors = require('cors');
+
+const cron = require('node-cron');
+
+const db = require('./server/lib/loginmanager');
+
+const doJob = require('./server/lib/job');
+const checkAuth = require('./server/middle/checkAuth');
+
+// create express app
+const app = express();
+require('dotenv').config();
+
+const serverPort = process.env.PORT || 3000;
+
+const sitePath = 'dist';
+
+app.use(cors());
+app.use(helmet());
+
+app.use(session({
+  'secret': 'rBLH5#Q89Z4',
+  'resave': true,
+  'saveUninitialized': true
+}));
+
+app.get('/', (request: { session: { auth: any; }; }, response: { redirect: (arg0: string) => void; sendFile: (arg0: any) => void; }) => {
+  if (request.session.auth)
+    response.redirect('/menu');
+  else
+    response.sendFile(path.join(`${__dirname}/server/static/login.html`));
+});
+
+app.get('/menu', checkAuth, (req: any, res: { sendFile: (arg0: any) => void; }) => {
+  res.sendFile(path.join(`${__dirname }/dist/index.html`));
+});
+
+app.use(express.static(path.join(__dirname, sitePath)));
+
+// parse requests of content-type - application/x-www-form-urlencoded
+app.use(bodyParser.urlencoded({ 'extended': true }));
+
+// parse requests of content-type - application/json
+app.use(bodyParser.json());
+
+app.post('/auth', (request: { body: { u: any; p: any; }; session: { username: any; auth: string; }; }, response: { redirect: (arg0: string) => void; status: (arg0: number) => { (): any; new(): any; send: { (arg0: { message: any; }): void; new(): any; }; }; send: (arg0: string) => void; end: () => void; }) => {
+  const username = request.body.u;
+  const password = request.body.p;
+
+  if (username && password)
+
+    db.getOne(username, password)
+      .then((data: any) => {
+        if (!data)
+          // response.send('Incorrect Username and/or Password!');
+          response.redirect('/');
+        else {
+          request.session.username = username;
+          request.session.auth = 'jhgkjgkjhgkjhgjkhgjkhgfhghfjgfjhgf';
+          response.redirect('/menu');
+        }
+      })
+      .catch((err: { message: any; }) => {
+        console.log(err);
+        response.status(500).send({
+          'message': err.message || 'Some error occurred while querying the database.'
+        });
+      });
+
+  else {
+    response.send('Please enter Username and Password!');
+    response.end();
+  }
+});
+
+require('./server/routes/recipe.routes')(app);
+require('./server/routes/view.routes')(app);
+
+// listen for requests
+app.listen(serverPort, () => {
+  console.log(`Server is listening on port ${serverPort}`);
+});
+
+((() => {
+  console.log('Menuserver 2.0 started');
+})());
+
+cron.schedule('0 8 * * 6', function () {
+  doJob();
+
+  return -1;
+});

server/lib/FoodObj.js

@@ -1,13 +1,12 @@
 class FoodObj {
 
   constructor(limit) {
-    this.srcURL = 'https://menu.silvrtree.co.uk';
     this.limit = limit;
     this.store = [];
     this.soup = {};
     this.types = [0, 0, 0, 0, 0, 0, 0];
   }
-
+  
   get () {
     return this.store;
   }
@@ -15,18 +14,18 @@ class FoodObj {
   getFirstFive() {
     return (this.store.slice(0, 5));
   }
-
+  
   getFirstFiveIDs() {
     const outVal = this.store.slice(0, 5).map((item) => {
       return item._id;
     });
-
+    
     return (outVal);
   }
 
   add(item) {
     // console.log('>>', item);
-    item.url = `${this.srcURL}/view/${item.short}`;
+    item.url = `https://menu.silvrtree.co.uk/view/${item.short}`;
     if (this.types[item.meat] < this.limit) {
       this.store.push(item);
       this.types[item.meat]++;
@@ -34,7 +33,7 @@ class FoodObj {
   }
 
   addSoup(item) {
-    item.url = `${this.srcURL}/view/${item.short}`;
+    item.url = `https://menu.silvrtree.co.uk/view/${item.short}`;
     this.soup = item;
   }
 
@@ -45,13 +44,13 @@ class FoodObj {
   count() {
     return (this.store.slice(0, 5).length);
   }
-
+  
   forPug() {
     const output = { 'menu':null, 'soup':null };
-
+    
     output.menu = [...this.getFirstFive()];
     output.soup = this.soup;
-
+    
     return output;
   }
 }

tsconfig.json

@@ -0,0 +1,69 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Basic Options */
+    // "incremental": true,                   /* Enable incremental compilation */
+    "target": "es6",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
+    "module": "commonjs",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    // "outDir": "./",                        /* Redirect output structure to the directory. */
+    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+     "removeComments": true,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true,                  /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+    // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+
+    /* Advanced Options */
+    "skipLibCheck": true,                     /* Skip type checking of declaration files. */
+    "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
+  }
+}