diff --git a/.env.production b/.env.production
deleted file mode 100644
index c6a0ff437a..0000000000
--- a/.env.production
+++ /dev/null
@@ -1,9 +0,0 @@
-PUBLIC_FIREBASE_API_KEY=
-PUBLIC_FIREBASE_AUTH_DOMAIN=
-PUBLIC_FIREBASE_PROJECT_ID=
-PUBLIC_FIREBASE_STORAGE_BUCKET=
-PUBLIC_FIREBASE_MESSAGING_SENDER_ID=
-PUBLIC_FIREBASE_APP_ID=
-PUBLIC_FIREBASE_MEASUREMENT_ID=
-
-PUBLIC_FEEDBACK_FISH_PROJECT_ID=
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9ff6303b0e..6e63cf727d 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -92,7 +92,7 @@ jobs:
         run: |
           echo "> Start remove unused files..."
           rm -rf .github/workflows .svelte-kit markdowns screenshoot scripts static src node_modules
-          rm -rf .all-contributorsrc .editorconfig .eslintignore .eslintrc.cjs .gitignore .kodiak.toml .npmrc .prettierignore .prettierrc package.json pnpm-lock.yaml postcss.config.js svelte.config.js tailwind.config.js tsconfig.json vite.config.ts .env.example .env.production .nvmrc
+          rm -rf .all-contributorsrc .editorconfig .eslintignore .eslintrc.cjs .gitignore .kodiak.toml .npmrc .prettierignore .prettierrc package.json pnpm-lock.yaml postcss.config.js svelte.config.js tailwind.config.js tsconfig.json vite.config.ts .env.example .nvmrc
 
           echo "> Copy build directory..."
           cp -r build/. ./
diff --git a/scripts/routes.js b/scripts/routes.js
index 7f2374443c..64e6555e72 100644
--- a/scripts/routes.js
+++ b/scripts/routes.js
@@ -15,5 +15,6 @@ export const staticUrls = [
 	'/sync/',
 	'/tahlil/',
 	'/tasbih/',
-	'/wirid/'
+	'/wirid/',
+  '/pencatat-ibadah/'
 ];
diff --git a/src/lib/PrayerTimeCard.svelte b/src/lib/PrayerTimeCard.svelte
index d0cad6e332..2f84e494ce 100644
--- a/src/lib/PrayerTimeCard.svelte
+++ b/src/lib/PrayerTimeCard.svelte
@@ -1,17 +1,12 @@
 <script lang="ts">
 	import CardShadow from './CardShadow.svelte';
 	import type { PrayerKey, PrayerTimings } from './types';
-  import dayjs from 'dayjs';
-  import relativeTime from "dayjs/plugin/relativeTime";
-  import duration from "dayjs/plugin/duration";
-  import 'dayjs/locale/id'
 	import { onMount } from 'svelte';
+	import { getDayjs, getDayjsFormatted, getMinuteDuration } from '$lib/utils/date';
 
 	import { activeTheme } from '../store';
 
-  dayjs.locale('id')
-  dayjs.extend(relativeTime);
-  dayjs.extend(duration);
+
 	interface Props {
 		timings?: PrayerTimings | null;
 		prayerKey: PrayerKey;
@@ -23,14 +18,14 @@
 	let durationText: string = $state('');
 
 	onMount(async () => {
-    const now = dayjs();
+    const now = getDayjs();
     const timeStr = `${timings?.[prayerKey] || ''}`.substring(0, 5);
 
-    const prayerTime = dayjs(`${now.format('YYYY-MM-DD')} ${timeStr}`, 'YYYY-MM-DD HH:mm');
+    const prayerTime = getDayjsFormatted(`${now.format('YYYY-MM-DD')} ${timeStr}`, 'YYYY-MM-DD HH:mm');
 
     const diffTime = prayerTime.diff(now, 'minute');
     isPast = diffTime < 0;
-    durationText = dayjs.duration(diffTime, "minutes").humanize(true);
+    durationText = getMinuteDuration(diffTime);
 	});
 
 </script>
diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index 564a033350..6fc137156c 100644
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -29,7 +29,8 @@ export const CONSTANTS = {
 		LAST_VERSES: 'vres',
 		LOCATION: 'loc',
 		PRAYER: 'pryr',
-		THEME: 'theme'
+		THEME: 'theme',
+		LOG_PRAYER: 'log'
 	},
 	BISMILLAH: '﷽'
 };
