hamx/ArtisanConnectFrontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Kuba
2025-06-13 22:32:45 +02:00
parent dd73dc070d 7efe9d91c3
commit 2d0f5b9e56
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ArtisanConnect/api/notices.jsx
View File

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

18
ArtisanConnect/app/(tabs)/index.jsx
View File

@@ -15,21 +15,21 @@ export default function Home() {
const [isReady, setIsReady] = useState(false); const [isReady, setIsReady] = useState(false);
const fetchNotices = useNoticesStore((state) => state.fetchNotices); 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(() => { useEffect(() => {
if (token) { if (token) {
fetchNotices(); fetchNotices();
} }
}, [token, fetchNotices]); }, [token]);
const notices = useNoticesStore((state) => state.notices); const notices = useNoticesStore((state) => state.notices);

4
ArtisanConnect/components/UserSection.jsx
View File

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