Skip to content

Commit 69c7424

Browse files
committed
format忘れ
1 parent 475165d commit 69c7424

8 files changed

+122
-122
lines changed

task_yell/src/app/home/page.tsx

+9-14
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,9 @@ import {
1010
readWantTodos,
1111
updateWantTodo,
1212
} from "@/lib/want-todo";
13-
import {
14-
addMonths,
15-
format,
16-
subMonths,
17-
} from "date-fns";
13+
import { addMonths, format, subMonths } from "date-fns";
1814
import { ja } from "date-fns/locale";
19-
import {
20-
ChevronLeft,
21-
ChevronRight,
22-
} from "lucide-react";
15+
import { ChevronLeft, ChevronRight } from "lucide-react";
2316
import { useRouter } from "next/navigation";
2417
import { useEffect, useMemo, useState } from "react";
2518
import { generateStickyNoteServer } from "./actions";
@@ -157,7 +150,7 @@ export default function Home() {
157150
newEvent: Event,
158151
notification: { date: Date | null; type: "call" | "push" },
159152
) => {
160-
console.log("addEvent",newEvent);
153+
console.log("addEvent", newEvent);
161154
setEvents([...events, newEvent]);
162155
setIsEventModalOpen(false);
163156
setRemovedStickyNote(null);
@@ -236,10 +229,12 @@ export default function Home() {
236229
</div>
237230

238231
<div className="w-full lg:w-1/2 pl-2 bg-white dark:bg-gray-800 overflow-auto lg:block hidden">
239-
<WantodoView
240-
newStickyNote={newStickyNote} setNewStickyNote={setNewStickyNote}
232+
<WantodoView
233+
newStickyNote={newStickyNote}
234+
setNewStickyNote={setNewStickyNote}
241235
addStickyNote={addStickyNote}
242-
searchTerm={searchTerm} setSearchTerm={setSearchTerm}
236+
searchTerm={searchTerm}
237+
setSearchTerm={setSearchTerm}
243238
filteredStickyNotes={filteredStickyNotes}
244239
setDraggedStickyNote={setDraggedStickyNote}
245240
generateStickyNote={generateStickyNote}
@@ -255,7 +250,7 @@ export default function Home() {
255250
updateStickyNote={updateStickyNote}
256251
/>
257252

258-
<CreateEventDialog
253+
<CreateEventDialog
259254
stickyNotes={stickyNotes}
260255
setStickyNotes={setStickyNotes}
261256
isEventModalOpen={isEventModalOpen}

task_yell/src/components/calendar-renderer.tsx

+23-14
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type Props = {
2525
draggedStickyNote: StickyNote | null;
2626
deleteStickyNote: (id: string) => void;
2727
setIsEventModalOpen: (isOpen: boolean) => void;
28-
}
28+
};
2929

3030
function getDaysInMonth(date: Date) {
3131
const start = startOfWeek(startOfMonth(date), { weekStartsOn: 0 });
@@ -42,7 +42,11 @@ function getEventCountForDay(events: Event[], day: Date) {
4242
.length;
4343
}
4444

45-
function getTaskIndicatorStyle(isDarkMode: boolean, todoCount: number, eventCount: number) {
45+
function getTaskIndicatorStyle(
46+
isDarkMode: boolean,
47+
todoCount: number,
48+
eventCount: number,
49+
) {
4650
const count = todoCount + eventCount;
4751
if (count === 0) return "";
4852
const baseColor = isDarkMode ? "bg-red-" : "bg-red-";
@@ -52,13 +56,16 @@ function getTaskIndicatorStyle(isDarkMode: boolean, todoCount: number, eventCoun
5256
}
5357

5458
export function CalendarRenderer({
55-
todos, events,
56-
currentMonth, selectedDate, handleDateSelect,
59+
todos,
60+
events,
61+
currentMonth,
62+
selectedDate,
63+
handleDateSelect,
5764
isDarkMode,
58-
draggedStickyNote, deleteStickyNote,
59-
setIsEventModalOpen
60-
}: Props
61-
) {
65+
draggedStickyNote,
66+
deleteStickyNote,
67+
setIsEventModalOpen,
68+
}: Props) {
6269
const days = getDaysInMonth(currentMonth);
6370
const weeks = Math.ceil(days.length / 7);
6471

@@ -78,7 +85,8 @@ export function CalendarRenderer({
7885
const weekDays = days.slice(weekIndex * 7, (weekIndex + 1) * 7);
7986
const maxEventsInWeek = Math.max(
8087
...weekDays.map(
81-
(day) => getTodoCountForDay(todos, day) + getEventCountForDay(events, day),
88+
(day) =>
89+
getTodoCountForDay(todos, day) + getEventCountForDay(events, day),
8290
),
8391
);
8492
const weekHeight =
@@ -105,10 +113,11 @@ export function CalendarRenderer({
105113
return (
106114
<motion.div
107115
key={day.toISOString()}
108-
className={`p-1 border rounded-md cursor-pointer transition-all duration-300 overflow-hidden ${isSelected ? "border-blue-300 dark:border-blue-600" : ""} ${!isCurrentMonth
109-
? "text-gray-400 dark:text-gray-600 bg-gray-100 dark:bg-gray-700"
110-
: ""
111-
} ${getTaskIndicatorStyle(isDarkMode, todoCount, eventCount)} hover:bg-gray-100 dark:hover:bg-gray-700`}
116+
className={`p-1 border rounded-md cursor-pointer transition-all duration-300 overflow-hidden ${isSelected ? "border-blue-300 dark:border-blue-600" : ""} ${
117+
!isCurrentMonth
118+
? "text-gray-400 dark:text-gray-600 bg-gray-100 dark:bg-gray-700"
119+
: ""
120+
} ${getTaskIndicatorStyle(isDarkMode, todoCount, eventCount)} hover:bg-gray-100 dark:hover:bg-gray-700`}
112121
onClick={() => handleDateSelect(day)}
113122
whileHover={{ scale: 1.05 }}
114123
whileTap={{ scale: 0.95 }}
@@ -164,4 +173,4 @@ export function CalendarRenderer({
164173
})}
165174
</div>
166175
);
167-
};
176+
}

task_yell/src/components/create-event-dialog.tsx

+15-10
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import {
66
DialogHeader,
77
DialogTitle,
88
} from "@/components/ui/dialog";
9-
import {
10-
format,
11-
} from "date-fns";
9+
import { format } from "date-fns";
1210
import { ja } from "date-fns/locale";
1311
import { EventCreator } from "@/components/event-creator";
1412
import { Event, StickyNote } from "@/components/types";
@@ -20,18 +18,25 @@ type Props = {
2018
setIsEventModalOpen: (isOpen: boolean) => void;
2119
selectedDate: Date;
2220
events: Event[];
23-
addEvent: (newEvent: Event, notification: { date: Date | null; type: "call" | "push" }) => void;
21+
addEvent: (
22+
newEvent: Event,
23+
notification: { date: Date | null; type: "call" | "push" },
24+
) => void;
2425
removedStickyNote: StickyNote | null;
2526
setRemovedStickyNote: (note: StickyNote | null) => void;
2627
draggedStickyNote: StickyNote | null;
2728
};
2829

2930
export function CreateEventDialog({
30-
stickyNotes, setStickyNotes,
31-
isEventModalOpen, setIsEventModalOpen,
31+
stickyNotes,
32+
setStickyNotes,
33+
isEventModalOpen,
34+
setIsEventModalOpen,
3235
selectedDate,
33-
events, addEvent,
34-
removedStickyNote, setRemovedStickyNote,
36+
events,
37+
addEvent,
38+
removedStickyNote,
39+
setRemovedStickyNote,
3540
draggedStickyNote,
3641
}: Props) {
3742
return (
@@ -57,5 +62,5 @@ export function CreateEventDialog({
5762
/>
5863
</DialogContent>
5964
</Dialog>
60-
)
61-
}
65+
);
66+
}

task_yell/src/components/edit-wantodo-dialog.tsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ type Props = {
1414
editingStickyNote: StickyNote | null;
1515
setEditingStickyNote: (stickyNote: StickyNote | null) => void;
1616
updateStickyNote: (stickyNote: StickyNote) => void;
17-
}
17+
};
1818

19-
export function EditWantodoDialog({ editingStickyNote, setEditingStickyNote, updateStickyNote }: Props) {
19+
export function EditWantodoDialog({
20+
editingStickyNote,
21+
setEditingStickyNote,
22+
updateStickyNote,
23+
}: Props) {
2024
return (
2125
<Dialog
2226
open={!!editingStickyNote}
@@ -50,5 +54,5 @@ export function EditWantodoDialog({ editingStickyNote, setEditingStickyNote, upd
5054
)}
5155
</DialogContent>
5256
</Dialog>
53-
)
54-
}
57+
);
58+
}

task_yell/src/components/event-creator.tsx

+8-16
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,9 @@ import {
2121
Pencil1Icon,
2222
ViewGridIcon,
2323
} from "@radix-ui/react-icons";
24-
import {
25-
format,
26-
getHours,
27-
isSameDay,
28-
} from "date-fns";
24+
import { format, getHours, isSameDay } from "date-fns";
2925
import { ja } from "date-fns/locale";
30-
import {
31-
MapPinIcon,
32-
UserPlusIcon,
33-
} from "lucide-react";
26+
import { MapPinIcon, UserPlusIcon } from "lucide-react";
3427
import { useState } from "react";
3528
import { Event } from "@/components/types";
3629
import { priorityColors } from "./priority-colors";
@@ -79,7 +72,6 @@ export function EventCreator({
7972
isLocked: z.boolean(),
8073
});
8174

82-
8375
const handleSave = () => {
8476
if (targetDate) {
8577
const newEvent: Event = {
@@ -95,12 +87,12 @@ export function EventCreator({
9587
isTask,
9688
isLocked,
9789
};
98-
// バリデーションの実行
99-
const result = eventSchema.safeParse(newEvent);
100-
if (!result.success) {
101-
alert(result.error.errors.map((err) => err.message).join("\n"));
102-
return;
103-
}
90+
// バリデーションの実行
91+
const result = eventSchema.safeParse(newEvent);
92+
if (!result.success) {
93+
alert(result.error.errors.map((err) => err.message).join("\n"));
94+
return;
95+
}
10496
onSave(newEvent, { date: notificationDate, type: notificationType });
10597
}
10698
};

task_yell/src/components/navigation.tsx

+39-43
Original file line numberDiff line numberDiff line change
@@ -15,64 +15,60 @@ import { signOut } from "@/firebase/auth";
1515
import { auth, db } from "@/firebase/client-app";
1616
import { subscribeNotification } from "@/lib/push-notification";
1717
import { doc, getDoc, setDoc, updateDoc } from "firebase/firestore";
18-
import {
19-
Menu,
20-
Bell,
21-
Users,
22-
Download,
23-
LogOut,
24-
PhoneCall,
25-
} from "lucide-react";
18+
import { Menu, Bell, Users, Download, LogOut, PhoneCall } from "lucide-react";
2619
import { useRouter } from "next/navigation";
2720
import { useMemo, useState } from "react";
2821

2922
type Props = {
3023
isDarkMode: boolean;
3124
setIsDarkMode: (isDarkMode: boolean) => void;
32-
}
25+
};
3326

3427
export function Navigation({ isDarkMode, setIsDarkMode }: Props) {
3528
const [isOpen, setIsOpen] = useState(false);
3629
const [isNotificationsOpen, setIsNotificationsOpen] = useState(false);
3730
const [notificationsEnabled, setNotificationsEnabled] = useState(false);
3831
const router = useRouter();
3932

40-
const menuItems = useMemo(() => [
41-
{
42-
icon: PhoneCall,
43-
label: "電話通知",
44-
onClick: () => {
45-
return setIsNotificationsOpen(!isNotificationsOpen);
33+
const menuItems = useMemo(
34+
() => [
35+
{
36+
icon: PhoneCall,
37+
label: "電話通知",
38+
onClick: () => {
39+
return setIsNotificationsOpen(!isNotificationsOpen);
40+
},
4641
},
47-
},
48-
{
49-
icon: Bell,
50-
label: "プッシュ通知",
51-
onClick: async () => {
52-
await subscribeNotification();
42+
{
43+
icon: Bell,
44+
label: "プッシュ通知",
45+
onClick: async () => {
46+
await subscribeNotification();
47+
},
5348
},
54-
},
55-
{ icon: Users, label: "友達", onClick: () => console.log("友達") },
56-
{
57-
icon: Download,
58-
label: "インポート",
59-
onClick: () => {
60-
if (auth.currentUser) {
61-
router.push(
62-
`/api/auth/google-cal?userId=${encodeURIComponent(auth.currentUser.uid)}`,
63-
);
64-
}
49+
{ icon: Users, label: "友達", onClick: () => console.log("友達") },
50+
{
51+
icon: Download,
52+
label: "インポート",
53+
onClick: () => {
54+
if (auth.currentUser) {
55+
router.push(
56+
`/api/auth/google-cal?userId=${encodeURIComponent(auth.currentUser.uid)}`,
57+
);
58+
}
59+
},
6560
},
66-
},
67-
{
68-
icon: LogOut,
69-
label: "ログアウト",
70-
onClick: async () => {
71-
await signOut();
72-
router.refresh();
61+
{
62+
icon: LogOut,
63+
label: "ログアウト",
64+
onClick: async () => {
65+
await signOut();
66+
router.refresh();
67+
},
7368
},
74-
},
75-
], [isNotificationsOpen, router]);
69+
],
70+
[isNotificationsOpen, router],
71+
);
7672

7773
return (
7874
<Sheet open={isOpen} onOpenChange={setIsOpen}>
@@ -157,5 +153,5 @@ export function Navigation({ isDarkMode, setIsDarkMode }: Props) {
157153
</nav>
158154
</SheetContent>
159155
</Sheet>
160-
)
161-
}
156+
);
157+
}

0 commit comments

Comments
 (0)