Skip to content

Commit b0e8bfe

Browse files
authored
Merge pull request #21 from NwinNwin/steven-creation+layout
Steven creation+layout
2 parents 6221fcc + 918bc1e commit b0e8bfe

File tree

11 files changed

+732
-15
lines changed

11 files changed

+732
-15
lines changed

package-lock.json

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

package.json

+3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"@chakra-ui/react": "^2.6.1",
88
"@emotion/react": "^11.11.0",
99
"@emotion/styled": "^11.11.0",
10+
"@ionic/react": "^7.3.0",
1011
"@testing-library/jest-dom": "^5.16.5",
1112
"@testing-library/react": "^13.4.0",
1213
"@testing-library/user-event": "^13.5.0",
@@ -15,8 +16,10 @@
1516
"firebase": "^9.23.0",
1617
"firebase-auth": "^0.1.2",
1718
"framer-motion": "^10.12.16",
19+
"ionicons": "^7.1.2",
1820
"leaflet": "^1.9.4",
1921
"react": "^18.2.0",
22+
"react-calendar": "^4.6.0",
2023
"react-dom": "^18.2.0",
2124
"react-icons": "^4.10.1",
2225
"react-leaflet": "^4.2.1",

src/components/AboutPage/AboutPage.jsx

-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ export default function AboutPage() {
3434
getData();
3535
}, []);
3636

37-
console.log("data", data);
38-
3937
return (
4038
<Flex
4139
alignItems={"center"}
+144
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
.react-calendar {
2+
width: 100%;
3+
max-width: 100%;
4+
background: white;
5+
border: 1px solid #a0a096;
6+
font-family: Arial, Helvetica, sans-serif;
7+
line-height: 1.125em;
8+
}
9+
10+
.react-calendar--doubleView {
11+
width: 100%;
12+
}
13+
14+
.react-calendar--doubleView .react-calendar__viewContainer {
15+
display: flex;
16+
margin: -0.5em;
17+
}
18+
19+
.react-calendar--doubleView .react-calendar__viewContainer > * {
20+
width: 50%;
21+
margin: 0.5em;
22+
}
23+
24+
.react-calendar,
25+
.react-calendar *,
26+
.react-calendar *:before,
27+
.react-calendar *:after {
28+
-moz-box-sizing: border-box;
29+
-webkit-box-sizing: border-box;
30+
box-sizing: border-box;
31+
}
32+
33+
.react-calendar button {
34+
margin: 0;
35+
border: 0;
36+
outline: none;
37+
}
38+
39+
.react-calendar button:enabled:hover {
40+
cursor: pointer;
41+
}
42+
43+
.react-calendar__navigation {
44+
display: flex;
45+
height: 44px;
46+
margin-bottom: 1em;
47+
}
48+
49+
.react-calendar__navigation button {
50+
min-width: 44px;
51+
background: none;
52+
}
53+
54+
.react-calendar__navigation button:disabled {
55+
background-color: #f0f0f0;
56+
}
57+
58+
.react-calendar__navigation button:enabled:hover,
59+
.react-calendar__navigation button:enabled:focus {
60+
background-color: #e6e6e6;
61+
}
62+
63+
.react-calendar__month-view__weekdays {
64+
text-align: center;
65+
text-transform: uppercase;
66+
font-weight: bold;
67+
font-size: 0.75em;
68+
}
69+
70+
.react-calendar__month-view__weekdays__weekday {
71+
padding: 0.5em;
72+
}
73+
74+
.react-calendar__month-view__weekNumbers .react-calendar__tile {
75+
display: flex;
76+
align-items: center;
77+
justify-content: center;
78+
font-size: 0.75em;
79+
font-weight: bold;
80+
}
81+
82+
.react-calendar__month-view__days__day--weekend {
83+
color: #d10000;
84+
}
85+
86+
.react-calendar__month-view__days__day--neighboringMonth {
87+
color: #757575;
88+
}
89+
90+
.react-calendar__year-view .react-calendar__tile,
91+
.react-calendar__decade-view .react-calendar__tile,
92+
.react-calendar__century-view .react-calendar__tile {
93+
padding: 2em 0.5em;
94+
}
95+
96+
.react-calendar__tile {
97+
max-width: 100%;
98+
padding: 10px 6.6667px;
99+
background: none;
100+
text-align: center;
101+
line-height: 16px;
102+
}
103+
104+
.react-calendar__tile:disabled {
105+
background-color: #f0f0f0;
106+
}
107+
108+
.react-calendar__tile:enabled:hover,
109+
.react-calendar__tile:enabled:focus {
110+
background-color: #e6e6e6;
111+
}
112+
113+
/* .react-calendar__tile--now {
114+
background: #ffff76;
115+
}
116+
117+
.react-calendar__tile--now:enabled:hover,
118+
.react-calendar__tile--now:enabled:focus {
119+
background: #ffffa9;
120+
} */
121+
122+
.react-calendar__tile--hasActive {
123+
background: #76baff;
124+
}
125+
126+
.react-calendar__tile--hasActive:enabled:hover,
127+
.react-calendar__tile--hasActive:enabled:focus {
128+
background: #a9d4ff;
129+
}
130+
131+
.react-calendar__tile--active {
132+
background: #006edc;
133+
color: white;
134+
}
135+
136+
.react-calendar__tile--active:enabled:hover,
137+
.react-calendar__tile--active:enabled:focus {
138+
background: #1087ff;
139+
}
140+
141+
.react-calendar--selectRange .react-calendar__tile--hover {
142+
background-color: #e6e6e6;
143+
}
144+

0 commit comments

Comments
 (0)