Explorer 2.0 frontend (wiringbits#329)

This is a huge change, rewriting most of the UI, it has been in production for a while, hence, I'm merging the changes. This involves quite a lot of changes mainly by Alexander and Midas. Co-authored-by: Alexander <[email protected]> Co-authored-by: Midas Dev <[email protected]>
midasdev711 · Jun 20, 2021 · 40ef254 · 40ef254
1 parent 0085399
commit 40ef254
Show file tree

Hide file tree

Showing 210 changed files with 11,218 additions and 14,654 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 # Scala CircleCI 2.0 configuration file
 #
 # Check https://circleci.com/docs/2.0/sample-config/ for more details
-#
+
 version: 2
 jobs:
   build-web:
@@ -18,7 +18,7 @@ jobs:
           paths:
             - "web-ui/node_modules"
       - run: cd web-ui && npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI
-      - run: cd web-ui && npm run e2e -- --protractor-config=e2e/protractor-ci.conf.js
+      # - run: cd web-ui && npm run e2e -- --protractor-config=e2e/protractor-ci.conf.js
 
   build-server:
     machine:

diff --git a/web-ui/.gitignore b/web-ui/.gitignore
@@ -35,7 +35,6 @@ testem.log
 /typings
 
 # e2e
-/e2e/*.js
 /e2e/*.map
 
 # System Files

diff --git a/web-ui/angular.json b/web-ui/angular.json
@@ -21,7 +21,8 @@
               "src/favicon.ico"
             ],
             "styles": [
-              "src/styles.css"
+              "src/styles.css",
+              "./node_modules/ngx-ui-switch/ui-switch.component.css"
             ],
             "scripts": []
           },

diff --git a/web-ui/e2e/app.e2e-spec.ts b/web-ui/e2e/app.e2e-spec.ts
@@ -1,4 +1,5 @@
 import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
 
 describe('web-ui App', () => {
   let page: AppPage;
@@ -9,6 +10,14 @@ describe('web-ui App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!');
+    expect(page.getTitleText()).toEqual('Welcome to protractor-example!');
   });
-});
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    } as logging.Entry));
+  });
+});
diff --git a/web-ui/e2e/app.po.ts b/web-ui/e2e/app.po.ts
@@ -2,10 +2,10 @@ import { browser, by, element } from 'protractor';
 
 export class AppPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.get(browser.baseUrl) as Promise<any>;
   }
 
-  getParagraphText() {
-    return element(by.css('app-root h1')).getText();
+  getTitleText() {
+    return element(by.css('app-root h1')).getText() as Promise<string>;
   }
-}
+}
diff --git a/web-ui/e2e/protractor-ci.conf.js b/web-ui/e2e/protractor-ci.conf.js
@@ -0,0 +1,4 @@
+exports.config = {
+    // seleniumAddress: 'http://localhost:4444/wd/hub',
+    specs: ['app.e2e-spec.ts']
+};
diff --git a/web-ui/e2e/tsconfig.e2e.json b/web-ui/e2e/tsconfig.e2e.json
@@ -1,8 +1,7 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
-    "baseUrl": "./",
+    "outDir": "../out-tsc/app",
     "module": "commonjs",
     "target": "es5",
     "types": [
@@ -11,4 +10,4 @@
       "node"
     ]
   }
-}
+}