Commit c5c2b1e1 authored by KangMin An's avatar KangMin An
Browse files

Merge branch 'who' into premaster

parents e8d4c3a3 2426975f
...@@ -24,6 +24,7 @@ function Donation() { ...@@ -24,6 +24,7 @@ function Donation() {
color: 'rgb(110, 189, 142)', color: 'rgb(110, 189, 142)',
borderColor: 'rgba(195, 195, 195, 0.753)', borderColor: 'rgba(195, 195, 195, 0.753)',
borderRadius: '20px', borderRadius: '20px',
fontSize: '1em'
} }
const [donateShow, setDonateShow] = useState(false); const [donateShow, setDonateShow] = useState(false);
...@@ -58,7 +59,7 @@ function Donation() { ...@@ -58,7 +59,7 @@ function Donation() {
이용하시는데 불편함이 없도록 광고 없이 운영하고 있습니다. <br /> 이용하시는데 불편함이 없도록 광고 없이 운영하고 있습니다. <br />
서버비용 충당 후원금이 남을시 UNICEF 기부하겠습니다. 서버비용 충당 후원금이 남을시 UNICEF 기부하겠습니다.
</Card.Subtitle> </Card.Subtitle>
<Row className='my-2 d-flex justify-content-center'> <Row className='py-3 d-flex justify-content-center'>
<Button variant='light' style={btnstyled2} onClick={() => setDonateShow(true)}> <Button variant='light' style={btnstyled2} onClick={() => setDonateShow(true)}>
후원하기 후원하기
</Button> </Button>
...@@ -88,7 +89,7 @@ function Donation() { ...@@ -88,7 +89,7 @@ function Donation() {
margin: '5px', margin: '5px',
maxWidth: 'fit-content', maxWidth: 'fit-content',
borderWidth: '2px', borderWidth: '2px',
fontSize: '14px', // fontSize: '14px',
color: 'black', color: 'black',
border: 'none', border: 'none',
whiteSpace: 'nowrap' whiteSpace: 'nowrap'
......
import React, { useEffect } from 'react' import React, { useEffect } from 'react'
import { Row, Card, Col } from 'react-bootstrap'; import { Row, Card, Col } from 'react-bootstrap';
import { isLogined } from '../utils/Auth';
function EueSuggest() { function EueSuggest() {
...@@ -15,7 +16,6 @@ function EueSuggest() { ...@@ -15,7 +16,6 @@ function EueSuggest() {
color: '#04AB70' color: '#04AB70'
} }
return ( return (
<Row className='text-center w-100 my-2'> <Row className='text-center w-100 my-2'>
<Card style={cardstyled}> <Card style={cardstyled}>
...@@ -26,7 +26,15 @@ function EueSuggest() { ...@@ -26,7 +26,15 @@ function EueSuggest() {
</p> </p>
</Card.Title> </Card.Title>
<Card.Text> <Card.Text>
"에어컨을 줄이시면 더 효율적입니다." {isLogined() ?
<>
에어컨을 줄이시면 효율적입니다.
</>
:
<>
로그인 사용가능합니다.
</>
}
</Card.Text> </Card.Text>
</Card> </Card>
......
import React from 'react' import React from 'react'
import { Spinner, Row, Button } from 'react-bootstrap'; import { Spinner, Button } from 'react-bootstrap';
function Loading() { function Loading() {
return ( return (
......
...@@ -63,10 +63,10 @@ function LoginComp() { ...@@ -63,10 +63,10 @@ function LoginComp() {
<Row className='text-center w-100 my-2'> <Row className='text-center w-100 my-2'>
<Card style={cardstyled}> <Card style={cardstyled}>
<Card.Title id='impactTitle'> <Card.Title id='impactTitle'>
LOGIN 로그인
</Card.Title> </Card.Title>
<Card.Subtitle style={{ fontWeight: 'lighter' }}> <Card.Subtitle style={{ fontWeight: 'lighter' }}>
Log in with your social media account or email address 이메일 또는 소셜미디어로 로그인하세요
</Card.Subtitle> </Card.Subtitle>
<hr /> <hr />
<Card.Text> <Card.Text>
...@@ -97,7 +97,7 @@ function LoginComp() { ...@@ -97,7 +97,7 @@ function LoginComp() {
<Form.Control type="email" placeholder="Email" onChange={handleChange} required /> <Form.Control type="email" placeholder="Email" onChange={handleChange} required />
</FloatingLabel> </FloatingLabel>
<Button variant='light' className='mt-3' id='formbtn' type='submit'> <Button variant='light' className='mt-3' id='formbtn' type='submit'>
LOGIN 로그인
</Button> </Button>
</Form> </Form>
......
import React from 'react' import React from 'react'
import { Button, Image, Row, ButtonGroup, Form, Col } from 'react-bootstrap'; import { Button, Image, Row, ButtonGroup, Col } from 'react-bootstrap';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import '../App.css' import '../App.css'
import UserInfo from './UserInfo'; import UserInfo from './UserInfo';
import { kakaoLogout } from '../utils/Oauth'; import { kakaoLogout } from '../utils/Oauth';
import UsingAircon from './UsingAircon'; import UsingAircon from './UsingAircon';
import { isLogined, localLogout } from '../utils/Auth'; import { isLogined, localLogout } from '../utils/Auth';
import TimeNow from './TimeNow';
function MainLayer() { function MainLayer() {
...@@ -40,9 +41,11 @@ function MainLayer() { ...@@ -40,9 +41,11 @@ function MainLayer() {
<Link to='/' className='p-0 m-auto'> <Link to='/' className='p-0 m-auto'>
<Image src='/images/EUE11.jpg' alt='EUE' style={boxstyled} /> <Image src='/images/EUE11.jpg' alt='EUE' style={boxstyled} />
</Link> </Link>
</Row> </Row>
<Row className='m-auto d-flex justify-content-center w-100'> <Row className='m-auto d-flex justify-content-center w-100'>
<TimeNow />
<UserInfo /> <UserInfo />
</Row> </Row>
...@@ -74,6 +77,7 @@ function MainLayer() { ...@@ -74,6 +77,7 @@ function MainLayer() {
} }
</ButtonGroup> </ButtonGroup>
</Row> </Row>
<Row className='m-auto justify-content-center w-100' id='contour'> <Row className='m-auto justify-content-center w-100' id='contour'>
| |
......
import React, { useEffect, useState } from 'react' import React, { useState } from 'react'
import '../App.css' import '../App.css'
import { Form, Button, Row, Col, Card, Alert, FloatingLabel } from 'react-bootstrap'; import { Form, Button, Row, Col, Card, Alert, FloatingLabel } from 'react-bootstrap';
import { LoginWithKakao } from '../utils/Oauth'; import { LoginWithKakao } from '../utils/Oauth';
...@@ -58,10 +58,10 @@ function SignupComp() { ...@@ -58,10 +58,10 @@ function SignupComp() {
<Row className='text-center w-100 my-2'> <Row className='text-center w-100 my-2'>
<Card style={cardstyled}> <Card style={cardstyled}>
<Card.Title id='impactTitle'> <Card.Title id='impactTitle'>
Create an Account 계정 생성하기
</Card.Title> </Card.Title>
<Card.Subtitle style={{ fontWeight: 'lighter' }}> <Card.Subtitle style={{ fontWeight: 'lighter' }}>
Sign up with your social media account or email address 이메일 또는 소셜미디어로 계정을 생성하세요
</Card.Subtitle> </Card.Subtitle>
<hr /> <hr />
<Card.Text> <Card.Text>
...@@ -113,7 +113,7 @@ function SignupComp() { ...@@ -113,7 +113,7 @@ function SignupComp() {
</FloatingLabel> </FloatingLabel>
<Button variant='light' className='mt-3' id='formbtn' type='submit'> <Button variant='light' className='mt-3' id='formbtn' type='submit'>
Sign Up 회원가입
</Button> </Button>
</Form> </Form>
......
import React from "react"; import React from "react";
import { Row, Card } from "react-bootstrap"; import { Row, Col } from "react-bootstrap";
import Clock from "react-live-clock"; import Clock from "react-live-clock";
import "../App.css"; import "../App.css";
function TimeNow() { function TimeNow() {
const cardstyled = { const cardstyled = {
margin: "auto", margin: "auto",
padding: "1em", padding: "0.5em",
display: "flex", display: "flex",
justifyContent: "center", justifyContent: "center",
width: "100%", width: "100%",
borderWidth: "3px", border: 'none',
borderRadius: "20px", flexDirection: 'column',
borderColor: "rgb(110, 189, 142)", color: "rgb(70, 70, 70) ",
color: "#04AB70", fontWeight: '300'
}; };
return ( return (
<Row className="text-center w-100 my-2"> <Row className="text-center w-100" style={cardstyled}>
<Card style={cardstyled}> <Col className='d-flex justify-content-center'>
<Card.Title>
<p>현재시각</p>
</Card.Title>
<Card.Text>
<Clock format={"Y년 M월 D일"} /> <Clock format={"Y년 M월 D일"} />
<br /> </Col>
<Col className='d-flex justify-content-center'>
<Clock <Clock
format={"HH : mm : ss"} format={"HH : mm : ss"}
ticking={true} ticking={true}
timezone={"Asia/Seoul"} timezone={"Asia/Seoul"}
/> />
</Card.Text> </Col>
</Card>
</Row> </Row>
); );
} }
......
...@@ -50,7 +50,7 @@ function UserInfo() { ...@@ -50,7 +50,7 @@ function UserInfo() {
const btMs = endDate.getTime() - stDate.getTime() // 주어진 날짜 사이의 경과 시간 (밀리 초) const btMs = endDate.getTime() - stDate.getTime() // 주어진 날짜 사이의 경과 시간 (밀리 초)
const btDay = btMs / (1000 * 60 * 60 * 24) // -> 일 const btDay = btMs / (1000 * 60 * 60 * 24) // Ms -> 일
setCreatedTime(btDay) setCreatedTime(btDay)
} }
...@@ -80,7 +80,7 @@ function UserInfo() { ...@@ -80,7 +80,7 @@ function UserInfo() {
return ( return (
<Col className='text-center pt-3 pb-2 px-0'> <Col className='text-center pb-2 px-0'>
<Card style={cardstyled} id='localName'> <Card style={cardstyled} id='localName'>
<Card.Title> <Card.Title>
<strong> <strong>
...@@ -90,7 +90,7 @@ function UserInfo() { ...@@ -90,7 +90,7 @@ function UserInfo() {
</h3> </h3>
: :
<h3> <h3>
GUEST
</h3> </h3>
} }
</strong> </strong>
......
import React, { useEffect, useState } from 'react' import React, { useEffect, useState } from 'react'
import { Container, Row, Col, Modal } from 'react-bootstrap'; import { Container, Row, Col, Modal } from 'react-bootstrap';
import MainLayer from '../components/MainLayer'; import MainLayer from '../components/MainLayer';
import TimeNow from './../components/TimeNow';
import '../App.css' import '../App.css'
import EueSuggest from '../components/EueSuggest'; import EueSuggest from '../components/EueSuggest';
import ChartLine from '../components/ChartLine'; import ChartLine from '../components/ChartLine';
...@@ -9,6 +8,7 @@ import ChartDoughnut from '../components/ChartDoughnut'; ...@@ -9,6 +8,7 @@ import ChartDoughnut from '../components/ChartDoughnut';
import Donation from '../components/Donation'; import Donation from '../components/Donation';
import LocCodeChange from '../components/LocCodeChange'; import LocCodeChange from '../components/LocCodeChange';
import { callUserInfo } from '../utils/CheckDB'; import { callUserInfo } from '../utils/CheckDB';
import { isLogined } from './../utils/Auth';
function GetLocFirst() { function GetLocFirst() {
const constyled = { const constyled = {
...@@ -32,27 +32,25 @@ function GetLocFirst() { ...@@ -32,27 +32,25 @@ function GetLocFirst() {
padding: '0' padding: '0'
} }
const [existLoc, setExistLoc] = useState('')
const [show, setShow] = useState(false) const [show, setShow] = useState(false)
useEffect(() => { useEffect(() => {
callUserInfo().then((res) => { callUserInfo().then((res) => {
setExistLoc(res[0]['loc_code']) if (isLogined()) {
}) const existLoc = res[0]['loc_code']
}, []) if (existLoc === null) {
useEffect(() => {
if (existLoc === '') {
setTimeout(function () { setTimeout(function () {
setShow(true) setShow(true)
}, 1500) }, 1000)
} }
else { else {
setShow(false) console.log('Already has Loc_code')
window.location.replace('/') window.location.replace('/')
} }
}, [existLoc]) }
})
}, [])
return ( return (
...@@ -67,7 +65,6 @@ function GetLocFirst() { ...@@ -67,7 +65,6 @@ function GetLocFirst() {
</Col> </Col>
<Col md={6} style={col2sty}> <Col md={6} style={col2sty}>
<TimeNow />
<EueSuggest /> <EueSuggest />
<ChartLine /> <ChartLine />
<ChartDoughnut /> <ChartDoughnut />
......
import React from 'react' import React from 'react'
import { Container, Row, Col } from 'react-bootstrap'; import { Container, Row, Col } from 'react-bootstrap';
import MainLayer from '../components/MainLayer'; import MainLayer from '../components/MainLayer';
import TimeNow from './../components/TimeNow';
import '../App.css' import '../App.css'
import EueSuggest from '../components/EueSuggest'; import EueSuggest from '../components/EueSuggest';
import ChartLine from '../components/ChartLine'; import ChartLine from '../components/ChartLine';
...@@ -43,7 +42,6 @@ function Home() { ...@@ -43,7 +42,6 @@ function Home() {
</Col> </Col>
<Col md={6} style={col2sty}> <Col md={6} style={col2sty}>
<TimeNow />
<EueSuggest /> <EueSuggest />
<ChartLine /> <ChartLine />
<ChartDoughnut /> <ChartDoughnut />
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment