From 76afd97979cd2a66d862c4a5937e128e0f6c220e Mon Sep 17 00:00:00 2001 From: byung eun park Date: Sun, 28 Jul 2019 18:55:33 +0900 Subject: [PATCH] menu added --- src/app/app.component.ts | 4 +- src/app/navigation/i18n/en.ts | 16 +++++-- src/app/navigation/i18n/ko.ts | 16 +++++-- src/app/navigation/navigation.ts | 47 ++++++++++--------- src/app/pages/users/user/component/index.ts | 3 +- .../user-connect/user-connect.component.html | 1 + .../user-connect/user-connect.component.scss | 0 .../user-connect.component.spec.ts | 25 ++++++++++ .../user-connect/user-connect.component.ts | 43 +++++++++++++++++ .../user/component/user-list.component.ts | 3 +- .../pages/users/user/user-routing.module.ts | 7 ++- src/app/pages/users/user/user.module.ts | 10 +--- 12 files changed, 131 insertions(+), 44 deletions(-) create mode 100644 src/app/pages/users/user/component/user-connect/user-connect.component.html create mode 100644 src/app/pages/users/user/component/user-connect/user-connect.component.scss create mode 100644 src/app/pages/users/user/component/user-connect/user-connect.component.spec.ts create mode 100644 src/app/pages/users/user/component/user-connect/user-connect.component.ts diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 905b0ff..ce4c740 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -62,7 +62,7 @@ export class AppComponent implements OnInit, OnDestroy { this._translateService.addLangs(['ko', 'en']); // Set the default language - this._translateService.setDefaultLang('en'); + this._translateService.setDefaultLang('ko'); // Set the navigation translations this._fuseTranslationLoaderService.loadTranslations( @@ -71,7 +71,7 @@ export class AppComponent implements OnInit, OnDestroy { ); // Use a language - this._translateService.use('en'); + this._translateService.use('ko'); /** * ---------------------------------------------------------------------------------------------------- diff --git a/src/app/navigation/i18n/en.ts b/src/app/navigation/i18n/en.ts index 6b3c982..bb5f122 100644 --- a/src/app/navigation/i18n/en.ts +++ b/src/app/navigation/i18n/en.ts @@ -3,11 +3,21 @@ export const locale = { data: { NAV: { DASHBOARD: 'Dashboard', - USERS: 'Users', + USERS: 'User-Management', APPLICATIONS: 'Application', - USER: { - TITLE: 'User', + USER_LIST: { + TITLE: 'User List', BADGE: '15' + }, + USER_CONNECT_LIST: { + TITLE: 'Current Connect List', + BADGE: '15' + }, + USER_REGIST: { + TITLE: 'SignUp', + }, + USER_FEES_MANAGEMENT: { + TITLE: 'Fees Management', } } } diff --git a/src/app/navigation/i18n/ko.ts b/src/app/navigation/i18n/ko.ts index adbd164..7b72b92 100644 --- a/src/app/navigation/i18n/ko.ts +++ b/src/app/navigation/i18n/ko.ts @@ -3,11 +3,19 @@ export const locale = { data: { NAV: { DASHBOARD: '대시보드', - USERS: '사용자 관리', + USERS: '회원 관리', APPLICATIONS: '어플리케이션', - USER: { - TITLE: '사용자', - BADGE: '15' + USER_LIST: { + TITLE: '회원 리스트', + }, + USER_CONNECT_LIST: { + TITLE: '현재접속자', + }, + USER_REGIST: { + TITLE: '회원가입', + }, + USER_FEES_MANAGEMENT: { + TITLE: '커미션 설정', } } } diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts index 9164129..c800f87 100644 --- a/src/app/navigation/navigation.ts +++ b/src/app/navigation/navigation.ts @@ -3,7 +3,7 @@ import { FuseNavigation } from 'src/@fuse/types'; export const navigation: FuseNavigation[] = [ { id: 'dashboard', - title: 'Dashboard', + title: '대시보드', translate: 'NAV.DASHBOARD', type: 'item', icon: 'dashboard', @@ -11,38 +11,41 @@ export const navigation: FuseNavigation[] = [ }, { id: 'users', - title: 'Users', + title: '회원 관리', translate: 'NAV.USERS', type: 'collapsable', children: [ { - id: 'user', - title: 'User', - translate: 'NAV.USER.TITLE', + id: 'user_list', + title: '회원 리스트', + translate: 'NAV.USER_LIST.TITLE', type: 'item', icon: 'email', url: '/pages/users/user-list', - badge: { - title: '25', - translate: 'NAV.USER.BADGE', - bg: '#F44336', - fg: '#FFFFFF' - } }, - { - id: 'sample', - title: 'Sample', - translate: 'NAV.SAMPLE.TITLE', + id: 'user_connect_list', + title: '현재접속자', + translate: 'NAV.USER_CONNECT_LIST.TITLE', type: 'item', icon: 'email', - url: '/sample', - badge: { - title: '25', - translate: 'NAV.SAMPLE.BADGE', - bg: '#F44336', - fg: '#FFFFFF' - } + url: '/pages/users/user-connect', + }, + { + id: 'user_regist', + title: '회원가입', + translate: 'NAV.USER_REGIST.TITLE', + type: 'item', + icon: 'email', + url: '/pages/users/user-connect' + }, + { + id: 'user_fees_management', + title: '커미션 설정', + translate: 'NAV.USER_FEES_MANAGEMENT.TITLE', + type: 'item', + icon: 'email', + url: '/pages/users/user-connect' } ] }, diff --git a/src/app/pages/users/user/component/index.ts b/src/app/pages/users/user/component/index.ts index 0c6c60c..e432fcf 100644 --- a/src/app/pages/users/user/component/index.ts +++ b/src/app/pages/users/user/component/index.ts @@ -1,4 +1,5 @@ import { UserDetailComponent } from './user-detail.component'; import { UserListComponent } from './user-list.component'; +import { UserConnectComponent } from './user-connect/user-connect.component'; -export const COMPONENTS = [UserDetailComponent, UserListComponent]; +export const COMPONENTS = [UserDetailComponent, UserListComponent, UserConnectComponent]; 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 new file mode 100644 index 0000000..0f65e9d --- /dev/null +++ b/src/app/pages/users/user/component/user-connect/user-connect.component.html @@ -0,0 +1 @@ +

user-connect works!

diff --git a/src/app/pages/users/user/component/user-connect/user-connect.component.scss b/src/app/pages/users/user/component/user-connect/user-connect.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/users/user/component/user-connect/user-connect.component.spec.ts b/src/app/pages/users/user/component/user-connect/user-connect.component.spec.ts new file mode 100644 index 0000000..a12d1a0 --- /dev/null +++ b/src/app/pages/users/user/component/user-connect/user-connect.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { UserConnectComponent } from './user-connect.component'; + +describe('UserConnectComponent', () => { + let component: UserConnectComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ UserConnectComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UserConnectComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/users/user/component/user-connect/user-connect.component.ts b/src/app/pages/users/user/component/user-connect/user-connect.component.ts new file mode 100644 index 0000000..efaa6aa --- /dev/null +++ b/src/app/pages/users/user/component/user-connect/user-connect.component.ts @@ -0,0 +1,43 @@ + +import { + Component, + ElementRef, + OnDestroy, + OnInit, + ViewChild, + ViewEncapsulation +} from '@angular/core'; +import { fuseAnimations } from 'src/@fuse/animations'; +import { BehaviorSubject, fromEvent, merge, Observable, Subject } from 'rxjs'; + +@Component({ + selector: 'app-user-connect', + templateUrl: './user-connect.component.html', + styleUrls: ['./user-connect.component.scss'], + animations: fuseAnimations, + encapsulation: ViewEncapsulation.None +}) +export class UserConnectComponent implements OnInit, OnDestroy { + + private _unsubscribeAll: Subject; + + /** + * Constructor + */ + constructor( + + ) { + + // Set the private defaults + this._unsubscribeAll = new Subject(); + } + + ngOnInit() { + } + + ngOnDestroy(): void { + // Unsubscribe from all subscriptions + this._unsubscribeAll.next(); + this._unsubscribeAll.complete(); + } +} diff --git a/src/app/pages/users/user/component/user-list.component.ts b/src/app/pages/users/user/component/user-list.component.ts index c46857f..3ae933a 100644 --- a/src/app/pages/users/user/component/user-list.component.ts +++ b/src/app/pages/users/user/component/user-list.component.ts @@ -16,7 +16,6 @@ import { fuseAnimations } from 'src/@fuse/animations'; import { FuseUtils } from 'src/@fuse/utils'; import { takeUntil } from 'rxjs/internal/operators'; -import { UserListService } from './user-list.service'; @Component({ selector: 'app-user-user-list', @@ -62,7 +61,7 @@ export class UserListComponent implements OnInit, OnDestroy { * Constructor */ constructor( - private _userListService: UserListService + ) { // Set the private defaults diff --git a/src/app/pages/users/user/user-routing.module.ts b/src/app/pages/users/user/user-routing.module.ts index fd14cfd..1ba2aeb 100644 --- a/src/app/pages/users/user/user-routing.module.ts +++ b/src/app/pages/users/user/user-routing.module.ts @@ -3,7 +3,8 @@ import { Routes, RouterModule } from '@angular/router'; import { UserDetailComponent } from './component/user-detail.component'; import { UserListComponent } from './component/user-list.component'; -import { UserListService } from './component/user-list.service'; +import { UserConnectComponent } from './component/user-connect/user-connect.component'; + const routes: Routes = [ { @@ -13,6 +14,10 @@ const routes: Routes = [ { path: 'user-list/:userId', component: UserDetailComponent + }, + { + path: 'user-connect', + component: UserConnectComponent } ]; diff --git a/src/app/pages/users/user/user.module.ts b/src/app/pages/users/user/user.module.ts index f084480..13ef5f4 100644 --- a/src/app/pages/users/user/user.module.ts +++ b/src/app/pages/users/user/user.module.ts @@ -13,12 +13,10 @@ import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatSortModule } from '@angular/material/sort'; import { MatTableModule } from '@angular/material/table'; import { MatTabsModule } from '@angular/material/tabs'; -import { AgmCoreModule } from '@agm/core'; import { FuseSharedModule } from 'src/@fuse/shared.module'; import { UserRoutingModule } from './user-routing.module'; import { COMPONENTS } from './component'; -import { UserListService } from './component/user-list.service'; @NgModule({ imports: [ @@ -36,17 +34,11 @@ import { UserListService } from './component/user-list.service'; MatTableModule, MatTabsModule, - AgmCoreModule.forRoot({ - apiKey: 'AIzaSyD81ecsCj4yYpcXSLFcYU97PvRsE_X8Bx8' - }), - FuseSharedModule, UserRoutingModule ], declarations: [...COMPONENTS], - providers: [ - UserListService - ] + }) export class UserModule { }