-
팀 수정하기
-
팀 인원 : 3명-8명까지 가능
- {teamData && (
-
- )}
+
+
+
팀 수정하기
+ {teamData && (
+
+ )}
+
>
);
diff --git a/pages/agenda/[agendaKey]/[teamUID]/index.tsx b/pages/agenda/[agendaKey]/[teamUID]/index.tsx
index 9f9652e71..bf3c5653e 100644
--- a/pages/agenda/[agendaKey]/[teamUID]/index.tsx
+++ b/pages/agenda/[agendaKey]/[teamUID]/index.tsx
@@ -61,7 +61,7 @@ export default function TeamDetail() {
const sendRequest = useFetchRequest().sendRequest;
const shareTeamInfo = () => {
- alert('공유하기');
+ alert('링크가 복사되었습니다.');
const url = window.location.href;
navigator.clipboard.writeText(url);
};
diff --git a/styles/agenda/Form/Form.module.scss b/styles/agenda/Form/Form.module.scss
index 5ce426afa..b14f12ffa 100644
--- a/styles/agenda/Form/Form.module.scss
+++ b/styles/agenda/Form/Form.module.scss
@@ -4,6 +4,7 @@
display: flex;
width: 100%;
flex-direction: column;
+ text-align: left;
}
.pageContianer {
@@ -28,6 +29,9 @@
.description {
@include text('description');
padding: 0.5rem;
+ > span {
+ @include text('description-regular');
+ }
}
%item-container {
diff --git a/styles/agenda/Layout/Layout.module.scss b/styles/agenda/Layout/Layout.module.scss
index 02fb3febf..3fc6fcb16 100644
--- a/styles/agenda/Layout/Layout.module.scss
+++ b/styles/agenda/Layout/Layout.module.scss
@@ -29,13 +29,14 @@
font-size: var(--font-size-xl);
color: white;
cursor: pointer;
- background-color: var(--highlight-violet);
+
+ background-color: var(--highlight-yellow);
border: none;
border-radius: $radius-circle;
box-shadow: var(--box-shadow-light);
transition: background-color 0.3s;
&:hover {
- background-color: var(--highlight-yellow);
+ background-color: var(--highlight-violet);
}
}
diff --git a/styles/agenda/agendaDetail/AgendaInfo.module.scss b/styles/agenda/agendaDetail/AgendaInfo.module.scss
index 494e357c2..ba9dc5d91 100644
--- a/styles/agenda/agendaDetail/AgendaInfo.module.scss
+++ b/styles/agenda/agendaDetail/AgendaInfo.module.scss
@@ -43,7 +43,7 @@ $info-gradient: linear-gradient(
bottom: 1.5rem;
left: 1.5rem;
@media screen and (min-width: 961px) {
- bottom: 0.3rem;
+ bottom: 1rem;
}
}
@@ -59,18 +59,10 @@ $info-gradient: linear-gradient(
align-items: center;
gap: 1rem;
}
-}
-.titleWarp {
- display: flex;
- align-items: center;
- width: 100%;
- gap: 1.5rem;
- @media screen and (max-width: 961px) {
- justify-content: space-between;
- }
h2 {
- @include text('agenda-title');
+ @include text('date');
+ margin: 0.5rem 0;
}
}
@@ -89,17 +81,22 @@ $info-gradient: linear-gradient(
display: flex; // flex 컨테이너로 설정
flex-direction: column; // 기본적으로 세로 정렬
align-items: flex-end; // 오른쪽 정렬
- gap: 0.4rem;
+ gap: 0.8rem;
@media screen and (max-width: 960px) {
- bottom: 100%; // 960px 이하에서 세로 정렬
+ bottom: 56%;
}
@media screen and (min-width: 961px) {
- bottom: 26%; // 961px 이상에서 위치 조정
- flex-direction: row; // 가로 배치
+ bottom: 18%;
+ flex-direction: row-reverse; // 가로 배치
justify-content: flex-end; // 오른쪽 정렬
align-items: center; // 세로 중앙 정렬
gap: 1rem;
}
}
+
+.agendaItemTagBox {
+ display: flex;
+ gap: 0.3rem;
+}
diff --git a/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss b/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
index d77154fe1..135db8ef9 100644
--- a/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
+++ b/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
@@ -12,8 +12,7 @@
gap: 1.5rem;
align-items: flex-start;
@media screen and (min-width: 481px) and (max-width: 960px) {
- width: 450px;
- max-width: 800px;
+ width: 100%;
}
@media screen and (min-width: 961px) {
diff --git a/styles/agenda/agendaDetail/tabs/ParticipantsList.module.scss b/styles/agenda/agendaDetail/tabs/ParticipantsList.module.scss
index 69249273e..1df198d0c 100644
--- a/styles/agenda/agendaDetail/tabs/ParticipantsList.module.scss
+++ b/styles/agenda/agendaDetail/tabs/ParticipantsList.module.scss
@@ -8,12 +8,13 @@
display: flex;
width: 100%;
flex-direction: column;
+
gap: 1rem 2rem;
}
.participantsContainer {
display: flex;
- justify-content: center;
+ justify-content: flex-start;
flex-wrap: wrap;
gap: 2rem;
width: 100%;
diff --git a/styles/agenda/button/TabButton.module.scss b/styles/agenda/button/TabButton.module.scss
index 241e8075f..b7f7ca0c8 100644
--- a/styles/agenda/button/TabButton.module.scss
+++ b/styles/agenda/button/TabButton.module.scss
@@ -21,6 +21,6 @@
}
&.isActive {
- background: var(--highlight-yellow-light);
+ background: var(--highlight-yellow);
}
}
diff --git a/styles/agenda/common.scss b/styles/agenda/common.scss
index 3cb532e97..0d987b143 100644
--- a/styles/agenda/common.scss
+++ b/styles/agenda/common.scss
@@ -177,6 +177,9 @@ $font-size-xs: 0.8rem; // $small-font
// 제목 뒤에 붙는 설명
font-family: $font-text-light;
font-size: $font-size-xs;
+ } @else if ($type == 'description-regular') {
+ font-family: $font-text-regular;
+ font-size: $font-size-xs;
} @else if ($type == 'agenda-title') {
font-family: $font-text-bold;
font-size: $font-size-xl;
diff --git a/styles/agenda/modal/AgendaModalProvider.module.scss b/styles/agenda/modal/AgendaModalProvider.module.scss
index 0d0622261..5026f9cf6 100644
--- a/styles/agenda/modal/AgendaModalProvider.module.scss
+++ b/styles/agenda/modal/AgendaModalProvider.module.scss
@@ -3,7 +3,7 @@
.backdrop {
@include backdrop;
position: fixed;
- z-index: 4000;
+ z-index: 4;
display: flex;
justify-content: center;
diff --git a/styles/agenda/modal/modal.module.scss b/styles/agenda/modal/modal.module.scss
index c757a86be..61b8c8ef3 100644
--- a/styles/agenda/modal/modal.module.scss
+++ b/styles/agenda/modal/modal.module.scss
@@ -2,13 +2,15 @@
.modalContainer {
@include container(modal);
- z-index: 5000;
+ z-index: 5;
display: flex;
width: max-content;
min-width: 20rem;
+ max-width: 30rem;
height: max-content;
flex-direction: column;
+ overflow: visible;
line-height: 150%;
text-align: center;
white-space: pre;
@@ -32,6 +34,7 @@
&.left {
width: 100%;
padding: 0 1rem;
+ text-align: left;
}
}
diff --git a/styles/agenda/pages/create-team.module.scss b/styles/agenda/pages/create-team.module.scss
index 7d47e1377..d0f922217 100644
--- a/styles/agenda/pages/create-team.module.scss
+++ b/styles/agenda/pages/create-team.module.scss
@@ -15,3 +15,10 @@
@include text('title');
margin: 0 0 1rem;
}
+
+.modifyContainer {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ margin: 2rem 5rem;
+}
diff --git a/styles/agenda/utils/AgendaTag.module.scss b/styles/agenda/utils/AgendaTag.module.scss
index 34e2a9206..f6b172d43 100644
--- a/styles/agenda/utils/AgendaTag.module.scss
+++ b/styles/agenda/utils/AgendaTag.module.scss
@@ -23,5 +23,18 @@ $tags: (
border-radius: $radius-medium;
justify-content: center;
align-items: center;
- @include text(description);
+ @include text(description-regular);
+}
+
+.defaultTag {
+ display: flex;
+ width: 3.3rem;
+ height: 1.2rem;
+ padding: 0.2rem;
+
+ background-color: var(--box-bg-2-light);
+ border-radius: $radius-medium;
+ justify-content: center;
+ align-items: center;
+ @include text(description-regular);
}
diff --git a/types/agenda/modalTypes.ts b/types/agenda/modalTypes.ts
index 433f804f1..c0d3170b4 100644
--- a/types/agenda/modalTypes.ts
+++ b/types/agenda/modalTypes.ts
@@ -16,4 +16,5 @@ export interface agendaModal {
data?: any;
stringKey?: string;
isAdmin?: boolean;
+ image?: string;
}
diff --git a/utils/agenda/getAgendaSnackBarInfo.ts b/utils/agenda/getAgendaSnackBarInfo.ts
index a639af4a3..4bb6d0f8b 100644
--- a/utils/agenda/getAgendaSnackBarInfo.ts
+++ b/utils/agenda/getAgendaSnackBarInfo.ts
@@ -62,9 +62,13 @@ export default function getAgendaSnackBarInfo(
severity: 'info',
message: '팀이 폭파되었습니다.',
},
+ '/team/drop': {
+ severity: 'info',
+ message: '팀에서 나갔습니다.',
+ },
'/team/confirm': {
severity: 'success',
- message: '대회 정보가 성공적으로 확정되었습니다.',
+ message: '팀이 성공적으로 확정되었습니다.',
},
'/ticket': {
severity: 'success',
@@ -77,6 +81,6 @@ export default function getAgendaSnackBarInfo(
if (result) {
return { severity: result.severity, message: result.message };
} else {
- return { severity: 'default', message: '뭔진 모르겠지만 성공!.' };
+ return { severity: 'default', message: '성공했습니다.' };
}
}