diff --git a/frontend/public/donations/donationsbackground.png b/frontend/public/donations/donationsbackground.png new file mode 100644 index 00000000..ba6aeccc Binary files /dev/null and b/frontend/public/donations/donationsbackground.png differ diff --git a/frontend/src/app/(web app)/donations/page.tsx b/frontend/src/app/(web app)/donations/page.tsx index 28c05224..f01cee9e 100644 --- a/frontend/src/app/(web app)/donations/page.tsx +++ b/frontend/src/app/(web app)/donations/page.tsx @@ -1,15 +1,15 @@ import DonateApp from "../../../components/payment/DonateApp"; -export default function App() { +export default function Donations() { return (
diff --git a/frontend/src/app/admin/dashboard/page.tsx b/frontend/src/app/admin/dashboard/page.tsx index 7f887f2f..ec827fb9 100644 --- a/frontend/src/app/admin/dashboard/page.tsx +++ b/frontend/src/app/admin/dashboard/page.tsx @@ -1,10 +1,11 @@ "use client"; import { useEffect, useState } from "react"; + import styles from "./page.module.css"; -import DashboardCard from "@/components/DashboardCard"; import { getRecord } from "@/api/records"; +import DashboardCard from "@/components/DashboardCard"; export default function Dashboard() { const [lastUpdated, setLastUpdated] = useState>({}); diff --git a/frontend/src/components/ContactForm.tsx b/frontend/src/components/ContactForm.tsx index 2dffea44..6bf1220f 100644 --- a/frontend/src/components/ContactForm.tsx +++ b/frontend/src/components/ContactForm.tsx @@ -99,8 +99,7 @@ const ContactForm: React.FC = () => { subject, message, question: questionType, - }).then((error) => { - // If the .then() request fails, show the error message + }).catch((error) => { alert(error); }); }; diff --git a/frontend/src/components/EventSidebar.tsx b/frontend/src/components/EventSidebar.tsx index 915ad3f9..e5a6b570 100644 --- a/frontend/src/components/EventSidebar.tsx +++ b/frontend/src/components/EventSidebar.tsx @@ -12,11 +12,11 @@ import { TextAreaCharLimit } from "./TextAreaCharLimit"; import { TextFieldCharLimit } from "./TextFieldCharLimit"; import SimpleImageDropzone from "./admin/storage/SimpleImageDropzone"; +import { updateRecord } from "@/api/records"; import { deleteFile } from "@/app/admin/util/pageeditUtil"; import AlertBanner from "@/components/AlertBanner"; import { TextField } from "@/components/TextField"; import { WarningModule } from "@/components/WarningModule"; -import { updateRecord } from "@/api/records"; const EVENT_TITLE_CHAR_LIMIT = 35; const EVENT_DESCRIPTION_SHORT_CHAR_LIMIT = 200; diff --git a/frontend/src/components/Footer.tsx b/frontend/src/components/Footer.tsx index 650395af..01e48662 100644 --- a/frontend/src/components/Footer.tsx +++ b/frontend/src/components/Footer.tsx @@ -7,6 +7,7 @@ import React, { useState } from "react"; import { createSubscriber } from "../api/subscriber"; import styles from "./Footer.module.css"; + import { updateRecord } from "@/api/records"; const Footer = () => { diff --git a/frontend/src/components/NewsletterForm.tsx b/frontend/src/components/NewsletterForm.tsx index 1ada6320..139ce6e7 100644 --- a/frontend/src/components/NewsletterForm.tsx +++ b/frontend/src/components/NewsletterForm.tsx @@ -5,6 +5,7 @@ import { sendEmail } from "../api/email"; import { createSubscriber } from "../api/subscriber"; import styles from "./NewsletterForm.module.css"; + import { updateRecord } from "@/api/records"; type NewsLetterFormProps = { @@ -82,12 +83,9 @@ const NewsletterForm: React.FC = ({ email, quarterlyUpdates, specialUpdates, - }).then( - () => {}, - (error) => { - alert(error); - }, - ); + }).catch((error) => { + alert(error); + }); updateRecord("mailing-list").catch(console.error); setSuccess(true); diff --git a/frontend/src/components/NewsletterSidebar.tsx b/frontend/src/components/NewsletterSidebar.tsx index 8d6dda56..d76b81b7 100644 --- a/frontend/src/components/NewsletterSidebar.tsx +++ b/frontend/src/components/NewsletterSidebar.tsx @@ -15,8 +15,8 @@ import { TextFieldCharLimit } from "./TextFieldCharLimit"; import { WarningModule } from "./WarningModule"; import SimpleImageDropzone from "./admin/storage/SimpleImageDropzone"; -import { deleteFile } from "@/app/admin/util/pageeditUtil"; import { updateRecord } from "@/api/records"; +import { deleteFile } from "@/app/admin/util/pageeditUtil"; const NEWSLETTER_TITLE_CHAR_LIMIT = 35; const NEWSLETTER_DESCRIPTION_CHAR_LIMIT = 200; diff --git a/frontend/src/components/VolunteerForm.tsx b/frontend/src/components/VolunteerForm.tsx index 79288f04..c865f06b 100644 --- a/frontend/src/components/VolunteerForm.tsx +++ b/frontend/src/components/VolunteerForm.tsx @@ -99,12 +99,9 @@ const VolunteerForm: React.FC = ({ email, phoneNumber, receiveNews, - }).then( - () => {}, - (error) => { - alert(error); - }, - ); + }).catch((error) => { + alert(error); + }); } else { alert(response.error); } diff --git a/frontend/src/components/admin/storage/GalleryDropzone.tsx b/frontend/src/components/admin/storage/GalleryDropzone.tsx index 3265a810..104aeb6a 100644 --- a/frontend/src/components/admin/storage/GalleryDropzone.tsx +++ b/frontend/src/components/admin/storage/GalleryDropzone.tsx @@ -49,7 +49,7 @@ function IconAndText({ capped, uploading, disabled }: IconTextProps) { export default function GalleryDropzone({ field }: GalleryDropProps) { const storage = getStorage(); - const [uploadFile, uploading, snapshot, error] = useUploadFile(); + const [uploadFile, uploading, error] = useUploadFile(); const accept = { "image/*": [".jpeg", ".jpg", ".png"], }; diff --git a/frontend/src/components/admin/storage/ImageDropzone.tsx b/frontend/src/components/admin/storage/ImageDropzone.tsx index 02dfbf45..b8d2afa2 100644 --- a/frontend/src/components/admin/storage/ImageDropzone.tsx +++ b/frontend/src/components/admin/storage/ImageDropzone.tsx @@ -15,7 +15,7 @@ type ImageDropProps = { export default function ImageDropzone({ field }: ImageDropProps) { const storage = getStorage(); - const [uploadFile, uploading, snapshot, error] = useUploadFile(); + const [uploadFile, uploading, error] = useUploadFile(); const accept = { "image/*": [".jpeg", ".jpg", ".png"], }; diff --git a/frontend/src/components/admin/storage/SimpleImageDropzone.tsx b/frontend/src/components/admin/storage/SimpleImageDropzone.tsx index 26257f83..74f1fb1b 100644 --- a/frontend/src/components/admin/storage/SimpleImageDropzone.tsx +++ b/frontend/src/components/admin/storage/SimpleImageDropzone.tsx @@ -23,7 +23,7 @@ export default function SimpleImageDropzone({ onUpload, }: ImageDropProps) { const storage = getStorage(); - const [uploadFile, uploading, snapshot, error] = useUploadFile(); + const [uploadFile, uploading, error] = useUploadFile(); const accept = { "image/*": [".jpeg", ".jpg", ".png"], };