fixed timezone default to nepal

Author: khumnath

bikram-calendar/src/bikram.ts

@@ -1,4 +1,3 @@
-
 /*
  * TypeScript implementation of Bikram calendar conversion
  * Copyright (c) 2024 onwards - khumnath cg, [email protected]
@@ -43,8 +42,9 @@ export class BikramDate {
       const { gYear, gMonth, gDay } = this.toGregorian(year, month, day);
       this.englishDate = new Date(gYear, gMonth - 1, gDay);
     } else {
-      // Default to current date
-      this.englishDate = new Date();
+      const now = new Date();
+      now.setHours(0, 0, 0, 0);
+      this.englishDate = now;
       const { bsYear, bsMonth, bsDay } = this.fromGregorian(
         this.englishDate.getFullYear(),
         this.englishDate.getMonth() + 1,
@@ -58,16 +58,14 @@ export class BikramDate {
 
   // Create a new BikramDate from a JavaScript Date
   static fromDate(date: Date): BikramDate {
-    const bikramDate = new BikramDate();
-    const { bsYear, bsMonth, bsDay } = bikramDate.fromGregorian(
-      date.getFullYear(),
-      date.getMonth() + 1,
-      date.getDate()
+    const d = new Date(date);
+    d.setHours(0, 0, 0, 0);
+    const { bsYear, bsMonth, bsDay } = new BikramDate().fromGregorian(
+      d.getFullYear(),
+      d.getMonth() + 1,
+      d.getDate()
     );
-    bikramDate.year = bsYear;
-    bikramDate.month = bsMonth;
-    bikramDate.day = bsDay;
-    return bikramDate;
+    return new BikramDate(bsYear, bsMonth, bsDay);
   }
 
   // Convert to JavaScript Date
@@ -109,8 +107,8 @@ export class BikramDate {
   // Convert AD (Gregorian) date to BS (Bikram Sambat)
   fromGregorian(gYear: number, gMonth: number, gDay: number): { bsYear: number; bsMonth: number; bsDay: number } {
     // Reference date: 1 Baisakh 2000 BS = 14 April 1943 AD
-    const refDate = new Date(1943, 3, 14); // Month is 0-indexed in JS Date
-    const targetDate = new Date(gYear, gMonth - 1, gDay);
+    const refDate = new Date(Date.UTC(1943, 3, 14)); // Month is 0-indexed in JS Date
+    const targetDate = new Date(Date.UTC(gYear, gMonth - 1, gDay));
 
     // Calculate difference in days
     const timeDiff = targetDate.getTime() - refDate.getTime();

bikram-calendar/src/converter.ts

@@ -1,4 +1,3 @@
-
 import { BikramDate, BS_START_YEAR, BS_END_YEAR } from './bikram';
 
 export type BikramDateObj = {
@@ -43,14 +42,15 @@ export const nepaliDaysEn = [
 ];
 
 // Get Today's Bikram Date
-export const getToday = (): BikramDateObj => {
-  const bikramDate = new BikramDate();
+export const getToday = (date?: Date): BikramDateObj => {
+  const today = date || new Date();
+  const bikramDate = BikramDate.fromDate(today);
 
   return {
     year: bikramDate.getYear(),
     month: bikramDate.getMonth(),
     day: bikramDate.getDate(),
-    englishDate: bikramDate.toJsDate(),
+    englishDate: today,
   };
 };
 

docs/404.html

@@ -17,7 +17,7 @@
     <link href="https://fonts.googleapis.com/css2?family=Lohit+Devanagari&display=swap" rel="stylesheet">
     <!-- Print stylesheet -->
     <link rel="stylesheet" href="./print.css" media="print">
-    <script type="module" crossorigin src="./assets/index-9O1kINYt.js"></script>
+    <script type="module" crossorigin src="./assets/index-k7-yqMtV.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-fmTXRpHI.css">
   </head>
 

docs/assets/index-9O1kINYt.js renamed to docs/assets/index-k7-yqMtV.js

@@ -17,7 +17,7 @@
     <link href="https://fonts.googleapis.com/css2?family=Lohit+Devanagari&display=swap" rel="stylesheet">
     <!-- Print stylesheet -->
     <link rel="stylesheet" href="./print.css" media="print">
-    <script type="module" crossorigin src="./assets/index-9O1kINYt.js"></script>
+    <script type="module" crossorigin src="./assets/index-k7-yqMtV.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-fmTXRpHI.css">
   </head>
 

docs/index.html

@@ -121,7 +121,7 @@ const BikramCalendar: React.FC = () => {
             days={calendarState.currentView.days} 
             startWeekDay={calendarState.currentView.startWeekDay} 
             englishStartDate={calendarState.currentView.englishStartDate} 
-            currentDate={calendarState.today.year === calendarState.currentView.year && calendarState.today.month === calendarState.currentView.month ? calendarState.today : undefined} 
+            currentDate={calendarState.today} 
             selectedDate={calendarState.selectedDate || undefined} 
             onDateSelect={calendarState.handleDateSelect} 
             useNepaliLanguage={calendarState.useNepaliLanguage} 

src/components/BikramCalendar.tsx

@@ -1,5 +1,5 @@
 import { useState, useEffect } from 'react';
-import { BikramDateObj, BikramMonth, getToday, getBikramMonth, getNepaliDigits, containsNepaliDigits, getEnglishDigits } from '../utils/bikramConverter';
+import { BikramDateObj, BikramMonth, getToday, getBikramMonth, getNepaliDigits, containsNepaliDigits, getEnglishDigits, getNepalTodayDate } from '../utils/bikramConverter';
 import { EventModalData } from '../types/events';
 import { CalendarEvent } from '../types/events';
 import { loadEventsForYear } from '../utils/events';
@@ -8,7 +8,17 @@ import { calculateTithi } from '../utils/tithiCalculation';
 import { getAllEventText, getAllEventDetails } from '../utils/events';
 
 export function useCalendarState() {
-  const [today, setToday] = useState<BikramDateObj>(getToday());
+  const [today, setToday] = useState<BikramDateObj>(() => getToday(getNepalTodayDate()));
+
+  // Keep today in sync with Nepal time
+  useEffect(() => {
+    const timer = setInterval(() => {
+      setToday(getToday(getNepalTodayDate()));
+    }, 60000); // Update every minute
+
+    return () => clearInterval(timer);
+  }, []);
+
   const [currentView, setCurrentView] = useState<BikramMonth>(() => getBikramMonth(today.year, today.month));
   const [selectedDate, setSelectedDate] = useState<BikramDateObj | null>(null);
   const [useNepaliLanguage, setUseNepaliLanguage] = useState<boolean>(true);
@@ -61,7 +71,7 @@ export function useCalendarState() {
   };
 
   const handleTodayClick = () => {
-    const todayDate = getToday();
+    const todayDate = getToday(getNepalTodayDate());
     setCurrentView(getBikramMonth(todayDate.year, todayDate.month));
     setSelectedDate(todayDate);
     setYearInput(useNepaliLanguage ? getNepaliDigits(todayDate.year) : todayDate.year.toString());

src/hooks/useCalendarState.ts

@@ -1,7 +1,6 @@
-
 // Re-export all needed functionality from the bikram-calendar package
 import {
-  getToday,
+  getToday as originalGetToday,
   getBikramMonth,
   convertToBikram,
   convertToEnglish,
@@ -16,8 +15,31 @@ import {
   type BikramMonth
 } from '../../bikram-calendar/src/converter';
 
+export function getToday(date?: Date): BikramDateObj {
+  const today = date || new Date();
+  const bikramDate = convertToBikram(today);
+  return {
+    year: bikramDate.year,
+    month: bikramDate.month,
+    day: bikramDate.day,
+    englishDate: today
+  };
+}
+
+export function getNepalTodayDate(): Date {
+  const now = new Date();
+  const utc = now.getTime() + (now.getTimezoneOffset() * 60000);
+  const nepalOffsetMs = 5.75 * 60 * 60 * 1000;
+  const nepalNow = new Date(utc + nepalOffsetMs);
+  return new Date(
+    nepalNow.getFullYear(),
+    nepalNow.getMonth(),
+    nepalNow.getDate(),
+    0, 0, 0, 0
+  );
+}
+
 export {
-  getToday,
   getBikramMonth,
   convertToBikram,
   convertToEnglish,