Feature/npm refactor

.coveragerc

@@ -6,7 +6,7 @@ omit =
     # omit everything in /usr
     /usr/*
     # omit this single file
-    s3browser/__init__.py
+    swift_browser_ui/__init__.py
 
 [report]
 # Regexes for lines to exclude from consideration

.travis.yml

@@ -23,27 +23,46 @@ stages:
 jobs:
   include:
     - stage: tests
-      name: "Code Style Check"
+      name: "Code Style Check Python"
       python: 3.6
       before_script:
         - pip install tox-travis
       script: tox -e flake8
+    - stage: tests
+      name: "Code Style Check Javascript"
+      node_js: "12"
+      before_script:
+        - cd swift_browser_ui_frontend
+        - npm install
+      script: npm run lint
     - stage: tests
       name: "Unit Tests  Python 3.6"
       python: 3.6
       before_script:
+        - cd swift_browser_ui_frontend
+        - npm install
+        - npm run build
+        - cd ..
         - pip install tox-travis
       script: tox -e pytest
     - stage: tests
       name: "Unit Tests Python 3.7"
       python: 3.7
       before_script:
+        - cd swift_browser_ui_frontend
+        - npm install
+        - npm run build
+        - cd ..
         - pip install tox-travis
       script: tox -e pytest
     - stage: tests
       name: "Documentation Tests"
       python: 3.6
       before_script:
+        - cd swift_browser_ui_frontend
+        - npm install
+        - npm run build
+        - cd ..
         - pip install tox-travis
         - wget https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz
         - tar -xvzf geckodriver-v0.24.0-linux64.tar.gz
@@ -65,6 +84,10 @@ jobs:
       name: "Firefox UI Tests"
       python: 3.6
       before_script:
+        - cd swift_browser_ui_frontend
+        - npm install
+        - npm run build
+        - cd ..
         - pip install tox-travis
         - wget https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz
         - tar -xvzf geckodriver-v0.24.0-linux64.tar.gz
@@ -80,6 +103,10 @@ jobs:
       name: "Chrome UI Tests"
       python: 3.6
       before_script:
+        - cd swift_browser_ui_frontend
+        - npm install
+        - npm run build
+        - cd ..
         - pip install tox-travis
         - curl -sS -o - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add
         - echo "deb [arch=amd64]  http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee -a /etc/apt/sources.list.d/google-chrome.list

Dockerfile

@@ -1,4 +1,16 @@
-FROM python:3.7-alpine3.9 as BUILD
+FROM node:12.10-alpine as FRONTEND
+
+RUN apk add --update \
+    && apk add --no-cache build-base curl-dev linux-headers bash git\
+    && rm -rf /var/cache/apk/*
+
+COPY swift_browser_ui_frontend /root/swift_ui/swift_browser_ui_frontend
+
+RUN cd /root/swift_ui/swift_browser_ui_frontend \\
+    && npm install \\
+    && npm run build
+
+FROM python:3.7-alpine3.9 as BACKEND
 
 RUN apk add --update \
     && apk add --no-cache build-base curl-dev linux-headers bash git\
@@ -8,7 +20,7 @@ RUN apk add --update \
 COPY requirements.txt /root/swift_ui/requirements.txt
 COPY setup.py /root/swift_ui/setup.py
 COPY swift_browser_ui /root/swift_ui/swift_browser_ui
-COPY swift_browser_ui_frontend /root/swift_ui/swift_browser_ui_frontend
+COPY --from=FRONTEND /root/swift_ui/swift_browser_ui_frontend/dist /root/swift_ui/swift_browser_ui_frontend/dist
 
 RUN pip install --upgrade pip && \
     pip install -r /root/swift_ui/requirements.txt && \
@@ -22,11 +34,11 @@ LABEL maintainer "CSC Developers"
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.vcs-url="https://github.com/CSCFI/swift-browser-ui"
 
-COPY --from=BUILD usr/local/lib/python3.7/ usr/local/lib/python3.7/
+COPY --from=BACKEND usr/local/lib/python3.7/ usr/local/lib/python3.7/
 
-COPY --from=BUILD /usr/local/bin/gunicorn /usr/local/bin/
+COPY --from=BACKEND /usr/local/bin/gunicorn /usr/local/bin/
 
-COPY --from=BUILD /usr/local/bin/swift-browser-ui /usr/local/bin/
+COPY --from=BACKEND /usr/local/bin/swift-browser-ui /usr/local/bin/
 
 RUN mkdir -p /app
 

README.md

@@ -40,6 +40,10 @@ Getting started:
 ```
 git clone git@gitlab.csc.fi:CSCCSDP/swift_browser_ui.git
 cd swift_browser_ui
+cd swift_browser_ui_frontend
+npm install
+npm run build
+cd ..
 pip install -r requirements.txt
 pip install .
 ```

docs/source/testing.rst

@@ -55,4 +55,4 @@ implemented in the UI testing scenarios. The utility can be run using:
 
 .. code-block:: console
 
-    $ python -m ui_tests.ui_take_screenshots
+    $ python -m tests.ui.ui_take_screenshots

swift_browser_ui/static

@@ -1 +1 @@
-../swift_browser_ui_frontend
+../swift_browser_ui_frontend/dist

swift_browser_ui_frontend/.eslintrc.json

@@ -0,0 +1,66 @@
+{
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:vue/essential",
+        "plugin:vue/base",
+        "plugin:vue/strongly-recommended",
+        "plugin:vue/recommended"
+    ],
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "vue"
+    ],
+    "rules": {
+        "indent": [
+            "error",
+            2,
+            {
+                "SwitchCase": 1
+            }
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "comma-dangle": [
+            "error",
+            "always-multiline"
+        ],
+        "max-len": ["error", {
+            "code": 80,
+            "comments": 75,
+            "ignoreTemplateLiterals": true,
+            "ignoreUrls": true
+        }],
+        // Vue rules here
+        "vue/html-closing-bracket-newline": ["error", {
+            "singleline": "never",
+            "multiline": "always"
+        }],
+        "vue/mustache-interpolation-spacing": ["error", "always"],
+        "vue/script-indent": ["error", 2, {
+            "baseIndent": 0,
+            "switchCase": 1
+        }],
+        "vue/require-prop-types": [0]
+    }
+}