Merge pull request #132 from FltSv/develop

v0.3.0リリース

.github/workflows/hosting-pr-actions.yml

@@ -1,9 +1,8 @@
 name: hosting-pr-actions
 on:
   pull_request:
-  push:
-    branches:
-      - master
+    branches-ignore:
+      - "master"
 
 defaults:
   run:

Hosting/package.json

@@ -14,6 +14,9 @@
   "author": "suna",
   "license": "ISC",
   "dependencies": {
+    "@dnd-kit/core": "^6.1.0",
+    "@dnd-kit/sortable": "^8.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
     "@mui/joy": "^5.0.0-dev.240424162023-9968b4889d",

Hosting/src/Auth.ts

@@ -1,10 +1,15 @@
 import {
   createUserWithEmailAndPassword,
+  FacebookAuthProvider,
   getAuth,
+  GoogleAuthProvider,
   sendEmailVerification,
   signInWithEmailAndPassword,
+  signInWithPopup,
 } from 'firebase/auth';
 
+type providerTypes = 'google' | 'facebook' | 'email';
+
 /**
  * メール・パスワードによるログイン処理
  * @param email メールアドレス
@@ -32,6 +37,28 @@ export async function signupWithEmail(email: string, pass: string) {
   return userCredential;
 }
 
+/** Googleログイン・新規登録 */
+export async function loginWith(providerType: providerTypes) {
+  let provider;
+  switch (providerType) {
+    case 'google':
+      provider = new GoogleAuthProvider();
+      break;
+
+    case 'facebook':
+      provider = new FacebookAuthProvider();
+      break;
+
+    default:
+      throw new Error('Invalid provider type');
+  }
+
+  // ポップアップでログイン
+  return await signInWithPopup(getAuth(), provider).catch((error: unknown) => {
+    console.error(error);
+  });
+}
+
 /**
  * ログアウト
  */

Hosting/src/Data.ts

@@ -46,6 +46,8 @@ export async function getCreatorData(user: User) {
   const creatorUrl = getCreatorStorageUrl(userId);
   const creator: Creator = {
     name: '',
+    profile: '',
+    links: [],
     products: [],
     exhibits: [],
   };
@@ -67,11 +69,15 @@ export async function getCreatorData(user: User) {
   console.debug('docSnap.data:', data);
 
   creator.name = data.name ?? '';
+  creator.profile = data.profile ?? '';
+  creator.links = data.links ?? [];
 
   // 発表作品
   const fbProducts = data.products ?? [];
   creator.products = fbProducts.map(x => ({
     id: x.id,
+    title: x.title ?? '',
+    detail: x.detail ?? '',
     srcImage: x.image,
     imageUrl: creatorUrl + x.image,
     tmpImageData: '',
@@ -112,7 +118,14 @@ export async function setCreatorData(user: User, data: Creator) {
   );
   await setDoc(docRef, {
     name: data.name,
-    products: data.products.map(x => ({ id: x.id, image: x.srcImage })),
+    profile: data.profile,
+    links: data.links,
+    products: data.products.map(x => ({
+      id: x.id,
+      title: x.title,
+      detail: x.detail,
+      image: x.srcImage,
+    })),
     exhibits: data.exhibits.map(x => ({
       id: x.id,
       title: x.title,
@@ -307,6 +320,12 @@ export interface Creator {
   /** 表示名 */
   name: string;
 
+  /** プロフィール */
+  profile: string;
+
+  /** SNSリンク */
+  links: string[];
+
   /** 発表作品一覧 */
   products: Product[];
 
@@ -317,6 +336,12 @@ export interface Creator {
 /** 発表作品 */
 export interface Product extends ImageStatus {
   id: string;
+
+  /** 作品名 */
+  title: string;
+
+  /** 作品説明、他 */
+  detail: string;
 }
 
 /** 展示 */

Hosting/src/components/pages/Login.tsx

@@ -6,7 +6,7 @@ import { FcGoogle } from 'react-icons/fc';
 import { FaFacebook } from 'react-icons/fa';
 import { FirebaseError } from 'firebase/app';
 import { Button, SubmitButton, Textbox } from '../ui/Input';
-import { loginWithEmail, signupWithEmail } from '../../Auth';
+import { loginWithEmail, loginWith, signupWithEmail } from '../../Auth';
 import { useAuthContext } from '../AuthContext';
 
 interface Inputs {
@@ -147,18 +147,18 @@ export const Login = () => {
 
       {/* ソーシャルログイン */}
       <Divider className="text-base">or</Divider>
-      {/* 実装まで無効化 */}
       <div className="flex gap-4">
         <Button
-          disabled
           startDecorator={<FcGoogle />}
-          className="w-fit bg-white text-black">
+          className="w-fit bg-white text-black"
+          onClick={() => void loginWith('google')}>
           Continue with Google
         </Button>
+        {/* 法人化が必要そうなので非表示 */}
         <Button
-          disabled
           startDecorator={<FaFacebook color="#1877F2" />}
-          className="w-fit bg-white text-black">
+          className="hidden w-fit bg-white text-black"
+          onClick={() => void loginWith('facebook')}>
           Continue with Facebook
         </Button>
       </div>