[build] finished connectin diary

src/api/connectDiary.js

@@ -1,5 +1,5 @@
 export const connectDiary = async ({ diaryId, credentials }) => {
-    console.log("createDiary diary info for user:", credentials, diaryId);
+    console.log("connect diary info for user:", credentials, diaryId);
     const fetchUrl = `${process.env.NEXT_PUBLIC_LAMBDA_URL}/connect-diary`;
 
     try {
@@ -11,8 +11,9 @@ export const connectDiary = async ({ diaryId, credentials }) => {
         },
         body: JSON.stringify({
           diaryId: diaryId,
-          connected: true,
-          user2: credentials,
+          connected: '1',
+          user2: credentials.email,
+          user2Name: credentials.name,
           }),
       });
 
@@ -21,7 +22,7 @@ export const connectDiary = async ({ diaryId, credentials }) => {
       return null;
       }
 
-      console.log('Diary created successfully!');
+      console.log('Diary connected successfully!');
       return await response.json(); // Return the response if needed
     } catch (error) {
       console.error('Error during diary creation:', error);

src/api/createDiary.js

@@ -13,7 +13,8 @@ export const createDiary = async ({ diaryId, date, credentials }) => {
         diaryId: diaryId,
         startDate: date,
         connected: false,
-        user1: credentials,
+        user1: credentials.email,
+        user1Name: credentials.name,
         }),
     });
 

src/components/CreateDiary.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { createDiary } from '../api/createDiary';
 import { connectDiary } from '../api/connectDiary';
 
-function Diary({ setDiaryCreated, credentials }) {
+function Diary({ setDiaryCreated, credentials, setDiaryConnected}) {
   const [selectedAccordion, setSelectedAccordion] = useState(""); // To track which accordion is selected
   const [date, setDate] = useState('');
   const [loading, setLoading] = useState(false);
@@ -29,11 +29,11 @@ function Diary({ setDiaryCreated, credentials }) {
   };
 
   // Handle Connect Diary button click
-  const handleConnectDiary = async (e) => {  // Add async here
+  const handleConnectDiary = async (e) => {
     setLoading(true);
-    e.preventDefault();  // Ensure e is passed in
+    e.preventDefault();
     const response = await connectDiary({diaryId, credentials});
-    setDiaryCreated(true);
+    setDiaryConnected(true);
   };
 
 
@@ -94,7 +94,7 @@ function Diary({ setDiaryCreated, credentials }) {
                 className="BasicButton" 
                 disabled={selectedAccordion !== 'connect'}
               >
-                Connect
+                {loading ? "Connecting..." : "Connect"}
               </button>
             </div>
           )}

src/components/DiaryHome.js

@@ -18,12 +18,13 @@ export default function DiaryHome({ credentials }) {
   });
 
   const getDiaryInfo = async () => {
-    const diaryData = await fetchDiaryInfo(credentials);
+    console.log(credentials.email);
+    const diaryData = await fetchDiaryInfo(credentials.email);
     if (diaryData[0]) {
       setDiaryInfo({
         diaryId: diaryData[0].diaryId,
-        name1: diaryData[0].user1,
-        name2: diaryData[0].user2,
+        name1: diaryData[0].user1Name,
+        name2: diaryData[0].user2Name,
         date: diaryData[0].startDate,
         connected: diaryData[0].connected == 1 ? true : false,
       });
@@ -60,7 +61,8 @@ export default function DiaryHome({ credentials }) {
 
   useEffect(() => {
     if (diaryConnected) {
-      console.log('Diary has been successfully connected.');
+      console.log('Diary has been successfully connected. getting diary info...');
+      getDiaryInfo();
     }
   }, [diaryConnected]);
 
@@ -72,11 +74,11 @@ export default function DiaryHome({ credentials }) {
           diaryInfo={diaryInfo}
           diaryCreated={diaryCreated}
           diaryConnected={diaryConnected}
-          setDiaryConnected={setDiaryConnected}
           setDiaryInfo={setDiaryInfo}
           setShowReadDiary={setShowReadDiary}
           setShowWriteDiary={setShowWriteDiary}
           setDiaryCreated={setDiaryCreated}
+          setDiaryConnected={setDiaryConnected}
         />
       </main>
     </div>

src/components/DiaryMain.js

@@ -19,12 +19,12 @@ const DiaryMain = ({
   const [showReadDiary, setShowReadDiaryLocal] = useState(false);
   const [showWriteDiary, setShowWriteDiaryLocal] = useState(false);
 
-  
+
   return (
     <div>
       {/* Conditional Rendering of Components */}
       {!diaryCreated ? (
-        <CreateDiary setDiaryCreated={setDiaryCreated} credentials={credentials} />
+        <CreateDiary setDiaryCreated={setDiaryCreated} setDiaryConnected={setDiaryConnected} credentials={credentials} />
       ) : !diaryConnected ? (
         <WaitingForConnection diaryInfo={diaryInfo} />
       ) : showWriteDiary ? (

src/components/auth/GoogleLoginComponent.js

@@ -32,8 +32,8 @@ const OAuthCallback = ({ setIsRegistered, setLoading, setCredentials }) => {
       })
       .then(data => {
         setIsRegistered(true)
-        console.log(data.email);
-        setCredentials(data.email);
+        console.log(data);
+        setCredentials({ email: data.email, name: data.name });
       })
       .catch(error => {
         console.error('Error fetching data:', error);

src/pages/index.js

@@ -5,7 +5,10 @@ import DiaryHome from '../components/DiaryHome';
 
 export default function Home() {
   const [isRegistered, setIsRegistered] = useState(false);
-  const [credentials, setCredentials] = useState('');
+  const [credentials, setCredentials] = useState({
+    email: '',
+    name: '',
+  });
 
   useEffect(() => {
     if (isRegistered) {