Skip to content

GitLab

Commit 73a1e1bc authored by Jiwon Yoon's avatar Jiwon Yoon
Browse files

Merge branch 'sy_lee' into develop

parents 3e2be733 da97d437
Hide whitespace changes
Inline Side-by-side
frontend/src/CreateSurveyForm/QRadio.tsx
View file @ 73a1e1bc
...@@ -33,7 +33,7 @@ export const QRadio = ({ element }: Props) => { ...@@ -33,7 +33,7 @@ export const QRadio = ({ element }: Props) => {
></input> ></input>
</div> </div>
<div className="flex mt-4"> <div className="flex mt-4">
{element.content.choices.map((e: any) => ( {element.content.choices.map((e: any, index: number) => (
<div> <div>
<input <input
type="radio" type="radio"
......
frontend/src/auth/Login.tsx
View file @ 73a1e1bc
...@@ -36,11 +36,9 @@ export const Login = () => { ...@@ -36,11 +36,9 @@ export const Login = () => {
} }
return ( return (
<div className="flex justify-center mt-3"> <div className="flex flex-col items-center mt-5">
<form <div className="text-2xl mt-5">로그인</div>
onSubmit={handleSubmit} <form onSubmit={handleSubmit} className="flex flex-col mt-3 w-80">
className="flex flex-col space-y-4 mt-5 text-xl font-bold"
>
<label className="block text-gray-700 text-sm font-bold mb-2 mt-3"> <label className="block text-gray-700 text-sm font-bold mb-2 mt-3">
이메일 이메일
</label> </label>
...@@ -75,7 +73,7 @@ export const Login = () => { ...@@ -75,7 +73,7 @@ export const Login = () => {
<button <button
type="submit" type="submit"
disabled={loading ? true : false} disabled={loading ? true : false}
className="bg-themeColor text-white border rounded w-100 py-2 px-3 mt-3" className="bg-themeColor text-white border rounded w-100 py-2 px-3 mt-5"
> >
{loading && ( {loading && (
<SpinnerIcon className="animate-spin h-5 w-5 mr-1 text-white" /> <SpinnerIcon className="animate-spin h-5 w-5 mr-1 text-white" />
......
frontend/src/auth/SignUp.tsx
View file @ 73a1e1bc
...@@ -67,9 +67,9 @@ export const SignUp = () => { ...@@ -67,9 +67,9 @@ export const SignUp = () => {
} }
return ( return (
<div className="flex flex-col items-center mt-3"> <div className="flex flex-col items-center mt-5">
<div className="text-2xl">회원 가입</div> <div className="text-2xl mt-5">회원가입</div>
<form onSubmit={handleSubmit} className="flex flex-col mt-5 w-80"> <form onSubmit={handleSubmit} className="flex flex-col mt-3 w-80">
<label className="block text-gray-700 text-sm font-bold mb-2 mt-3"> <label className="block text-gray-700 text-sm font-bold mb-2 mt-3">
이름 이름
</label> </label>
......
frontend/src/commons/SurveyForm.tsx
View file @ 73a1e1bc
import React from 'react' import React, { InputHTMLAttributes } from "react";
export const SurveyForm = () => ( export const SurveyForm = () => {
<div className='flex justify-center'> return (
<div className="flex flex-col space-y-4 mt-5"> <div className="flex flex-col place-items-center">
설문조사 이름 <div className="flex flex-col container place-items-center mt-4">
<div className="box-content h-52 w-96 py-4 px-5 border-2 mt-5"> <form className="font-bold text-4xl text-center m-2">설문지 제목</form>
<form> <textarea
<label>첫번째 질문</label> className="font-bold text-1xl text-center m-2 resize-none"
</form> placeholder="설문조사에 대한 설명을 입력해주세요"
rows={2}
cols={60}
></textarea>
<div className="flex flex-col container w-4/5 h-auto border-2 border-themeColor items-center m-3 py-3">
<div className="flex flexgi-row h-16 w-full place-content-between items-center">
<form className="text-xl font-bold ml-6 w-1/2">
Q1. 첫번째 질문
</form>
</div>
<form className="border w-11/12 my-3">설문조사 설명</form>
<input
className="border w-11/12 h-36 my-3"
type="text"
placeholder="설문조사 답변"
></input>
</div>
<div className="flex flex-col container w-4/5 h-auto border-2 border-themeColor items-center m-3 py-3">
<div className="flex flexgi-row h-16 w-full place-content-between items-center">
<form className="text-xl font-bold ml-6 w-1/2">
Q2. 두번째 질문
</form>
</div>
<form className="border w-11/12 my-4">설문조사 설명</form>
<div className="flex flex-row items-center m-3">
<div className="mb-4 mx-3">
<input
id="default-checkbox"
type="checkbox"
className="w-5 h-5 mt-3 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
/>
<label className="ml-2 text-lg font-medium">First checkbox</label>
</div>
<div className="mb-4 mx-3">
<input
id="default-checkbox"
type="checkbox"
className="w-5 h-5 mt-3 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
/>
<label className="ml-2 text-lg font-medium">
Second checkbox
</label>
</div>
<div className="mb-4 mx-3">
<input
id="default-checkbox"
type="checkbox"
value=""
className="w-5 h-5 mt-3 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
/>
<label className="ml-2 text-lg font-medium">Third checkbox</label>
</div>
<div className="mb-4 mx-4">
<input
id="default-checkbox"
type="checkbox"
value=""
className="w-5 h-5 mt-3 text-blue-600 bg-gray-100 rounded border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
/>
<label className="ml-2 text-lg font-medium">
Fourth checkbox
</label>
</div>
</div>
</div>
<div className="flex flex-col container w-4/5 h-auto border-2 border-themeColor items-center m-3 py-3">
<div className="flex flexgi-row h-16 w-full place-content-between items-center">
<form className="text-xl font-bold ml-6 w-1/2">
Q3. 세번째 질문
</form>
</div>
<form className="border w-11/12 my-4">설문조사 설명</form>
<div className="flex flex-row items-center m-3">
<div className="flex items-center mb-4 mx-4">
<input
id="default-radio-1"
type="radio"
value=""
name="default-radio"
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
/>
<label className="ml-2 text-lg">First radio</label>
</div>
<div className="flex items-center mb-4 mx-4">
<input
id="default-radio-1"
type="radio"
value=""
name="default-radio"
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
/>
<label className="ml-2 text-lg">Second radio</label>
</div>
<div className="flex items-center mb-4 mx-4">
<input
checked
id="default-radio-2"
type="radio"
value=""
name="default-radio"
className="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 focus:ring-blue-500 dark:focus:ring-blue-600 dark:ring-offset-gray-800 focus:ring-2 dark:bg-gray-700 dark:border-gray-600"
/>
<label className="ml-2 text-lg">Checked state</label>
</div>
</div>
</div>
</div> </div>
<div className="box-content h-52 w-96 py-4 px-5 border-2 mt-5"> <div>
<form> <button className="rounded bg-themeColor my-5 py-2 px-5 font-bold text-white">
<label>두번째 질문</label> 제출하기
</form>
</div>
<div className="box-content h-52 w-96 py-4 px-5 border-2 mt-5">
<form>
<label>세번째 질문</label>
</form>
</div>
<div className="text-center t-5">
<button className="bg-themeColor text-white border rounded py-2 px-6">
제출
</button> </button>
</div> </div>
</div> </div>
</div> );
) };
frontend/src/profile/Profile.tsx
View file @ 73a1e1bc
import React from "react"; import React from "react";
import { Link } from "react-router-dom";
export const Profile = () => { export const Profile = () => {
return <div>Profile</div>; return (
<div className="flex flex-col items-center">
<div className="m-5">나의 설문조사</div>
<div className="flex flex-row space-x-4 mt-5">
<Link
to="/create"
className="flex h-60 w-48 items-center border-2 border-themeColor font-bold bg-gray-200 hover:bg-themeColor rounded-lg "
>
<div className="text-center px-6 py-6 font-bold text-gray-500 place-items-center hover:text-white">
CREATE NEW SURVEY!
</div>
</Link>
<div className="w-48 h-60 rounded overflow-hidden border-2">
<div className="px-6 py-4">
<p className="text-gray-700 text-base">
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
</p>
</div>
<div className="flex flex-col py-6">
<div className="px-2 py-2">
<label>설문조사 이름</label>
</div>
<div className="flex justify-end dropdown-toggle">
<select className="py-2 w-14 bg-themeColor rounded text-white">
<option selected>옵션</option>
<option>삭제</option>
<option>이름 바꾸기</option>
</select>
</div>
</div>
</div>
<div className="w-48 h-60 rounded overflow-hidden border-2">
<div className="px-6 py-4">
<p className="text-gray-700 text-base">
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
</p>
</div>
<div className="flex flex-col py-6">
<div className="px-2 py-2">
<label>설문조사이름</label>
</div>
<div className="flex justify-end dropdown-toggle">
<select className="py-2 w-14 bg-themeColor rounded text-white">
<option selected>옵션</option>
<option>삭제</option>
<option>이름 바꾸기</option>
</select>
</div>
</div>
</div>
<div className="w-48 h-60 rounded overflow-hidden border-2">
<div className="px-6 py-4">
<p className="text-gray-700 text-base">
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
</p>
</div>
<div className="flex flex-col py-6">
<div className="px-2 py-2">
<label>설문조사 이름</label>
</div>
<div className="flex justify-end dropdown-toggle">
<select className="py-2 w-14 bg-themeColor rounded text-white">
<option selected>옵션</option>
<option>삭제</option>
<option>이름 바꾸기</option>
</select>
</div>
</div>
</div>
<div className="w-48 h-60 rounded overflow-hidden border-2">
<div className="px-6 py-4">
<p className="text-gray-700 text-base">
Lorem ipsum dolor sit amet, consectetur adipisicing elit.
</p>
</div>
<div className="flex flex-col py-6">
<div className="px-2 py-2">
<label>설문조사 이름</label>
</div>
<div className="flex justify-end dropdown-toggle">
<select className="py-2 w-14 bg-themeColor rounded text-white">
<option selected>옵션</option>
<option>삭제</option>
<option>이름 바꾸기</option>
</select>
</div>
</div>
</div>
</div>
</div>
);
}; };
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