Skip to content

[Merge] 새학기 대비 기능 추가 업데이트 develop -> main #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnals0924 merged 3 commits into from
Mar 4, 2026
Merged

[Merge] 새학기 대비 기능 추가 업데이트 develop -> main #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e0548f5
feat: 근무자, 총무부도 관리자 대시보드로 이동할 수 있도록 수정
tnals0924 Mar 2, 2026
333c18a
chore: 관리자 홈페이지 링크 변경
tnals0924 Mar 2, 2026
d63d78f
chore: 배포 환경 caprover 앱 변경
tnals0924 Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
DOCKER_IMAGE: ${{ secrets.DOCKER_USERNAME }}/billilge-client
CAPROVER_APP: app
CAPROVER_APP: www

jobs:
build-and-deploy:
Expand Down
6 changes: 4 additions & 2 deletions src/components/mobile/SidebarMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ interface SidebarProps {
role?: string;
}

const adminRole = ['GA', 'WORKER', 'ADMIN'];

const menuItems = [
{ icon: IconRentalList, label: '복지 물품 목록', href: '/mobile/main' },
{ icon: IconRentalHistory, label: '대여기록', href: '/mobile/history' },
Expand All @@ -38,7 +40,7 @@ const adminItems = [
{
icon: IconAdminHomepage,
label: '관리자 홈페이지',
href: 'https://www.billilge.site/desktop/login',
href: 'https://admin.billilge.site/login',
},
];

Expand Down Expand Up @@ -100,7 +102,7 @@ export default function Sidebar({
<div className="my-5 border-t border-gray-border" />

{/* 관리자 메뉴 */}
{role === 'ADMIN' && (
{adminRole.includes(role) && (
<>
<ul className="text-body-2-normal_semi font-semibold text-black-primary">
{adminItems.map(({ icon: Icon, label, href }) => {
Expand Down
Loading