Showing
5 changed files
with
66 additions
and
29 deletions
... | @@ -126,9 +126,10 @@ table { | ... | @@ -126,9 +126,10 @@ table { |
126 | /*Background random image: use unsplash api*/ | 126 | /*Background random image: use unsplash api*/ |
127 | html, | 127 | html, |
128 | body { | 128 | body { |
129 | - width:100vw; /* or % */ | 129 | + width: 100vw; /* or % */ |
130 | - height:100vh; /* or % */ | 130 | + height: 100vh; /* or % */ |
131 | - overflow-x: hidden; | 131 | + overflow-x: hidden; |
132 | + font-family: MapoGoldenPier; | ||
132 | } | 133 | } |
133 | body { | 134 | body { |
134 | width: 100%; | 135 | width: 100%; |
... | @@ -139,11 +140,19 @@ body { | ... | @@ -139,11 +140,19 @@ body { |
139 | 140 | ||
140 | /*SCROLL BAR DESIGN*/ | 141 | /*SCROLL BAR DESIGN*/ |
141 | body::-webkit-scrollbar { | 142 | body::-webkit-scrollbar { |
142 | - width: 10px; | 143 | + width: 10px; |
143 | - background: transparent; | 144 | + background: transparent; |
144 | - background-color: rgba(0, 0, 0, 0.5); | 145 | + background-color: rgba(0, 0, 0, 0.5); |
145 | } | 146 | } |
146 | body::-webkit-scrollbar-thumb { | 147 | body::-webkit-scrollbar-thumb { |
147 | background-color: #ffffff; | 148 | background-color: #ffffff; |
148 | border-radius: 10px; | 149 | border-radius: 10px; |
149 | } | 150 | } |
151 | + | ||
152 | +@font-face { | ||
153 | + font-family: "MapoGoldenPier"; | ||
154 | + src: url("https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/MapoGoldenPierA.woff") | ||
155 | + format("woff"); | ||
156 | + font-weight: normal; | ||
157 | + font-style: normal; | ||
158 | +} | ... | ... |
1 | -import React from 'react'; | 1 | +import React from "react"; |
2 | -import LandingPage from './pages/LandingPage.js'; | 2 | +import LandingPage from "./pages/LandingPage.js"; |
3 | -import MainPage from './pages/MainPage.js'; | 3 | +import MainPage from "./pages/MainPage.js"; |
4 | 4 | ||
5 | -import { | 5 | +import { BrowserRouter as Router, Switch, Route } from "react-router-dom"; |
6 | - BrowserRouter as Router, | 6 | +import { MuiThemeProvider, createMuiTheme } from "@material-ui/core/styles"; |
7 | - Switch, | ||
8 | - Route | ||
9 | -} from "react-router-dom"; | ||
10 | 7 | ||
8 | +const THEME = createMuiTheme({ | ||
9 | + typography: { | ||
10 | + "fontFamily": "MapoGoldenPier", | ||
11 | + } | ||
12 | +}); | ||
11 | 13 | ||
12 | function App() { | 14 | function App() { |
13 | return ( | 15 | return ( |
14 | - <Router> | 16 | + <MuiThemeProvider theme={THEME}> |
15 | - <> | 17 | + <Router> |
16 | <Switch> | 18 | <Switch> |
17 | - <Route exact path="/" component={LandingPage}/> | 19 | + <Route exact path="/" component={LandingPage} /> |
18 | - <Route exact path="/main" component={MainPage}/> | 20 | + <Route exact path="/main" component={MainPage} /> |
19 | </Switch> | 21 | </Switch> |
20 | - </> | 22 | + </Router> |
21 | - </Router> | 23 | + </MuiThemeProvider> |
22 | ); | 24 | ); |
23 | } | 25 | } |
24 | 26 | ||
25 | -export default App; | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
27 | +export default App; | ... | ... |
... | @@ -72,7 +72,6 @@ const useStyles = makeStyles((theme) => ({ | ... | @@ -72,7 +72,6 @@ const useStyles = makeStyles((theme) => ({ |
72 | 72 | ||
73 | export default function AddButton({ handleClose }) { | 73 | export default function AddButton({ handleClose }) { |
74 | const classes = useStyles(); | 74 | const classes = useStyles(); |
75 | - const initCk = new Array(3,0); | ||
76 | const [title, setTitle] = useState(""); | 75 | const [title, setTitle] = useState(""); |
77 | const [date, setDate] = useState(new Date()); | 76 | const [date, setDate] = useState(new Date()); |
78 | const [isPublic, setIsPublic] = useState(1); | 77 | const [isPublic, setIsPublic] = useState(1); |
... | @@ -82,7 +81,6 @@ export default function AddButton({ handleClose }) { | ... | @@ -82,7 +81,6 @@ export default function AddButton({ handleClose }) { |
82 | ]); | 81 | ]); |
83 | 82 | ||
84 | const addApi = (data) => { | 83 | const addApi = (data) => { |
85 | - console.log(data); | ||
86 | return fetch("/api/addcard", { | 84 | return fetch("/api/addcard", { |
87 | method: "POST", | 85 | method: "POST", |
88 | headers: { | 86 | headers: { | ... | ... |
... | @@ -72,7 +72,6 @@ export default function TodoCard({ data, isMine}) { | ... | @@ -72,7 +72,6 @@ export default function TodoCard({ data, isMine}) { |
72 | {checkState.reduce((a, b) => a + b)}/{checkState.length} | 72 | {checkState.reduce((a, b) => a + b)}/{checkState.length} |
73 | </Typography> | 73 | </Typography> |
74 | {todo.map((item, idx) => { | 74 | {todo.map((item, idx) => { |
75 | - console.log(item); | ||
76 | return ( | 75 | return ( |
77 | <FormControlLabel | 76 | <FormControlLabel |
78 | className={classes.checkBox} | 77 | className={classes.checkBox} | ... | ... |
1 | import React from "react"; | 1 | import React from "react"; |
2 | +import { makeStyles } from "@material-ui/core/styles"; | ||
2 | 3 | ||
3 | -function App() { | 4 | +const useStyles = makeStyles((theme) =>({ |
5 | + root: { | ||
6 | + position:"fixed", | ||
7 | + minHeight:"100vh", | ||
8 | + minWidth:"100vw", | ||
9 | + backgroundColor: "rgba(0,0,0,0.5)", | ||
10 | + padding:0, | ||
11 | + }, | ||
12 | + title:{ | ||
13 | + color:"white", | ||
14 | + fontSize: 50, | ||
15 | + textAlign:"center", | ||
16 | + marginLeft : "auto", | ||
17 | + marginRight : "auto", | ||
18 | + marginTop:"15%", | ||
19 | + width: "15rem" | ||
20 | + }, | ||
21 | + content:{ | ||
22 | + color:"white", | ||
23 | + textAlign:"center", | ||
24 | + marginTop:"1rem", | ||
25 | + marginLeft : "auto", | ||
26 | + marginRight : "auto", | ||
27 | + width: "20rem" | ||
28 | + } | ||
29 | +})); | ||
30 | + | ||
31 | +export default function LandingPage() { | ||
32 | + const classes = useStyles(); | ||
4 | return ( | 33 | return ( |
5 | - <> | 34 | + <div className={classes.root}> |
6 | - </> | 35 | + <p className={classes.title}>Do-gether</p> |
36 | + <p className={classes.content}>Sharing your TODO-LIST with others!</p> | ||
37 | + </div> | ||
7 | ); | 38 | ); |
8 | } | 39 | } |
9 | - | ||
10 | -export default App; | ... | ... |
-
Please register or login to post a comment