feat: add sync and logout toolbar to calendar screen
- Add CalendarToolbar component between header and weekdays in calendar.tsx - Sync button with CalDAV sync, spinner during sync, green checkmark on success, red X on error (3s feedback) - Sync button disabled/greyed out when no CalDAV config present - Logout button with redirect to login screen - Buttons styled with border and shadow - Update CLAUDE.md with CalendarToolbar documentation
This commit is contained in:
@@ -76,7 +76,7 @@ src/
|
|||||||
│ ├── (tabs)/ # Tab navigation group
|
│ ├── (tabs)/ # Tab navigation group
|
||||||
│ │ ├── _layout.tsx # Tab bar configuration (themed)
|
│ │ ├── _layout.tsx # Tab bar configuration (themed)
|
||||||
│ │ ├── chat.tsx # Chat screen (AI conversation)
|
│ │ ├── chat.tsx # Chat screen (AI conversation)
|
||||||
│ │ ├── calendar.tsx # Calendar overview
|
│ │ ├── calendar.tsx # Calendar overview (with CalendarToolbar: sync + logout)
|
||||||
│ │ └── settings.tsx # Settings screen (theme switcher, logout, CalDAV config with feedback)
|
│ │ └── settings.tsx # Settings screen (theme switcher, logout, CalDAV config with feedback)
|
||||||
│ ├── editEvent.tsx # Event edit screen (dual-mode: calendar/chat)
|
│ ├── editEvent.tsx # Event edit screen (dual-mode: calendar/chat)
|
||||||
│ ├── event/
|
│ ├── event/
|
||||||
@@ -637,6 +637,7 @@ NODE_ENV=development # development = pretty logs, production = JSON
|
|||||||
- `EventCard`: Uses EventCardBase + edit/delete buttons (TouchableOpacity with delayPressIn for scroll-friendly touch handling)
|
- `EventCard`: Uses EventCardBase + edit/delete buttons (TouchableOpacity with delayPressIn for scroll-friendly touch handling)
|
||||||
- `ProposedEventCard`: Uses EventCardBase + confirm/reject/edit buttons for chat proposals, displays green highlighted text for new changes ("Neue Ausnahme: [date]" for single delete, "Neues Ende: [date]" for UNTIL updates), shows yellow conflict warnings when proposed time overlaps with existing events. Edit button allows modifying proposals before confirming.
|
- `ProposedEventCard`: Uses EventCardBase + confirm/reject/edit buttons for chat proposals, displays green highlighted text for new changes ("Neue Ausnahme: [date]" for single delete, "Neues Ende: [date]" for UNTIL updates), shows yellow conflict warnings when proposed time overlaps with existing events. Edit button allows modifying proposals before confirming.
|
||||||
- `DeleteEventModal`: Delete confirmation modal using ModalBase - shows three options for recurring events (single/future/all), simple confirm for non-recurring
|
- `DeleteEventModal`: Delete confirmation modal using ModalBase - shows three options for recurring events (single/future/all), simple confirm for non-recurring
|
||||||
|
- `CalendarToolbar` (in calendar.tsx): Toolbar between header and weekdays with Sync button (CalDAV sync with spinner/green checkmark/red X feedback, disabled without config) and Logout button
|
||||||
- `EventOverlay` (in calendar.tsx): Day events overlay using ModalBase - shows EventCards for selected day
|
- `EventOverlay` (in calendar.tsx): Day events overlay using ModalBase - shows EventCards for selected day
|
||||||
- `Themes.tsx`: Theme definitions with THEMES object (defaultLight, defaultDark) including all color tokens (textPrimary, borderPrimary, eventIndicator, secondaryBg, shadowColor, etc.)
|
- `Themes.tsx`: Theme definitions with THEMES object (defaultLight, defaultDark) including all color tokens (textPrimary, borderPrimary, eventIndicator, secondaryBg, shadowColor, etc.)
|
||||||
- `EventsStore`: Zustand store with setEvents(), addEvent(), updateEvent(), deleteEvent() - stores ExpandedEvent[], preloaded by AuthGuard
|
- `EventsStore`: Zustand store with setEvents(), addEvent(), updateEvent(), deleteEvent() - stores ExpandedEvent[], preloaded by AuthGuard
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Pressable, Text, View } from "react-native";
|
import { ActivityIndicator, Pressable, Text, View } from "react-native";
|
||||||
import {
|
import {
|
||||||
DAYS,
|
DAYS,
|
||||||
MONTHS,
|
MONTHS,
|
||||||
@@ -16,9 +16,11 @@ import { router, useFocusEffect } from "expo-router";
|
|||||||
import { Ionicons } from "@expo/vector-icons";
|
import { Ionicons } from "@expo/vector-icons";
|
||||||
import { useThemeStore } from "../../stores/ThemeStore";
|
import { useThemeStore } from "../../stores/ThemeStore";
|
||||||
import BaseBackground from "../../components/BaseBackground";
|
import BaseBackground from "../../components/BaseBackground";
|
||||||
import { EventService } from "../../services";
|
import { AuthService, EventService } from "../../services";
|
||||||
import { useEventsStore } from "../../stores";
|
import { useEventsStore } from "../../stores";
|
||||||
import { useDropdownPosition } from "../../hooks/useDropdownPosition";
|
import { useDropdownPosition } from "../../hooks/useDropdownPosition";
|
||||||
|
import { CaldavConfigService } from "../../services/CaldavConfigService";
|
||||||
|
import { useCaldavConfigStore } from "../../stores/CaldavConfigStore";
|
||||||
|
|
||||||
// MonthSelector types and helpers
|
// MonthSelector types and helpers
|
||||||
type MonthItem = {
|
type MonthItem = {
|
||||||
@@ -239,6 +241,7 @@ const Calendar = () => {
|
|||||||
setMonthIndex={setMonthIndex}
|
setMonthIndex={setMonthIndex}
|
||||||
setYear={setCurrentYear}
|
setYear={setCurrentYear}
|
||||||
/>
|
/>
|
||||||
|
<CalendarToolbar loadEvents={loadEvents} />
|
||||||
<WeekDaysLine />
|
<WeekDaysLine />
|
||||||
<CalendarGrid
|
<CalendarGrid
|
||||||
month={MONTHS[monthIndex]}
|
month={MONTHS[monthIndex]}
|
||||||
@@ -543,6 +546,131 @@ const ChangeMonthButton = (props: ChangeMonthButtonProps) => {
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
type CalendarToolbarProps = {
|
||||||
|
loadEvents: () => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
const CalendarToolbar = ({ loadEvents }: CalendarToolbarProps) => {
|
||||||
|
const { theme } = useThemeStore();
|
||||||
|
const { config } = useCaldavConfigStore();
|
||||||
|
const [isSyncing, setIsSyncing] = useState(false);
|
||||||
|
const [syncResult, setSyncResult] = useState<"success" | "error" | null>(
|
||||||
|
null,
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleSync = async () => {
|
||||||
|
if (!config || isSyncing) return;
|
||||||
|
setSyncResult(null);
|
||||||
|
setIsSyncing(true);
|
||||||
|
try {
|
||||||
|
await CaldavConfigService.sync();
|
||||||
|
await loadEvents();
|
||||||
|
setSyncResult("success");
|
||||||
|
} catch (error) {
|
||||||
|
console.error("CalDAV sync failed:", error);
|
||||||
|
setSyncResult("error");
|
||||||
|
} finally {
|
||||||
|
setIsSyncing(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!syncResult) return;
|
||||||
|
const timer = setTimeout(() => setSyncResult(null), 3000);
|
||||||
|
return () => clearTimeout(timer);
|
||||||
|
}, [syncResult]);
|
||||||
|
|
||||||
|
const handleLogout = async () => {
|
||||||
|
await AuthService.logout();
|
||||||
|
router.replace("/login");
|
||||||
|
};
|
||||||
|
|
||||||
|
const syncIcon = () => {
|
||||||
|
if (isSyncing) {
|
||||||
|
return <ActivityIndicator size="small" color={theme.primeFg} />;
|
||||||
|
}
|
||||||
|
if (syncResult === "success") {
|
||||||
|
return (
|
||||||
|
<Ionicons
|
||||||
|
name="checkmark-circle"
|
||||||
|
size={20}
|
||||||
|
color={theme.confirmButton}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (syncResult === "error") {
|
||||||
|
return (
|
||||||
|
<Ionicons name="close-circle" size={20} color={theme.rejectButton} />
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
<Ionicons
|
||||||
|
name="sync-outline"
|
||||||
|
size={20}
|
||||||
|
color={config ? theme.primeFg : theme.textMuted}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const buttonStyle = {
|
||||||
|
backgroundColor: theme.chatBot,
|
||||||
|
borderColor: theme.borderPrimary,
|
||||||
|
borderWidth: 1,
|
||||||
|
shadowColor: theme.shadowColor,
|
||||||
|
shadowOffset: { width: 0, height: 2 },
|
||||||
|
shadowOpacity: 0.25,
|
||||||
|
shadowRadius: 4,
|
||||||
|
elevation: 4,
|
||||||
|
};
|
||||||
|
|
||||||
|
const className = "flex flex-row items-center gap-2 px-3 py-1 rounded-lg"
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
className="flex flex-row items-center justify-around py-2"
|
||||||
|
style={{
|
||||||
|
backgroundColor: theme.primeBg,
|
||||||
|
borderBottomWidth: 0,
|
||||||
|
borderBottomColor: theme.borderPrimary,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Pressable
|
||||||
|
onPress={handleSync}
|
||||||
|
disabled={!config || isSyncing}
|
||||||
|
className={className}
|
||||||
|
style={{
|
||||||
|
...buttonStyle,
|
||||||
|
...(config
|
||||||
|
? {}
|
||||||
|
: {
|
||||||
|
backgroundColor: theme.disabledButton,
|
||||||
|
borderColor: theme.disabledButton,
|
||||||
|
}),
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{syncIcon()}
|
||||||
|
<Text
|
||||||
|
style={{ color: config ? theme.textPrimary : theme.textMuted }}
|
||||||
|
className="font-medium"
|
||||||
|
>
|
||||||
|
Sync
|
||||||
|
</Text>
|
||||||
|
</Pressable>
|
||||||
|
|
||||||
|
<Pressable
|
||||||
|
onPress={handleLogout}
|
||||||
|
className={className}
|
||||||
|
style={buttonStyle}
|
||||||
|
>
|
||||||
|
<Ionicons name="log-out-outline" size={20} color={theme.primeFg} />
|
||||||
|
<Text style={{ color: theme.textPrimary }} className="font-medium">
|
||||||
|
Logout
|
||||||
|
</Text>
|
||||||
|
</Pressable>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
const WeekDaysLine = () => {
|
const WeekDaysLine = () => {
|
||||||
const { theme } = useThemeStore();
|
const { theme } = useThemeStore();
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user