Feat/config widgets and refactoring #45
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
| import { sheetsGetAnnouncement } from '@/services/GoogleSheetsService'; | ||
| import { | ||
| getAnnouncement, | ||
| } from '@/services/MosqueDataService' | ||
|
|
||
| import { type NextRequest } from 'next/server' | ||
| import { isSheetsClientEnabled } from "@/services/GoogleSheetsUtil" | ||
|
|
||
| export async function GET(request: NextRequest,) { | ||
| try { | ||
| let announcement = null; | ||
| // call the sheets API if we are connected, saves having to call external API | ||
| if (isSheetsClientEnabled()) { | ||
| announcement = await sheetsGetAnnouncement() | ||
| } else { | ||
| announcement = await getAnnouncement() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ import { | |
| getPrayerTimesForUpcomingDays, | ||
| getPrayerTimesForToday, | ||
| getPrayerTimesForTomorrow, | ||
| getConfiguration, | ||
| } from "@/services/MosqueDataService" | ||
| import type { | ||
| DailyPrayerTime, | ||
|
|
@@ -24,6 +25,8 @@ import type { Metadata } from "next" | |
| import UpcomingPrayerDayTiles from "@/components/UpcomingPrayerDayTiles/UpcomingPrayerDayTiles" | ||
| import "./prayer-times.css" | ||
| import Announcement from "@/components/Announcement/Announcement" | ||
| import { ConfigurationJson } from "@/types/ConfigurationType" | ||
| import { ConfigurationProvider } from "@/providers/ConfigurationProvider" | ||
|
|
||
| export async function generateMetadata(): Promise<Metadata> { | ||
| const mosqueMetadata: MosqueMetadataType = await getMetaData() | ||
|
|
@@ -39,6 +42,7 @@ export default async function Home() { | |
| const tomorrow: DailyPrayerTime = await getPrayerTimesForTomorrow() | ||
| const jummahTimes: JummahTimes = await getJummahTimes() | ||
| const mosqueMetadata: MosqueMetadataType = await getMetaData() | ||
| const config: ConfigurationJson = await getConfiguration() | ||
| const upcomingPrayerDays: UpcomingPrayerTimes[] = | ||
| await getPrayerTimesForUpcomingDays() | ||
|
|
||
|
|
@@ -51,38 +55,42 @@ export default async function Home() { | |
| ] | ||
|
|
||
| upcomingPrayerDays.forEach((times) => { | ||
| slides.push( | ||
| <UpcomingPrayerDayTiles times={times} key={times.display_date} />, | ||
| ) | ||
| }) | ||
|
|
||
| return ( | ||
| <ConfigurationProvider config={config}> | ||
| <div className="bg-mosqueBrand min-h-screen min-w-full"> | ||
| <main className="md:p-5"> | ||
| <div className="md:grid md:grid-cols-8"> | ||
| <div className="md:col-span-3"> | ||
| <div className="p-4 md:p-6"> | ||
| <Clock /> | ||
| </div> | ||
| <div className="p-4 md:p-6"> | ||
| <Date /> | ||
| </div> | ||
| <div className="p-4 md:p-6"> | ||
| <MosqueMetadata metadata={mosqueMetadata} /> | ||
| </div> | ||
| <div className="hidden md:p-6 md:block"> | ||
| <Notice /> | ||
| </div> | ||
| </div> | ||
| <div className="p-4 md:p-6 md:col-span-5"> | ||
| <PrayerTimes today={today} tomorrow={tomorrow} /> | ||
| </div> | ||
| </div> | ||
| <div className="p-4 md:p-6"> | ||
| <SlidingBanner slides={slides} /> | ||
| </div> | ||
| <ServiceWorker /> | ||
| </main> | ||
| {config.feature.announcement.enabled && <Announcement />} | ||
| <Blackout prayerTimeToday={today} /> | ||
| </div> | ||
| </ConfigurationProvider> | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| import { DailyPrayerTime } from "@/types/DailyPrayerTimeType" | ||
| import "../../widget.css" | ||
| import { getNextPrayer } from "@/services/PrayerTimeService" | ||
| import { | ||
| getPrayerTimesForToday, | ||
| getPrayerTimesForTomorrow, | ||
| } from "@/services/MosqueDataService" | ||
| import { cn } from "@/lib/utils" | ||
| import { | ||
| dtHijriNow, | ||
| dtNowFormatFull, | ||
| dtNowHijriFormatFull, | ||
| dtNowLocale, | ||
| dtFormatTimeToCustom, | ||
| } from "@/lib/datetimeUtils" | ||
|
|
||
| type Props = { | ||
| timeFormat?: "h:mm" | "h:mm A" | "HH:mm" | ||
| showSunrise?: boolean | ||
| showDate?: boolean | ||
| showHijri?: boolean | ||
| } | ||
|
|
||
| export async function TodayPrayerTime({ | ||
| timeFormat = "h:mm", | ||
| showSunrise = false, | ||
| showDate = false, | ||
| showHijri = false, | ||
| }: Props) { | ||
| const convertTime = (time: string) => | ||
| dtFormatTimeToCustom(time, timeFormat) | ||
|
|
||
| const today: DailyPrayerTime = await getPrayerTimesForToday() | ||
| const tomorrow: DailyPrayerTime = await getPrayerTimesForTomorrow() | ||
| let currentDailyPrayerTimes = today | ||
| let englishDate = dtNowFormatFull() | ||
| let hijriDate = dtNowHijriFormatFull() | ||
|
|
||
| let nextPrayerTime = getNextPrayer(today) | ||
| if (!nextPrayerTime.today) { | ||
| nextPrayerTime = { | ||
| today: true, | ||
| prayerIndex: 0 | ||
| } | ||
| currentDailyPrayerTimes = tomorrow | ||
| englishDate = dtNowLocale().add(1, "day").format("D MMMM YYYY") | ||
| hijriDate = dtHijriNow().add(1, "day").format("iD iMMMM iYYYY") | ||
| } | ||
|
|
||
| let currentSalahTimes: Array<{ | ||
| label: string | ||
| start: string | ||
| congregation: string | null | ||
| prayerIndex: number | ||
| }> = [ | ||
| { | ||
| label: "Fajr", | ||
| start: currentDailyPrayerTimes.fajr.start, | ||
| congregation: currentDailyPrayerTimes.fajr.congregation_start, | ||
| prayerIndex: 0, | ||
| }, | ||
| { | ||
| label: "Zuhr", | ||
| start: currentDailyPrayerTimes.zuhr.start, | ||
| congregation: currentDailyPrayerTimes.zuhr.congregation_start, | ||
| prayerIndex: 1, | ||
| }, | ||
| { | ||
| label: "Asr", | ||
| start: currentDailyPrayerTimes.asr.start, | ||
| congregation: currentDailyPrayerTimes.asr.congregation_start, | ||
| prayerIndex: 2, | ||
| }, | ||
| { | ||
| label: "Maghrib", | ||
| start: currentDailyPrayerTimes.maghrib.start, | ||
| congregation: currentDailyPrayerTimes.maghrib.congregation_start, | ||
| prayerIndex: 3, | ||
| }, | ||
| { | ||
| label: "Isha", | ||
| start: currentDailyPrayerTimes.isha.start, | ||
| congregation: currentDailyPrayerTimes.isha.congregation_start, | ||
| prayerIndex: 4, | ||
| }, | ||
| ] | ||
|
|
||
| if (showSunrise) { | ||
| currentSalahTimes = [ | ||
| ...currentSalahTimes.slice(0, 1), | ||
| { | ||
| label: "Sunrise", | ||
| start: currentDailyPrayerTimes.sunrise_start, | ||
| congregation: null, | ||
| prayerIndex: -1, | ||
| }, | ||
| ...currentSalahTimes.slice(1), | ||
| ] | ||
| } | ||
|
|
||
| return ( | ||
| <div className="PrayerTimeWidgetWrapper"> | ||
| <table className="w-full ml-0 text-center"> | ||
| <thead> | ||
| {(showDate || showHijri) && ( | ||
| <tr> | ||
| <th className={"pr-6 text-right text-gray-300"}></th> | ||
| <th | ||
| colSpan={currentSalahTimes?.length} | ||
| className={"text-gray-400 font-normal text-center text-md"} | ||
| > | ||
| {[showDate && englishDate, showHijri && hijriDate] | ||
| .filter(Boolean) | ||
| .join(" • ")} | ||
| </th> | ||
| </tr> | ||
| )} | ||
| <tr> | ||
| <th /> | ||
| {currentSalahTimes.map((value, index) => ( | ||
| <th | ||
| key={index} | ||
| className={cn( | ||
| "min-w-[10px] w-24", | ||
| nextPrayerTime.today && | ||
| nextPrayerTime.prayerIndex === value.prayerIndex | ||
| ? "bg-mosqueBrand-primaryAlt text-mosqueBrand-onPrimary rounded-t-md" | ||
| : "", | ||
| )} | ||
| > | ||
| {value.label} | ||
| </th> | ||
| ))} | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <th className={"text-right text-gray-400 font-medium pr-2"}> | ||
| Begins | ||
| </th> | ||
| {currentSalahTimes.map((value, index) => ( | ||
| <td | ||
| key={index} | ||
| className={cn( | ||
| "min-w-[10px] w-24", | ||
| nextPrayerTime.today && | ||
| nextPrayerTime.prayerIndex === value.prayerIndex | ||
| ? "bg-mosqueBrand-primaryAlt text-mosqueBrand-onPrimary" | ||
| : "", | ||
| )} | ||
| > | ||
| {value.start ? convertTime(value.start) : ""} | ||
| </td> | ||
| ))} | ||
| </tr> | ||
| <tr> | ||
| <th className={"text-right text-gray-400 font-medium pr-2"}> | ||
| Jama'ah | ||
| </th> | ||
|
|
||
| {currentSalahTimes.map((value, index) => ( | ||
| <td | ||
| key={index} | ||
| className={cn( | ||
| "min-w-[10px] w-24", | ||
| nextPrayerTime.today && | ||
| nextPrayerTime.prayerIndex === value.prayerIndex | ||
| ? "bg-mosqueBrand-primaryAlt text-mosqueBrand-onPrimary rounded-b-md" | ||
| : "", | ||
| )} | ||
| > | ||
| {value.congregation ? convertTime(value.congregation) : ""} | ||
| </td> | ||
| ))} | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| ) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix typo in comment.
The comment contains a typo: "local" should be "locale".
🔎 Proposed fix
📝 Committable suggestion
🤖 Prompt for AI Agents