정성훈 / MEALKHU

Go to a project
Toggle navigation Toggle navigation pinning
swa07016
bcf9d9e7 1 parent b608656a

한글 웹폰트 적용

Inline Side-by-side
Showing 4 changed files with 26 additions and 6 deletions
1 node_modules 1 node_modules
2 -json_datas.json
...\ No newline at end of file ...\ No newline at end of file
2 +json_datas.json
3 +client/public/images
4 +client/node_modules
...\ No newline at end of file ...\ No newline at end of file
......
1 -<!DOCTYPE html> 1 +<!DOCTYPE html>
2 <html lang="en" style="margin: 0; 2 <html lang="en" style="margin: 0;
3 height: 100%; 3 height: 100%;
4 -
5 "> 4 ">
6 <head> 5 <head>
7 <meta charset="utf-8" /> 6 <meta charset="utf-8" />
7 + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
8 <link rel="icon" href="%PUBLIC_URL%/fork.ico" /> 8 <link rel="icon" href="%PUBLIC_URL%/fork.ico" />
9 <meta name="viewport" content="width=device-width, initial-scale=1" /> 9 <meta name="viewport" content="width=device-width, initial-scale=1" />
10 <meta name="theme-color" content="#000000" /> 10 <meta name="theme-color" content="#000000" />
...@@ -28,10 +28,15 @@ height: 100%; ...@@ -28,10 +28,15 @@ height: 100%;
28 Learn how to configure a non-root public URL by running `npm run build`. 28 Learn how to configure a non-root public URL by running `npm run build`.
29 --> 29 -->
30 <title>MEALKHU</title> 30 <title>MEALKHU</title>
31 + <link href="https://fonts.googleapis.com/css?family=Do+Hyeon:400" rel="stylesheet">
32 + <style>
33 + #root{font-family: 'Do Hyeon', sans-serif;}
34 + </style>
31 </head> 35 </head>
32 <body style="width : 100%; height:100%; margin: 0;"> 36 <body style="width : 100%; height:100%; margin: 0;">
33 <noscript>You need to enable JavaScript to run this app.</noscript> 37 <noscript>You need to enable JavaScript to run this app.</noscript>
34 <div id="root" style="width : 100%; height:100%;"></div> 38 <div id="root" style="width : 100%; height:100%;"></div>
39 + <h1>안녕</h1>
35 <!-- 40 <!--
36 This HTML file is a template. 41 This HTML file is a template.
37 If you open it directly in the browser, you will see an empty page. 42 If you open it directly in the browser, you will see an empty page.
......
...@@ -15,7 +15,6 @@ const MealCard = (props) => { ...@@ -15,7 +15,6 @@ const MealCard = (props) => {
15 15
16 <CardImg 16 <CardImg
17 top width="100%" 17 top width="100%"
18 - onerror="this.src='https://pngimage.net/wp-content/uploads/2018/06/no-image-available-icon-png-8.png'"
19 src={props.img} alt="Card image cap" /> 18 src={props.img} alt="Card image cap" />
20 <CardBody> 19 <CardBody>
21 <CardTitle><strong>{props.name}</strong></CardTitle> 20 <CardTitle><strong>{props.name}</strong></CardTitle>
...@@ -40,7 +39,7 @@ const MealCard = (props) => { ...@@ -40,7 +39,7 @@ const MealCard = (props) => {
40 'float':'left', 39 'float':'left',
41 'fontSize': '14px' 40 'fontSize': '14px'
42 }}> 41 }}>
43 - View more 42 + view more
44 </span> 43 </span>
45 <FontAwesomeIcon style={{ 44 <FontAwesomeIcon style={{
46 'color': 'black', 45 'color': 'black',
......
1 import React, { useState, useEffect } from 'react'; 1 import React, { useState, useEffect } from 'react';
2 import NavBar from '../components/NavBar'; 2 import NavBar from '../components/NavBar';
3 import MealCard from '../components/MealCard'; 3 import MealCard from '../components/MealCard';
4 +import { CustomInput, Form, FormGroup, Label } from 'reactstrap';
4 import { Container, Row, Col } from "reactstrap"; 5 import { Container, Row, Col } from "reactstrap";
5 import axios from 'axios'; 6 import axios from 'axios';
6 7
8 +
9 +
7 const MenuPage = (props) => { 10 const MenuPage = (props) => {
8 const [datas, setDatas] = useState([]); 11 const [datas, setDatas] = useState([]);
9 const [isLoading, setIsLoading] = useState(false); 12 const [isLoading, setIsLoading] = useState(false);
10 useEffect(() => { 13 useEffect(() => {
11 const fetchData = async () => { 14 const fetchData = async () => {
12 const result = await axios( 15 const result = await axios(
13 - 'http://192.168.0.2:5000/api/datas', 16 + 'http://localhost:5000/api/datas',
14 // localhost로 바꾸기 17 // localhost로 바꾸기
15 ); 18 );
16 setDatas(result.data); 19 setDatas(result.data);
...@@ -24,6 +27,17 @@ const MenuPage = (props) => { ...@@ -24,6 +27,17 @@ const MenuPage = (props) => {
24 <> 27 <>
25 <NavBar/> 28 <NavBar/>
26 <Container> 29 <Container>
30 +
31 + {/* ???????? ???? */}
32 + {/* <FormGroup>
33 + <Label for="exampleCheckbox">??</Label>
34 + <div>
35 + <CustomInput type="checkbox" id="exampleCustomInline" label="??" inline />
36 +
37 + </div>
38 + </FormGroup> */}
39 + </Container>
40 + <Container>
27 <Row xs="2" sm="2" md="4"> 41 <Row xs="2" sm="2" md="4">
28 42
29 { 43 {
......