Skip to content

Commit

Permalink
Merge pull request #21 from NwinNwin/steven-creation+layout
Browse files Browse the repository at this point in the history
Steven creation+layout
  • Loading branch information
stevem-zhou authored Aug 22, 2023
2 parents 6221fcc + 918bc1e commit b0e8bfe
Show file tree
Hide file tree
Showing 11 changed files with 732 additions and 15 deletions.
145 changes: 145 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"@chakra-ui/react": "^2.6.1",
"@emotion/react": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@ionic/react": "^7.3.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
Expand All @@ -15,8 +16,10 @@
"firebase": "^9.23.0",
"firebase-auth": "^0.1.2",
"framer-motion": "^10.12.16",
"ionicons": "^7.1.2",
"leaflet": "^1.9.4",
"react": "^18.2.0",
"react-calendar": "^4.6.0",
"react-dom": "^18.2.0",
"react-icons": "^4.10.1",
"react-leaflet": "^4.2.1",
Expand Down
2 changes: 0 additions & 2 deletions src/components/AboutPage/AboutPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ export default function AboutPage() {
getData();
}, []);

console.log("data", data);

return (
<Flex
alignItems={"center"}
Expand Down
144 changes: 144 additions & 0 deletions src/components/CreateModal/Calendar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,144 @@
.react-calendar {
width: 100%;
max-width: 100%;
background: white;
border: 1px solid #a0a096;
font-family: Arial, Helvetica, sans-serif;
line-height: 1.125em;
}

.react-calendar--doubleView {
width: 100%;
}

.react-calendar--doubleView .react-calendar__viewContainer {
display: flex;
margin: -0.5em;
}

.react-calendar--doubleView .react-calendar__viewContainer > * {
width: 50%;
margin: 0.5em;
}

.react-calendar,
.react-calendar *,
.react-calendar *:before,
.react-calendar *:after {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}

.react-calendar button {
margin: 0;
border: 0;
outline: none;
}

.react-calendar button:enabled:hover {
cursor: pointer;
}

.react-calendar__navigation {
display: flex;
height: 44px;
margin-bottom: 1em;
}

.react-calendar__navigation button {
min-width: 44px;
background: none;
}

.react-calendar__navigation button:disabled {
background-color: #f0f0f0;
}

.react-calendar__navigation button:enabled:hover,
.react-calendar__navigation button:enabled:focus {
background-color: #e6e6e6;
}

.react-calendar__month-view__weekdays {
text-align: center;
text-transform: uppercase;
font-weight: bold;
font-size: 0.75em;
}

.react-calendar__month-view__weekdays__weekday {
padding: 0.5em;
}

.react-calendar__month-view__weekNumbers .react-calendar__tile {
display: flex;
align-items: center;
justify-content: center;
font-size: 0.75em;
font-weight: bold;
}

.react-calendar__month-view__days__day--weekend {
color: #d10000;
}

.react-calendar__month-view__days__day--neighboringMonth {
color: #757575;
}

.react-calendar__year-view .react-calendar__tile,
.react-calendar__decade-view .react-calendar__tile,
.react-calendar__century-view .react-calendar__tile {
padding: 2em 0.5em;
}

.react-calendar__tile {
max-width: 100%;
padding: 10px 6.6667px;
background: none;
text-align: center;
line-height: 16px;
}

.react-calendar__tile:disabled {
background-color: #f0f0f0;
}

.react-calendar__tile:enabled:hover,
.react-calendar__tile:enabled:focus {
background-color: #e6e6e6;
}

/* .react-calendar__tile--now {
background: #ffff76;
}
.react-calendar__tile--now:enabled:hover,
.react-calendar__tile--now:enabled:focus {
background: #ffffa9;
} */

.react-calendar__tile--hasActive {
background: #76baff;
}

.react-calendar__tile--hasActive:enabled:hover,
.react-calendar__tile--hasActive:enabled:focus {
background: #a9d4ff;
}

.react-calendar__tile--active {
background: #006edc;
color: white;
}

.react-calendar__tile--active:enabled:hover,
.react-calendar__tile--active:enabled:focus {
background: #1087ff;
}

.react-calendar--selectRange .react-calendar__tile--hover {
background-color: #e6e6e6;
}

Loading

0 comments on commit b0e8bfe

Please sign in to comment.