update: fixed conflicting files

ambianic · Jul 22, 2021 · 9b81297 · 9b81297
1 parent 25dff40
commit 9b81297
Show file tree

Hide file tree

Showing 9 changed files with 33,630 additions and 55,562 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -43,7 +43,7 @@ jobs:
       env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - name: Upload Jest coverage to Github Artifacts
+    - name: Upload combined test coverage to Github Artifacts
       uses: actions/upload-artifact@v2
       with:
         name: Ambianic-PWA-Test-Artifact

diff --git a/.gitignore b/.gitignore
@@ -26,8 +26,8 @@ cypress/videos/
 cypress/screenshots/
 
 # Test coverage reports
-reports/
 .nyc_output/
 coverage/
+reports/
 jest-coverage/
 cypress-coverage/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,8 +9,8 @@
     "lint": "vue-cli-service lint",
     "codecov:e2e": "codecov -f ./jest-coverage/coverage-final.json",
     "codecov:unit": "codecov -f ./jest-coverage/coverage-final.json",
-    "codecov": "codecov -f jest-coverage/coverage-final.json && codecov -f cypress-coverage/coverage-final.json",
-    "copy:reports": "mkdir -p reports/ && cp cypress-coverage/coverage-final.json reports/from-cypress.json && cp jest-coverage/coverage-final.json reports/from-jest.json",
+    "codecov": "codecov -f jest-coverage/coverage-final.json && codecov -f coverage/coverage-final.json",
+    "copy:reports": "mkdir -p reports/ && cp coverage/coverage-final.json reports/from-cypress.json && cp jest-coverage/coverage-final.json reports/from-jest.json",
     "combine:reports": "mkdir -p reports/ && npx nyc merge reports && mv coverage.json .nyc_output/out.json",
     "test:unit": "jest",
     "test:e2e": "npx cypress run",
@@ -103,7 +103,7 @@
   ],
   "license": "Apache-2.0",
   "nyc": {
-    "report-dir": "cypress-coverage",
+    "report-dir": "coverage",
     "reporter": [
       "text",
       "json"

diff --git a/reports/from-cypress.json b/reports/from-cypress.json
diff --git a/reports/from-jest.json b/reports/from-jest.json
diff --git a/src/components/edge-auth0-sync.vue b/src/components/edge-auth0-sync.vue
@@ -22,7 +22,6 @@
             @click="handleClose('DENIED')"
           >
             <v-icon
-              style="margin: 0.5rem 0;"
               center
               id="close-icon"
               size="25"
@@ -239,6 +238,10 @@ export default {
   align-items: center;
 }
 
+.icon {
+  margin: 0.5rem 0;
+}
+
 .icon:hover {
   cursor: pointer;
 }

diff --git a/src/views/Home.vue b/src/views/Home.vue
@@ -1,21 +1,21 @@
 <template>
   <v-main class="body">
     <v-container
-      id="container"
-      fluid
+        id="container"
+        fluid
     >
       <v-row
-        align="center"
-        justify="center"
-        no-gutters
+          align="center"
+          justify="center"
+          no-gutters
       >
         <v-card
-          max-width="344"
-          class="mx-auto"
+            max-width="344"
+            class="mx-auto"
         >
           <v-list-item
-            align="center"
-            justify="center"
+              align="center"
+              justify="center"
           >
             <v-list-item-content>
               <v-list-item-title class="headline">
@@ -32,31 +32,31 @@
             </v-list-item-subtitle>
 
             <p
-              class="center"
-              v-if="!hasSetupSystem"
+                class="center"
+                v-if="!hasSetupSystem"
             >
               Let's setup your system
             </p>
             <p
-              class="center"
-              v-else
+                class="center"
+                v-else
             >
               Control your Ambianic Edge Appliances from your console.
             </p>
           </v-card-text>
 
           <v-card-actions class="align-center">
             <div
-              class="skip-link"
+                class="skip-link"
             >
               <v-btn
-                rounded
-                color="pink darken-4"
-                dark
-                data-cy="timeline"
-                class="ma-2 white--text"
-                :to="'onboarding'"
-                id="btn-timeline"
+                  rounded
+                  color="pink darken-4"
+                  dark
+                  data-cy="timeline"
+                  class="ma-2 white--text"
+                  :to="'onboarding'"
+                  id="btn-timeline"
               >
                 Continue Setup
                 <v-icon right>
@@ -68,9 +68,9 @@
         </v-card>
       </v-row>
       <v-row
-        align="end"
-        justify="center"
-        no-gutters=""
+          align="end"
+          justify="center"
+          no-gutters=""
       >
         <v-col>
           <update-notification class="mx-auto" />
@@ -82,7 +82,9 @@
 
 <script>
 import { mapState } from 'vuex'
+
 import UpdateNotification from '@/components/UpdateNotification'
+
 export default {
   name: 'Home',
   components: {
@@ -99,6 +101,7 @@ export default {
   created () {
     const setupStatus = window.localStorage.getItem('hasCompletedOnboarding')
     const remotePeerId = this.edgePeerId
+
     if (setupStatus || remotePeerId) {
       this.$router.push('timeline')
     }
@@ -110,6 +113,7 @@ export default {
 .see-thru {
   opacity: 0.8
 }
+
 .center {
   text-align : center;
 }
@@ -123,11 +127,13 @@ export default {
 .invisible {
   opacity : 0;
 }
+
 .align-center {
   display : flex;
   justify-content : center;
   align-content  :center;
 }
+
 .body {
   display: flex;
   background: rgba(233, 241, 251, 0.81);