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
eue
Commits
98a89331
Commit
98a89331
authored
Jul 28, 2021
by
KangMin An
Browse files
Merge branch 'who' into premaster
parents
3a341f06
ed505954
Changes
4
Hide whitespace changes
Inline
Side-by-side
client/src/App.js
View file @
98a89331
...
@@ -4,7 +4,7 @@ import './App.css';
...
@@ -4,7 +4,7 @@ import './App.css';
import
Home
from
'
./pages/Home
'
;
import
Home
from
'
./pages/Home
'
;
import
SignupPage
from
'
./pages/SignupPage
'
;
import
SignupPage
from
'
./pages/SignupPage
'
;
import
LoginPage
from
'
./pages/LoginPage
'
;
import
LoginPage
from
'
./pages/LoginPage
'
;
import
LocalCode
Page
from
'
./pages/
LocalCode
Page
'
;
import
Edit
Page
from
'
./pages/
Edit
Page
'
;
import
PrivateRoute
from
'
./utils/PrivateRoutes
'
;
import
PrivateRoute
from
'
./utils/PrivateRoutes
'
;
import
PageNotFound
from
'
./components/PageNotFound
'
;
import
PageNotFound
from
'
./components/PageNotFound
'
;
import
Footer
from
'
./components/Footer
'
;
import
Footer
from
'
./components/Footer
'
;
...
@@ -18,14 +18,14 @@ function App() {
...
@@ -18,14 +18,14 @@ function App() {
<
Route
exact
path
=
'
/
'
component
=
{
Home
}
/
>
<
Route
exact
path
=
'
/
'
component
=
{
Home
}
/
>
<
Route
path
=
'
/signup
'
component
=
{
SignupPage
}
/
>
<
Route
path
=
'
/signup
'
component
=
{
SignupPage
}
/
>
<
Route
path
=
'
/login
'
component
=
{
LoginPage
}
/
>
<
Route
path
=
'
/login
'
component
=
{
LoginPage
}
/
>
<
Route
path
=
'
/loc
'
component
=
{
LocalCodePage
}
/
>
<
PrivateRoute
path
=
'
/
local_code
'
>
<
PrivateRoute
path
=
'
/
edit
'
>
<
LocalCode
Page
/>
<
Edit
Page
/>
<
/PrivateRoute
>
<
/PrivateRoute
>
<
Route
component
=
{
PageNotFound
}
/
>
<
Route
component
=
{
PageNotFound
}
/
>
<
/Switch
>
<
/Switch
>
<
Footer
/>
<
Footer
/>
<
/Router
>
<
/Router
>
...
...
client/src/components/UserInfo.js
View file @
98a89331
...
@@ -78,7 +78,7 @@ function UserInfo() {
...
@@ -78,7 +78,7 @@ function UserInfo() {
<
/Card.Subtitle
>
<
/Card.Subtitle
>
{
nickname
&&
{
nickname
&&
<
Button
variant
=
'
light
'
className
=
'
m-auto d-flex
'
style
=
{
btnstyled2
}
>
<
Button
variant
=
'
light
'
className
=
'
m-auto d-flex
'
style
=
{
btnstyled2
}
>
<
Link
to
=
'
/
local_code
'
className
=
'
w-100
'
style
=
{{
textDecoration
:
'
none
'
,
color
:
'
rgb(110, 189, 142)
'
}}
>
<
Link
to
=
'
/
edit
'
className
=
'
w-100
'
style
=
{{
textDecoration
:
'
none
'
,
color
:
'
rgb(110, 189, 142)
'
}}
>
변경
변경
<
/Link
>
<
/Link
>
<
/Button
>
<
/Button
>
...
...
client/src/pages/
LocalCode
Page.js
→
client/src/pages/
Edit
Page.js
View file @
98a89331
...
@@ -5,7 +5,7 @@ import '../App.css'
...
@@ -5,7 +5,7 @@ import '../App.css'
import
LocCodeChange
from
'
../components/LocCodeChange
'
;
import
LocCodeChange
from
'
../components/LocCodeChange
'
;
import
NicknameChange
from
'
../components/NicknameChange
'
;
import
NicknameChange
from
'
../components/NicknameChange
'
;
function
Signup
Page
()
{
function
Edit
Page
()
{
const
constyled
=
{
const
constyled
=
{
display
:
'
flex
'
,
display
:
'
flex
'
,
justifyContent
:
'
space-evenly
'
,
justifyContent
:
'
space-evenly
'
,
...
@@ -49,4 +49,4 @@ function SignupPage() {
...
@@ -49,4 +49,4 @@ function SignupPage() {
);
);
}
}
export
default
SignupPage
;
export
default
EditPage
;
\ No newline at end of file
\ No newline at end of file
client/src/routes.js
View file @
98a89331
...
@@ -2,7 +2,7 @@ export const routes = {
...
@@ -2,7 +2,7 @@ export const routes = {
home
:
'
/
'
,
home
:
'
/
'
,
signup
:
'
/signup
'
,
signup
:
'
/signup
'
,
login
:
'
login
'
,
login
:
'
login
'
,
localcode
:
'
/local_code
'
,
edit
:
'
/edit
'
,
}
}
...
...
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