From f28e2123b1ebfc78d36f03bcf0ee3b52a18f9d96 Mon Sep 17 00:00:00 2001 From: Matthew Aaron Raymer Date: Wed, 30 Nov 2022 13:20:45 +0800 Subject: [PATCH] Resynching master branch --- package-lock.json | 26 ----- package.json | 2 - src/App.vue | 2 + src/components/HelloWorld.vue | 150 ++++++++++++++++++++++++++++ src/main.ts | 56 ++++++++--- src/router/index.ts | 66 ++++++++++++ src/views/AccountViewView.vue | 22 ++-- src/views/ConfirmContactView.vue | 2 +- src/views/ContactScanView.vue | 8 +- src/views/DiscoverView.vue | 21 ++-- src/views/HomeView.vue | 5 +- src/views/ImportAccountView.vue | 6 +- src/views/NewEditAccountView.vue | 8 +- src/views/NewEditCommitmentView.vue | 10 +- src/views/NewEditProjectView.vue | 12 +-- src/views/ProjectViewView.vue | 27 +++-- src/views/StartView.vue | 13 +-- 17 files changed, 329 insertions(+), 107 deletions(-) create mode 100644 src/components/HelloWorld.vue diff --git a/package-lock.json b/package-lock.json index 07483ce..0d72eea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,8 +9,6 @@ "version": "0.1.0", "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.2.1", - "@fortawesome/free-brands-svg-icons": "^6.2.1", - "@fortawesome/free-regular-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/vue-fontawesome": "^3.0.2", "core-js": "^3.26.1", @@ -1830,30 +1828,6 @@ "node": ">=6" } }, - "node_modules/@fortawesome/free-brands-svg-icons": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.1.tgz", - "integrity": "sha512-L8l4MfdHPmZlJ72PvzdfwOwbwcCAL0vx48tJRnI6u1PJXh+j2f3yDoKyQgO3qjEsgD5Fr2tQV/cPP8F/k6aUig==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/@fortawesome/free-regular-svg-icons": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.1.tgz", - "integrity": "sha512-wiqcNDNom75x+pe88FclpKz7aOSqS2lOivZeicMV5KRwOAeypxEYWAK/0v+7r+LrEY30+qzh8r2XDaEHvoLsMA==", - "hasInstallScript": true, - "dependencies": { - "@fortawesome/fontawesome-common-types": "6.2.1" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@fortawesome/free-solid-svg-icons": { "version": "6.2.1", "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.1.tgz", diff --git a/package.json b/package.json index 21ca17f..ceacc9e 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,6 @@ }, "dependencies": { "@fortawesome/fontawesome-svg-core": "^6.2.1", - "@fortawesome/free-brands-svg-icons": "^6.2.1", - "@fortawesome/free-regular-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/vue-fontawesome": "^3.0.2", "core-js": "^3.26.1", diff --git a/src/App.vue b/src/App.vue index 98240ae..1c7a01b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,3 +1,5 @@ + + diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue new file mode 100644 index 0000000..f60f20a --- /dev/null +++ b/src/components/HelloWorld.vue @@ -0,0 +1,150 @@ + + + + + + diff --git a/src/main.ts b/src/main.ts index f066e02..dba0ad9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -6,21 +6,49 @@ import store from "./store"; import "./assets/styles/tailwind.css"; -/* import the fontawesome core */ import { library } from "@fortawesome/fontawesome-svg-core"; +import { + faChevronLeft, + faHouseChimney, + faMagnifyingGlass, + faFolderOpen, + faHand, + faCircleUser, + faCopy, + faShareNodes, + faQrcode, + faUser, + faPen, + faTrashCan, + faCalendar, + faEllipsisVertical, + faSpinner, + faCircleCheck, +} from "@fortawesome/free-solid-svg-icons"; + +library.add( + faChevronLeft, + faHouseChimney, + faMagnifyingGlass, + faFolderOpen, + faHand, + faCircleUser, + faCopy, + faShareNodes, + faQrcode, + faUser, + faPen, + faTrashCan, + faCalendar, + faEllipsisVertical, + faSpinner, + faCircleCheck +); -/* import font awesome icon component */ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; -/* import specific icons */ -import { faUserSecret } from "@fortawesome/free-solid-svg-icons"; - -/* add icons to the library */ -library.add(faUserSecret); - -/* add font awesome icon component */ -App.component("font-awesome-icon", FontAwesomeIcon); - -App.config.productionTip = false; - -createApp(App).use(store).use(router).mount("#app"); +createApp(App) + .component("fa", FontAwesomeIcon) + .use(store) + .use(router) + .mount("#app"); diff --git a/src/router/index.ts b/src/router/index.ts index 13b317d..86f2f80 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -22,6 +22,72 @@ const routes: Array = [ component: () => import(/* webpackChunkName: "start" */ "../views/StartView.vue"), }, + { + path: "/account", + name: "account", + component: () => + import(/* webpackChunkName: "account" */ "../views/AccountViewView.vue"), + }, + { + path: "/confirm-contact", + name: "confirm-contact", + component: () => + import( + /* webpackChunkName: "confirm-contact" */ "../views/ConfirmContactView.vue" + ), + }, + { + path: "/scan-contact", + name: "scan-contact", + component: () => + import( + /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue" + ), + }, + { + path: "/discover", + name: "discover", + component: () => + import(/* webpackChunkName: "discover" */ "../views/DiscoverView.vue"), + }, + { + path: "/import-account", + name: "import-account", + component: () => + import( + /* webpackChunkName: "import-account" */ "../views/ImportAccountView.vue" + ), + }, + { + path: "/new-edit-account", + name: "new-edit-account", + component: () => + import( + /* webpackChunkName: "new-edit-account" */ "../views/NewEditAccountView.vue" + ), + }, + { + path: "/new-edit-commitment", + name: "new-edit-commitment", + component: () => + import( + /* webpackChunkName: "new-edit-commitment" */ "../views/NewEditCommitmentView.vue" + ), + }, + { + path: "/new-edit-project", + name: "new-edit-project", + component: () => + import( + /* webpackChunkName: "new-edit-project" */ "../views/NewEditProjectView.vue" + ), + }, + { + path: "/project", + name: "project", + component: () => + import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"), + }, ]; const router = createRouter({ diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue index bebea95..6d353dd 100644 --- a/src/views/AccountViewView.vue +++ b/src/views/AccountViewView.vue @@ -5,31 +5,31 @@
    • @@ -68,18 +68,18 @@ > did:peer:kl45kj41lk451kl3 - @@ -88,7 +88,7 @@
    dyIgKepL19trfrFu5jzkoNhI -
    @@ -96,7 +96,7 @@
    m/44'/0'/0'/0/0 -
    diff --git a/src/views/ConfirmContactView.vue b/src/views/ConfirmContactView.vue index 2f299fe..848af6d 100644 --- a/src/views/ConfirmContactView.vue +++ b/src/views/ConfirmContactView.vue @@ -8,7 +8,7 @@ Confirm Contact diff --git a/src/views/ContactScanView.vue b/src/views/ContactScanView.vue index a2b86ac..eef5bfb 100644 --- a/src/views/ContactScanView.vue +++ b/src/views/ContactScanView.vue @@ -7,7 +7,7 @@ Scan Contact @@ -56,17 +56,17 @@
    diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue index ea533c0..dc16ffa 100644 --- a/src/views/DiscoverView.vue +++ b/src/views/DiscoverView.vue @@ -1,34 +1,35 @@