@@ -80,6 +81,9 @@ export const META_DESC_TASBIH = `Tasbih online, mempermudah menghitung Dzikirmu
 export const META_TITLE_JADWAL_SHOLAT = `Jadwal sholat | ${TITLE_CONSTANTS.TITLE_META}`;
 export const META_DESC_JADWAL_SHOLAT = `Jadwal sholat sesuai lokasi 💯 gratis, ❌ tanpa iklan, ❌ tanpa analitik`;
 
+export const META_TITLE_PENCATAT_IBADAH = `Pencatat Ibadah | ${TITLE_CONSTANTS.TITLE_META}`;
+export const META_DESC_PENCATAT_IBADAH = `Pencatat Ibadah ${postfix(false)}`;
+
 export const META_TITLE_SURAH = (name: string) =>
 	`Qur'an Surat ${name} | ${TITLE_CONSTANTS.TITLE_META}`;
 export const META_DESC_SURAH = (name: string) => `Qur'an Surat ${name} ${postfix(true)}`;
@@ -91,6 +95,7 @@ export const META_TITLE_AYAH = (
 	translation?: string
 ) =>
 	`QS ${surahid}:${verseid}, Surat ${name} - ${translation}, Ayat ${verseid || 1} | ${TITLE_CONSTANTS.TITLE_META}`;
+
 export const META_DESC_AYAH = (
 	verseid: string,
 	surahid?: string,
@@ -117,7 +122,8 @@ export type PageVariant =
 	| 'TASBIH'
 	| 'MAKKIYAH'
 	| 'MADANIYAH'
-	| 'JADWAL_SHOLAT';
+	| 'JADWAL_SHOLAT'
+  | 'CATAT_IBADAH';
 
 export const SEO_TEXT = {
 	ALL_SURAH:
@@ -142,6 +148,8 @@ export const SEO_TEXT = {
 		'Tasbih online, mempermudah menghitung Dzikirmu. Langsung dari peramban, tanpa iklan, tanpa analitik, privasi aman dan gratis sepenuhnya.',
 	JADWAL_SHOLAT:
 		'Jadwal sholat terlengkap. Langsung dari peramban, tanpa iklan, tanpa analitik, privasi aman dan gratis sepenuhnya.',
+  CATAT_SHOLAT:
+    'Jadwal sholat terlengkap. Langsung dari peramban, tanpa iklan, tanpa analitik, privasi aman dan gratis sepenuhnya.',
 	SURAH_DETAIL: '',
 	AYAT_DETAIL: ''
 };
diff --git a/src/lib/utils/array.ts b/src/lib/utils/array.ts
new file mode 100644
index 0000000000..57a494b138
--- /dev/null
+++ b/src/lib/utils/array.ts
@@ -0,0 +1,2 @@
+export const range = (start: number, stop: number, step = 1) =>
+  Array.from({ length: (stop - start) / step + 1 }, (_, i) => start + i * step)
diff --git a/src/lib/utils/date.ts b/src/lib/utils/date.ts
new file mode 100644
index 0000000000..3564f28e44
--- /dev/null
+++ b/src/lib/utils/date.ts
@@ -0,0 +1,40 @@
+import dayjs from 'dayjs';
+import relativeTime from "dayjs/plugin/relativeTime";
+import duration from "dayjs/plugin/duration";
+import 'dayjs/locale/id'
+
+dayjs.locale('id')
+dayjs.extend(relativeTime);
+dayjs.extend(duration);
+
+export const getDayjs = () => {
+  return dayjs();
+};
+
+export const getDayjsFormatted = (dateString: string, format: string) => {
+  return dayjs(dateString, format)
+};
+
+export const getDayInMonth = (dateString: string) => {
+  return dayjs(dateString).daysInMonth()
+};
+
+export const getMonthName = () => {
+  return dayjs().format('MMMM')
+};
+
+export const getCurrentDate = () => {
+  return dayjs().toDate().getDate();
+};
+
+export const formatDate = (date: string, format: string) => {
+  return dayjs(date).format(format);
+};
+
+export const formatYYYYMMDD = (date: string) => {
+  return dayjs(date).format('YYYY-MM-DD');
+};
+
+export const getMinuteDuration = (diffTime: number) => {
+  return dayjs.duration(diffTime, "minutes").humanize(true);
+};
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 9f416953db..1b5eefadb0 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -12,7 +12,8 @@
 		settingAutoNext,
 		pinnedSurah,
 		lastReadVerses,
-		settingLocation
+		settingLocation,
+    logPrayer,
 	} from '../store';
 
 	import '../app.css';
@@ -85,6 +86,14 @@
 				} else {
 					settingLocation.set(null);
 				}
