Update

Reviewed-on: #2

Docker/Dockerfile

@@ -0,0 +1,24 @@
+# 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

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

Docker/start.sh

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

Makefile

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,42 @@
+#!/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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,5 @@
+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,4 +1 @@
-.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 */
+.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}

docker-compose.yml

@@ -0,0 +1,14 @@
+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,7 +10,6 @@
   "license": "ISC",
   "dependencies": {
     "axios": "^0.19.0",
-    "backbone": "^1.4.0",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dateformat": "^3.0.3",
@@ -30,20 +29,17 @@
     "smtp-email-sender": "^1.0.0",
     "sqlite3": "^4.1.1",
     "tape": "^4.13.2",
-    "tape-promise": "^4.0.0",
-    "ultrases": "^0.1.3"
+    "tape-promise": "^4.0.0"
   },
   "devDependencies": {
     "browserify": "^16.5.0",
+    "cz-conventional-changelog": "^3.3.0",
     "eslint": "^6.6.0",
-    "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"
+    "require-dir": "^1.2.0"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }

pg.docker-compose.yml

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

server.js

@@ -1,3 +1,4 @@
+'use strict';
 require('dotenv').config();
 const express = require('express');
 const bodyParser = require('body-parser');
@@ -5,60 +6,52 @@ 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 localHost = process.env.LOCAL || false;
 const sitePath = 'dist';
-
 app.use(cors());
 app.use(helmet());
-
 app.use(session({
   'secret': 'rBLH5#Q89Z4',
   'resave': true,
   'saveUninitialized': true
 }));
-
 app.get('/', (request, response) => {
-  if (request.session.auth)
+ /* if (request.session.auth)
     response.redirect('/menu');
-  else 
+  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');
+});
 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)));
-
-// 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, response) => {
   const username = request.body.u;
   const password = request.body.p;
-
   if (username && password)
-
     db.getOne(username, password)
       .then((data) => {
         if (!data)
-          // response.send('Incorrect Username and/or Password!');
           response.redirect('/');
         else {
           request.session.username = username;
@@ -72,25 +65,19 @@ app.post('/auth', (request, response) => {
           '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();
 

server/lib/FoodObj.js

@@ -1,12 +1,13 @@
 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;
   }
@@ -14,18 +15,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 = `https://menu.silvrtree.co.uk/view/${item.short}`;
+    item.url = `${this.srcURL}/view/${item.short}`;
     if (this.types[item.meat] < this.limit) {
       this.store.push(item);
       this.types[item.meat]++;
@@ -33,7 +34,7 @@ class FoodObj {
   }
 
   addSoup(item) {
-    item.url = `https://menu.silvrtree.co.uk/view/${item.short}`;
+    item.url = `${this.srcURL}/view/${item.short}`;
     this.soup = item;
   }
 
@@ -44,13 +45,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;
   }
 }