Merge pull request #32 from jphacks/fix/ci

ci.yamlを修正
jphacks · Oct 26, 2024 · e589d39 · e589d39
2 parents 7456e5f + 4469862
commit e589d39
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -40,18 +40,18 @@ jobs:
     environment:
       name: preview
       url: ${{ steps.deploy.outputs.url }}
+    defaults:
+      run:
+        working-directory: task_yell
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup node
         uses: actions/setup-node@v3
         with:
           node-version: 18
           check-latest: true
 
-      - name: Mv directory
-        run: cd ./task_yell
-
       - name: Install Vercel CLI
         run: npm install --global vercel@latest
 
@@ -73,8 +73,11 @@ jobs:
     needs: lint
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: task_yell
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup node
         uses: actions/setup-node@v3
@@ -85,9 +88,6 @@ jobs:
       - name: Install Vercel CLI
         run: npm install --global vercel@latest
 
-      - name: Mv directory
-        run: cd ./task_yell
-
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
 

diff --git a/task_yell/src/firebase/firestore.ts b/task_yell/src/firebase/firestore.ts
@@ -8,28 +8,28 @@ import {
   deleteDoc,
   doc,
   //追加
-  WithFieldValue,
-  DocumentData,
+  type WithFieldValue,
+  type DocumentData,
   getDoc,
 } from "firebase/firestore";
 
 /** dataが WithFieldValue<DocumentData> を拡張するように制約を追加 */
 export async function createData<T extends WithFieldValue<DocumentData>>(
   collectionName: string,
-  data: T
+  data: T,
 ): Promise<string> {
   const docRef = await addDoc(collection(db, collectionName), data);
   return docRef.id;
 }
 
 export async function readData<T>(collectionName: string): Promise<T[]> {
   const snapshot = await getDocs(collection(db, collectionName));
-  return snapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() } as T));
+  return snapshot.docs.map((doc) => ({ id: doc.id, ...doc.data() }) as T);
 }
 
 export async function readSingleData<T>(
   collectionName: string,
-  id: string
+  id: string,
 ): Promise<T | null> {
   const docRef = doc(db, collectionName, id);
   const snapshot = await getDoc(docRef);
@@ -39,15 +39,15 @@ export async function readSingleData<T>(
 export async function updateData<T>(
   collectionName: string,
   id: string,
-  data: Partial<T>
+  data: Partial<T>,
 ): Promise<void> {
   const docRef = doc(db, collectionName, id);
   await updateDoc(docRef, data);
 }
 
 export async function deleteData(
   collectionName: string,
-  id: string
+  id: string,
 ): Promise<void> {
   const docRef = doc(db, collectionName, id);
   await deleteDoc(docRef);

diff --git a/task_yell/src/lib/events.ts b/task_yell/src/lib/events.ts
@@ -22,7 +22,7 @@ export async function readSingleEvent(id: string): Promise<Event | null> {
 
 export async function updateEvent(
   id: string,
-  eventData: Partial<Event>
+  eventData: Partial<Event>,
 ): Promise<void> {
   return updateData<Event>(COLLECTION_NAME, id, eventData);
 }

diff --git a/task_yell/src/lib/types.ts b/task_yell/src/lib/types.ts
@@ -14,4 +14,4 @@ export interface Notification {
   type: "call" | "push";
   eventOrTaskRef: string;
   userId: string;
-}
+}