Merged in with small corrections

2023-01-10 16:30:03 +08:00
parent 8540a2de77 1c0881fe14
commit c61be23fee
10 changed files with 183 additions and 90 deletions
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,6 +26,7 @@
        "class-transformer": "^0.5.1",
        "core-js": "^3.26.1",
        "dexie": "^3.2.2",
+        "did-jwt": "^6.9.0",
        "ethereum-cryptography": "^1.1.2",
        "ethereumjs-util": "^7.1.5",
        "ethr-did-resolver": "^8.0.0",
@@ -12186,9 +12187,9 @@
      }
    },
    "node_modules/did-jwt": {
-      "version": "6.10.1",
-      "resolved": "https://registry.npmjs.org/did-jwt/-/did-jwt-6.10.1.tgz",
-      "integrity": "sha512-YJOvkuPKKX364ooAFNxZPcz/KBLRwLhRABQVQlVEqOjygsCkplNFB3UL97UqZ7Y3cAG6Jh5jKoAC4xFSm+h0qw==",
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/did-jwt/-/did-jwt-6.9.0.tgz",
+      "integrity": "sha512-kZ8pakovM2VkG0pia6x0SA9/1rl9dOUti4i2FL3xg7arJDWW7dACJxX+6gQK7iR/DvXrfFo8F784ejHVbw9ryA==",
      "dependencies": {
        "@stablelib/ed25519": "^1.0.2",
        "@stablelib/random": "^1.0.1",
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
    "class-transformer": "^0.5.1",
    "core-js": "^3.26.1",
    "dexie": "^3.2.2",
+    "did-jwt": "^6.9.0",
    "ethereum-cryptography": "^1.1.2",
    "ethereumjs-util": "^7.1.5",
    "ethr-did-resolver": "^8.0.0",
--- a/src/libs/crypto/index.ts
+++ b/src/libs/crypto/index.ts
@@ -5,44 +5,8 @@ import { entropyToMnemonic } from "ethereum-cryptography/bip39";
 import { wordlist } from "ethereum-cryptography/bip39/wordlists/english";
 import { HDNode } from "@ethersproject/hdnode";
 import * as didJwt from "did-jwt";
-import { Signer } from "did-jwt";
 import * as u8a from "uint8arrays";

-export function hexToBytes(s: string): Uint8Array {
-  const input = s.startsWith("0x") ? s.substring(2) : s;
-  return u8a.fromString(input.toLowerCase(), "base16");
-}
-
-export function fromJose(signature: string): {
-  r: string;
-  s: string;
-  recoveryParam?: number;
-} {
-  const signatureBytes: Uint8Array = base64ToBytes(signature);
-  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
-    throw new TypeError(
-      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`
-    );
-  }
-  const r = bytesToHex(signatureBytes.slice(0, 32));
-  const s = bytesToHex(signatureBytes.slice(32, 64));
-  const recoveryParam =
-    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
-  return { r, s, recoveryParam };
-}
-
-export function bytesToHex(b: Uint8Array): string {
-  return u8a.toString(b, "base16");
-}
-
-export function base64ToBytes(s: string): Uint8Array {
-  const inputBase64Url = s
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_")
-    .replace(/=/g, "");
-  return u8a.fromString(inputBase64Url, "base64url");
-}
-
 /**
 *
 *
@@ -117,12 +81,8 @@ export const createIdentifier = (): string => {
 export const accessToken = async (identifier: IIdentifier) => {
  const did: string = identifier.did;
  const privateKeyHex: string = identifier.keys[0].privateKeyHex as string;
-  const input = privateKeyHex.startsWith("0x")
-    ? privateKeyHex.substring(2)
-    : privateKeyHex;
-  const privateKeyBytes = u8a.fromString(input.toLowerCase(), "base16");

-  const signer = didJwt.SimpleSigner(privateKeyHex);
+  const signer = SimpleSigner(privateKeyHex);

  const nowEpoch = Math.floor(Date.now() / 1000);
  const endEpoch = nowEpoch + 60; // add one minute
@@ -138,17 +98,14 @@ export const accessToken = async (identifier: IIdentifier) => {
 };

 export const sign = async (privateKeyHex: string) => {
-  const input = privateKeyHex.startsWith("0x")
-    ? privateKeyHex.substring(2)
-    : privateKeyHex;
-  const privateKeyBytes = u8a.fromString(input.toLowerCase(), "base16");
-
-  const signer = didJwt.SimpleSigner(privateKeyHex);
+  const signer = SimpleSigner(privateKeyHex);

  return signer;
 };

 /**
+ *  Copied out of did-jwt since it's deprecated in that library.
+ *
 *  The SimpleSigner returns a configured function for signing data.
 *
 *  @example
@@ -160,10 +117,34 @@ export const sign = async (privateKeyHex: string) => {
 *  @param    {String}         hexPrivateKey    a hex encoded private key
 *  @return   {Function}                     a configured signer function
 */
-export const SimpleSigner = async (hexPrivateKey: string): Promise<Signer> => {
-  const signer = didJwt.ES256KSigner(hexToBytes(hexPrivateKey), true);
+export function SimpleSigner(hexPrivateKey: string): didJwt.Signer {
+  const signer = didJwt.ES256KSigner(didJwt.hexToBytes(hexPrivateKey), true);
  return async (data) => {
    const signature = (await signer(data)) as string;
    return fromJose(signature);
  };
-};
+}
+
+// from did-jwt/util; see SimpleSigner above
+export function fromJose(signature: string): {
+  r: string;
+  s: string;
+  recoveryParam?: number;
+} {
+  const signatureBytes: Uint8Array = didJwt.base64ToBytes(signature);
+  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
+    throw new TypeError(
+      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`
+    );
+  }
+  const r = bytesToHex(signatureBytes.slice(0, 32));
+  const s = bytesToHex(signatureBytes.slice(32, 64));
+  const recoveryParam =
+    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
+  return { r, s, recoveryParam };
+}
+
+// from did-jwt/util; see SimpleSigner above
+export function bytesToHex(b: Uint8Array): string {
+  return u8a.toString(b, "base16");
+}
--- a/src/main.ts
+++ b/src/main.ts
@@ -21,6 +21,7 @@ import {
  faQrcode,
  faUser,
  faPen,
+  faPlus,
  faTrashCan,
  faCalendar,
  faEllipsisVertical,
@@ -40,6 +41,7 @@ library.add(
  faQrcode,
  faUser,
  faPen,
+  faPlus,
  faTrashCan,
  faCalendar,
  faEllipsisVertical,
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -7,13 +7,19 @@ const routes: Array<RouteRecordRaw> = [
    name: "home",
    component: () =>
      import(/* webpackChunkName: "start" */ "../views/DiscoverView.vue"),
+    beforeEnter: (to, from, next) => {
+      const appStore = useAppStore();
+      const isAuthenticated = appStore.condition === "registered";
+      if (isAuthenticated) {
+        next();
+      } else {
+        next({ name: "start" });
+      }
+    },
  },
  {
    path: "/about",
    name: "about",
-    // route level code-splitting
-    // this generates a separate chunk (about.[hash].js) for this route
-    // which is lazy-loaded when the route is visited.
    component: () =>
      import(/* webpackChunkName: "about" */ "../views/AboutView.vue"),
  },
@@ -75,6 +81,12 @@ const routes: Array<RouteRecordRaw> = [
        /* webpackChunkName: "new-edit-commitment" */ "../views/NewEditCommitmentView.vue"
      ),
  },
+  {
+    path: "/project",
+    name: "project",
+    component: () =>
+      import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
+  },
  {
    path: "/new-edit-project",
    name: "new-edit-project",
@@ -83,12 +95,6 @@ const routes: Array<RouteRecordRaw> = [
        /* webpackChunkName: "new-edit-project" */ "../views/NewEditProjectView.vue"
      ),
  },
-  {
-    path: "/project",
-    name: "project",
-    component: () =>
-      import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
-  },
  {
    path: "/projects",
    name: "projects",
@@ -111,27 +117,4 @@ const router = createRouter({
  routes,
 });

-router.beforeEach(async (to, from, next) => {
-  const publicPages = ["/start", "/account", "/import-account"];
-  const isPublic = publicPages.includes(to.path);
-  const appStore = useAppStore();
-  console.log(to);
-  if (to.path === "/" && appStore.condition === "registered") {
-    next({ path: "/account" });
-  } else if (isPublic) {
-    switch (appStore.condition) {
-      case "registered":
-        next();
-        break;
-      default:
-        next();
-        break;
-    }
-  } else if (appStore.condition === "uninitialized") {
-    next({ path: "/start" });
-  } else {
-    next();
-  }
-});
-
 export default router;
--- a/src/store/app.ts
+++ b/src/store/app.ts
@@ -12,9 +12,14 @@ export const useAppStore = defineStore({
      typeof localStorage["lastView"] == "undefined"
        ? "/start"
        : localStorage["lastView"],
+    _projectId:
+      typeof localStorage.getItem("projectId") === "undefined"
+        ? ""
+        : localStorage.getItem("projectId"),
  }),
  getters: {
    condition: (state) => state._condition,
+    projectId: (state): string => state._projectId as string,
  },
  actions: {
    reset() {
@@ -23,5 +28,8 @@ export const useAppStore = defineStore({
    setCondition(newCondition: string) {
      localStorage.setItem("condition", newCondition);
    },
+    setProjectId(newProjectId: string) {
+      localStorage.setItem("projectId", newProjectId);
+    },
  },
 });
--- a/src/views/DiscoverView.vue
+++ b/src/views/DiscoverView.vue
@@ -19,7 +19,7 @@
      <!-- Projects -->
      <li class="basis-1/5 rounded-md text-slate-500">
        <router-link
-          :to="{ name: 'project' }"
+          :to="{ name: 'projects' }"
          class="block text-center py-3 px-1"
          ><fa icon="folder-open" class="fa-fw"></fa
        ></router-link>
--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -10,7 +10,6 @@
          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
          ><fa icon="chevron-left" class="fa-fw"></fa
        ></router-link>
-
        [New/Edit] Project
      </h1>
    </div>
@@ -39,7 +38,7 @@
      type="text"
      placeholder="Project Name"
      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-      v-modal="projectName"
+      v-model="projectName"
    />

    <textarea
@@ -77,6 +76,7 @@ import { db } from "../db";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
 import * as didJwt from "did-jwt";
 import { IIdentifier } from "@veramo/core";
+import { useAppStore } from "@/store/app";

@Options({
  components: {},
@@ -134,6 +134,12 @@ export default class NewEditProjectView extends Vue {
      try {
        const resp = await this.axios.post(url, payload, { headers });
        console.log(resp.status, resp.data);
+        useAppStore().setProjectId(resp.data);
+        const route = {
+          name: "project",
+        };
+        console.log(route);
+        this.$router.push(route);
      } catch (error) {
        console.log(error);
      }
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -126,9 +126,16 @@

 <script lang="ts">
 import { Options, Vue } from "vue-class-component";
+import { useAppStore } from "@/store/app";

@Options({
  components: {},
 })
-export default class ProjectViewView extends Vue {}
+export default class ProjectViewView extends Vue {
+  projectId = "";
+  created(): void {
+    this.projectId = useAppStore().projectId;
+    console.log(this.projectId);
+  }
+}
 </script>
--- a/src/views/ProjectsView.vue
+++ b/src/views/ProjectsView.vue
@@ -1,3 +1,107 @@
 <template>
-  <section id="Content" class="p-6 pb-24"></section>
+  <section id="Content" class="p-6 pb-24">
+    <!-- Heading -->
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      My Projects
+    </h1>
+
+    <!-- Quick Search -->
+    <form id="QuickSearch" class="mb-4 flex">
+      <input
+        type="text"
+        placeholder="Search…"
+        class="block w-full rounded-l border-r-0 border-slate-400"
+      />
+      <button
+        class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
+      >
+        <i class="fa-solid fa-magnifying-glass fa-fw"></i>
+      </button>
+    </form>
+
+    <!-- New Project -->
+    <button
+      class="fixed right-6 bottom-24 text-center text-4xl leading-none bg-blue-600 text-white w-14 py-2.5 rounded-full"
+      @click="onClickNewProject()"
+    >
+      <fa icon="plus" class="fa-fw"></fa>
+    </button>
+
+    <!-- Results List -->
+    <ul class="">
+      <li class="border-b border-slate-300">
+        <a href="project-view.html" class="block py-4 flex gap-4">
+          <div class="flex-none w-12">
+            <img
+              src="https://picsum.photos/200/200?random=1"
+              class="w-full rounded"
+            />
+          </div>
+
+          <div class="grow overflow-hidden">
+            <h2 class="text-base font-semibold">Canyon cleanup</h2>
+            <div class="text-sm truncate">
+              The quick brown fox jumps over the lazy dog. The quick brown fox
+              jumps over the lazy dog.
+            </div>
+          </div>
+        </a>
+      </li>
+
+      <li class="border-b border-slate-300">
+        <a href="project-view.html" class="block py-4 flex gap-4">
+          <div class="flex-none w-12">
+            <img
+              src="https://picsum.photos/200/200?random=2"
+              class="w-full rounded"
+            />
+          </div>
+
+          <div class="grow overflow-hidden">
+            <h2 class="text-base font-semibold">Potluck with neighbors</h2>
+            <div class="text-sm truncate">
+              The quick brown fox jumps over the lazy dog. The quick brown fox
+              jumps over the lazy dog.
+            </div>
+          </div>
+        </a>
+      </li>
+
+      <li class="border-b border-slate-300">
+        <a href="project-view.html" class="block py-4 flex gap-4">
+          <div class="flex-none w-12">
+            <img
+              src="https://picsum.photos/200/200?random=3"
+              class="w-full rounded"
+            />
+          </div>
+
+          <div class="grow overflow-hidden">
+            <h2 class="text-base font-semibold">Historical site</h2>
+            <div class="text-sm truncate">
+              The quick brown fox jumps over the lazy dog. The quick brown fox
+              jumps over the lazy dog.
+            </div>
+          </div>
+        </a>
+      </li>
+    </ul>
+  </section>
 </template>
+
+<script lang="ts">
+import { Options, Vue } from "vue-class-component";
+
+@Options({
+  components: {},
+})
+export default class ProjectsView extends Vue {
+  onClickNewProject(): void {
+    const route = {
+      name: "new-edit-project",
+    };
+    console.log(route);
+    this.$router.push(route);
+  }
+}
+</script>