feat: working docker-compose

.dockerignore

@@ -6,3 +6,5 @@ Dockerfile*
 .git/
 .git/*
 .git/**
+.nuxt/
+dist/

Dockerfile

@@ -1,20 +1,23 @@
 FROM mhart/alpine-node:12
 
-RUN apk update && \ 
+RUN apk update && \
     apk upgrade && \
     apk add --no-cache git nano bash jq
 
 WORKDIR /app
 
 COPY package.json package-lock.json ./
 RUN npm install
-RUN npm run-script build
+RUN npm run build
 
 # Only copy over the node pieces we need from the above image
-FROM mhart/alpine-node:slim-12
+FROM mhart/alpine-node:12
 WORKDIR /app
 COPY --from=0 /app .
 COPY . .
-EXPOSE 3000
 
-CMD ["npm", "run", "dev"]
+EXPOSE 5302
+ENV PORT=5302
+
+# CMD ["npm", "start"]
+CMD npm run dev-clean

nuxt.config.js

@@ -33,7 +33,7 @@ module.exports = {
   io: {
     sockets: [{
       name: 'main',
-      url: process.env.SERVER_URL || 'http://localhost:3001'
+      url: process.env.SERVER_URL || 'http://localhost:5301'
     }]
   },
 

package.json

@@ -6,13 +6,15 @@
   "homepage": "https://github.com/viasite/site-audit-seo-viewer",
   "private": true,
   "scripts": {
-    "dev": "cross-env SERVER_URL=http://localhost:3001 HOST=0.0.0.0 PORT=3000 nuxt",
+    "dev": "cross-env SERVER_URL=http://localhost:5301 HOST=0.0.0.0 nuxt",
+    "dev-popstas": "cross-env SERVER_URL=http://popstas-server:5301 HOST=0.0.0.0 nuxt",
     "dev-clean": "nuxt",
     "build": "nuxt build",
     "deploy": "bash scripts/deploy.sh",
     "deploy-dev": "bash data/deploy-dev.sh",
     "start": "nuxt start",
     "generate": "nuxt generate -c nuxt.config.prod.js",
+    "generate-clean": "nuxt generate",
     "generate-dev": "nuxt generate -c data/nuxt.config.dev.js",
     "version": "npm run changelog && git add CHANGELOG.md",
     "postversion": "git push --tags && npm run release",

pages/scan.vue

@@ -48,15 +48,15 @@
 </style>
 
 <script>
-const apiUrl = process.env.SERVER_URL || 'http://localhost:3001';
+const apiUrl = process.env.SERVER_URL || 'http://localhost:5301';
 
 export default {
   components: {},
   data() {
     return {
       form: {
         url: "https://blog.popstas.ru",
-        args: '--max-requests 100 --upload'
+        args: '--max-requests 10'
       },
       log: []
     };
@@ -79,11 +79,24 @@ export default {
     this.socket = this.$nuxtSocket({
       channel: "/",
     });
+
     /* Listen for events: */
     this.socket.on("status", (msg, cb) => {
-      console.log('msg: ', msg);
+      // console.log('msg: ', msg);
       this.log.push(msg);
     });
+
+    this.socket.on("result", (data, cb) => {
+      const viewerUrl = window.location.origin + this.$router.options.base;
+      if (data.json) {
+        const url = viewerUrl + '?url=' + data.json;
+        this.log.push(`result: <a target="_blank" href="${url}">${url}</a>`);
+      }
+      if (data.name) {
+        const url = `${viewerUrl}?url=${apiUrl}/reports/${data.name}`;
+        this.log.push(`result: <a target="_blank" href="${url}">${url}</a>`);
+      }
+    });
   }
 };
 </script>