Merge branch 'dev' into fixcss/event
merge dev into fixcss
This commit is contained in:
commit
df2d5b4592
32 files changed
+330
-255
No files matched your search
@@ -1,15 +0,0 @@
|
||||
import styles from "./HomePage.module.css";
|
||||
import Calendar from "./components/Calendar/Calendar.jsx";
|
||||
import EventList from "./components/EventList/EventList";
|
||||
|
||||
function HomePage() {
|
||||
|
||||
return (
|
||||
<div className={styles.allContent}>
|
||||
<Calendar />
|
||||
<EventList />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default HomePage;
|
||||
@@ -0,0 +1,12 @@
|
||||
import styles from "./HomePage.module.css";
|
||||
import Calendar from "./components/Calendar/Calendar";
|
||||
import EventList from "./components/EventList/EventList";
|
||||
import { ReactNode } from "react";
|
||||
|
||||
export default function HomePage(): ReactNode {
|
||||
|
||||
return <div className={styles.allContent}>
|
||||
<Calendar/>
|
||||
<EventList/>
|
||||
</div>
|
||||
}
|
||||
@@ -1,9 +1,8 @@
|
||||
import {useState, useMemo, useEffect, useContext} from "react";
|
||||
import styles from "./Calendar.module.css";
|
||||
import {formatDateLetterJS} from "../../../../utils/date/formatDateLetter.js";
|
||||
import Button from "../../../../components/ui/Button/Button";
|
||||
import {AuthContext} from "../../../../contexts/Auth/AuthContext.ts";
|
||||
import ExportBtn from "./ExportBtn.tsx";
|
||||
import ExportBtn from "../../../../components/ExportCalendarBtn/ExportBtn.tsx";
|
||||
|
||||
function
|
||||
Calendar() {
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
import Button from "../../../../components/ui/Button/Button";
|
||||
import styles from "../../HomePage.module.css"
|
||||
import { useContext } from "react";
|
||||
import { AuthContext, AuthContextType } from "../../../../contexts/Auth/AuthContext";
|
||||
import { APP_CONFIG } from "../../../../config/appConfig";
|
||||
|
||||
export default function ExportBtn() {
|
||||
|
||||
const { user } = useContext(AuthContext) as AuthContextType;
|
||||
const calendarUrl = `${import.meta.env.VITE_API_URL}/api/export/ics/${user?.id}`;
|
||||
|
||||
return <Button className={styles.exportbtn}
|
||||
onClick={() => {
|
||||
window.open(
|
||||
`${APP_CONFIG.newCalendarURL}${calendarUrl}`
|
||||
);
|
||||
}}
|
||||
>
|
||||
Exporter
|
||||
</Button>
|
||||
}
|
||||
Reference in new issue
Block a user