From 7d693939fa238c1a295544c1bf9ade6761d3a273 Mon Sep 17 00:00:00 2001 From: henningxtro Date: Tue, 1 Dec 2020 19:24:29 +0100 Subject: [PATCH 1/4] Added pm2 environment file --- Backend/Backend.config.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Backend/Backend.config.js diff --git a/Backend/Backend.config.js b/Backend/Backend.config.js new file mode 100644 index 0000000..4683cdc --- /dev/null +++ b/Backend/Backend.config.js @@ -0,0 +1,27 @@ +module.exports = { + apps : [{ + name: "Backend", + script: 'dist/index.js', + watch: '.', + env: { + "PORT": '3000', + "DB_HOST": 'localhost', + "DB_USER": 'betterzon_admin', + "DB_PASSWORD": 'FezcxEfXWH6sgJfZLfY9Cd5Fyu2NTwEM7i8j', + "DB_DATABASE": 'betterzon_dev' + }, + }], + + deploy : { + production : { + user : 'SSH_USERNAME', + host : 'SSH_HOSTMACHINE', + ref : 'origin/master', + repo : 'GIT_REPOSITORY', + path : 'DESTINATION_PATH', + 'pre-deploy-local': '', + 'post-deploy' : 'npm install && pm2 reload ecosystem.config.js --env production', + 'pre-setup': '' + } + } +}; \ No newline at end of file From cce7b58497c2620ad4eae74d721b0f85505d7dc5 Mon Sep 17 00:00:00 2001 From: rebooooorn Date: Wed, 2 Dec 2020 22:23:10 +0100 Subject: [PATCH 2/4] BETTERZON-35 added footer --- Frontend/src/app/footer/footer.component.css | 18 ++++++++++++++++-- Frontend/src/app/footer/footer.component.html | 15 +++++++++++---- .../app/landingpage/landingpage.component.html | 1 + 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Frontend/src/app/footer/footer.component.css b/Frontend/src/app/footer/footer.component.css index e25c62c..c39569a 100644 --- a/Frontend/src/app/footer/footer.component.css +++ b/Frontend/src/app/footer/footer.component.css @@ -1,3 +1,17 @@ -.container{ - text-align: center; +.footer { + position: fixed; + left: 0; + bottom: 0; + width: 100%; + background-color: dimgrey; + color: white; + text-align: center; } + +.icon-3d { + padding: 10px; + color: #fff; +} + + + diff --git a/Frontend/src/app/footer/footer.component.html b/Frontend/src/app/footer/footer.component.html index aa19043..e6d17d8 100644 --- a/Frontend/src/app/footer/footer.component.html +++ b/Frontend/src/app/footer/footer.component.html @@ -1,7 +1,14 @@ -