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
5dfc26a1
Commit
5dfc26a1
authored
Aug 02, 2021
by
KangMin An
Browse files
Merge branch 'who' into premaster
parents
fe677cec
7e6db371
Changes
3
Hide whitespace changes
Inline
Side-by-side
client/src/components/Footer.js
View file @
5dfc26a1
...
@@ -11,7 +11,8 @@ function Footer() {
...
@@ -11,7 +11,8 @@ function Footer() {
style
=
{{
fontSize
:
'
0.8em
'
}}
>
style
=
{{
fontSize
:
'
0.8em
'
}}
>
<
hr
/>
<
hr
/>
<
Col
style
=
{{
display
:
'
flex
'
,
color
:
'
gray
'
,
fontWeight
:
'
300
'
,
alignItems
:
'
center
'
,
justifyContent
:
'
center
'
}}
>
<
Col
style
=
{{
display
:
'
flex
'
,
color
:
'
gray
'
,
fontWeight
:
'
300
'
,
alignItems
:
'
center
'
,
justifyContent
:
'
center
'
}}
>
©
2021
TEAM
EUE
.
All
rights
reserved
©
2021
TEAM
EUE
.
All
rights
reserved
<
br
/>
문의
:
dev0gomgom
@
gmail
.
com
<
/Col
>
<
/Col
>
<
Col
>
<
Col
>
<
a
href
=
'
https://www.notion.so/EUE-047f1812c6c24096a528dfd3330c227d
'
<
a
href
=
'
https://www.notion.so/EUE-047f1812c6c24096a528dfd3330c227d
'
...
@@ -20,7 +21,9 @@ function Footer() {
...
@@ -20,7 +21,9 @@ function Footer() {
<
strong
>
<
strong
>
TEAM
EUE
TEAM
EUE
<
/strong
>
<
/strong
>
<
/a> <br /
>
안강민
,
박상호
,
박예은
<
/a
>
<
br
/>
안강민
,
박상호
,
박예은
<
/Col
>
<
/Col
>
<
/Row
>
<
/Row
>
<
/Container
>
<
/Container
>
...
...
client/src/components/LoginComp.js
View file @
5dfc26a1
...
@@ -40,7 +40,7 @@ function LoginComp() {
...
@@ -40,7 +40,7 @@ function LoginComp() {
const
newLink
=
'
https://www.
'
+
afterAt
;
const
newLink
=
'
https://www.
'
+
afterAt
;
window
.
location
.
replace
(
newLink
);
window
.
location
.
replace
(
newLink
);
}
}
else
if
(
afterAt
==
'
korea.ac.kr
'
)
{
if
(
afterAt
==
=
'
korea.ac.kr
'
)
{
window
.
location
.
replace
(
'
https://www.gmail.com
'
);
window
.
location
.
replace
(
'
https://www.gmail.com
'
);
}
}
}
}
...
...
client/src/components/UsingAircon.js
View file @
5dfc26a1
...
@@ -17,7 +17,9 @@ function UsingAircon() {
...
@@ -17,7 +17,9 @@ function UsingAircon() {
useEffect
(()
=>
{
useEffect
(()
=>
{
callUserInfo
().
then
((
res
)
=>
{
callUserInfo
().
then
((
res
)
=>
{
setAirUsing
(
res
[
0
][
'
using_aircon
'
])
if
(
isLogined
())
{
setAirUsing
(
res
[
0
][
'
using_aircon
'
])
}
})
})
},
[])
},
[])
...
...
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