Skip to content

Commit 091c8ba

Browse files
authored
Merge pull request #92 from wafflestudio/main
시간표 모바일 설명 관련 dev 반영
2 parents 268dc25 + afb4f24 commit 091c8ba

6 files changed

Lines changed: 28 additions & 3 deletions

File tree

.github/workflows/_deploy.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ on:
1212
ga_measurement_id:
1313
required: true
1414
type: string
15+
social_login_base_url:
16+
required: true
17+
type: string
1518

1619
jobs:
1720
deploy:
@@ -35,7 +38,7 @@ jobs:
3538
env:
3639
VITE_GA_MEASUREMENT_ID: ${{ inputs.ga_measurement_id }}
3740
VITE_API_URL: ${{ vars.VITE_API_URL }}
38-
VITE_SOCIAL_LOGIN_BASE_URL: ${{ vars.VITE_SOCIAL_LOGIN_BASE_URL }}
41+
VITE_SOCIAL_LOGIN_BASE_URL: ${{ inputs.social_login_base_url }}
3942

4043
- name: Deploy to S3 and Invalidate Cloudfront
4144
env:

.github/workflows/deploy-dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ jobs:
1313
bucket_name: hangsha-web-dev
1414
distribution_id: E3FWQLYH2W4XLU
1515
ga_measurement_id: ${{ vars.VITE_GA_MEASUREMENT_ID_DEV }}
16+
social_login_base_url: ${{ vars.VITE_SOCIAL_LOGIN_BASE_URL_DEV }}
1617
secrets: inherit

.github/workflows/deploy-prod.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ jobs:
1313
bucket_name: hangsha-web-prod
1414
distribution_id: E1UQAE6HOA8O14
1515
ga_measurement_id: ${{ vars.VITE_GA_MEASUREMENT_ID_PROD }}
16+
social_login_base_url: ${{ vars.VITE_SOCIAL_LOGIN_BASE_URL_PROD }}
1617
secrets: inherit

src/api/bugReport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ export interface CreateBugReportRequest {
66
}
77

88
export const createBugReport = async (body: CreateBugReportRequest) => {
9-
await api.post("/api/v1/bug-reports", body);
9+
await api.post("/bug-reports", body);
1010
};

src/pages/timetable/TimetablePage.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,14 @@ export default function TimetablePage() {
208208
선택된 시간표가 없어요
209209
</div>
210210
<div style={{ opacity: 0.7, lineHeight: 1.5 }}>
211-
왼쪽 사이드바에서 시간표를 추가하거나 선택해 주세요.
211+
<span className={styles.emptyDesktop}>
212+
왼쪽 사이드바에서 시간표를 추가하거나 선택해 주세요.
213+
</span>
214+
<span className={styles.emptyMobile}>
215+
시간표는 데스크탑 뷰에서 설정해주세요!
216+
</span>
212217
</div>
218+
213219
</div>
214220
) : (
215221
<TimetableGrid

src/styles/Timetable.module.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,13 @@
395395
height: 60vh;
396396
}
397397

398+
.emptyDesktop {
399+
display: block;
400+
}
401+
.emptyMobile {
402+
display: none;
403+
}
404+
398405
@media (max-width: 576px) {
399406
.page,
400407
.AddClassPanelClosed,
@@ -609,4 +616,11 @@
609616
.notFound {
610617
display: flex;
611618
}
619+
620+
.emptyDesktop {
621+
display: none;
622+
}
623+
.emptyMobile {
624+
display: block;
625+
}
612626
}

0 commit comments

Comments
 (0)