Update Project Structure

- Changes in Dockerfile
- Update Dependencies
- Add Lazy Loading Modules
- Remove Tests
- Update to 1.0.2

Author: V1ncNet

.angular-cli.json

@@ -22,17 +22,22 @@
         "../node_modules/font-awesome/css/font-awesome.min.css",
         "styles.scss"
       ],
-      "scripts": [
-        "../node_modules/jquery/dist/jquery.min.js",
-        "../node_modules/bootstrap/dist/js/bootstrap.bundle.js"
-      ],
+      "scripts": [],
       "environmentSource": "environments/environment.ts",
       "environments": {
         "dev": "environments/environment.ts",
         "prod": "environments/environment.prod.ts"
+      },
+      "stylePreprocessorOptions": {
+        "includePaths": ["./", "./scss"]
       }
     }
   ],
+  "e2e": {
+    "protractor": {
+      "config": "./protractor.conf.js"
+    }
+  },
   "lint": [
     {
       "project": "src/tsconfig.app.json",
@@ -41,6 +46,10 @@
     {
       "project": "src/tsconfig.spec.json",
       "exclude": "**/node_modules/**"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json",
+      "exclude": "**/node_modules/**"
     }
   ],
   "test": {
@@ -50,8 +59,31 @@
   },
   "defaults": {
     "styleExt": "scss",
+    "build": {
+      "showCircularDependencies": false
+    },
+    "class": {
+      "spec": false
+    },
     "component": {
-      "inlineStyle": true
+      "inlineStyle": true,
+      "inlineTemplate": false,
+      "spec": false
+    },
+    "directive": {
+      "spec": false
+    },
+    "guard": {
+      "spec": false
+    },
+    "module": {
+      "spec": false
+    },
+    "pipe": {
+      "spec": false
+    },
+    "service": {
+      "spec": false
     }
   }
 }

.dockerignore

@@ -1 +1,2 @@
-.git*
+.git*
+node_modules/

Dockerfile

@@ -1,114 +1,33 @@
-FROM docker.io/lalyos/upx AS upx
+# Stage 0, based on Node.js, to build and compile Angular
+FROM node:8 as node
 
-FROM node:8 AS asset-builder
-RUN mkdir -p /usr/src/app
-WORKDIR /usr/src/app
-ARG NODE_ENV=development
-ENV NODE_ENV=$NODE_ENV
-COPY package.json /usr/src/app/
-COPY package-lock.json /usr/src/app/
+WORKDIR /app
 
-RUN  npm install && npm cache clean --force
+COPY package.json /app/
+COPY package-lock.json /app/
 
-COPY .angular-cli.json /usr/src/app/
-COPY build.js          /usr/src/app/
-COPY tsconfig.json     /usr/src/app/
-COPY tslint.json       /usr/src/app/
+RUN npm install
 
-COPY src               /usr/src/app/src
+COPY ./ /app/
 
-RUN npm run build
+ARG env=prod
+ARG lang=en
 
-FROM golang AS asset-compiler
-RUN go get github.com/elazarl/go-bindata/...
-RUN go get github.com/elazarl/go-bindata-assetfs/...
+RUN npm run build:$lang -- --prod --environment $env
 
-COPY --from=asset-builder /usr/src/app/dist /dist
-RUN go-bindata-assetfs -nomemcopy -nocompress /dist/... \
- && ( grep -q '"os"' bindata_assetfs.go \
-      || sed -e 's|"github.com/elazarl/go-bindata-assetfs"|"github.com/elazarl/go-bindata-assetfs"\n\t"os"|' -i bindata_assetfs.go ) \
- && cp bindata_assetfs.go /bindata_assetfs.go
 
+# Stage 1, based on Nginx, to have only the compiled app, ready for production with Nginx
+FROM nginx
 
-FROM golang AS server-builder
+COPY --from=node /app/dist/ /usr/share/nginx/html
 
