From 08656bff9985e5569991bb43f815d7b9bd987a27 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@gmail.com>
Date: Sat, 9 Nov 2019 18:38:14 +0200
Subject: [PATCH] Lint before testing

---
 .eslintrc.json                                |  5 ++++
 .gitlab-ci.yml                                | 26 +++++++++----------
 .../AdminSignupPage/AdminSignupPage.scss      | 13 +++++-----
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 684920c..30d2014 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -26,6 +26,11 @@
         "react",
         "@typescript-eslint"
     ],
+    "settings": {
+        "react": {
+            "version": "detect"
+        }
+    },
     "rules": {
         "arrow-parens": ["off", "always"],
         "comma-dangle": [
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e8310a..3f9cab6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
     - setup
-    - test
     - lint
+    - test
     - publish
     - deploy
 
@@ -15,18 +15,6 @@ setup:
     script:
         - npm ci
 
-# test:unit:
-#     image: node:12
-#     stage: test
-#     script:
-#         - npm run test:unit
-
-test:e2e:
-    image: circleci/node:12-browsers
-    stage: test
-    script:
-        - npm run test:e2e
-
 es:lint:
     image: node:12
     stage: lint
@@ -39,6 +27,18 @@ sass:lint:
     script:
         - npm run lint:sass
 
+# test:unit:
+#     image: node:12
+#     stage: test
+#     script:
+#         - npm run test:unit
+
+test:e2e:
+    image: circleci/node:12-browsers
+    stage: test
+    script:
+        - npm run test:e2e
+
 publish:
     stage: publish
     image: docker:stable
diff --git a/src/pages/AdminSignupPage/AdminSignupPage.scss b/src/pages/AdminSignupPage/AdminSignupPage.scss
index 0624933..26d2705 100644
--- a/src/pages/AdminSignupPage/AdminSignupPage.scss
+++ b/src/pages/AdminSignupPage/AdminSignupPage.scss
@@ -1,5 +1,11 @@
 @import "../../assets/scss/globals";
 
+.signup-create-page {
+  a {
+      color: color(orange1);
+      text-decoration: underline;
+  }
+}
 
 .admin-signup-page {
   table {
@@ -18,10 +24,3 @@
     }
   }
 }
-
-.signup-create-page {
-  a {
-      color: color(orange1);
-      text-decoration: underline;
-  }
-}
\ No newline at end of file