Skip to content

Commit abb3c19

Browse files
feat: draft calendar
1 parent c25638c commit abb3c19

10 files changed

+339
-91
lines changed

package-lock.json

+260-76
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+10
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,14 @@
1313
"@types/jest": "^27.5.2",
1414
"@types/node": "^16.11.39",
1515
"@types/react": "^18.0.12",
16+
"@types/react-calendar": "^3.5.2",
1617
"@types/react-dom": "^18.0.5",
1718
"@types/styled-components": "^5.1.25",
19+
"fullcalendar": "^5.11.3",
20+
"js-year-calendar": "^2.0.0",
21+
"rc-year-calendar": "^1.0.2",
1822
"react": "^18.1.0",
23+
"react-calendar": "^3.8.0",
1924
"react-dom": "^18.1.0",
2025
"react-router-dom": "^6.3.0",
2126
"react-scripts": "5.0.1",
@@ -46,5 +51,10 @@
4651
"last 1 firefox version",
4752
"last 1 safari version"
4853
]
54+
},
55+
"devDependencies": {
56+
"autoprefixer": "^10.4.10",
57+
"postcss": "^8.4.16",
58+
"tailwindcss": "^3.1.8"
4959
}
5060
}

postcss.config.js

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
plugins: {
3+
tailwindcss: {},
4+
autoprefixer: {},
5+
},
6+
}

src/App.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import ChooseCalendar from './Pages/ChooseCalendar/ChooseCalendar';
55
import SettingCalendar from './Pages/SettingCalendar/SettingCalendar';
66
import { createGlobalStyle } from 'styled-components';
77
import DraftYear from './Pages/DraftYear/DraftYear';
8+
import 'react-calendar/dist/Calendar.css';
89

910
const GobalStyle = createGlobalStyle`
1011
font-family: 'Roboto', sans-serif;

src/Components/Draft.styled.tsx

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import styled from 'styled-components'
2+
3+
export const DraftContainer = styled.div`
4+
5+
margin-top: 200px;
6+
display: flex;
7+
flex-wrap: wrap;
8+
`

src/Components/Draft.tsx

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React, { useState } from "react";
2+
import { Calendar } from "react-calendar";
3+
import { DraftContainer } from "./Draft.styled";
4+
5+
export default function Draft() {
6+
const [value, onChange] = useState(new Date());
7+
8+
return (
9+
<div>
10+
<div className='absolute bottom-0 left-0'>
11+
<DraftContainer>
12+
<Calendar onChange={onChange} value={value} />
13+
<Calendar onChange={onChange} value={value} />
14+
<Calendar onChange={onChange} value={value} />
15+
<Calendar onChange={onChange} value={value} />
16+
<Calendar onChange={onChange} value={value} />
17+
<Calendar onChange={onChange} value={value} />
18+
<Calendar onChange={onChange} value={value} />
19+
<Calendar onChange={onChange} value={value} />
20+
<Calendar onChange={onChange} value={value} />
21+
<Calendar onChange={onChange} value={value} />
22+
<Calendar onChange={onChange} value={value} />
23+
<Calendar onChange={onChange} value={value} />
24+
</DraftContainer>
25+
</div>
26+
</div>
27+
);
28+
}

src/Pages/ChooseCalendar/ChooseCalendar.tsx

-14
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,6 @@ const NewCalendar = styled.button`
1717

1818
function ChooseCalendar(){
1919

20-
// const card_render:React.FC = () => {
21-
// return(
22-
// <>
23-
// {
24-
// cards_dummy.map((item :Data)=>(
25-
// <div>
26-
// <CalendarCard name={item.name} year={item.year} create_date={item.create_date} recently_edited={item.recently_edited}/>
27-
// </div>
28-
29-
// ))
30-
// }
31-
// </>
32-
// )
33-
// }
3420
return(
3521
<>
3622
<NavBar />
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import styled from "styled-components";
2+
3+
export const InsertFile = styled.div`
4+
color: #f57f17;
5+
`;

src/Pages/DraftYear/DraftYear.tsx

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
import React from "react";
2+
import CalendarTodayOutlinedIcon from "@mui/icons-material/CalendarTodayOutlined";
3+
import InsertDriveFileOutlinedIcon from '@mui/icons-material/InsertDriveFileOutlined';
4+
25
import {
36
NavButton,
47
NavBarSt,
58
ButtonSave,
69
BackButton,
7-
}from '../SettingCalendar/SearchBar.styled'
10+
} from "../SettingCalendar/SearchBar.styled";
11+
import { InsertFile } from "./DraftYear.styled";
12+
import Draft from "../../Components/Draft";
813

914
const DraftYear: React.FC = () => {
1015
return (
1116
<div>
1217
<NavBarSt>
18+
<InsertFile>
19+
<InsertDriveFileOutlinedIcon />
20+
</InsertFile>
1321
<NavButton>
1422
<BackButton> Back</BackButton>
23+
<CalendarTodayOutlinedIcon />
1524
<ButtonSave>Save Changes</ButtonSave>
1625
</NavButton>
1726
</NavBarSt>
27+
{/* <Draft /> */}
1828
</div>
1929
);
2030
};

tailwind.config.js

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/** @type {import('tailwindcss').Config} */
2+
module.exports = {
3+
content: [
4+
"./src/**/*.{js,tsx,ts,tsx"
5+
],
6+
theme: {
7+
extend: {},
8+
},
9+
plugins: [],
10+
}

0 commit comments

Comments
 (0)