Merge pull request #1011 from bierteam/v1

Bring back newer legacy

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         folder:
-          - beer-import
+          - beer-import-legacy
           - pils-legacy
           - frontend-legacy
     steps:
@@ -51,7 +51,7 @@ jobs:
     strategy:
       matrix:
         folder:
-         - beer-import-go
+         - beer-import
          - pils
     steps:
       -
@@ -78,7 +78,7 @@ jobs:
       matrix:
         folder:
           - beer-import
-          - beer-import-go
+          - beer-import-legacy
           - frontend
           - frontend-legacy
           - pils

frontend-legacy/.dockerignore

@@ -0,0 +1,19 @@
+.DS_Store
+.git/
+.github/
+.vscode/
+docs/
+node_modules
+*/.DS_Store
+test/
+.babelrc
+.env*
+.git*
+.postcssrc.js
+renovate.json
+selenium-server.log
+npm-debug.log*
+coverage
+config/backend.js
+config.js
+ecosystem.config.js

frontend-legacy/.editorconfig

@@ -0,0 +1,5 @@
+[*.{js,jsx,ts,tsx,vue}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

frontend-legacy/.github/renovate.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["config:base", ":docker", ":automergeMinor", ":maintainLockFilesMonthly"]
+}

frontend-legacy/.gitignore

@@ -0,0 +1,20 @@
+.DS_Store
+node_modules
+/dist
+
+# local env files
+.env*
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

frontend-legacy/Dockerfile

@@ -0,0 +1,18 @@
+# ---- Build with node ----
+FROM node:12 AS build  
+WORKDIR /app
+COPY public ./public
+COPY index.html ./
+COPY build ./build
+COPY config ./config
+COPY src ./src
+COPY package*.json ./
+RUN npm install
+RUN npm run build
+
+# --- Release with Alpine nginx----
+FROM nginx:alpine
+RUN rm -rf /etc/nginx/conf.d /etc/nginx/nginx.conf
+COPY nginx.conf /etc/nginx/nginx.conf
+COPY --from=build /app/public /usr/share/nginx/html
+EXPOSE 80

frontend-legacy/config/backend.js

@@ -0,0 +1,23 @@
+const backend = {
+  app: {
+    port: 3000,
+    secret: 'KoudPils',
+    devmode: false,
+    defaultAccount: {
+      autoCreate: true,
+      username: 'dorst',
+      password: 'ikwilpils'
+    }
+  },
+  db: {
+    host: 'cluster0-zdik9.mongodb.net',
+    username: 'dikkelul3bier',
+    password: 'mVHy5EoRm954TQ59',
+    name: 'oscar'
+  },
+  scraper: {
+    uri: 'https://www.biernet.nl/bier/aanbiedingen'
+  }
+}
+
+module.exports = backend

frontend-legacy/nginx.conf

@@ -0,0 +1,48 @@
+user  nginx;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+    gzip  on;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        location / {
+            root   /usr/share/nginx/html;
+            try_files $uri $uri/ /index.html;
+        }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   /usr/share/nginx/html;
+        }
+
+        # location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
+        #     # Some basic cache-control for static files to be sent to the browser
+        #     expires max;
+        #     add_header Pragma public;
+        #     add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+        # }
+    }
+}

frontend-legacy/package.json

