diff --git a/src/app/navigation/i18n/en.ts b/src/app/navigation/i18n/en.ts index bb5f122..fb3b023 100644 --- a/src/app/navigation/i18n/en.ts +++ b/src/app/navigation/i18n/en.ts @@ -18,7 +18,42 @@ export const locale = { }, USER_FEES_MANAGEMENT: { TITLE: 'Fees Management', - } + }, + USER_ATTENDANCE_MANAGEMENT: { + TITLE: 'Attendance Management', + }, + GAME_MANAGEMENT: 'Game Management', + SPORT_RESULT_MANAGEMENT: { + TITLE: 'Sport Result Management', + }, + SPORT_MIX_MANAGEMENT: { + TITLE: 'Sport Mix Management', + }, + MINI_GAME: { + TITLE: 'Mini Game', + }, + MINI_GAME_MANAGEMENT: { + TITLE: 'Mini Game Management' + }, + EXCEL_REGIST: { + TITLE: 'Excel Regist' + }, + BET_HISTORY: { + TITLE: 'Bet History' + }, + SETTLEMENT: { + TITLE: 'Settlement' + }, + ITEM_MANAGEMENT: { + TITLE: 'Item Management' + }, + LEAGUE_MANAGEMENT: { + TITLE: 'League Management' + }, + EXCEPT_AUTO_REGIST: { + TITLE: 'Except Auto Regist' + }, + DEPOSIT_MANAGEMENT: 'Depost Management' } } }; diff --git a/src/app/navigation/i18n/ko.ts b/src/app/navigation/i18n/ko.ts index 7b72b92..0a0e653 100644 --- a/src/app/navigation/i18n/ko.ts +++ b/src/app/navigation/i18n/ko.ts @@ -16,7 +16,42 @@ export const locale = { }, USER_FEES_MANAGEMENT: { TITLE: '커미션 설정', - } + }, + USER_ATTENDANCE_MANAGEMENT: { + TITLE: '출석 관리', + }, + GAME_MANAGEMENT: '게임관리', + SPORT_RESULT_MANAGEMENT: { + TITLE: '결과입력 및 수정', + }, + SPORT_MIX_MANAGEMENT: { + TITLE: '스포츠 조합설정', + }, + MINI_GAME: { + TITLE: '미니게임', + }, + MINI_GAME_MANAGEMENT: { + TITLE: '미니게임 관리' + }, + EXCEL_REGIST: { + TITLE: '엑셀등록' + }, + BET_HISTORY: { + TITLE: '배팅내역' + }, + SETTLEMENT: { + TITLE: '정산하기' + }, + ITEM_MANAGEMENT: { + TITLE: '종목관리' + }, + LEAGUE_MANAGEMENT: { + TITLE: '리그관리' + }, + EXCEPT_AUTO_REGIST: { + TITLE: '자동등록 제외' + }, + DEPOSIT_MANAGEMENT: '입출금 관리' } } }; diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts index c800f87..4a77a63 100644 --- a/src/app/navigation/navigation.ts +++ b/src/app/navigation/navigation.ts @@ -21,7 +21,8 @@ export const navigation: FuseNavigation[] = [ translate: 'NAV.USER_LIST.TITLE', type: 'item', icon: 'email', - url: '/pages/users/user-list', + url: '/pages/users/management/list', + exactMatch: true }, { id: 'user_connect_list', @@ -29,7 +30,8 @@ export const navigation: FuseNavigation[] = [ translate: 'NAV.USER_CONNECT_LIST.TITLE', type: 'item', icon: 'email', - url: '/pages/users/user-connect', + url: '/pages/users/management/connect', + exactMatch: true }, { id: 'user_regist', @@ -37,7 +39,7 @@ export const navigation: FuseNavigation[] = [ translate: 'NAV.USER_REGIST.TITLE', type: 'item', icon: 'email', - url: '/pages/users/user-connect' + url: '/pages/users/user-connect1' }, { id: 'user_fees_management', @@ -45,50 +47,110 @@ export const navigation: FuseNavigation[] = [ translate: 'NAV.USER_FEES_MANAGEMENT.TITLE', type: 'item', icon: 'email', - url: '/pages/users/user-connect' + url: '/pages/users/user-connect2' + }, + { + id: 'user_attendance_management', + title: '출석관리', + translate: 'NAV.USER_ATTENDANCE_MANAGEMENT.TITLE', + type: 'item', + icon: 'email', + url: '/pages/users/user-connect3' } ] }, { - id: 'users', - title: 'Users', - translate: 'NAV.USERS', + id: 'gameManagement', + title: '게임관리', + translate: 'NAV.GAME_MANAGEMENT', type: 'collapsable', children: [ { - id: 'sample', - title: 'Sample', - translate: 'NAV.SAMPLE.TITLE', + id: 'sportResultManagement', + title: '결과입력 및 수정', + translate: 'NAV.SPORT_RESULT_MANAGEMENT.TITLE', type: 'item', icon: 'email', url: '/sample', - badge: { - title: '25', - translate: 'NAV.SAMPLE.BADGE', - bg: '#F44336', - fg: '#FFFFFF' - } }, { - id: 'sample', - title: 'Sample', - translate: 'NAV.SAMPLE.TITLE', + id: 'sportMixManagement', + title: '스포츠 조합설정', + translate: 'NAV.SPORT_MIX_MANAGEMENT.TITLE', + type: 'item', + icon: 'email', + url: '/sample', + }, + { + id: 'miniGame', + title: '미니게임', + translate: 'NAV.MINI_GAME.TITLE', + type: 'item', + icon: 'email', + url: '/sample', + }, + { + id: 'miniGameManagement', + title: '미니게임 관리', + translate: 'NAV.MINI_GAME_MANAGEMENT.TITLE', + type: 'item', + icon: 'email', + url: '/sample', + }, + { + id: 'excelRegist', + title: '엑셀등록', + translate: 'NAV.EXCEL_REGIST.TITLE', + type: 'item', + icon: 'email', + url: '/sample', + }, + { + id: 'betHistory', + title: '배팅내역', + translate: 'NAV.BET_HISTORY.TITLE', + type: 'item', + icon: 'email', + url: '/sample', + }, + { + id: 'settlement', + title: '정산하기', + translate: 'NAV.SETTLEMENT.TITLE', + type: 'item', + icon: 'email', + url: '/sample', + }, + { + id: 'itemManagement', + title: '종목관리', + translate: 'NAV.ITEM_MANAGEMENT.TITLE', + type: 'item', + icon: 'email', + url: '/sample', + }, + { + id: 'leagueManagement', + title: '종목관리', + translate: 'NAV.LEAGUE_MANAGEMENT.TITLE', + type: 'item', + icon: 'email', + url: '/sample', + }, + { + id: 'exceptAutoRegist', + title: '자동등록 제외', + translate: 'NAV.EXCEPT_AUTO_REGIST.TITLE', type: 'item', icon: 'email', url: '/sample', - badge: { - title: '25', - translate: 'NAV.SAMPLE.BADGE', - bg: '#F44336', - fg: '#FFFFFF' - } } ] }, { - id: 'users', - title: 'Users', - translate: 'NAV.USERS', + id: 'depositManagemnet', + title: '입출금관리', + translate: 'NAV.DEPOSIT_MANAGEMENT', type: 'collapsable', children: [ { diff --git a/src/app/pages/users/user/component/user-connect/user-connect.component.html b/src/app/pages/users/user/component/user-connect/user-connect.component.html index 0f65e9d..081164d 100644 --- a/src/app/pages/users/user/component/user-connect/user-connect.component.html +++ b/src/app/pages/users/user/component/user-connect/user-connect.component.html @@ -1 +1 @@ -
user-connect works!
+user-connect worksddddddddddd!
\ No newline at end of file diff --git a/src/app/pages/users/user/user-routing.module.ts b/src/app/pages/users/user/user-routing.module.ts index 1ba2aeb..6b5b75b 100644 --- a/src/app/pages/users/user/user-routing.module.ts +++ b/src/app/pages/users/user/user-routing.module.ts @@ -8,15 +8,15 @@ import { UserConnectComponent } from './component/user-connect/user-connect.comp const routes: Routes = [ { - path: '', + path: 'list', component: UserListComponent, }, { - path: 'user-list/:userId', + path: 'list/:userId', component: UserDetailComponent }, { - path: 'user-connect', + path: 'connect', component: UserConnectComponent } ]; diff --git a/src/app/pages/users/users-routing.module.ts b/src/app/pages/users/users-routing.module.ts index 5b436fd..f6700d5 100644 --- a/src/app/pages/users/users-routing.module.ts +++ b/src/app/pages/users/users-routing.module.ts @@ -3,7 +3,7 @@ import { Routes, RouterModule } from '@angular/router'; const routes: Routes = [ { - path: 'user-list', + path: 'management', loadChildren: './user/user.module#UserModule' } ];