Commit 99a6f465 authored by JeongYeonwoo's avatar JeongYeonwoo
Browse files

머지했습니다!

parent 4f586830
...@@ -12,8 +12,8 @@ function Hello(props) { ...@@ -12,8 +12,8 @@ function Hello(props) {
<Navbar.Brand href="/homepage">YDK Messenger</Navbar.Brand> <Navbar.Brand href="/homepage">YDK Messenger</Navbar.Brand>
<div className='ml-1 mr-2' style={{ color: 'white' }}>{userName} 환영합니다</div> <div className='ml-1 mr-2' style={{ color: 'white' }}>{userName} 환영합니다</div>
<Nav className="mr-auto"> <Nav className="mr-auto">
<Nav.Link href="/homepage">Home</Nav.Link> <Nav.Link href="/home">Home</Nav.Link>
<Nav.Link href="/profilepage">Profile</Nav.Link> <Nav.Link href="/profile">Profile</Nav.Link>
<Nav.Link href="/hello">Hello</Nav.Link> <Nav.Link href="/hello">Hello</Nav.Link>
</Nav> </Nav>
{/* <Form inline> {/* <Form inline>
......
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Button, Form, Container, Navbar } from 'react-bootstrap'; import { Button, Form, Container, Navbar } from 'react-bootstrap';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import Menu from '../Components/Menu';
function LogIn() { function LogIn() {
const [validated, setValidated] = useState(false); const [validated, setValidated] = useState(false);
...@@ -18,7 +18,11 @@ function LogIn() { ...@@ -18,7 +18,11 @@ function LogIn() {
return ( return (
<> <>
<Menu /> <Navbar bg="dark" variant="dark">
<Navbar.Brand>YDK Messenger</Navbar.Brand>
</Navbar>
<Form noValidate validated={validated} onSubmit={handleSubmit}> <Form noValidate validated={validated} onSubmit={handleSubmit}>
<Container className="d-flex justify-content-center"> <Container className="d-flex justify-content-center">
<div className="mt-5 p-5 shadow w-75"> <div className="mt-5 p-5 shadow w-75">
...@@ -47,11 +51,11 @@ function LogIn() { ...@@ -47,11 +51,11 @@ function LogIn() {
</Form.Control.Feedback> </Form.Control.Feedback>
</Form.Group> </Form.Group>
<Link to="./homepage"> <Link to="./home">
<Button type="submit" variant="outline-success" size="lg" className="mr-4" block>로그인</Button> <Button type="submit" variant="outline-success" size="lg" className="mr-4" block>로그인</Button>
</Link> </Link>
<Link to="./signuppage"> <Link to="./signup">
<h6 type="button" className="text-right mt-2" style={{ cursor: 'pointer' }}>회원가입</h6> <h6 type="button" className="text-right mt-2" style={{ cursor: 'pointer' }}>회원가입</h6>
</Link> </Link>
</div> </div>
......
import React, { useState } from 'react'; import React, { useState } from 'react';
import { Button, Form, Container, Navbar } from 'react-bootstrap'; import { Button, Form, Container, Navbar } from 'react-bootstrap';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import Menu from '../Components/Menu';
function SingUp() { function SingUp() {
const [validated, setValidated] = useState(false); const [validated, setValidated] = useState(false);
...@@ -18,7 +18,9 @@ function SingUp() { ...@@ -18,7 +18,9 @@ function SingUp() {
return ( return (
<> <>
<Menu /> <Navbar bg="dark" variant="dark">
<Navbar.Brand>YDK Messenger</Navbar.Brand>
</Navbar>
<div> <div>
<Form noValidate validated={validated} onSubmit={handleSubmit}> <Form noValidate validated={validated} onSubmit={handleSubmit}>
......
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