Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
students
survey
Commits
d6f76734
Commit
d6f76734
authored
Jul 01, 2022
by
Jiwon Yoon
Browse files
Merge branch 'yeon' into develope
parents
6883d5f2
6635e0b8
Changes
5
Hide whitespace changes
Inline
Side-by-side
frontend/package.json
View file @
d6f76734
...
@@ -12,9 +12,12 @@
...
@@ -12,9 +12,12 @@
"author"
:
"Daeki Yoon"
,
"author"
:
"Daeki Yoon"
,
"license"
:
"ISC"
,
"license"
:
"ISC"
,
"devDependencies"
:
{
"devDependencies"
:
{
"@types/bcryptjs"
:
"^2.4.2"
,
"@types/cookie-parser"
:
"^1.4.3"
,
"@types/react"
:
"^18.0.14"
,
"@types/react"
:
"^18.0.14"
,
"@types/react-dom"
:
"^18.0.5"
,
"@types/react-dom"
:
"^18.0.5"
,
"@types/react-router-dom"
:
"^5.3.3"
,
"@types/react-router-dom"
:
"^5.3.3"
,
"@types/validator"
:
"^13.7.3"
,
"autoprefixer"
:
"^10.4.7"
,
"autoprefixer"
:
"^10.4.7"
,
"css-loader"
:
"^6.7.1"
,
"css-loader"
:
"^6.7.1"
,
"html-webpack-plugin"
:
"^5.5.0"
,
"html-webpack-plugin"
:
"^5.5.0"
,
...
@@ -29,8 +32,11 @@
...
@@ -29,8 +32,11 @@
"webpack-dev-server"
:
"^4.9.2"
"webpack-dev-server"
:
"^4.9.2"
},
},
"dependencies"
:
{
"dependencies"
:
{
"bcryptjs"
:
"^2.4.3"
,
"cookie-parser"
:
"^1.4.6"
,
"react"
:
"^18.2.0"
,
"react"
:
"^18.2.0"
,
"react-dom"
:
"^18.2.0"
,
"react-dom"
:
"^18.2.0"
,
"react-router-dom"
:
"^6.3.0"
"react-router-dom"
:
"^6.3.0"
,
"validator"
:
"^13.7.0"
}
}
}
}
frontend/src/SurveyRouter.tsx
View file @
d6f76734
...
@@ -2,7 +2,7 @@ import React from "react";
...
@@ -2,7 +2,7 @@ import React from "react";
import
{
BrowserRouter
,
Route
,
Routes
}
from
"
react-router-dom
"
;
import
{
BrowserRouter
,
Route
,
Routes
}
from
"
react-router-dom
"
;
import
App
from
"
./App
"
;
import
App
from
"
./App
"
;
import
{
Login
,
SignUp
}
from
"
./auth
"
;
import
{
Login
,
SignUp
}
from
"
./auth
"
;
import
{
CreateSurveyForm
}
from
"
./commons
"
;
import
{
CreateSurveyForm
,
SurveyForm
}
from
"
./commons
"
;
import
{
Home
}
from
"
./home
"
;
import
{
Home
}
from
"
./home
"
;
export
const
SurveyRouter
=
()
=>
{
export
const
SurveyRouter
=
()
=>
{
...
@@ -14,6 +14,7 @@ export const SurveyRouter = () => {
...
@@ -14,6 +14,7 @@ export const SurveyRouter = () => {
<
Route
path
=
"login"
element
=
{
<
Login
/>
}
/>
<
Route
path
=
"login"
element
=
{
<
Login
/>
}
/>
<
Route
path
=
"signup"
element
=
{
<
SignUp
/>
}
/>
<
Route
path
=
"signup"
element
=
{
<
SignUp
/>
}
/>
<
Route
path
=
"create"
element
=
{
<
CreateSurveyForm
/>
}
/>
<
Route
path
=
"create"
element
=
{
<
CreateSurveyForm
/>
}
/>
<
Route
path
=
"survey"
element
=
{
<
SurveyForm
/>
}
/>
</
Route
>
</
Route
>
</
Routes
>
</
Routes
>
</
BrowserRouter
>
</
BrowserRouter
>
...
...
frontend/src/auth/SignUp.tsx
View file @
d6f76734
import
React
from
"
react
"
;
import
React
,
{
useEffect
,
useState
}
from
"
react
"
;
import
{
useNavigate
}
from
"
react-router-dom
"
;
type
SignUpProps
=
{};
type
SignUpProps
=
{};
export
const
SignUp
=
({}:
SignUpProps
)
=>
(
export
const
SignUp
=
({}:
SignUpProps
)
=>
{
<
div
className
=
"flex justify-center mt-3"
>
const
USER
=
{
<
div
className
=
"text-slate-300 text-xl font-bold"
>
name
:
""
,
<
label
className
=
"block text-gray-700 text-sm font-bold mb-2 mt-3"
>
email
:
""
,
이름
password
:
"
2345
"
,
</
label
>
password2
:
"
1234
"
,
<
input
};
className
=
"shadow appearance-none border rounded py-2 px-3 text-gray-60"
id
=
"name"
const
[
user
,
setUser
]
=
useState
(
USER
);
type
=
"name"
const
[
error
,
setError
]
=
useState
(
''
)
placeholder
=
"이름을 입력하세요"
const
[
disabled
,
setDisabled
]
=
useState
(
false
)
/>
const
[
success
,
setSuccess
]
=
useState
(
false
)
<
label
className
=
"block text-gray-700 text-sm font-bold mb-2 mt-3"
>
const
navigate
=
useNavigate
();
이메일
</
label
>
useEffect
(()
=>
{
<
input
setDisabled
(
!
(
user
.
name
&&
user
.
email
&&
user
.
password
&&
user
.
password2
))
className
=
"shadow appearance-none border rounded py-2 px-3 text-gray-70"
},
[
user
])
id
=
"email"
type
=
"email"
function
handleChange
(
event
:
React
.
ChangeEvent
<
HTMLInputElement
>
)
{
placeholder
=
"이메일을 입력하세요"
const
{
name
,
value
}
=
event
.
target
/>
setUser
({...
user
,
[
name
]:
value
})
}
<
label
className
=
"block text-gray-700 text-sm font-bold mb-2 mt-3"
>
비밀번호
async
function
handleSubmit
(
event
:
React
.
MouseEvent
<
HTMLButtonElement
>
)
{
</
label
>
event
.
preventDefault
();
<
input
try
{
className
=
"shadow appearance-none border rounded py-2 px-3 text-gray-70"
// console.log('checkPassword:',checkPassword())
id
=
"username"
// const passwordMatch = checkPassword()
type
=
"password"
if
(
passwordmatch
())
{
placeholder
=
"비밀번호를 입력하세요"
// const res = await userApi.signup(user)
/>
// console.log('서버연결됬나요', res)
<
div
className
=
"text-center"
>
console
.
log
(
'
회원가입
'
)
<
button
className
=
"bg-themeColor text-white border rounded w-100 py-2 px-3 mt-3"
>
setSuccess
(
true
)
회원가입
setError
(
''
)
</
button
>
}
}
catch
(
error
)
{
console
.
log
(
'
에러발생
'
)
// catchErrors(error, setError)
}
finally
{
// setLoading(false);
}
}
function
passwordmatch
()
{
if
(
user
.
password
!==
user
.
password2
)
{
alert
(
"
비밀번호가 일치하지않습니다
"
);
console
.
log
(
"
password fail
"
);
return
false
;
}
else
{
console
.
log
(
"
password match
"
);
return
true
;
}
}
if
(
success
)
{
alert
(
'
회원가입 되었습니다
'
)
navigate
(
`../`
)
}
return
(
<
div
className
=
"flex justify-center mt-3"
>
<
div
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
>
<
input
className
=
"shadow appearance-none border rounded py-2 px-3 text-gray-60"
id
=
"name"
type
=
"text"
placeholder
=
"이름을 입력하세요"
onChange
=
{
handleChange
}
/>
<
label
className
=
"block text-gray-700 text-sm font-bold mb-2 mt-3"
>
이메일
</
label
>
<
input
className
=
"shadow appearance-none border rounded py-2 px-3 text-gray-70"
id
=
"email"
type
=
"text"
placeholder
=
"이메일을 입력하세요"
onChange
=
{
handleChange
}
/>
<
label
className
=
"block text-gray-700 text-sm font-bold mb-2 mt-3"
>
비밀번호
</
label
>
<
input
className
=
"shadow appearance-none border rounded py-2 px-3 text-gray-70"
id
=
"password"
type
=
"password"
placeholder
=
"비밀번호를 입력하세요"
onChange
=
{
handleChange
}
/>
<
label
className
=
"block text-gray-700 text-sm font-bold mb-2 mt-3"
>
비밀번호 확인
</
label
>
<
input
className
=
"shadow appearance-none border rounded py-2 px-3 text-gray-70"
id
=
"password2"
type
=
"password"
placeholder
=
"비밀번호를 다시 입력하세요"
onChange
=
{
handleChange
}
/>
<
div
className
=
"text-center mt-3"
>
<
button
className
=
"bg-themeColor text-white border rounded w-100 py-2 px-3 mt-3"
onClick
=
{
handleSubmit
}
>
회원가입
</
button
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
);
)
;
}
;
frontend/src/commons/SurveyForm.tsx
0 → 100644
View file @
d6f76734
import
React
from
'
react
'
export
const
SurveyForm
=
()
=>
(
<
div
className
=
'flex justify-center'
>
<
div
className
=
"flex flex-col space-y-4 mt-5"
>
설문조사 이름
<
div
className
=
"box-content h-52 w-96 py-4 px-5 border-2 mt-5"
>
<
form
>
<
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
=
"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
>
</
div
>
</
div
>
</
div
>
)
frontend/src/commons/index.tsx
View file @
d6f76734
export
{
CreateSurveyForm
}
from
"
./CreateSurveyForm
"
;
export
{
CreateSurveyForm
}
from
"
./CreateSurveyForm
"
;
export
{
Header
}
from
"
./Header
"
;
export
{
Header
}
from
"
./Header
"
;
export
{
SurveyForm
}
from
"
./SurveyForm
"
;
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment