Merge pull request #501 from narumincho/dev-dev

デスクトップアプリなど

.github/workflows/desktop_build.yml

@@ -0,0 +1,54 @@
+# https://minerva.mamansoft.net/Notes/GitHub+Actions%E3%81%A7Rust%E3%82%92cross+compile%E3%83%93%E3%83%AB%E3%83%89 を参考にした
+name: Desktop Build
+
+on: workflow_dispatch
+
+jobs:
+  build:
+    name: Release binary
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-gnu
+            artifact_name: hibou
+            asset_name: hibou-x86_64-unknown-linux-gnu
+          - os: ubuntu-latest
+            target: x86_64-unknown-linux-musl
+            artifact_name: hibou
+            asset_name: hibou-x86_64-unknown-linux-musl
+          - os: windows-latest
+            target: x86_64-pc-windows-msvc
+            artifact_name: hibou.exe
+            asset_name: hibou-x86_64-pc-windows-msvc
+          - os: macos-latest
+            target: x86_64-apple-darwin
+            artifact_name: hibou
+            asset_name: hibou-x86_64-apple-darwin
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v2
+      - run: cd ./desktop
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+
+      - uses: Swatinem/rust-cache@v1
+
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: build
+          args: --release --target ${{ matrix.target }} --all-features --verbose
+      - name: Upload binaries to release
+        uses: svenstaro/[email protected]
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: target/${{ matrix.target }}/release/${{ matrix.artifact_name }}
+          asset_name: ${{ matrix.asset_name }}
+          tag: ${{ github.ref }}
+          overwrite: true

.gitignore

@@ -23,4 +23,5 @@ tsconfig.tsbuildinfo
 /.vercel/
 
 .vercel
-/databaseSetupSecret.ts
+/databaseMigrationSecret.ts
+target/

client/hook/useDefinyApp.ts

@@ -1,5 +1,6 @@
 import * as d from "../../localData";
 import * as indexedDB from "../indexedDB";
+import * as zodType from "../../common/zodType";
 import { AddMessage, useNotification } from "./useNotification";
 import { ReactElement, useCallback, useEffect, useMemo, useState } from "react";
 import type { TypePartIdAndMessage } from "../../core/TypePartIdAndMessage";
@@ -398,7 +399,7 @@ export const useDefinyApp = (): UseDefinyAppResult => {
         }
         verifyingAccountTokenAndGetAccount(
           setLogInState,
-          accountToken,
+          accountToken as unknown as d.AccountToken,
           accountDict.setLoaded,
           addMessage
         );
@@ -764,7 +765,7 @@ const verifyingAccountTokenAndGetAccount = (
       setLogInState(d.LogInState.Guest);
       return;
     }
