Skip to content

GitLab

Commit ded7f980 authored by Ha YeaJin's avatar Ha YeaJin
Browse files

비염 너무 힘드러

parent 9e22fd14
Show whitespace changes
Inline Side-by-side
server/client/src/Components/Menu.js
View file @ ded7f980
...@@ -41,7 +41,7 @@ function Menu() { ...@@ -41,7 +41,7 @@ function Menu() {
if (state) return <Redirect to="/" /> if (state) return <Redirect to="/" />
return ( return (
<MENU expand="md" variant="dark"> <MENU expand="md" variant="dark">
<Navbar.Brand href="#">대관 서비스</Navbar.Brand> <Navbar.Brand as={Link} to="/home">대관 서비스</Navbar.Brand>
<Navbar.Toggle aria-controls="basic-navbar-nav" /> <Navbar.Toggle aria-controls="basic-navbar-nav" />
<Navbar.Collapse id="basic-navbar-nav"> <Navbar.Collapse id="basic-navbar-nav">
<Nav className="mr-auto"> <Nav className="mr-auto">
......
server/client/src/Pages/ApplyPage.js
View file @ ded7f980
...@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react'; ...@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react';
import { Formik, Field, ErrorMessage, FieldArray } from 'formik'; import { Formik, Field, ErrorMessage, FieldArray } from 'formik';
import Menu from '../Components/Menu'; import Menu from '../Components/Menu';
import axios from 'axios'; import axios from 'axios';
import 'bootstrap/dist/css/bootstrap.css';
import * as Yup from 'yup'; import * as Yup from 'yup';
import { Redirect } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import { Col, Container, Row } from 'react-bootstrap';
function Apply(props) { function Apply(props) {
const [state, setState] = useState(); const [state, setState] = useState();
...@@ -41,7 +41,6 @@ function Apply(props) { ...@@ -41,7 +41,6 @@ function Apply(props) {
<option value="2">2시간</option> <option value="2">2시간</option>
<option value="3">3시간</option> <option value="3">3시간</option>
</Field>) </Field>)
} }
function getUser() { function getUser() {
...@@ -63,6 +62,9 @@ function Apply(props) { ...@@ -63,6 +62,9 @@ function Apply(props) {
return ( return (
<div> <div>
<Menu /> <Menu />
<Container fluid>
<Row className="justify-content-center">
<Col md={5}>
<Formik <Formik
initialValues={{ initialValues={{
_id: `${props.match.params.id}`, _id: `${props.match.params.id}`,
...@@ -117,14 +119,14 @@ function Apply(props) { ...@@ -117,14 +119,14 @@ function Apply(props) {
getFieldProps, getFieldProps,
isSubmitting, isSubmitting,
}) => ( }) => (
<div className="row justify-content-center align-items-center"> <form onSubmit={handleSubmit} className="d-flex flex-column">
<form onSubmit={handleSubmit} className="col-sm-3"> <h3 className="form-group font-weight-bold">
<div className="form-group mb-4"> <label className="pr-2 ">대표자 :</label>{user.name}
<label>대표자</label> </h3>
<div>{user.name}</div>
</div> <div className="form-group">
<div className="form-group mb-4">
<label>신청날짜</label> <div className={touched.date && errors.date ? "text-danger" : ""}>신청날짜</div>
<input <input
className={(touched.date && errors.date ? 'form-control is-invalid' : "form-control")} className={(touched.date && errors.date ? 'form-control is-invalid' : "form-control")}
type="text" type="text"
...@@ -132,12 +134,11 @@ function Apply(props) { ...@@ -132,12 +134,11 @@ function Apply(props) {
{...getFieldProps('date')} {...getFieldProps('date')}
placeholder="yyyy-mm-dd" placeholder="yyyy-mm-dd"
/> />
{touched.date && errors.date ? (
<div className="invalid-feedback text-left">{errors.date}</div>
) : null}
</div> </div>
<div className="form-group mb-4"> <div className="form-group mb-4">
<label>이용시작시간</label> <label>이용시작시간</label>
<div>
<Field as="select" name="starttime"> <Field as="select" name="starttime">
<option value="">이용시작시간</option> <option value="">이용시작시간</option>
<option value="9">9시</option> <option value="9">9시</option>
...@@ -155,12 +156,17 @@ function Apply(props) { ...@@ -155,12 +156,17 @@ function Apply(props) {
<option value="21">21시</option> <option value="21">21시</option>
</Field> </Field>
</div> </div>
</div>
<div className="form-group mb-4"> <div className="form-group mb-4">
<label>이용시간</label> <label>이용시간</label>
<div>
{time(values.starttime)} {time(values.starttime)}
</div> </div>
</div>
<div className="form-group mb-4"> <div className="form-group mb-4">
<label>강의실</label> <div className={touched.room && errors.room ? "text-danger" : ""}>강의실</div>
<input <input
className={(touched.room && errors.room ? 'form-control is-invalid' : "form-control")} className={(touched.room && errors.room ? 'form-control is-invalid' : "form-control")}
type="text" type="text"
...@@ -168,12 +174,10 @@ function Apply(props) { ...@@ -168,12 +174,10 @@ function Apply(props) {
{...getFieldProps('room')} {...getFieldProps('room')}
placeholder="bn-nnn" placeholder="bn-nnn"
/> />
{touched.room && errors.room ? (
<div className="invalid-feedback text-left">{errors.room}</div>
) : null}
</div> </div>
<div className="form-group mb-4"> <div className="form-group mb-4">
<label>대관목적</label> <div className={touched.reason && errors.reason ? "text-danger" : ""}>대관 목적</div>
<input <input
className={(touched.reason && errors.reason ? 'form-control is-invalid' : "form-control")} className={(touched.reason && errors.reason ? 'form-control is-invalid' : "form-control")}
type="text" type="text"
...@@ -181,10 +185,8 @@ function Apply(props) { ...@@ -181,10 +185,8 @@ function Apply(props) {
{...getFieldProps('reason')} {...getFieldProps('reason')}
placeholder="대관목적을 입력해 주세요." placeholder="대관목적을 입력해 주세요."
/> />
{touched.reason && errors.reason ? (
<div className="invalid-feedback text-left">{errors.reason}</div>
) : null}
</div> </div>
<div className="form-group mb-4"> <div className="form-group mb-4">
<FieldArray name="students"> <FieldArray name="students">
{({ insert, remove, push }) => ( {({ insert, remove, push }) => (
...@@ -192,8 +194,7 @@ function Apply(props) { ...@@ -192,8 +194,7 @@ function Apply(props) {
<label>이용자</label> <label>이용자</label>
{ {
values.students.map((student, index) => ( values.students.map((student, index) => (
<div className="row" key={index}> <Row key={index}>
<div className="col">
<Field <Field
name={`students.${index}.member`} name={`students.${index}.member`}
placeholder="이용자 성함을 입력하세요." placeholder="이용자 성함을 입력하세요."
...@@ -208,19 +209,14 @@ function Apply(props) { ...@@ -208,19 +209,14 @@ function Apply(props) {
type="button" type="button"
className="secondary" className="secondary"
onClick={() => remove(index)} onClick={() => remove(index)}
> >X</button>
X </Row>
</button>
</div>
</div>
))} ))}
<button <button
type="button" type="button"
className="btn btn-primary" className="btn btn-primary"
onClick={() => push({ member: '' })} onClick={() => push({ member: '' })}
> >추가</button>
추가
</button>
</div> </div>
)} )}
</FieldArray> </FieldArray>
...@@ -229,9 +225,12 @@ function Apply(props) { ...@@ -229,9 +225,12 @@ function Apply(props) {
신청하기 신청하기
</button> </button>
</form> </form>
</div>
)} )}
</Formik> </Formik>
</Col>
</Row>
</Container>
</div> </div>
) )
} }
......
server/client/src/Pages/SignupPage.js
View file @ ded7f980
...@@ -25,11 +25,6 @@ const Wow = styled.div` ...@@ -25,11 +25,6 @@ const Wow = styled.div`
content: '비밀번호가 일치하지 않습니다.'; content: '비밀번호가 일치하지 않습니다.';
color: red; color: red;
} }
& .asd {
display: flex;
flex-direction: column;
}
` `
function Signup() { function Signup() {
...@@ -91,7 +86,7 @@ function Signup() { ...@@ -91,7 +86,7 @@ function Signup() {
getFieldProps, // contain values, handleChange, handleBlur getFieldProps, // contain values, handleChange, handleBlur
isSubmitting, isSubmitting,
}) => ( }) => (
< form onSubmit={handleSubmit} className="asd"> <form onSubmit={handleSubmit} className="d-flex flex-column pt-3">
<div className="form-group "> <div className="form-group ">
<div className={touched.name && errors.name ? "text-danger" : ""}>이름을 입력하세요</div> <div className={touched.name && errors.name ? "text-danger" : ""}>이름을 입력하세요</div>
<input <input
...@@ -154,7 +149,7 @@ function Signup() { ...@@ -154,7 +149,7 @@ function Signup() {
{...getFieldProps('answer')} {...getFieldProps('answer')}
placeholder="Input answer" /> placeholder="Input answer" />
</div> </div>
<Button type="submit" variant="secondary" disabled={isSubmitting}>회원가입</Button> <Button type="submit" variant="secondary" className="mb-2" disabled={isSubmitting}>회원가입</Button>
<Button variant="outline-secondary" as={Link} to="/login">로그인하러 가기</Button> <Button variant="outline-secondary" as={Link} to="/login">로그인하러 가기</Button>
</form> </form>
)} )}
......
server/client/src/Pages/WritePage.js
View file @ ded7f980
...@@ -3,7 +3,7 @@ import { Link, Redirect } from 'react-router-dom'; ...@@ -3,7 +3,7 @@ import { Link, Redirect } from 'react-router-dom';
import Menu from '../Components/Menu'; import Menu from '../Components/Menu';
import * as Yup from 'yup'; import * as Yup from 'yup';
import axios from 'axios'; import axios from 'axios';
import { Container, Row, Col } from 'react-bootstrap'; import { Container, Row, Col, Form } from 'react-bootstrap';
import { Field, Formik } from 'formik'; import { Field, Formik } from 'formik';
function Write() { function Write() {
...@@ -18,7 +18,7 @@ function Write() { ...@@ -18,7 +18,7 @@ function Write() {
<Menu /> <Menu />
<Container fluid> <Container fluid>
<Row className="justify-content-center"> <Row className="justify-content-center">
<Col md={12} xl={8} style={{ height: "35em" }}> <Col md={5} xs={11} className="pt-3" >
<Formik <Formik
initialValues={{ title: '', content: '' }} initialValues={{ title: '', content: '' }}
validationSchema={Yup.object({ validationSchema={Yup.object({
...@@ -52,11 +52,23 @@ function Write() { ...@@ -52,11 +52,23 @@ function Write() {
getFieldProps, // contain values, handleChange, handleBlur getFieldProps, // contain values, handleChange, handleBlur
isSubmitting, isSubmitting,
}) => ( }) => (
<form onSubmit={handleSubmit} className="asd"> // <Form onSubmit={handleSubmit}>
{/* col-sm-3 */} // <Form.Group>
// <Form.Label variant={touched.name && errors.name ? "danger" : ""}>제목</Form.Label>
// <Form.Control className={(touched.name && errors.name ? 'form-control is-invalid' : "form-control")}
// type="text"
// placeholder="제목"
// title="title"
// {...getFieldProps('title')} />
// </Form.Group>
// <Form.Group>
// <Form.Label>내용</Form.Label>
// <Form.Control as="textarea" rows={10} />
// </Form.Group>
// </Form>
<form onSubmit={handleSubmit}>
<div className="form-group"> <div className="form-group">
{/* mb-4 */}
<div className={touched.name && errors.name ? "text-danger" : ""}>제목</div> <div className={touched.name && errors.name ? "text-danger" : ""}>제목</div>
<input className={(touched.name && errors.name ? 'form-control is-invalid' : "form-control")} <input className={(touched.name && errors.name ? 'form-control is-invalid' : "form-control")}
type="text" type="text"
...@@ -64,8 +76,8 @@ function Write() { ...@@ -64,8 +76,8 @@ function Write() {
{...getFieldProps('title')} {...getFieldProps('title')}
placeholder="제목" /> placeholder="제목" />
</div> </div>
<div className="form-group "> <div className="form-group ">
{/* mb-4 */}
<div className={touched.name && errors.name ? "text-danger" : ""}>내용</div> <div className={touched.name && errors.name ? "text-danger" : ""}>내용</div>
<input className={(touched.name && errors.name ? 'form-control is-invalid' : "form-control")} <input className={(touched.name && errors.name ? 'form-control is-invalid' : "form-control")}
type="text" type="text"
...@@ -73,6 +85,7 @@ function Write() { ...@@ -73,6 +85,7 @@ function Write() {
{...getFieldProps('content')} {...getFieldProps('content')}
placeholder="내용" /> placeholder="내용" />
</div> </div>
<button type="submit" className="btn btn-dark" disabled={isSubmitting}>공지 등록</button> <button type="submit" className="btn btn-dark" disabled={isSubmitting}>공지 등록</button>
</form> </form>
)} )}
......
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