-RUN go get github.com/heptiolabs/healthcheck/...
-RUN go get github.com/gorilla/handlers/...
-RUN go get github.com/hkwi/h2c/...
-RUN go get github.com/elazarl/go-bindata-assetfs/...
-RUN go get github.com/heptiolabs/healthcheck/...
-
-COPY --from=upx /bin/upx /bin/upx
-RUN  ( \
-     echo 'package main'; \
-     echo ''; \
-     echo 'import ('; \
-     echo '    "github.com/gorilla/handlers"'; \
-     echo '    "github.com/hkwi/h2c"'; \
-     echo '    "log"'; \
-     echo '    "net/http"'; \
-     echo '    "os"'; \
-     echo ')'; \
-     echo ''; \
-     echo 'func getEnv(key, fallback string) string {'; \
-     echo '    if value, ok := os.LookupEnv("SERVER_" + key); ok {'; \
-     echo '        return value'; \
-     echo '    }'; \
-     echo '    return fallback'; \
-     echo '}'; \
-     echo ''; \
-     echo 'type hookedResponseWriter struct {'; \
-     echo '    http.ResponseWriter'; \
-     echo '    ignore bool'; \
-     echo '}'; \
-     echo ''; \
-     echo 'func (hrw *hookedResponseWriter) WriteHeader(status int) {'; \
-     echo '    if status == 404 {'; \
-     echo '        hrw.ignore = true'; \
-     echo '        fallbackDocument, err := Asset("dist/index.html")'; \
-     echo '        if err != nil {'; \
-     echo '            log.Fatal("cannot process 404-handler", err)'; \
-     echo '        }'; \
-     echo '        hrw.ResponseWriter.Header().Set("Content-Type", "text/html; charset=utf-8");'; \
-     echo '        hrw.ResponseWriter.WriteHeader(200)'; \
-     echo '        hrw.ResponseWriter.Write(fallbackDocument)'; \
-     echo '    } else {'; \
-     echo '        hrw.ResponseWriter.WriteHeader(status)'; \
-     echo '    }'; \
-     echo '}'; \
-     echo ''; \
-     echo 'func (hrw *hookedResponseWriter) Write(p []byte) (int, error) {'; \
-     echo '    if hrw.ignore {'; \
-     echo '        return len(p), nil'; \
-     echo '    }'; \
-     echo '    return hrw.ResponseWriter.Write(p)'; \
-     echo '}'; \
-     echo ''; \
-     echo 'type NotFoundHook struct {'; \
-     echo '    h http.Handler'; \
-     echo '}'; \
-     echo ''; \
-     echo 'func (nfh NotFoundHook) ServeHTTP(w http.ResponseWriter, r *http.Request) {'; \
-     echo '    nfh.h.ServeHTTP(&hookedResponseWriter{ResponseWriter: w}, r)'; \
-     echo '}'; \
-     echo ''; \
-     echo 'func main() {'; \
-     echo '    http.Handle("/", handlers.ProxyHeaders(handlers.LoggingHandler(os.Stdout, NotFoundHook{http.FileServer(assetFS())})))'; \
-     echo '    log.Fatal(http.ListenAndServe(getEnv("BIND", ":8080"), &h2c.Server{}))'; \
-     echo '}'; \
-     ) > web.go
-COPY --from=asset-compiler /bindata_assetfs.go bindata_assetfs.go
-ARG GOOS=linux
-ENV GOOS=$GOOS
-
-ARG CGO_ENABLED=0
-ENV CGO_ENABLED=$CGO_ENABLED
-
-RUN go build -o /server bindata_assetfs.go web.go
-
-ARG UPX_ARGS=-6
-RUN upx ${UPX_ARGS} /server
-
-FROM scratch
-ENTRYPOINT ["server"]
-COPY --from=server-builder /server /bin/server
+RUN ( \
+    echo 'server {'; \
+    echo '  listen 80;'; \
+    echo '  location / {'; \
+    echo '    root /usr/share/nginx/html;'; \
+    echo '    index index.html index.htm;'; \
+    echo '    try_files $uri $uri/ /index.html =404;'; \
+    echo '  }'; \
+    echo '}'; \
+    ) >  /etc/nginx/conf.d/default.conf