Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
bora-it
Commits
12c642ee
Commit
12c642ee
authored
Aug 06, 2021
by
Kim, Chaerin
Browse files
merge byoungyun
parent
7c53066a
Changes
3
Show whitespace changes
Inline
Side-by-side
client/.gitignore
View file @
12c642ee
...
...
@@ -23,3 +23,5 @@ yarn-debug.log*
yarn-error.log*
.env
kakao.config.json
\ No newline at end of file
client/src/components/KakaoShareButton.js
View file @
12c642ee
...
...
@@ -6,12 +6,12 @@ import catchErrors from "../context/catchError";
const
INIT_invite
=
{
id
:
""
,
name
:
""
,
}
name
:
""
,
}
;
const
KakaoShareButton
=
(
porps
)
=>
{
const
[
inviteperson
,
setProfile
]
=
useState
(
INIT_invite
);
const
[
error
,
setError
]
=
useState
(
""
);
const
[
error
,
setError
]
=
useState
(
""
);
const
{
roomId
}
=
useParams
();
const
invitepersonId
=
localStorage
.
getItem
(
"
user
"
);
...
...
@@ -33,14 +33,14 @@ const KakaoShareButton = (porps) => {
},
[]);
useEffect
(()
=>
{
const
script
=
document
.
createElement
(
'
script
'
)
script
.
src
=
'
https://developers.kakao.com/sdk/js/kakao.js
'
script
.
async
=
true
document
.
body
.
appendChild
(
script
)
const
script
=
document
.
createElement
(
"
script
"
);
script
.
src
=
"
https://developers.kakao.com/sdk/js/kakao.js
"
;
script
.
async
=
true
;
document
.
body
.
appendChild
(
script
)
;
return
()
=>
{
document
.
body
.
removeChild
(
script
)
}
},
[])
document
.
body
.
removeChild
(
script
)
;
}
;
},
[])
;
const
createKakaoButton
=
()
=>
{
// kakao sdk script이 정상적으로 불러와졌으면 window.Kakao로 접근이 가능합니다
...
...
@@ -52,15 +52,12 @@ const KakaoShareButton = (porps) => {
kakao
.
init
(
kakao_key
[
0
].
kakao_key
);
}
kakao
.
Link
.
createDefaultButton
({
container
:
'
#kakao-link-btn
'
,
objectType
:
'
text
'
,
text
:
`
${
inviteperson
.
name
}
님이 당신을 화상회의에 초대했습니다! 초대된 방 코드:
${
roomId
}
`
,
container
:
"
#kakao-link-btn
"
,
objectType
:
"
text
"
,
text
:
`
${
inviteperson
.
name
}
님이 당신을 화상회의에 초대했습니다! 초대된 방 코드:
${
roomId
}
`
,
link
:
{
mobileWebUrl
:
`http://localhost:3000/invite/
${
roomId
}
`
,
webUrl
:
`http://localhost:3000/invite/
${
roomId
}
`
,
mobileWebUrl
:
`http://localhost:3000/invite/
${
roomId
}
`
,
webUrl
:
`http://localhost:3000/invite/
${
roomId
}
`
,
},
});
}
...
...
@@ -75,7 +72,9 @@ const KakaoShareButton = (porps) => {
className
=
"
col-2 p-1 btn btn-primary
"
data
-
bs
-
dismiss
=
"
modal
"
style
=
{{
width
:
"
120px
"
}}
>
카카오로
초대
onClick
=
{()
=>
console
.
log
(
"
안녕
"
)}
>
카카오로
초대
<
/button
>
<
/div
>
);
...
...
client/src/components/Room/ChannelSingle.js
View file @
12c642ee
...
...
@@ -7,8 +7,8 @@ const ChannelSingle = (props) => {
return
(
<
div
>
<
div
className
=
"
overflow-auto
"
style
=
{{
height
:
'
610px
'
}}
>
{
props
.
channel
.
map
((
el
)
=>
(
<
div
className
=
"
mb-3
"
>
{
props
.
channel
.
map
((
el
,
i
)
=>
(
<
div
className
=
"
mb-3
"
key
=
{
`channel
${
i
}
`
}
>
<
Link
to
=
{
`/room/
${
roomId
}
/
${
el
.
channelName
}
`
}
>
<
div
className
=
"
m-3 p-1 row
"
...
...
@@ -36,8 +36,8 @@ const ChannelSingle = (props) => {
<
/Link
>
{
el
.
joinName
&&
el
.
joinName
.
map
((
e
)
=>
(
<
div
>
el
.
joinName
.
map
((
e
,
i
)
=>
(
<
div
key
=
{
`member
${
i
}
`
}
>
<
ul
className
=
"
mx-5
"
style
=
{{
color
:
'
#76D079
'
}}
>
<
li
>
<
p
style
=
{{
color
:
'
black
'
}}
>
{
e
}
<
/p
>
...
...
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