Merge remote-tracking branch 'origin/main'

ArtisanConnect/api/notices.jsx

@@ -42,8 +42,10 @@ export async function createNotice(notice) {
       for (const image of notice.image) {
         if (notice.image.indexOf(image) === 0) {
           await uploadImage(response.data.noticeId, image, true);
+        } else {
+          await uploadImage(response.data.noticeId, image, false);
         }
-        await uploadImage(response.data.noticeId, image, false);
+        console.log("Image uploaded successfully");
       }
     }
 
@@ -125,7 +127,7 @@ export const uploadImage = async (noticeId, imageObj, isFirst) => {
         headers: headers,
       }
     );
-    console.info("Upload successful:", response.data);
+    console.log("Upload successful:", response.data);
     return response.data;
   } catch (error) {
     console.error(
@@ -180,7 +182,7 @@ export const editNotice = async (noticeId, notice) => {
     if (response.data && notice.image && notice.image.length > 0) {
       for (let i = 0; i < notice.image.length; i++) {
         const image = notice.image[i];
-        const isFirst = i == 0;
+        const isFirst = i === 0;
 
         if (typeof image === "string" && !image.startsWith("http")) {
           await uploadImage(noticeId, image, isFirst);

ArtisanConnect/app/(tabs)/dashboard/account.jsx

@@ -44,7 +44,7 @@ export default function Account() {
           <Image
             source={{
               uri:
-                user.profileImage ||
+                user.image ||
                 "https://th.bing.com/th/id/OIP.3coo_N8sieled8QNroQmkgHaHa?rs=1&pid=ImgDetMain",
             }}
             className="h-24 w-24 rounded-full border-4 border-white shadow-md"

ArtisanConnect/app/(tabs)/index.jsx

@@ -15,21 +15,21 @@ export default function Home() {
   const [isReady, setIsReady] = useState(false);
   const fetchNotices = useNoticesStore((state) => state.fetchNotices);
 
-  // useEffect(() => {
+  useEffect(() => {
-  //   setIsReady(true);
+    setIsReady(true);
-  // }, []);
+  }, []);
 
-  // useEffect(() => {
+  useEffect(() => {
-  //   if (isReady && !token) {
+    if (isReady && !token) {
-  //     router.replace("/login");
+      router.replace("/login");
-  //   }
+    }
-  // }, [isReady, token, router]);
+  }, [isReady, token, router]);
 
   useEffect(() => {
     if (token) {
       fetchNotices();
     }
-  }, [token, fetchNotices]);
+  }, [token]);
 
   const notices = useNoticesStore((state) => state.notices);
 

ArtisanConnect/components/UserSection.jsx

@@ -20,7 +20,9 @@ export function UserSection({ notices, title }) {
       }
     };
 
-    fetchUsers();
+    if (token) {
+        fetchUsers();
+    }
   }, [token]);
 
   const usersWithNoticeCount =