+
+        const storageLogPrayer = localStorage.getItem(CONSTANTS.STORAGE_KEY.LOG_PRAYER);
+				if (storageLogPrayer) {
+					const parsedValue = JSON.parse(storageLogPrayer);
+					logPrayer.set(parsedValue);
+				} else {
+					settingLocation.set(null);
+				}
 			}
 		}
 	});
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index f3d1d604fb..2c754bb988 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -45,6 +45,10 @@
 		{
 			href: '/jadwal-sholat/',
 			title: '⏰ Jadwal Sholat'
+		},
+		{
+			href: '/pencatat-ibadah/',
+			title: '⏺️ Pencatat Ibadah'
 		}
 	];
 </script>
diff --git a/src/routes/pencatat-ibadah/+page.svelte b/src/routes/pencatat-ibadah/+page.svelte
new file mode 100644
index 0000000000..b00c3bfc29
--- /dev/null
+++ b/src/routes/pencatat-ibadah/+page.svelte
@@ -0,0 +1,149 @@
+<script lang="ts">
+	import Breadcrumb from '$lib/Breadcrumb.svelte';
+	import MetaTag from '$lib/MetaTag.svelte';
+	import SeoText from '$lib/SeoText.svelte';
+	import {
+	CONSTANTS,
+		META_DESC_PENCATAT_IBADAH,
+		META_TITLE_PENCATAT_IBADAH,
+		TITLE_CONSTANTS
+	} from '$lib/constants';
+	import { formatDate, getCurrentDate, getDayInMonth } from '$lib/utils/date';
+	import { range } from '$lib/utils/array';
+	import type { PrayerKey } from '$lib/types';
+	import CardShadow from '$lib/CardShadow.svelte';
+	import { logPrayer, type LogPrayerItemKey, type LogPrayerItemValue, type LogPrayerValue } from '$store';
+
+	let dayInMonth = getDayInMonth(new Date().toISOString());
+	let dayRanges = range(1, dayInMonth);
+
+	let selectedDate = $state(getCurrentDate());
+	let selectedDateFormatted = $derived.by(() => {
+		const nDate = new Date();
+		nDate.setDate(selectedDate);
+		const res = formatDate(nDate.toISOString(), 'DD MMMM YYYY');
+		return res;
+	});
+  let selectedYYYYMMDD = $derived.by(() => {
+		const nDate = new Date();
+		nDate.setDate(selectedDate);
+		const res = formatDate(nDate.toISOString(), 'YYYYMMDD');
+		return res;
+	});
+
+	const PRAYER_LIST: Array<{
+		key: PrayerKey;
+		title: string;
+		id: LogPrayerItemKey;
+	}> = [
+		{
+			key: 'Fajr',
+			title: 'Subuh',
+			id: '1'
+		},
+		{
+			key: 'Dhuhr',
+			title: 'Dzuhur',
+			id: '2'
+		},
+		{
+			key: 'Asr',
+			title: 'Ashar',
+			id: '3'
+		},
+		{
+			key: 'Maghrib',
+			title: 'Maghrib',
+			id: '4'
+		},
+		{
+			key: 'Isha',
+			title: 'Isya',
+			id: '5'
+		}
+	];
+
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  let handleCheckUncheck = (e) => {
+    const id = e.target.value.toString() as LogPrayerItemKey;
+    const isChecked = e.target.checked as boolean;
+
+    logPrayer.update((val) => {
+      const newItem = {
+        [id]: isChecked ? 1 : 0 as LogPrayerItemValue
+      } as LogPrayerValue;
+
+      if (val) {
+        if (val[selectedYYYYMMDD]) {
+          val[selectedYYYYMMDD] = {
+            ...val[selectedYYYYMMDD],
+            ...newItem,
+          }
+        } else {
+          val[selectedYYYYMMDD] = newItem;
+        }
+      } else {
+        val = {
+          [selectedYYYYMMDD]: newItem
+        };
+      }
+
+      localStorage.setItem(CONSTANTS.STORAGE_KEY.LOG_PRAYER, JSON.stringify(val));
+      return val
+    });
+  }
+
+</script>
+
+<svelte:head>
+	<MetaTag
+		title={META_TITLE_PENCATAT_IBADAH}
+		desc={META_DESC_PENCATAT_IBADAH}
+		url={`${TITLE_CONSTANTS.PATH}pencatat-ibadah/`}
+	/>
+</svelte:head>
+
+<div class="flex gap-2 px-4 mb-4">
+	<h1 class="text-3xl font-bold">⏺️ Pencatat Ibadah</h1>
+</div>
+
+<div class="px-4 mb-4">
+	<Breadcrumb items={[{ text: '🏠 Beranda', href: '/' }]} />
+</div>
+
+<div class="px-4 flex flex-col gap-2">
+	<p class="text-lg">Catatan ibadah pada {selectedDateFormatted}</p>
+	<div class="flex gap-2 w-full overflow-x-auto pb-4 pt-2 px-4 mt-2">
+		{#each dayRanges as day (day)}
+			<button
+				class={`h-12 w-12 rounded flex items-center justify-center p-4 border focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 ${day === selectedDate ? 'bg-primary font-bold border-blue-500' : 'bg-secondary'}`}
+				onclick={() => {
+					selectedDate = day;
+				}}
+			>
+				{day}
+			</button>
+		{/each}
+	</div>
+	<div class="grid gap-2">
+		{#each PRAYER_LIST as prayer (prayer.key)}
+			<CardShadow class="flex items-center">
+				<input
+					id={`chk-${prayer.id}`}
+					type="checkbox"
+					value={prayer.id}
+					name={prayer.title}
+          onchange={handleCheckUncheck}
+          checked={$logPrayer && $logPrayer?.[selectedYYYYMMDD] ? $logPrayer[selectedYYYYMMDD]?.[`${prayer.id}` as LogPrayerItemKey] === 1 : false}
+					class="peer w-6 h-6 text-blue-600 bg-gray-100 border-gray-300 rounded focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
+				/>
+				<label for={`chk-${prayer.id}`} class="w-full ms-2 text-sm font-medium text-foreground peer-checked:line-through">
+					{prayer.title}
+				</label>
+			</CardShadow>
+		{/each}
+	</div>
+</div>
+
+<SeoText variant="CATAT_IBADAH" />
diff --git a/src/routes/sync/+page.svelte b/src/routes/sync/+page.svelte
index f25f392515..e446e3de1b 100644
--- a/src/routes/sync/+page.svelte
+++ b/src/routes/sync/+page.svelte
@@ -38,7 +38,8 @@
 		activeTheme,
 		settingLocation,
 		lastReadVerses,
-		pinnedSurah
+		pinnedSurah,
+    logPrayer,
 	} from '../../store';
 	import { toast } from '../../store/toast';
 	import { CONSTANTS, TITLE_CONSTANTS } from '$lib/constants';
@@ -140,7 +141,8 @@
 					district: 'N/A'
 				},
 				[CONSTANTS.STORAGE_KEY.LAST_VERSES]: [],
