Skip to content

Commit

Permalink
Merge pull request #1374 from 42organization/1358-feat-party-detail-r…
Browse files Browse the repository at this point in the history
…oom의-css-변경

[Ci] party detail room의 css 변경 - 1358
  • Loading branch information
contemplation-person authored Apr 8, 2024
2 parents 68d460a + f7198eb commit a7d859c
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 15 deletions.
1 change: 1 addition & 0 deletions .github/workflows/main-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Deploy to 42ggClientS3

on:
workflow_dispatch:
push:
branches:
- deploy
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
- name: Build
env:
NEXT_PUBLIC_SERVER_ENDPOINT: ${{ secrets.NEXT_DEV_PUBLIC_SERVER_ENDPOINT }}
NEXT_PUBLIC_CLIENT_ENDPOINT: ${{ secrets.DEV_NEXT_PUBLIC_CLIENT_ENDPOINT }}
NEXT_PUBLIC_PARTY_MANAGE_SERVER_ENDPOINT: ${{ secrets.DEV_NEXT_PUBLIC_PARTY_MANAGE_SERVER_ENDPOINT }}
NEXT_PUBLIC_MANAGE_SERVER_ENDPOINT: ${{ secrets.NEXT_DEV_PUBLIC_MANAGE_SERVER_ENDPOINT }}
GENERATE_SOURCEMAP: ${{ secrets.GENERATE_SOURCEMAP }}
run: |
Expand Down
8 changes: 4 additions & 4 deletions components/party/roomDetail/PartyDetailButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ function ReportNoShow({ roomId, userIntraId }: ParytButtonProps) {
}

function ShareRoom() {
const roomId = useRouter().query.roomId;
const setSnackbar = useSetRecoilState(toastState);
const shareUrl = `${process.env.NEXT_PUBLIC_CLIENT_ENDPOINT}${
useRouter().asPath
}`;

return (
<button
className={styles.shareBtn}
onClick={() => {
navigator.clipboard.writeText(
`${process.env.NEXT_PUBLIC_SERVER_ENDPOINT}/party/${roomId}`
);
navigator.clipboard.writeText(shareUrl);
setSnackbar({
toastName: 'clip board',
message: '주소가 복사되었습니다.',
Expand Down
24 changes: 13 additions & 11 deletions styles/party/PartyDetailRoom.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ $detailCommonRem: 1rem;
border-radius: $mini-radius;

hr {
border-top: 1px solid $medium-gray;
border-top: 0.1px solid $medium-gray;
}
}

Expand Down Expand Up @@ -165,12 +165,14 @@ $detailCommonRem: 1rem;
}

.btnContainer {
display: flex;
justify-content: space-between;
text-align: right;
border-bottom: 0.3rem;
}

.joinBtn {
width: 50%;
width: 49.5%;
height: 3rem;
margin-bottom: $detailCommonRem;
font-family: $common-font;
Expand All @@ -190,7 +192,7 @@ $detailCommonRem: 1rem;
}

.leaveBtn {
width: 50%;
width: 49.5%;
height: 3rem;
margin-bottom: $detailCommonRem * 0.3;
font-family: $common-font;
Expand All @@ -203,7 +205,7 @@ $detailCommonRem: 1rem;
}

.startBtn {
width: 50%;
width: 49.5%;
height: 3rem;
margin-bottom: $detailCommonRem * 0.3;
font-family: $common-font;
Expand All @@ -228,7 +230,7 @@ $detailCommonRem: 1rem;
border-radius: $mini-radius;

hr {
margin: 0.1rem;
border-top: 0.1px solid $medium-gray;
}
}

Expand Down Expand Up @@ -308,33 +310,33 @@ $detailCommonRem: 1rem;
.reportCommentBtn {
display: flex;
justify-items: right;
align-items: flex-end;
background-color: inherit;
border: none;
border: 0;
}

.commentCreateBar {
display: flex;
min-height: 1.3rem;
margin-bottom: 0.3rem;
background-color: rgba(216, 216, 216, 0.484);
background-color: rgb(232, 232, 232);
border-radius: $small-radius;
align-items: center;
}

.textBar {
width: 100%;
margin-left: 0.5rem;
margin-left: 0.4rem;
font-size: $small-font;
background-color: inherit;
color: black;
background-color: rgb(232, 232, 232);
border: inherit;
opacity: 0.3;
}

.inputBtn {
display: flex;
background-color: inherit;
border: none;
opacity: 0.3;
align-items: right;
}

Expand Down

0 comments on commit a7d859c

Please sign in to comment.