mirror of
https://github.com/urosran/cally.git
synced 2026-10-23 07:27:55 +00:00
bug fixes and new screens
This commit is contained in:
@@ -5,6 +5,7 @@ import {Button, Picker, PickerModes, SegmentedControl, Text, View} from "react-n
|
||||
import {MaterialIcons} from "@expo/vector-icons";
|
||||
import {AddEventDialog} from "@/components/pages/calendar/AddEventDialog";
|
||||
import {useGetEvents} from "@/hooks/firebase/useGetEvents";
|
||||
import { useAuthContext } from "@/contexts/AuthContext";
|
||||
|
||||
const modeMap = new Map([
|
||||
[0, "day"],
|
||||
@@ -18,6 +19,7 @@ const months = [
|
||||
];
|
||||
|
||||
export default function Screen() {
|
||||
const { profileData } = useAuthContext();
|
||||
const [calendarHeight, setCalendarHeight] = useState(0);
|
||||
const [mode, setMode] = useState<"week" | "month" | "day">("week");
|
||||
const [selectedDate, setSelectedDate] = useState<Date>(new Date());
|
||||
@@ -52,7 +54,7 @@ export default function Screen() {
|
||||
return (
|
||||
<View style={{flex: 1, height: "100%", padding: 10}}>
|
||||
<View style={{height: 60, justifyContent: "space-evenly", alignItems: "flex-start"}}>
|
||||
<Text>Welcome Dalia</Text>
|
||||
<Text>Welcome {profileData?.firstName}</Text>
|
||||
<Text>Let's get your week started!</Text>
|
||||
</View>
|
||||
|
||||
|
||||
@@ -2,24 +2,18 @@ import AddChore from "@/components/pages/todos/AddChore";
|
||||
import ProgressCard from "@/components/pages/todos/ProgressCard";
|
||||
import ToDoItem from "@/components/pages/todos/ToDoItem";
|
||||
import ToDosList from "@/components/pages/todos/ToDosList";
|
||||
import ToDosPage from "@/components/pages/todos/ToDosPage";
|
||||
import HeaderTemplate from "@/components/shared/HeaderTemplate";
|
||||
import { useAuthContext } from "@/contexts/AuthContext";
|
||||
import { ToDosContextProvider, useToDosContext } from "@/contexts/ToDosContext";
|
||||
import { AntDesign } from "@expo/vector-icons";
|
||||
import { ScrollView } from "react-native-gesture-handler";
|
||||
import { Button, ButtonSize, View } from "react-native-ui-lib";
|
||||
import { Button, ButtonSize, View, Text } from "react-native-ui-lib";
|
||||
|
||||
export default function Screen() {
|
||||
return (
|
||||
<ToDosContextProvider>
|
||||
<ScrollView>
|
||||
<View backgroundColor="#f9f8f7">
|
||||
<HeaderTemplate message="Here are your To Do's" isWelcome={true} />
|
||||
<ProgressCard />
|
||||
<ToDosList />
|
||||
</View>
|
||||
</ScrollView>
|
||||
<AddChore />
|
||||
<ToDosPage />
|
||||
</ToDosContextProvider>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user