From b82e177a6682d414b2f8fd5387b8d46be720dc4a Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Tue, 26 Apr 2022 10:43:06 -0300 Subject: [PATCH 01/10] update gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 99a279fb..dcf0f82a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,5 @@ docs/ .vscode/ package-lock.json + +Dockerfile -- GitLab From b136374e5316d3ecd6048e7467b2a8a38da236c2 Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Tue, 26 Apr 2022 10:45:01 -0300 Subject: [PATCH 02/10] remove dockerfile --- Dockerfile | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 49d758a4..00000000 --- a/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM node:dubnium-stretch - -ENV HTTP_PROXY=http://httpproxy.c3sl.ufpr.br:3128/ - -ENV HTTPS_PROXY=http://httpproxy.c3sl.ufpr.br:3128/ - -RUN npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint istanbul --force - -RUN npm un -g gulp - -RUN npm i -g gulp@3.9.0 - -RUN mkdir API - -COPY . ./API - -WORKDIR ./API - -RUN npm install - -RUN gulp build - -EXPOSE 3000 - -CMD NODE_ENV=production gulp -- GitLab From 7faf3b9fa2345758be3768d89fe41f70a405c5e9 Mon Sep 17 00:00:00 2001 From: SimCAQ-Homologa <root@simcaqhomologa.c3sl.ufpr.br> Date: Mon, 2 May 2022 09:19:29 -0300 Subject: [PATCH 03/10] add message route --- src/libs/routes/message.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/libs/routes/message.js b/src/libs/routes/message.js index 57eb350f..dd6f90a1 100644 --- a/src/libs/routes/message.js +++ b/src/libs/routes/message.js @@ -26,19 +26,22 @@ const email = require(`../middlewares/email`); const log = require(`../log`)(module); -messageApp.get('/', (req, res, next) => { - res.json({msg: 'This is the message route'}); -}) messageApp.post('/', (req, res, next) => { var reqName = req.body.name var reqEmail = req.body.email var reqContents = req.body.contents + var reqOrigin = req.body.origin ? req.body.origin : ""; + var sub = "Contato " + reqOrigin let mailOptions = { - from: `"${reqName} <${reqEmail}>"`, - text: reqContents + from: `\"${reqName}\" <${reqEmail}>`, + text: reqContents, + subject: sub } + console.log("reqbody", req.body) + console.log("mail options", mailOptions) + email(mailOptions, (err, info) => { if(err) { log.error(err); @@ -52,3 +55,4 @@ messageApp.post('/', (req, res, next) => { }) module.exports = messageApp; + -- GitLab From 1f65154d7c0f1a47e4a5480275eb4f8f7845acc6 Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Mon, 2 May 2022 10:33:27 -0300 Subject: [PATCH 04/10] fix gitlab-ci --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 356b1c4b..13096dc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,13 +31,13 @@ regression_tests: - npm install - gulp build && gulp & - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - - python get-pip.py + - python3 get-pip.py - sleep 60 script: - git clone https://gitlab.c3sl.ufpr.br/simcaq/lde-api-regression-test.git - cd lde-api-regression-test - - pip install -r requirements.txt - - python manage.py compare --verbose + - pip3 install -r requirements.txt + - python3 manage.py compare --verbose tags: - node -- GitLab From 0aeda285dccfea4f47a10d810190ea3734d0df7a Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Mon, 2 May 2022 10:38:03 -0300 Subject: [PATCH 05/10] fix gitlab-ci --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13096dc7..d21b3fcb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,14 +30,14 @@ regression_tests: - npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint - npm install - gulp build && gulp & - - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - - python3 get-pip.py + - curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py + - python get-pip.py - sleep 60 script: - git clone https://gitlab.c3sl.ufpr.br/simcaq/lde-api-regression-test.git - cd lde-api-regression-test - - pip3 install -r requirements.txt - - python3 manage.py compare --verbose + - pip install -r requirements.txt + - python manage.py compare --verbose tags: - node -- GitLab From cba7de54b09a06c1acb5d9a34fe0986acd91a82e Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Mon, 2 May 2022 11:12:52 -0300 Subject: [PATCH 06/10] fix gitlab-ci --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d21b3fcb..87783caa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,9 @@ variables: regression_tests: stage: test before_script: + - sudo apt-get update + - sudo apt-get install apt-transport-https ca-certificates -y + - sudo update-ca-certificates - npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint - npm install - gulp build && gulp & -- GitLab From 1da47988a5091005809942b96265150602d4695f Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Mon, 2 May 2022 11:14:13 -0300 Subject: [PATCH 07/10] fix gitlab-ci --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87783caa..71632ec4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,9 +27,9 @@ variables: regression_tests: stage: test before_script: - - sudo apt-get update - - sudo apt-get install apt-transport-https ca-certificates -y - - sudo update-ca-certificates + - apt update + - apt install apt-transport-https ca-certificates -y + - update-ca-certificates - npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint - npm install - gulp build && gulp & -- GitLab From fe4d3fe02d008cade6a61be1aa32d2e54a3d7342 Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Mon, 2 May 2022 11:22:51 -0300 Subject: [PATCH 08/10] fix gitlab-ci --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71632ec4..738c3b11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: node:9.2.1 +image: node:10.24.1 stages: - test -- GitLab From e3b2ed0d48c9a3f53a7d45794f3646a813cb2e42 Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Mon, 2 May 2022 11:26:37 -0300 Subject: [PATCH 09/10] return original gitlab-ci --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 738c3b11..d9d7a062 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: node:10.24.1 +image: node:9.2.1 stages: - test @@ -27,13 +27,10 @@ variables: regression_tests: stage: test before_script: - - apt update - - apt install apt-transport-https ca-certificates -y - - update-ca-certificates - npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint - npm install - gulp build && gulp & - - curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py + - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - python get-pip.py - sleep 60 script: @@ -44,3 +41,4 @@ regression_tests: - python manage.py compare --verbose tags: - node + -- GitLab From a313c3a5af5c6a516bb86783918c80a7036e1f45 Mon Sep 17 00:00:00 2001 From: Miguel Salerno <mans17@inf.ufpr.br> Date: Mon, 2 May 2022 11:29:30 -0300 Subject: [PATCH 10/10] remove gitlab-ci --- .gitlab-ci.yml | 44 -------------------------------------------- 1 file changed, 44 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index d9d7a062..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,44 +0,0 @@ -image: node:9.2.1 - -stages: - - test - -services: - - mongo:latest - -variables: - MONGO_URI: 'mongodb://mongo/app_name' - NODE_ENV: 'test' - -#run_tests: -# stage: test -# before_script: -# - node -v -# - npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha #gulp-eslint -# - npm install -# script: -# - ping -W1 -c1 mongo -# - sed -i -e 's/false/true/g' config.json -# - gulp build -# - gulp test -# tags: -# - node - -regression_tests: - stage: test - before_script: - - npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint - - npm install - - gulp build && gulp & - - curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py - - python get-pip.py - - sleep 60 - script: - - - git clone https://gitlab.c3sl.ufpr.br/simcaq/lde-api-regression-test.git - - cd lde-api-regression-test - - pip install -r requirements.txt - - python manage.py compare --verbose - tags: - - node - -- GitLab