diff --git a/src/main.js b/src/main.js index 18c0c5e..a30dcd0 100755 --- a/src/main.js +++ b/src/main.js @@ -98,8 +98,8 @@ async function render() {
${ avatarUrl - ? `Avatar` - : `
${(user.username || user.email).charAt(0).toUpperCase()}
` + ? `Avatar` + : `
${(user.username || user.email).charAt(0).toUpperCase()}
` }

${user.name || user.username || user.email}

diff --git a/src/pages/kaza.js b/src/pages/kaza.js index f7cba6a..db2a14e 100755 --- a/src/pages/kaza.js +++ b/src/pages/kaza.js @@ -1,4 +1,4 @@ -import { calculateMissedPrayers, getHijriBirthDate } from "../utils/hijri.js"; +import { calculateMissedPrayers, getHijribirthdate } from "../utils/hijri.js"; const PRAYERS = [ { id: "fajr", name: "SABAH", arabic: "Fecr" }, @@ -12,7 +12,7 @@ const PRAYERS = [ export function renderKaza(pb) { // Sıfır localStorage! Her şey PocketBase authStore modelinden okunuyor. const user = pb.authStore.model; - const birthDate = user?.birthDate || user?.birthdate; + const birthdate = user?.birthdate || user?.birthdate; const gender = user?.gender || "male"; const html = ` @@ -30,7 +30,7 @@ export function renderKaza(pb) {
${ - !birthDate + !birthdate ? `

Doğum Tarihi Gerekli

@@ -38,7 +38,7 @@ export function renderKaza(pb) {
- +
@@ -63,7 +63,7 @@ export function renderKaza(pb) { %0
-
+
Kılınan: 0 vakit @@ -82,7 +82,7 @@ export function renderKaza(pb) {
- ` + `, ).join("")}
@@ -120,46 +120,59 @@ export function renderKaza(pb) { html, initEvents: (container) => { container.querySelector("#closeBtn")?.addEventListener("click", () => { - window.dispatchEvent(new CustomEvent("navigate", { detail: "desktop" })); + window.dispatchEvent( + new CustomEvent("navigate", { detail: "desktop" }), + ); }); - if (!birthDate) { - container.querySelector("#profileForm")?.addEventListener("submit", async (e) => { - e.preventDefault(); - const bInput = container.querySelector("#birthDateInput").value; - const gInput = container.querySelector("#genderInput").value; + if (!birthdate) { + container + .querySelector("#profileForm") + ?.addEventListener("submit", async (e) => { + e.preventDefault(); + const bInput = container.querySelector("#birthdateInput").value; + const gInput = container.querySelector("#genderInput").value; - try { - await pb.collection("users").update(pb.authStore.model.id, { - birthDate: bInput, - gender: gInput, - }); - pb.authStore.model.birthDate = bInput; - pb.authStore.model.gender = gInput; - window.dispatchEvent(new CustomEvent("navigate", { detail: "kaza" })); - } catch (err) { - alert("Profil kaydedilemedi. PocketBase bağlantısını kontrol edin."); - } - }); + try { + await pb.collection("users").update(pb.authStore.model.id, { + birthdate: bInput, + gender: gInput, + }); + pb.authStore.model.birthdate = bInput; + pb.authStore.model.gender = gInput; + window.dispatchEvent( + new CustomEvent("navigate", { detail: "kaza" }), + ); + } catch (err) { + alert( + "Profil kaydedilemedi. PocketBase bağlantısını kontrol edin.", + ); + } + }); } else { - refreshKazaStats(container, pb, birthDate, gender); + refreshKazaStats(container, pb, birthdate, gender); - container.querySelector("#addKazaBtn")?.addEventListener("click", async () => { - await handleKazaLog(container, pb, birthDate, gender, 1); - }); + container + .querySelector("#addKazaBtn") + ?.addEventListener("click", async () => { + await handleKazaLog(container, pb, birthdate, gender, 1); + }); - container.querySelector("#removeKazaBtn")?.addEventListener("click", async () => { - await handleKazaLog(container, pb, birthDate, gender, -1); - }); + container + .querySelector("#removeKazaBtn") + ?.addEventListener("click", async () => { + await handleKazaLog(container, pb, birthdate, gender, -1); + }); } }, }; } -async function handleKazaLog(container, pb, birthDate, gender, multiplier) { +async function handleKazaLog(container, pb, birthdate, gender, multiplier) { const prayerId = container.querySelector("#kazaPrayerType").value; const countInput = container.querySelector("#kazaCount"); - const count = Math.max(1, parseInt(countInput?.value || "1", 10)) * multiplier; + const count = + Math.max(1, parseInt(countInput?.value || "1", 10)) * multiplier; const msg = container.querySelector("#kazaMsg"); try { @@ -170,16 +183,26 @@ async function handleKazaLog(container, pb, birthDate, gender, multiplier) { date: new Date().toISOString().split("T")[0], }); - showKazaMsg(msg, count > 0 ? `🎉 ${count} vakit kaza kılındı olarak işlendi!` : `${Math.abs(count)} vakit düşüldü.`, true); + showKazaMsg( + msg, + count > 0 + ? `🎉 ${count} vakit kaza kılındı olarak işlendi!` + : `${Math.abs(count)} vakit düşüldü.`, + true, + ); if (countInput) countInput.value = "1"; - await refreshKazaStats(container, pb, birthDate, gender); + await refreshKazaStats(container, pb, birthdate, gender); } catch (err) { - showKazaMsg(msg, "İşlem kaydedilemedi! PocketBase izinlerini veya bağlantısını kontrol edin.", false); + showKazaMsg( + msg, + "İşlem kaydedilemedi! PocketBase izinlerini veya bağlantısını kontrol edin.", + false, + ); } } -async function refreshKazaStats(container, pb, birthDate, gender) { - const calc = calculateMissedPrayers(birthDate, gender); +async function refreshKazaStats(container, pb, birthdate, gender) { + const calc = calculateMissedPrayers(birthdate, gender); let logsByPrayer = {}; let logs = []; @@ -191,7 +214,8 @@ async function refreshKazaStats(container, pb, birthDate, gender) { logs = records; records.forEach((l) => { - logsByPrayer[l.prayerId] = (logsByPrayer[l.prayerId] || 0) + (l.count || 0); + logsByPrayer[l.prayerId] = + (logsByPrayer[l.prayerId] || 0) + (l.count || 0); }); } catch (err) { console.error("Loglar çekilemedi:", err); @@ -213,15 +237,22 @@ async function refreshKazaStats(container, pb, birthDate, gender) { if (remainEl) remainEl.textContent = remaining; if (progressEl) { - const pct = missed > 0 ? Math.min(100, Math.round((completed / missed) * 100)) : 100; + const pct = + missed > 0 + ? Math.min(100, Math.round((completed / missed) * 100)) + : 100; progressEl.style.width = `${pct}%`; } }); // Genel İlerleme Çubuğu ve Yüzde Hesaplama - const overallPct = grandTotalMissed > 0 - ? Math.min(100, Math.round((grandTotalCompleted / grandTotalMissed) * 100)) - : 100; + const overallPct = + grandTotalMissed > 0 + ? Math.min( + 100, + Math.round((grandTotalCompleted / grandTotalMissed) * 100), + ) + : 100; const bar = container.querySelector("#overallProgressBar"); const pctText = container.querySelector("#overallPercentage"); @@ -231,7 +262,8 @@ async function refreshKazaStats(container, pb, birthDate, gender) { if (bar) bar.style.width = `${overallPct}%`; if (pctText) pctText.textContent = `%${overallPct}`; if (compText) compText.textContent = grandTotalCompleted; - if (remText) remText.textContent = Math.max(0, grandTotalMissed - grandTotalCompleted); + if (remText) + remText.textContent = Math.max(0, grandTotalMissed - grandTotalCompleted); // İşlem Geçmişi const logsContainer = container.querySelector("#logsContainer"); @@ -244,12 +276,13 @@ async function refreshKazaStats(container, pb, birthDate, gender) { const isPlus = log.count > 0; return `
- ${prayer?.name || log.prayerId} - ${log.date || ''} - ${isPlus ? '+' : ''}${log.count} + ${prayer?.name || log.prayerId} - ${log.date || ""} + ${isPlus ? "+" : ""}${log.count}
`; }) - .join("") || '

Henüz kayıt bulunmuyor.

'; + .join("") || + '

Henüz kayıt bulunmuyor.

'; } } @@ -258,4 +291,4 @@ function showKazaMsg(el, text, success) { el.textContent = text; el.className = `text-xs mt-2.5 ${success ? "text-emerald-400 font-medium" : "text-rose-400"}`; el.classList.remove("hidden"); -} \ No newline at end of file +} diff --git a/src/utils/hijri.js b/src/utils/hijri.js index be3eb65..cbe7611 100755 --- a/src/utils/hijri.js +++ b/src/utils/hijri.js @@ -1,23 +1,42 @@ const HIJRI_MONTHS = [ - "Muharrem", "Safer", "Rebiülevvel", "Rebiülahir", - "Cemaziyelevvel", "Cemaziyelahir", "Receb", "Şaban", - "Ramazan", "Şevval", "Zilkade", "Zilhicce", + "Muharrem", + "Safer", + "Rebiülevvel", + "Rebiülahir", + "Cemaziyelevvel", + "Cemaziyelahir", + "Receb", + "Şaban", + "Ramazan", + "Şevval", + "Zilkade", + "Zilhicce", ]; const DAYS = [ - "Pazar", "Pazartesi", "Salı", "Çarşamba", - "Perşembe", "Cuma", "Cumartesi", + "Pazar", + "Pazartesi", + "Salı", + "Çarşamba", + "Perşembe", + "Cuma", + "Cumartesi", ]; export function gregorianToHijri(date = new Date()) { - const year = date.getFullYear(); - const month = date.getMonth() + 1; - const day = date.getDate(); + // Türkiye coğrafi hizalaması ve Hilal takvimi için +2 gün adjustment + const adjustment = 2; + const adjustedDate = new Date( + date.getTime() + adjustment * 24 * 60 * 60 * 1000, + ); + + const year = adjustedDate.getFullYear(); + const month = adjustedDate.getMonth() + 1; + const day = adjustedDate.getDate(); let a = Math.floor((14 - month) / 12); let y = year + 4800 - a; let m = month + 12 * a - 3; - let jdn = day + Math.floor((153 * m + 2) / 5) + @@ -38,6 +57,7 @@ export function gregorianToHijri(date = new Date()) { Math.floor((30 - j) / 15) * Math.floor((17719 * j) / 50) - Math.floor(j / 16) * Math.floor((15238 * j) / 43) + 29; + let hijriMonth = Math.floor((24 * l) / 709); let hijriDay = l - Math.floor((709 * hijriMonth) / 24); let hijriYear = 30 * n + j - 30; @@ -73,27 +93,17 @@ export function calculateMissedPrayers(birthDate, gender, mukallafAge = 15) { const diffTime = today - mukallafDate; const days = Math.floor(diffTime / (1000 * 60 * 60 * 24)); - return { fajr: days, dhuhr: days, asr: days, maghrib: days, isha: days, vitr: days, days }; + return { + fajr: days, + dhuhr: days, + asr: days, + maghrib: days, + isha: days, + vitr: days, + days, + }; } export function getHijriBirthDate(birthDate) { return gregorianToHijri(new Date(birthDate)); } - -export function getHijriAge(birthDate, mukallafAge = 15) { - const birth = new Date(birthDate); - const today = new Date(); - - const hijriBirth = gregorianToHijri(birth); - const hijriToday = gregorianToHijri(today); - - let age = hijriToday.year - hijriBirth.year; - if ( - hijriToday.month < hijriBirth.month || - (hijriToday.month === hijriBirth.month && hijriToday.day < hijriBirth.day) - ) { - age -= 1; - } - - return Math.max(0, age); -} diff --git a/src/utils/prayerTimes.js b/src/utils/prayerTimes.js index be90775..9d4ff91 100755 --- a/src/utils/prayerTimes.js +++ b/src/utils/prayerTimes.js @@ -1,13 +1,31 @@ +import { getCityByName } from "./locations.js"; + export async function fetchPrayerTimes(cityName = "Edremit", lat, lon) { try { - let url; - if (lat !== undefined && lon !== undefined) { - url = `https://api.aladhan.com/v1/timings?latitude=${encodeURIComponent(lat)}&longitude=${encodeURIComponent(lon)}&method=13`; - } else { - url = `https://api.aladhan.com/v1/timingsByCity?city=${encodeURIComponent(cityName)}&country=Turkey&method=13`; + let fetchLat = lat; + let fetchLon = lon; + + // Eğer enlem/boylam verilmediyse şehir listemizden koordinatları çekiyoruz + if (fetchLat === undefined || fetchLon === undefined) { + const cityObj = getCityByName(cityName); + if (cityObj) { + fetchLat = cityObj.lat; + fetchLon = cityObj.lon; + } } + + let url; + if (fetchLat !== undefined && fetchLon !== undefined) { + // Diyanet İşleri Başkanlığı Metodu = 13 + url = `https://api.aladhan.com/v1/timings?latitude=${fetchLat}&longitude=${fetchLon}&method=13`; + } else { + url = `https://api.aladhan.com/v1/timingsByCity?city=Edremit&country=Turkey&method=13`; + } + const res = await fetch(url); - if (!res.ok) throw new Error("Namaz vakitleri alınamadı"); + if (!res.ok) { + throw new Error("Namaz vakitleri alınamadı"); + } const data = await res.json(); const t = data.data.timings; @@ -33,6 +51,7 @@ function getCurrentPrayer(timings) { const currentMinutes = now.getHours() * 60 + now.getMinutes(); const parseTime = (timeStr) => { + if (!timeStr) return 0; const [h, m] = timeStr.split(":").map(Number); return h * 60 + m; };