[WIP] Merging dev branch into master post-refactor (#437)

.github/workflows/cd.yaml

@@ -14,14 +14,10 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up node env
-      uses: actions/setup-node@v2.1.2
+      uses: actions/setup-node@v3.6.0
       with:
         node-version: 16
 
-    - name: Create .env file
-      run: |
-        echo "API_QUERY_URL=${{ vars.API_QUERY_URL }}" > .env
-
     - name: Install dependencies
       run: yarn
 

.github/workflows/lint.yaml

@@ -0,0 +1,16 @@
+name: lint
+
+on: [pull_request, workflow_dispatch]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Run ESLint
+      run: npm run lint

.github/workflows/test_component.yml

@@ -0,0 +1,15 @@
+name: Component tests (Cypress)
+
+on: [push]
+
+jobs:
+  cypress-run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      # Install NPM dependencies, cache them correctly
+      - name: Run Component tests 🧪
+        uses: cypress-io/github-action@v5
+        with:
+          component: true

.github/workflows/test_e2e.yml

@@ -0,0 +1,25 @@
+name: End to end tests (Cypress)
+
+on: [push]
+
+jobs:
+  cypress-run:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🔍
+        uses: actions/checkout@v3
+
+      - name: Set up node env
+        uses: actions/[email protected]
+        with:
+          node-version: 16
+
+      # Install NPM dependencies, cache them correctly
+      # and run all Cypress End to End tests
+      - name: Run End to End tests 🧪
+        uses: cypress-io/github-action@v5
+        with:
+          build: npm run generate
+          start: npm start
+          component: false
+

.gitignore

@@ -88,3 +88,8 @@ sw.*
 
 # Vim swap files
 *.swp
+
+# Cypress related files
+cypress/screenshots
+cypress/videos
+cypress/downloads

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run lint
+npx lint-staged

.lintstagedrc.json

@@ -0,0 +1,3 @@
+{
+    "*.{js,vue}": ["npm run lint"]
+}

assets/css/main.css

@@ -5,6 +5,12 @@
 	display: none;
 }
 
+.instructions-text {
+
+	color: grey;
+	font-style: italic;
+}
+
 /* Bootstrap styles */
 
 .container-fluid {
@@ -19,14 +25,6 @@
 	padding-right: 2em;
 }
 
-/* Categorization page styles */
-
-.instructions-text {
-
-	color: grey;
-	font-style: italic;
-}
-
 /* Annotation page styles */
 
 .annotation-card {
@@ -47,27 +45,27 @@
 
 /* Category palette */
 
-.category-style-0 {
+.category-style-1 {
 
 	background-color: rgb(164,208,90) !important;
 	color: black !important;
 }
-.category-style-1 {
+.category-style-2 {
 
 	background-color: rgb(127,23,167) !important;
 	color: white !important;
 }
-.category-style-2 {
+.category-style-3 {
 
 	background-color: rgb(70,76,174) !important;
 	color: white !important;		
 }
-.category-style-3 {
+.category-style-4 {
 
 	background-color: rgb(236,197,50) !important;
 	color: black !important;
 }
-.category-style-4 {
+.category-style-5 {
 
 	background-color: rgb(128,1,1) !important;
 	color: white !important;