Merge pull request #32 from mastertech/refactor

Refactor do projeto

Author: anabemorita

.gitignore

@@ -1,28 +1,5 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-
-# Distribution / packaging
-.Python
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-
-# mypy
-.mypy_cache/
-
-#Ide
-.vscode
+node_modules
 .idea
-
-Pipfile
-
-.DS_Store
+.code
+build
+.vscode

Dockerfile

@@ -1,25 +1,13 @@
-FROM python:3.7.4-alpine3.10
+FROM nginx:alpine
 
-WORKDIR /usr/src/app
+WORKDIR /usr/share/nginx/html
 
-COPY requirements.txt ./
-RUN apk add --no-cache postgresql-libs && \
-  apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev && \
-  pip install --no-cache-dir -r requirements.txt && \
-  apk --purge del .build-deps
-
-COPY . .
-
-RUN python manage.py collectstatic
+COPY nginx.conf /etc/nginx/conf.d/default.conf
 
-RUN apk add --no-cache bash && \
-    apk add nginx && \
-    apk add supervisor && \
-    cp -r shared/staticfiles/* /var/lib/nginx/html
+COPY build/ .
 
-COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+WORKDIR ~
 
-RUN echo "command=gunicorn --workers 1 --bind :8080 nisia.wsgi:application" >> /etc/supervisor/conf.d/supervisord.conf
+COPY start.sh .
 
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+CMD ["sh", "start.sh"]

Jenkinsfile

@@ -16,42 +16,23 @@ pipeline {
         }
     }
     stages{
-        stage("Install dependencies") {
-            steps {
-                sh "python3 -m venv venv"
-                sh ". venv/bin/activate"
-                sh "pip3 install -r requirements.txt"
-            }
-        }
-        stage("Tests") {
-            steps {
-                script {
-                    def postgresPort = sh (
-                            script: "awk -v min=64000 -v max=65000 'BEGIN{srand(); print int(min+rand()*(max-min+1))}'",
-                            returnStdout: true
-                        ).trim()
-                    docker.image("postgres:latest").withRun(
-                        "-e 'POSTGRES_DB=${params.APP_NAME}' " +
-                        "-e 'POSTGRES_USER=${params.APP_NAME}' " +
-                        "-e 'POSTGRES_PASSWORD=${params.APP_NAME}' " +
-                        "-p $postgresPort:5432") { c ->
-                            sh "while ! pg_isready -h localhost -p $postgresPort; do sleep 1; done"
-                            withEnv(["NISIA_DB_NAME=${params.APP_NAME}",
-                                     "NISIA_DB_USER=${params.APP_NAME}",
-                                     "NISIA_DB_PASS=${params.APP_NAME}",
-                                     "NISIA_DB_HOST=localhost",
-                                     "NISIA_DB_PORT=${postgresPort}",
-                                     "NISIA_DEBUG=True"]) {
-                                sh "python3 manage.py migrate"
-                                sh "python3 manage.py test"
-                            }
-                        }
-                }
-            }
-        }
-        stage("Build and Deploy Staging") {
+        stage("Build and deploy staging") {
             when { branch 'master' }
             stages {
+                stage("Install dependencies") {
+                    steps {
+                        script {
+                            sh "npm install"
+                        }
+                    }
+                }
+                stage("Package") {
+                    steps {
+                        script {
+                            sh "npm run build"
+                        }
+                    }
+                }
                 stage("Build and push image") {
                     steps {
                         script {
@@ -87,15 +68,15 @@ pipeline {
                         }
                     }
                 }
-                stage("Deploy Staging") {
+                stage("Deploy staging") {
                     steps {
                         sh "kubectl apply -f deploy/staging.yaml"
                         sh "kubectl rollout restart deploy ${params.APP_SERVICE_NAME} -n staging"
                     }
                 }
             }
         }
-        stage("Deploy Production") {
+        stage("Deploy production") {
             when { buildingTag() }
             steps {
                 sh "kubectl apply -f deploy/production.yaml"

gulpfile.js

@@ -0,0 +1,130 @@
+const gulp = require("gulp");
+const clean = require("del");
+const htmlMin = require("gulp-htmlmin");
+const cssMin = require("gulp-csso");
+const jsUglify = require("gulp-uglify");
+const autoPrefixer = require("gulp-autoprefixer");
+const browserSync = require("browser-sync").create();
+const sass = require("gulp-sass")(require("sass"));
+const image = require('gulp-image');
+const sourcemaps = require("gulp-sourcemaps");
+const webpack = require("webpack-stream");
+const babel = require("gulp-babel");
+const replace = require("gulp-replace");
+
+gulp.task("clean", () => clean("./build"));
+
+gulp.task("html", () =>
+  gulp
+    .src("./src/*.html")
+    .pipe(
+      htmlMin({
+        collapseWhitespace: true,
+        removeComments: true,
+      })
+    )
+    .pipe(gulp.dest("./build"))
+);
+
+gulp.task("scss", () =>
+  gulp
+    .src("./src/scss/*.scss")
+    .pipe(sourcemaps.init())
+    .pipe(sass().on("error", sass.logError))
+    .pipe(autoPrefixer())
+    .pipe(cssMin())
+    .pipe(sourcemaps.write())
+    .pipe(gulp.dest("./build/css"))
+);
+
+gulp.task("javascript", () =>
+  gulp
+    .src("./src/js/main.js")
+    .pipe(webpack({
+        mode: "development",
+        devtool: "source-map",
+        output: {
+          filename: "scripts.min.js",
+        },
+      })
+    )
+    .pipe(replace(
+        "LEADCOLLECTOR_URL",
+        "http://leadcollector.homolog.mastertech.com.br"
+      )
+    )
+    .pipe(replace(
+        "LEADCOLLECTOR_TOKEN",
+        "2bb4f7d7999ba46536b9caeafbaeafb38f464903"
+      )
+    )
+    .pipe(gulp.dest("./build/js"))
+);
+
+gulp.task("javascript:production", () =>
+  gulp
+    .src("./src/js/main.js")
+    .pipe(
+      webpack({
+        mode: "production",
+        output: {
+          filename: "scripts.min.js",
+        },
+      })
+    )
+    .pipe(
+      babel({
+        presets: ["@babel/env"],
+      })
+    )
+    .pipe(jsUglify())
+    .pipe(gulp.dest("./build/js"))
+);
+
+gulp.task("assets", () =>
+  gulp.src(["./src/assets/**/*"]).pipe(gulp.dest("./build/assets/"))
+);
+
+gulp.task("assets:optimize", () =>
+  gulp
+    .src(["./src/assets/**/*"])
+    .pipe(
+      image({
+        pngquant: true,
+        optipng: true,
+        zopflipng: true,
+        jpegRecompress: true,
+        mozjpeg: true,
+        gifsicle: true,
+        svgo: true,
+        concurrent: 10,
+      })
+    )
+    .pipe(gulp.dest("./build/assets/"))
+);
+
+gulp.task(
+  "build",
+  gulp.series("clean", gulp.parallel("html", "assets", "scss", "javascript"))
+);
+
+gulp.task(
+  "build:production",
+  gulp.series(
+    "clean",
+    gulp.parallel("html", "assets:optimize", "scss", "javascript:production")
+  )
+);
+
+gulp.task("server", () => {
+  browserSync.init({
+    server: "./build/",
+  });
+  gulp.watch("./src/**/*", gulp.series("build"));
+  gulp.watch("./src/**/*", (finish) => {
+    browserSync.reload();
+    finish();
+  });
+});
+
+gulp.task("default", gulp.series("build", "server"));