Skip to content

Your favorite shift management application!

fix: update banner & loading skeleton in calender grid (#69)

panteL6cc6df1c0175
diff --git a/app/api/version/route.ts b/app/api/version/route.ts
index 79e7ec0..c445b24 100644
--- a/app/api/version/route.ts
+++ b/app/api/version/route.ts
@@ -44,7 +44,10 @@ function getDockerVersion(): string | null {
try {
const versionFilePath = join(process.cwd(), ".version");
if (existsSync(versionFilePath)) {
- cachedDockerVersion = readFileSync(versionFilePath, "utf-8").trim();
+ // Remove 'v' prefix for consistent version comparison
+ cachedDockerVersion = readFileSync(versionFilePath, "utf-8")
+ .trim()
+ .replace(/^v/, "");
return cachedDockerVersion;
}
} catch {
diff --git a/hooks/useShifts.ts b/hooks/useShifts.ts
index 8b61f33..1cdd89c 100644
--- a/hooks/useShifts.ts
+++ b/hooks/useShifts.ts
@@ -10,32 +10,39 @@ export function useShifts(calendarId: string | undefined) {
const [shifts, setShifts] = useState<ShiftWithCalendar[]>([]);
const [loading, setLoading] = useState(false);
- const fetchShifts = useCallback(async () => {
- if (!calendarId) return;
+ const fetchShifts = useCallback(
+ async (showLoading = true) => {
+ if (!calendarId) return;
- setLoading(true);
- try {
- const password = getCachedPassword(calendarId);
- const params = new URLSearchParams({ calendarId });
- if (password) {
- params.append("password", password);
+ if (showLoading) {
+ setLoading(true);
}
-
- const response = await fetch(`/api/shifts?${params}`);
- if (!response.ok) {
- // Calendar is locked and no valid password - return empty array
+ try {
+ const password = getCachedPassword(calendarId);
+ const params = new URLSearchParams({ calendarId });
+ if (password) {
+ params.append("password", password);
+ }
+
+ const response = await fetch(`/api/shifts?${params}`);
+ if (!response.ok) {
+ // Calendar is locked and no valid password - return empty array
+ setShifts([]);
+ return;
+ }
+ const data = await response.json();
+ setShifts(data);
+ } catch (error) {
+ console.error("Failed to fetch shifts:", error);
setShifts([]);
- return;
+ } finally {
+ if (showLoading) {
+ setLoading(false);
+ }
}
- const data = await response.json();
- setShifts(data);
- } catch (error) {
- console.error("Failed to fetch shifts:", error);
- setShifts([]);
- } finally {
- setLoading(false);
- }
- }, [calendarId]);
+ },
+ [calendarId]
+ );
const createShift = async (formData: ShiftFormData) => {
if (!calendarId) return null;
@@ -189,6 +196,6 @@ export function useShifts(calendarId: string | undefined) {
createShift,
updateShift,
deleteShift,
- refetchShifts: fetchShifts,
+ refetchShifts: () => fetchShifts(false), // Silent refresh for live updates
};
}