@@ -0,0 +1,98 @@
+{
+  "description": "Frontend",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bierteam/frontend.git"
+  },
+  "contibutors": [
+    "Oscar Wieman (https://github.com/oscrx)",
+    "Nino van der Laan (https://github.com/NvdLaan)"
+  ],
+  "license": "MIT",
+  "scripts": {
+    "build": "node build/build.js"
+  },
+  "dependencies": {
+    "axios": "^0.19.0",
+    "body-parser": "^1.18.3",
+    "connect-history-api-fallback": "^1.6.0",
+    "helmet": "^3.21.2",
+    "moment": "^2.23.0",
+    "otplib": "^11.0.1",
+    "request": "^2.88.0",
+    "request-promise": "^4.2.2",
+    "uuid": "^3.3.2"
+  },
+  "devDependencies": {
+    "@babel/core": "7.7.7",
+    "@babel/plugin-proposal-class-properties": "7.7.4",
+    "@babel/plugin-proposal-decorators": "7.7.4",
+    "@babel/plugin-proposal-export-namespace-from": "7.7.4",
+    "@babel/plugin-proposal-function-sent": "7.7.4",
+    "@babel/plugin-proposal-json-strings": "7.7.4",
+    "@babel/plugin-proposal-numeric-separator": "7.7.4",
+    "@babel/plugin-proposal-throw-expressions": "7.7.4",
+    "@babel/plugin-syntax-dynamic-import": "7.7.4",
+    "@babel/plugin-syntax-import-meta": "7.7.4",
+    "@babel/plugin-syntax-jsx": "7.7.4",
+    "@babel/plugin-transform-runtime": "7.7.6",
+    "@babel/preset-env": "7.7.7",
+    "@babel/register": "7.7.7",
+    "@babel/runtime-corejs2": "7.7.7",
+    "@fortawesome/fontawesome-free": "5.12.0",
+    "autoprefixer": "9.7.3",
+    "babel-core": "7.0.0-bridge.0",
+    "babel-eslint": "10.0.3",
+    "babel-helper-vue-jsx-merge-props": "2.0.3",
+    "babel-jest": "24.9.0",
+    "babel-loader": "8.0.6",
+    "babel-plugin-syntax-jsx": "6.18.0",
+    "babel-plugin-transform-vue-jsx": "3.7.0",
+    "bulma": "0.8.0",
+    "bulma-tooltip": "3.0.2",
+    "chalk": "3.0.0",
+    "cheerio": "1.0.0-rc.3",
+    "chromedriver": "79.0.0",
+    "codecov": "3.7.1",
+    "copy-webpack-plugin": "5.1.1",
+    "cross-spawn": "7.0.1",
+    "css-loader": "3.4.2",
+    "dotenv": "8.2.0",
+    "extract-text-webpack-plugin": "3.0.2",
+    "file-loader": "5.0.2",
+    "friendly-errors-webpack-plugin": "1.7.0",
+    "havetheybeenpwned": "1.0.1",
+    "html-webpack-plugin": "3.2.0",
+    "jest": "24.9.0",
+    "jest-serializer-vue": "2.0.2",
+    "nightwatch": "1.3.2",
+    "node-notifier": "6.0.0",
+    "npm": "6.13.6",
+    "optimize-css-assets-webpack-plugin": "3.2.1",
+    "ora": "4.0.3",
+    "postcss-import": "12.0.1",
+    "postcss-loader": "3.0.0",
+    "postcss-url": "8.0.0",
+    "qrcode": "1.4.4",
+    "rimraf": "3.0.0",
+    "selenium-server": "3.141.59",
+    "semver": "7.1.1",
+    "shelljs": "0.8.5",
+    "standard": "14.3.1",
+    "uglifyjs-webpack-plugin": "1.3.0",
+    "url-loader": "3.0.0",
+    "vue": "2.6.11",
+    "vue-browserupdate": "1.2.0",
+    "vue-jest": "3.0.5",
+    "vue-loader": "13.7.3",
+    "vue-router": "3.1.3",
+    "vue-style-loader": "4.1.2",
+    "vue-template-compiler": "2.6.11",
+    "vue2-filters": "0.9.1",
+    "webpack": "3.12.0",
+    "webpack-bundle-analyzer": "3.6.0",
+    "webpack-cli": "3.3.10",
+    "webpack-dev-server": "2.11.5",
+    "webpack-merge": "4.2.2"
+  }
+}

pils-legacy/src/components/Logging.vue → frontend-legacy/src/components/Logging.vue

@@ -7,7 +7,13 @@
     <table class='table container'>
       <thead>
         <tr> <!-- first row -->
-          <th><a class="button is-danger" @click.once="deleteLogs">Delete all logs</a></th>
+          <th><a class="button is-danger" @click='state.deleteMsg = !state.deleteMsg'>Delete all logs</a></th>
+            <div v-if="state.deleteMsg" class="notification is-light">
+              <button class="delete" @click="state.deleteMsg = false"></button>
+              Are you sure? This is permanent.
+              <br><br>
+              <Button class="button is-danger is-large" @click.once="deleteLogs" type="button" >I am sure!</Button>
+            </div>
           <th><input class='input' type='text' placeholder='Search' v-model="search"></th>
           <th>
             <div class="select">
@@ -72,6 +78,9 @@ export default {
         Context: 'Context',
         Type: 'Type',
         Ip: 'Ip'
+      },
+      state: {
+        deleteMsg: false
       }
     }
   },

pils-legacy/.dockerignore

@@ -10,6 +10,8 @@ test/
 .env*
 .git*
 .postcssrc.js
+.travis.yml
+deploy_key.enc
 renovate.json
 selenium-server.log
 npm-debug.log*