-				[CONSTANTS.STORAGE_KEY.PINNED_SURAH]: []
+				[CONSTANTS.STORAGE_KEY.PINNED_SURAH]: [],
+        [CONSTANTS.STORAGE_KEY.LOG_PRAYER]: {}
 			};
 		}
 	};
@@ -155,7 +157,8 @@
 			[CONSTANTS.STORAGE_KEY.THEME]: $activeTheme || '',
 			[CONSTANTS.STORAGE_KEY.LOCATION]: $settingLocation || null,
 			[CONSTANTS.STORAGE_KEY.LAST_VERSES]: $lastReadVerses || null,
-			[CONSTANTS.STORAGE_KEY.PINNED_SURAH]: $pinnedSurah || null
+			[CONSTANTS.STORAGE_KEY.PINNED_SURAH]: $pinnedSurah || null,
+			[CONSTANTS.STORAGE_KEY.LOG_PRAYER]: $logPrayer || null
 		};
 		const dbRef = collection(db, 'progress');
 		const q = query(dbRef, where('uid', '==', currentUser?.uid));
@@ -273,6 +276,15 @@
 						);
 					}
 
+          // log prayer
+          if (data?.[CONSTANTS.STORAGE_KEY.LOG_PRAYER]) {
+						logPrayer.set(data?.[CONSTANTS.STORAGE_KEY.LOG_PRAYER]);
+						localStorage.setItem(
+							CONSTANTS.STORAGE_KEY.LOG_PRAYER,
+							JSON.stringify(data?.[CONSTANTS.STORAGE_KEY.LOG_PRAYER] || [])
+						);
+					}
+
 					currentRemoteProgress = doc.data();
 				}
 			});
diff --git a/src/store/index.ts b/src/store/index.ts
index 31c2aab771..ec2ee79e41 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -53,3 +53,18 @@ export type BookmarkVerseItem = {
 };
 
 export const lastReadVerses = writable<BookmarkVerseItem[]>([]);
+
+export type LogPrayerItemKey = '1' | '2' | '3' | '4' | '5';
+export type LogPrayerItemValue = 1 | 0;
+export type LogPrayerValue = Record<LogPrayerItemKey, LogPrayerItemValue>;
+/**
+ * Key is date in YYYYMMDD format
+ * Value is record { id: 1 | 0 }
+ * ID is ==> 1: Fajr, 2: Dhuhr, 3: Asr, 4: Maghrib, 5: Isha
+ */
+export type LogPrayer = Record<string, LogPrayerValue>;
+
+export const logPrayer = writable<LogPrayer>({});
+export const getLogPrayer = () => {
+	return get(logPrayer);
+};