-
+
+
+
+
+
+
새로운 아젠다 만들기
+
당부사항
+
{
+ router.push(`/agenda`);
+ }}
+ />
-
새로운 아젠다 만들기
-
당부사항
-
{
- router.push(`/agenda`);
- }}
- />
);
};
diff --git a/pages/agenda/index.tsx b/pages/agenda/index.tsx
index 1d696e445..0793fab21 100644
--- a/pages/agenda/index.tsx
+++ b/pages/agenda/index.tsx
@@ -1,10 +1,8 @@
-import React, { useRef, useEffect, useState } from 'react';
+import React, { useState } from 'react';
import { AgendaDataProps } from 'types/agenda/agendaDetail/agendaTypes';
import type { NextPage } from 'next';
import AgendaList from 'components/agenda/Home/AgendaList';
import AgendaTitle from 'components/agenda/Home/AgendaTitle';
-import MyAgendaBtn from 'components/agenda/Home/MyAgendaBtn';
-import { TestModal, TestModal2 } from 'components/agenda/modal/testModal';
import PageNation from 'components/Pagination';
import useFetchGet from 'hooks/agenda/useFetchGet';
import usePageNation from 'hooks/agenda/usePageNation';
@@ -30,41 +28,40 @@ const Agenda: NextPage = () => {
return (
-
-
-
AGENDA LIST
-
-
- 진행중
-
- {' | '}
-
+
+
AGENDA LIST
+
+
+ 진행중
+
+ {' | '}
+
- 종료된
-
+ name='closed'
+ onClick={toggleStatus}
+ >
+ 종료된
+
+
-
- {showCurrent ? (
-
- ) : (
- <>
-
-
{' '}
- >
- )}
-
-
+ {showCurrent ? (
+
+ ) : (
+ <>
+
+
{' '}
+ >
+ )}
+
);
};
diff --git a/pages/index.tsx b/pages/index.tsx
index 5ee98c0ec..4275d1a74 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -19,7 +19,7 @@ const Index: NextPage = () => {
Ticket & PingPong
-
+
handleNavigation('/agenda/ticket')}
@@ -40,7 +40,9 @@ const Index: NextPage = () => {
-
아우터 매치 준비중입니다.
+
+ 아우터 매치 준비중입니다.
+
);
};
diff --git a/styles/agenda/Home/Agenda.module.scss b/styles/agenda/Home/Agenda.module.scss
index ac518dc18..90c140e0e 100644
--- a/styles/agenda/Home/Agenda.module.scss
+++ b/styles/agenda/Home/Agenda.module.scss
@@ -1,10 +1,29 @@
@import 'styles/agenda/common.scss';
+.agendaContainer {
+ width: 100%;
+ margin: 0 auto;
+ @media screen and (min-width: 961px) {
+ @include container(2);
+ width: 100%;
+ max-width: 100%;
+ margin: 0;
+ }
+}
.agendaPageContainer {
+ @include layout;
+ position: relative;
+ top: -1rem;
display: flex;
width: 100%;
flex-direction: column;
padding: 1rem 0;
margin: 0;
gap: 1.5rem;
+ @media screen and (min-width: 961px) {
+ gap: 0rem;
+ > div:not(:first-child) {
+ margin-bottom: 1.5rem;
+ }
+ }
}
diff --git a/styles/agenda/Home/AgendaDeadLine.module.scss b/styles/agenda/Home/AgendaDeadLine.module.scss
index 35f74d960..0a524d04c 100644
--- a/styles/agenda/Home/AgendaDeadLine.module.scss
+++ b/styles/agenda/Home/AgendaDeadLine.module.scss
@@ -1,6 +1,7 @@
@import 'styles/agenda/common.scss';
.agendaItemDeadLineBox {
+ @include gridHidden(mobile);
position: absolute;
right: 1rem;
bottom: 1rem;
diff --git a/styles/agenda/Home/AgendaList.module.scss b/styles/agenda/Home/AgendaList.module.scss
index 5b7630978..671b82493 100644
--- a/styles/agenda/Home/AgendaList.module.scss
+++ b/styles/agenda/Home/AgendaList.module.scss
@@ -1,11 +1,26 @@
@import 'styles/agenda/common.scss';
-
+.container {
+ display: flex;
+ justify-content: center;
+ width: 100%;
+ @media screen and (min-width: 961px) {
+ display: grid;
+ grid-template: 'list big' 1fr / auto 1fr;
+ }
+}
.agendaListContainer {
display: flex;
width: 100%;
flex-direction: column;
padding: 0 1rem;
gap: 0.5rem;
+ @media screen and (min-width: 961px) {
+ width: 26rem;
+ height: 70vh;
+ padding: 0 1rem 0 0;
+ overflow-y: auto;
+ grid-area: list;
+ }
}
.agendaListTextWrapper {
@@ -39,7 +54,17 @@
display: flex;
width: 100%;
flex-direction: column;
- gap: 1rem;
+ margin-top: 1.5rem;
+ gap: 1.5rem;
+ align-items: center;
+ a {
+ display: flex;
+ width: 100%;
+ }
+ @media screen and (min-width: 961px) {
+ gap: 0.5rem;
+ margin-top: 0;
+ }
}
.agendaListItemBtn {
@@ -58,6 +83,27 @@
box-shadow: var(--default-box-shadow);
justify-content: center;
align-items: flex-start;
+ @media screen and (min-width: 961px) {
+ max-width: 100%;
+ max-height: 100%;
+ }
+}
+.listBig {
+ @include gridHidden(web);
+ width: 100%;
+ grid-area: big;
+ @media screen and (min-width: 961px) {
+ width: 100%;
+ height: 100%;
+ }
+}
+.listType {
+ @media screen and (min-width: 961px) {
+ width: 100%;
+ height: 6rem;
+ min-height: 6rem;
+ background: var(--box-bg-1);
+ }
}
.emptyContainer {
@@ -72,3 +118,11 @@
@include text('description');
@include container(1);
}
+
+.selected {
+ @media screen and (min-width: 961px) {
+ border-color: var(--highlight-violet);
+ border-width: 2px;
+ box-shadow: 2px 2px 0 2px var(--highlight-violet);
+ }
+}
diff --git a/styles/agenda/Home/AgendaTitle.module.scss b/styles/agenda/Home/AgendaTitle.module.scss
index 6d4d8b985..35bf0a24d 100644
--- a/styles/agenda/Home/AgendaTitle.module.scss
+++ b/styles/agenda/Home/AgendaTitle.module.scss
@@ -8,12 +8,24 @@
padding: 0 1rem;
@include text(main-menu);
- .agendaTitleButtonContainer {
+ .agendaTitle {
+ @include gridHidden(mobile);
+ }
+ .agendaTitleButton,
+ .agendaTitle {
display: flex;
flex-direction: column;
gap: 1rem;
align-items: flex-end;
}
+ .agendaTitleButton {
+ @media screen and (min-width: 961px) {
+ position: absolute;
+ top: 1rem;
+ right: 6rem;
+ flex-direction: row;
+ }
+ }
.agendaCreateBtn {
display: flex;
diff --git a/styles/agenda/Home/MyAgendaBtn.module.scss b/styles/agenda/Home/MyAgendaBtn.module.scss
index f155729d8..d45990402 100644
--- a/styles/agenda/Home/MyAgendaBtn.module.scss
+++ b/styles/agenda/Home/MyAgendaBtn.module.scss
@@ -17,14 +17,25 @@
transition: width 0.15s ease, height 0.15s ease;
gap: 1rem;
@include text(sub-menu);
+ @include gridHead;
}
.myAgendaContainer.expandedHeight {
height: 28rem;
+ overflow-y: auto;
+ @include gridHead;
+ @media screen and (min-width: 961px) {
+ height: max-content;
+ }
}
.myAgendaContainer.expandedWidth {
- width: 23rem;
+ // width: 23rem;
+ width: max-content;
+ @include gridHead;
+ @media screen and (min-width: 961px) {
+ width: 100%;
+ }
}
.myAgendaBtnToggle {
@@ -68,17 +79,27 @@
overflow-y: scroll;
align-items: flex-start;
gap: 1rem;
+ @media screen and (min-width: 961px) {
+ display: flex;
+ width: auto;
+ height: auto;
+ flex-direction: row;
+ flex-wrap: wrap;
+ }
}
.myagendaItemContainer {
display: flex;
justify-content: flex-start;
align-items: center;
- width: 100%;
+ width: max-content;
min-height: 5.5rem;
padding: 0 1.2rem;
background-color: var(--box-bg-1);
border: var(--default-border);
border-radius: $radius-big;
box-shadow: var(--default-box-shadow);
+ @media screen and (min-width: 961px) {
+ width: max-content;
+ }
}
diff --git a/styles/agenda/Layout/Layout.module.scss b/styles/agenda/Layout/Layout.module.scss
index 569fddc69..02fb3febf 100644
--- a/styles/agenda/Layout/Layout.module.scss
+++ b/styles/agenda/Layout/Layout.module.scss
@@ -2,11 +2,12 @@
.background {
position: fixed;
+ top: 0;
z-index: -1;
display: flex;
- width: 100vw;
+ width: 150vw;
min-width: 380px;
- height: calc(100vh - 4rem);
+ height: 150vh;
flex-direction: column;
background: var(--color-bg);
background-attachment: fixed;
@@ -14,8 +15,9 @@
background-size: cover;
}
-.container {
- margin-top: 4rem;
+.app {
+ margin-top: 5rem;
+ @include app;
}
.floatingButton {
diff --git a/styles/agenda/Layout/MenuBar.module.scss b/styles/agenda/Layout/MenuBar.module.scss
index 75c352970..46875755f 100644
--- a/styles/agenda/Layout/MenuBar.module.scss
+++ b/styles/agenda/Layout/MenuBar.module.scss
@@ -1,6 +1,7 @@
@import 'styles/agenda/common.scss';
.container {
position: fixed;
+ top: 4rem;
z-index: 1999;
width: 25vw;
min-width: 200px;
@@ -21,10 +22,12 @@
.inactivebg {
right: 100vw;
+ background: rgba(0, 0, 0, 0);
transition: all 0.5s;
}
.activebg {
right: 0;
+ background: var(--box-bg-3);
transition: all 0.5s;
}
@@ -33,7 +36,6 @@
z-index: 1998;
width: 100vw;
height: 100vh;
- background: var(--box-bg-3);
box-shadow: 5px 0 20px 10px var(--box-bg-3);
opacity: 0.5;
}
diff --git a/styles/agenda/TeamDetail/TeamDetail.module.scss b/styles/agenda/TeamDetail/TeamDetail.module.scss
index aba424866..94a978079 100644
--- a/styles/agenda/TeamDetail/TeamDetail.module.scss
+++ b/styles/agenda/TeamDetail/TeamDetail.module.scss
@@ -1,16 +1,13 @@
@import 'styles/agenda/common.scss';
.teamDetail {
- display: flex;
- flex-direction: column;
+ @include pageContainer;
}
.agendaLink {
display: flex;
- width: calc(100% - 2rem);
- max-width: 1200px;
+ width: 100%;
flex-direction: column;
- margin: 1rem;
cursor: pointer;
justify-content: center;
align-items: center;
diff --git a/styles/agenda/Ticket/Ticket.module.scss b/styles/agenda/Ticket/Ticket.module.scss
index d454b98e4..0630f796e 100644
--- a/styles/agenda/Ticket/Ticket.module.scss
+++ b/styles/agenda/Ticket/Ticket.module.scss
@@ -1,9 +1,14 @@
@import 'styles/agenda/common.scss';
+.pageContainer {
+ @include pageContainer;
+}
+
.container {
@include container(1);
flex-direction: column;
gap: 1.5rem;
+ margin-top: 0;
}
.h1 {
diff --git a/styles/agenda/agendaDetail/AgendaDetail.module.scss b/styles/agenda/agendaDetail/AgendaDetail.module.scss
index b94b7d09e..20ef98934 100644
--- a/styles/agenda/agendaDetail/AgendaDetail.module.scss
+++ b/styles/agenda/agendaDetail/AgendaDetail.module.scss
@@ -1,11 +1,15 @@
@import 'styles/agenda/common.scss';
+.layout {
+ @include layout;
+ grid-template:
+ 'top top top top' 450px
+ 'content content match match' auto / 1fr 1fr 1fr 1fr;
+ max-width: 100%;
+ padding-top: 1px;
+}
+
.agendaDetailWrap {
- display: flex;
- width: 100%;
+ @include pageContainer;
height: 100%;
- flex-direction: column;
- padding: 1rem;
- justify-content: center;
- align-items: center;
}
diff --git a/styles/agenda/agendaDetail/AgendaInfo.module.scss b/styles/agenda/agendaDetail/AgendaInfo.module.scss
index 1f404c5cd..494e357c2 100644
--- a/styles/agenda/agendaDetail/AgendaInfo.module.scss
+++ b/styles/agenda/agendaDetail/AgendaInfo.module.scss
@@ -12,7 +12,9 @@ $info-gradient: linear-gradient(
@include container(1);
position: relative;
width: 100%;
- padding: 1.5rem;
+ min-width: 280px;
+ max-width: 100%;
+ padding: 1.2rem;
margin: 0rem;
background: $info-gradient;
@@ -23,6 +25,16 @@ $info-gradient: linear-gradient(
&.smallHeight {
height: 10rem;
}
+
+ @media screen and (min-width: 481px) and (max-width: 960px) {
+ width: 100%;
+ }
+
+ @media screen and (min-width: 961px) {
+ width: 100%;
+ height: 5rem !important;
+ border-radius: 10rem;
+ }
}
.infoWarp {
@@ -30,6 +42,9 @@ $info-gradient: linear-gradient(
right: 1.5rem;
bottom: 1.5rem;
left: 1.5rem;
+ @media screen and (min-width: 961px) {
+ bottom: 0.3rem;
+ }
}
.contentWarp {
@@ -37,14 +52,23 @@ $info-gradient: linear-gradient(
flex-direction: column;
align-items: flex-start;
gap: 0.6rem;
+
+ @media screen and (min-width: 961px) {
+ flex-direction: row; // 가로 배치
+ justify-content: space-between; // 간격 조절
+ align-items: center;
+ gap: 1rem;
+ }
}
.titleWarp {
display: flex;
- width: 100%;
- height: 2.5rem;
- justify-content: space-between;
align-items: center;
+ width: 100%;
+ gap: 1.5rem;
+ @media screen and (max-width: 961px) {
+ justify-content: space-between;
+ }
h2 {
@include text('agenda-title');
}
@@ -54,15 +78,28 @@ $info-gradient: linear-gradient(
cursor: pointer;
}
-.enrollWarp {
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: flex-end;
- gap: 10px;
- align-self: stretch;
-}
-
.organizerWrap {
@include text('default'); // medium
+ margin-right: auto; // UploadBtn과의 간격 확보
+}
+
+.buttonWarp {
+ position: absolute;
+ right: 0;
+ display: flex; // flex 컨테이너로 설정
+ flex-direction: column; // 기본적으로 세로 정렬
+ align-items: flex-end; // 오른쪽 정렬
+ gap: 0.4rem;
+
+ @media screen and (max-width: 960px) {
+ bottom: 100%; // 960px 이하에서 세로 정렬
+ }
+
+ @media screen and (min-width: 961px) {
+ bottom: 26%; // 961px 이상에서 위치 조정
+ flex-direction: row; // 가로 배치
+ justify-content: flex-end; // 오른쪽 정렬
+ align-items: center; // 세로 중앙 정렬
+ gap: 1rem;
+ }
}
diff --git a/styles/agenda/agendaDetail/AgendaTab.module.scss b/styles/agenda/agendaDetail/AgendaTab.module.scss
index 66bdf592e..f144f1c39 100644
--- a/styles/agenda/agendaDetail/AgendaTab.module.scss
+++ b/styles/agenda/agendaDetail/AgendaTab.module.scss
@@ -12,3 +12,11 @@
align-items: center;
gap: 0.5rem;
}
+
+.tabWarp {
+ width: 100vw;
+ max-width: 100%;
+ @media screen and (min-width: 481px) and (max-width: 960px) {
+ width: 100%;
+ }
+}
diff --git a/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss b/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
index b943e271d..d77154fe1 100644
--- a/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
+++ b/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
@@ -11,6 +11,15 @@
margin: 0;
gap: 1.5rem;
align-items: flex-start;
+ @media screen and (min-width: 481px) and (max-width: 960px) {
+ width: 450px;
+ max-width: 800px;
+ }
+
+ @media screen and (min-width: 961px) {
+ width: 1000px;
+ max-width: 100%;
+ }
}
.conditionTitle {
diff --git a/styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss b/styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss
index 2f71f1253..c2ff2d4a5 100644
--- a/styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss
+++ b/styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss
@@ -3,14 +3,23 @@
.descriptionContainer {
@include container(1);
display: flex;
- width: 100%;
+ width: 100vw;
flex: 1 0 0;
flex-direction: column;
- padding: 1.5rem;
+ padding: 1.5rem !important;
margin: 0;
gap: 1.2rem;
align-items: flex-start;
+
+ @media screen and (min-width: 481px) and (max-width: 960px) {
+ width: 100%;
+ }
+
+ @media screen and (min-width: 961px) {
+ width: 1000px;
+ max-width: 100%;
+ }
}
.descriptionTitle {
diff --git a/styles/agenda/common.scss b/styles/agenda/common.scss
index a107efae5..3cb532e97 100644
--- a/styles/agenda/common.scss
+++ b/styles/agenda/common.scss
@@ -1,5 +1,6 @@
// https://dev.to/wgnrd/adding-a-dark-mode-to-your-website-using-scss-4pdc
// @import 'styles/globals.css';
+@import 'responsive.scss';
// radius
$radius-extra-small: 0.5rem;
@@ -54,8 +55,7 @@ $font-size-xs: 0.8rem; // $small-font
@mixin container($level) {
display: flex;
- width: calc(100% - 2rem);
- max-width: 1200px;
+ width: 100%;
flex-direction: column;
padding: 1rem;
margin: 1rem;
diff --git a/styles/agenda/pages/CreateAgenda.module.scss b/styles/agenda/pages/CreateAgenda.module.scss
index d89529206..97c4639cd 100644
--- a/styles/agenda/pages/CreateAgenda.module.scss
+++ b/styles/agenda/pages/CreateAgenda.module.scss
@@ -1,5 +1,8 @@
@import 'styles/agenda/Form/Form.module.scss';
+.pageContainer {
+ @include pageContainer;
+}
.container {
@include container(1);
padding: 0.5rem;
diff --git a/styles/agenda/pages/create-team.module.scss b/styles/agenda/pages/create-team.module.scss
index 7b7cc4146..7d47e1377 100644
--- a/styles/agenda/pages/create-team.module.scss
+++ b/styles/agenda/pages/create-team.module.scss
@@ -1,8 +1,13 @@
@import 'styles/agenda/common.scss';
+.pageContainer {
+ @include pageContainer;
+}
+
.container {
@include container(1);
- padding: 1rem 0.5rem;
+ padding: 1rem;
+ margin-top: 0;
@include text('default');
}
diff --git a/styles/agenda/responsive.scss b/styles/agenda/responsive.scss
new file mode 100644
index 000000000..8425ce445
--- /dev/null
+++ b/styles/agenda/responsive.scss
@@ -0,0 +1,96 @@
+@mixin action {
+ transition: all 0.5s;
+}
+
+// 최상위 앱 컨트롤러
+// Layout 모듈에서 사용
+@mixin app {
+ @include action;
+ display: flex;
+ width: 100vw;
+ flex-direction: column;
+ align-items: center;
+ @media screen and (max-width: 480px) {
+ // border: 1px solid red;
+ }
+ @media screen and (min-width: 481px) and (max-width: 960px) {
+ // border: 1px solid blue;
+ }
+ @media screen and (min-width: 961px) {
+ // border: 1px solid yellow;
+ }
+}
+
+// 기본 레이아웃, 모든 페이지에서 사용
+// 웹 뷰에서는 그리드, 모바일 뷰에서는 컬럼
+// 각 페이지 내에서 그리드 템플릿 세팅 필요
+@mixin layout {
+ @include action;
+ width: 100%;
+ @media screen and (max-width: 480px) {
+ display: flex;
+ flex-direction: column;
+ // border: 2px solid red;
+ }
+ @media screen and (min-width: 481px) and (max-width: 960px) {
+ display: flex;
+ flex-direction: column;
+ // padding: 0 5rem;
+ // border: 2px solid blue;
+ }
+ @media screen and (min-width: 961px) {
+ display: grid;
+ padding: 0 5rem;
+ // border: 2px solid yellow;
+ }
+}
+@mixin pageContainer {
+ @include action;
+ display: flex;
+ width: 100%;
+ flex-direction: column;
+ padding: 0 1rem;
+ align-items: center;
+
+ @media screen and (min-width: 451px) and (max-width: 960px) {
+ padding: 0 2rem;
+ }
+ @media screen and (min-width: 961px) {
+ height: auto;
+ }
+}
+
+// 헤더에 붙어있는 부분
+@mixin gridHead {
+ @include action;
+ @media screen and (min-width: 961px) {
+ width: calc(100%);
+ border: var(--default-border);
+ border-top: none;
+ border-radius: 0 0 $radius-big $radius-big;
+ }
+}
+
+// 아래 컨테이너 중 가장 위에 있는 부분
+@mixin gridTop {
+ @include action;
+ // @media screen and (min-width: 481px) and (max-width: 960px) {
+ // }
+ // @media screen and (min-width: 961px) {
+ // width: 100%;
+ // grid-column: 1 / -1;
+ // }
+}
+
+@mixin gridHidden($view) {
+ @include action;
+ @if ($view == 'web') {
+ @media screen and (max-width: 960px) {
+ display: none !important;
+ }
+ } @else {
+ @media screen and (min-width: 961px) {
+ display: none !important;
+ }
+ }
+}
diff --git a/styles/agenda/utils/PageController.module.scss b/styles/agenda/utils/PageController.module.scss
index 8bcc7cf45..aba8823fa 100644
--- a/styles/agenda/utils/PageController.module.scss
+++ b/styles/agenda/utils/PageController.module.scss
@@ -3,15 +3,18 @@
.container {
width: 100%;
height: max-content;
+ grid-area: top;
+ @include pageContainer;
}
.agendaInfoContainer {
@include container(1);
+ @media screen and (min-width: 961px) {
+ height: 360px;
+ }
position: relative;
z-index: 0;
display: flex;
- min-width: 352px;
- max-width: 750px;
height: calc(150px + (100vw - 352px) * ((600 - 150) / (750 - 352)));
min-height: 180px;
max-height: 600px;
diff --git a/styles/color-theme.css b/styles/color-theme.css
index 5d4890887..81b9a451f 100644
--- a/styles/color-theme.css
+++ b/styles/color-theme.css
@@ -24,6 +24,8 @@
--highlight-violet-light: #af71ff;
--highlight-yellow-dark: #fff78a;
--highlight-violet-dark: #af71ff;
+ --highlight-bg-dark: #af71ff;
+ --highlight-bg-light: #cda7fc;
--box-bg-1-light: #f8f8f8;
--box-bg-2-light: #c8c8c8ec;
@@ -47,6 +49,7 @@ html[data-theme='light'] {
--highlight-border: var(--border-highlight-light);
--default-box-shadow: var(--box-shadow-light);
--highlight-yellow: var(--highlight-yellow-light);
+ --highlight-bg: var(--highlight-bg-light);
--highlight-violet: var(--highlight-violet-light);
--box-bg-1: var(--box-bg-1-light);
--box-bg-2: var(--box-bg-2-light);
@@ -64,6 +67,7 @@ html[data-theme='dark'] {
--default-box-shadow: var(--box-shadow-dark);
--highlight-yellow: var(--highlight-yellow-dark);
--highlight-violet: var(--highlight-violet-dark);
+ --highlight-bg: var(--highlight-bg-dark);
--box-bg-1: var(--box-bg-1-dark);
--box-bg-2: var(--box-bg-2-dark);
--box-bg-3: var(--box-bg-3-dark);
diff --git a/styles/index.module.scss b/styles/index.module.scss
index 5cb028a9b..0e788d62b 100644
--- a/styles/index.module.scss
+++ b/styles/index.module.scss
@@ -1,5 +1,9 @@
@import 'styles/agenda/common.scss';
.layout {
+ @include layout;
+ grid-template:
+ 'top top top top' 450px
+ 'content content match match' auto / 1fr 1fr 1fr 1fr;
max-width: 100%;
padding-top: 1px;
}
@@ -17,3 +21,11 @@
.flex {
display: flex;
}
+
+.content {
+ grid-area: content;
+}
+
+.match {
+ grid-area: match;
+}
diff --git a/styles/takgu/Layout/MainPageProfile.module.scss b/styles/takgu/Layout/MainPageProfile.module.scss
index e29c38f9c..ae0cd738d 100644
--- a/styles/takgu/Layout/MainPageProfile.module.scss
+++ b/styles/takgu/Layout/MainPageProfile.module.scss
@@ -11,7 +11,7 @@
align-items: center;
}
-.gridContainer {
+.pageContainer {
display: grid;
grid-template-columns: 1fr 3fr;
grid-template-areas: 'image greetingsArea';
diff --git a/types/agenda/agendaDetail/agendaTypes.ts b/types/agenda/agendaDetail/agendaTypes.ts
index 6a760a71d..a5bf76fdb 100644
--- a/types/agenda/agendaDetail/agendaTypes.ts
+++ b/types/agenda/agendaDetail/agendaTypes.ts
@@ -22,6 +22,7 @@ export interface AgendaDataProps {
isRanking?: boolean;
agendaisRanking: boolean;
agendaKey: string;
+ idx?: number;
}
export interface AgendaProps {
@@ -32,6 +33,8 @@ export interface MyTeamDataProps {
agendaKey: string; // 대회 고유 키
agendaTitle: string;
agendaLocation: string; // ENUM 상단참고
+ agendaStartTime?: Date | string;
+ teamStatus: string;
teamKey: string; // 내 팀 조회를 위한 key
isOfficial: boolean; //공식대회여부
teamName: string; //fe 추가 0728 : 와이어프레임 참고