-    indexedDB.setAccountToken(accountToken);
+    indexedDB.setAccountToken(accountToken as unknown as zodType.AccountToken);
     addMessage({
       text: `「${response.value.value.name}」としてログインしました`,
       type: "success",
@@ -794,7 +795,9 @@ const verifyingAccountTokenAndGetAccountFromCodeAndState = (
       setLogInState(d.LogInState.Guest);
       return;
     }
-    indexedDB.setAccountToken(response.value.value.accountToken);
+    indexedDB.setAccountToken(
+      response.value.value.accountToken as unknown as zodType.AccountToken
+    );
     addMessage({
       text: `「${response.value.value.account.name}」としてログインしました`,
       type: "success",

client/ui/Button.tsx

@@ -25,6 +25,11 @@ export const Button = React.memo(
           },
           font: "inherit",
           borderRadius: 16,
+          "&:disabled": {
+            cursor: "not-allowed",
+            backgroundColor: "#000",
+            borderRadius: 0,
+          },
         },
         props.style
       )}

client/ui/OneLineTextEditor.tsx

@@ -44,10 +44,12 @@ export const OneLineTextEditor: React.FC<{
   onChange: ((value: string) => void) | undefined;
   id: string;
   style?: CSSObject | undefined;
+  placeholder?: string | undefined;
 }> = React.memo((props) => (
   <input
     type="text"
     value={props.value}
+    placeholder={props.placeholder}
     className={css(
       {
         padding: 8,

common/url.ts

@@ -61,6 +61,12 @@ const zodTypeLocationToPathList = (location: zodType.Location): string => {
       return "/create-account";
     case "local-project":
       return "/local-project";
+    case "create-project":
+      return "/create-project";
+    case "setting":
+      return "/setting";
+    case "dev":
+      return "dev";
   }
 };
 

common/zodType.ts

@@ -10,6 +10,9 @@ export const Location = z.union([
   }),
   z.object({ type: z.literal("create-account") }),
   z.object({ type: z.literal("local-project") }),
+  z.object({ type: z.literal("create-project") }),
+  z.object({ type: z.literal("setting") }),
+  z.object({ type: z.literal("dev") }),
 ]);
 
 export type Location = Readonly<z.TypeOf<typeof Location>>;
@@ -20,21 +23,21 @@ export type Language = z.TypeOf<typeof Language>;
 
 export const defaultLanguage: Language = "english";
 
-export const PreAccountToken = z
-  .string()
-  .length(64) as unknown as z.Schema<PreAccountToken>;
+export const PreAccountToken = z.string().length(64).brand<"PreAccountToken">();
 
-export type PreAccountToken = string & { _preAccountToken: never };
+export type PreAccountToken = z.TypeOf<typeof PreAccountToken>;
 
-export const AccountToken = z
-  .string()
-  .length(64) as unknown as z.Schema<AccountToken>;
+export const AccountToken = z.string().length(64).brand<"AccountToken">();
 
-export type AccountToken = string & { _accountToken: never };
+export type AccountToken = z.TypeOf<typeof AccountToken>;
 
-export const AccountId = z.bigint() as unknown as z.Schema<AccountId>;
+export const AccountId = z.string().min(1).brand<"AccountId">();
 
-export type AccountId = bigint & { _accountId: never };
+export type AccountId = z.TypeOf<typeof AccountId>;
+
+export const ProjectId = z.string().min(1).brand<"ProjectId">();
+
+export type ProjectId = z.TypeOf<typeof ProjectId>;
 
 export const LogInByCodeAndStatePayload = z.union([
   z.object({ type: z.literal("notGeneratedState") }),

components/Header.tsx

@@ -1,6 +1,5 @@
 import * as React from "react";
 import * as zodType from "../common/zodType";
-import { Image } from "./Image";
 import { Link } from "./Link";
 import { UseAccountTokenResult } from "../hooks/useAccountToken";
 import type { UseDefinyAppResult } from "../client/hook/useDefinyApp";
@@ -129,16 +128,17 @@ const SettingLink: React.FC<{
       }}
       language={props.language}
       // 後に設定に変更する
-      location={{ type: "home" }}
+      location={{ type: "setting" }}
     >
+      {/* eslint-disable-next-line @next/next/no-img-element */}
       <img
         css={{
           width: 32,
           height: 32,
           borderRadius: "50%",
         }}
         alt="設定"
-        src=""
+        src={account?.data?.imageUrl}
       />
       <div>{account?.data?.name ?? "..."}</div>
     </Link>

components/ProjectCard.tsx

@@ -0,0 +1,19 @@
+import * as React from "react";
+import { ProjectId } from "../common/zodType";
+import { trpc } from "../hooks/trpc";
+
+export const ProjectCard = (props: {
+  readonly projectId: ProjectId;
+}): React.ReactElement => {
+  const project = trpc.useQuery(["getProjectById", props.projectId]);
+  switch (project.status) {
+    case "error":
+      return <div>error...</div>;
+    case "idle":
+      return <div>....</div>;
+    case "loading":
+      return <div>..</div>;
+    case "success":
+      return <div>{project.data?.name}</div>;
+  }
+};

databaseMigration.ts

@@ -0,0 +1,12 @@
+import { getFaunaClient, migration } from "./functions/faunadb-interface";
+import { faunaServerKey } from "./databaseMigrationSecret";
+
+/**
+ * tsconfig.json の `exclude` から `databaseMigration.ts` を外して実行する必要あり
+ */
+export const main = async (): Promise<void> => {
+  await migration(getFaunaClient(faunaServerKey));
+  console.log("マイグレーション完了!");
+};
+
+main();