From 0b6cd50a1ff4c893763709c04a3eda5f168fe65e Mon Sep 17 00:00:00 2001 From: byung eun park Date: Sun, 27 Oct 2019 16:28:04 +0900 Subject: [PATCH] info model --- src/app/navigation/navigation.ts | 8 +- ...onent.html => betting-rule.component.html} | 2 +- ...onent.scss => betting-rule.component.scss} | 2 +- ...component.ts => betting-rule.component.ts} | 8 +- .../info/component/free-board.component.ts | 2 +- src/app/pages/infos/info/component/index.ts | 12 +- ...tml => popup-config-detail.component.html} | 2 +- ...css => popup-config-detail.component.scss} | 2 +- ...nt.ts => popup-config-detail.component.ts} | 8 +- .../component/popup-config.component.html | 221 +++++++++++++++ ...onent.scss => popup-config.component.scss} | 8 +- ...component.ts => popup-config.component.ts} | 26 +- ...-source.ts => popup-config.data-source.ts} | 78 +++--- .../info/component/popup-set.component.html | 254 ------------------ .../component/service-center.component.ts | 2 +- .../component/service-center.data-source.ts | 4 +- .../pages/infos/info/info-routing.module.ts | 22 +- src/app/pages/infos/info/resolver/index.ts | 4 +- ...ver.ts => popup-config-detail.resolver.ts} | 10 +- src/modules/infos/infos.module.ts | 6 +- src/modules/infos/model/betting-rule.model.ts | 7 + src/modules/infos/model/free-board.model.ts | 8 + src/modules/infos/model/main-event.model.ts | 7 + src/modules/infos/model/message.model.ts | 9 + src/modules/infos/model/notice-board.model.ts | 10 + src/modules/infos/model/popup-config.model.ts | 13 + src/modules/infos/model/reply.model.ts | 8 + .../infos/model/service-center.model.ts | 12 + .../infos/popup-set/model/popup-set.model.ts | 13 - src/modules/infos/popup-set/service/index.ts | 3 - .../model/service-center.model.ts | 13 - .../infos/service-center/service/index.ts | 3 - src/modules/infos/service/index.ts | 4 + .../popup-config.service.ts} | 4 +- .../service/service-center.service.ts | 0 src/modules/infos/type/answer-state.type.ts | 6 + src/modules/infos/type/message-state.type.ts | 4 + src/modules/infos/type/notice-state.type.ts | 4 + src/modules/infos/type/question-state.type.ts | 4 + 39 files changed, 427 insertions(+), 386 deletions(-) rename src/app/pages/infos/info/component/{bet-rule.component.html => betting-rule.component.html} (97%) rename src/app/pages/infos/info/component/{bet-rule.component.scss => betting-rule.component.scss} (99%) rename src/app/pages/infos/info/component/{bet-rule.component.ts => betting-rule.component.ts} (84%) rename src/app/pages/infos/info/component/{popup-set-detail.component.html => popup-config-detail.component.html} (99%) rename src/app/pages/infos/info/component/{popup-set-detail.component.scss => popup-config-detail.component.scss} (99%) rename src/app/pages/infos/info/component/{popup-set-detail.component.ts => popup-config-detail.component.ts} (82%) create mode 100644 src/app/pages/infos/info/component/popup-config.component.html rename src/app/pages/infos/info/component/{popup-set.component.scss => popup-config.component.scss} (96%) rename src/app/pages/infos/info/component/{popup-set.component.ts => popup-config.component.ts} (76%) rename src/app/pages/infos/info/component/{popup-set.data-source.ts => popup-config.data-source.ts} (59%) delete mode 100644 src/app/pages/infos/info/component/popup-set.component.html rename src/app/pages/infos/info/resolver/{popup-set-detail.resolver.ts => popup-config-detail.resolver.ts} (59%) create mode 100644 src/modules/infos/model/betting-rule.model.ts create mode 100644 src/modules/infos/model/free-board.model.ts create mode 100644 src/modules/infos/model/main-event.model.ts create mode 100644 src/modules/infos/model/message.model.ts create mode 100644 src/modules/infos/model/notice-board.model.ts create mode 100644 src/modules/infos/model/popup-config.model.ts create mode 100644 src/modules/infos/model/reply.model.ts create mode 100644 src/modules/infos/model/service-center.model.ts delete mode 100644 src/modules/infos/popup-set/model/popup-set.model.ts delete mode 100644 src/modules/infos/popup-set/service/index.ts delete mode 100644 src/modules/infos/service-center/model/service-center.model.ts delete mode 100644 src/modules/infos/service-center/service/index.ts create mode 100644 src/modules/infos/service/index.ts rename src/modules/infos/{popup-set/service/popup-set.service.ts => service/popup-config.service.ts} (88%) rename src/modules/infos/{service-center => }/service/service-center.service.ts (100%) create mode 100644 src/modules/infos/type/answer-state.type.ts create mode 100644 src/modules/infos/type/message-state.type.ts create mode 100644 src/modules/infos/type/notice-state.type.ts create mode 100644 src/modules/infos/type/question-state.type.ts diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts index bcba70c..ba30c7c 100644 --- a/src/app/navigation/navigation.ts +++ b/src/app/navigation/navigation.ts @@ -234,20 +234,20 @@ export const navigation: FuseNavigation[] = [ url: '/pages/infos/management/free-board' }, { - id: 'bet_rule', + id: 'betting_rule', title: '배팅규정', translate: 'NAV.INFO.BET_RULE.TITLE', type: 'item', icon: 'email', - url: '/pages/infos/management/bet-rule' + url: '/pages/infos/management/betting-rule' }, { - id: 'popup_setting', + id: 'popup_config', title: '팝업창', translate: 'NAV.INFO.POPUP_SETTING.TITLE', type: 'item', icon: 'email', - url: '/pages/infos/management/popup-set' + url: '/pages/infos/management/popup-config' }, { id: 'main_event_regist', diff --git a/src/app/pages/infos/info/component/bet-rule.component.html b/src/app/pages/infos/info/component/betting-rule.component.html similarity index 97% rename from src/app/pages/infos/info/component/bet-rule.component.html rename to src/app/pages/infos/info/component/betting-rule.component.html index 53da4c2..a1ed442 100644 --- a/src/app/pages/infos/info/component/bet-rule.component.html +++ b/src/app/pages/infos/info/component/betting-rule.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/pages/infos/info/component/bet-rule.component.scss b/src/app/pages/infos/info/component/betting-rule.component.scss similarity index 99% rename from src/app/pages/infos/info/component/bet-rule.component.scss rename to src/app/pages/infos/info/component/betting-rule.component.scss index f867e96..3759656 100644 --- a/src/app/pages/infos/info/component/bet-rule.component.scss +++ b/src/app/pages/infos/info/component/betting-rule.component.scss @@ -1,6 +1,6 @@ @import "src/@fuse/scss/fuse"; -#bet-rule { +#betting-rule { .header { diff --git a/src/app/pages/infos/info/component/bet-rule.component.ts b/src/app/pages/infos/info/component/betting-rule.component.ts similarity index 84% rename from src/app/pages/infos/info/component/bet-rule.component.ts rename to src/app/pages/infos/info/component/betting-rule.component.ts index 6a59036..1932a80 100644 --- a/src/app/pages/infos/info/component/bet-rule.component.ts +++ b/src/app/pages/infos/info/component/betting-rule.component.ts @@ -5,13 +5,13 @@ import { takeUntil } from 'rxjs/operators'; import { fuseAnimations } from 'src/@fuse/animations'; @Component({ - selector: 'app-bet-rule', - templateUrl: './bet-rule.component.html', - styleUrls: ['./bet-rule.component.scss'], + selector: 'app-betting-rule', + templateUrl: './betting-rule.component.html', + styleUrls: ['./betting-rule.component.scss'], encapsulation: ViewEncapsulation.None, animations: fuseAnimations }) -export class BetRuleComponent implements OnInit, OnDestroy { +export class BettingRuleComponent implements OnInit, OnDestroy { private unsubscribeAll: Subject; constructor(private fb: FormBuilder) { diff --git a/src/app/pages/infos/info/component/free-board.component.ts b/src/app/pages/infos/info/component/free-board.component.ts index c7cf029..255aced 100644 --- a/src/app/pages/infos/info/component/free-board.component.ts +++ b/src/app/pages/infos/info/component/free-board.component.ts @@ -16,7 +16,7 @@ import { takeUntil } from 'rxjs/operators'; import { fuseAnimations } from 'src/@fuse/animations'; -import { ServiceCenterService } from 'src/modules/infos/service-center/service/service-center.service'; +import { ServiceCenterService } from 'src/modules/infos/service/service-center.service'; import { ServiceCenterDataSource } from './service-center.data-source'; @Component({ selector: 'app-free-board', diff --git a/src/app/pages/infos/info/component/index.ts b/src/app/pages/infos/info/component/index.ts index 797d723..d9fb423 100644 --- a/src/app/pages/infos/info/component/index.ts +++ b/src/app/pages/infos/info/component/index.ts @@ -1,21 +1,21 @@ import { ServiceCenterComponent } from './service-center.component'; import { SendMessageComponent } from './send-message.component'; import { FreeBoardComponent } from './free-board.component'; -import { BetRuleComponent } from './bet-rule.component'; -import { PopupSetComponent } from './popup-set.component'; +import { BettingRuleComponent } from './betting-rule.component'; +import { PopupConfigComponent } from './popup-config.component'; import { EventRegistComponent } from './event-regist.component'; import { NoticeBoardComponent } from './notice-board.component'; import { FreeBoardRegistComponent } from './free-board-regist.component'; -import { PopupSetDetailComponent } from './popup-set-detail.component'; +import { PopupConfigDetailComponent } from './popup-config-detail.component'; export const COMPONENTS = [ ServiceCenterComponent, SendMessageComponent, FreeBoardComponent, - BetRuleComponent, - PopupSetComponent, + BettingRuleComponent, + PopupConfigComponent, EventRegistComponent, NoticeBoardComponent, FreeBoardRegistComponent, - PopupSetDetailComponent + PopupConfigDetailComponent ]; diff --git a/src/app/pages/infos/info/component/popup-set-detail.component.html b/src/app/pages/infos/info/component/popup-config-detail.component.html similarity index 99% rename from src/app/pages/infos/info/component/popup-set-detail.component.html rename to src/app/pages/infos/info/component/popup-config-detail.component.html index e4f07c9..4de9d92 100644 --- a/src/app/pages/infos/info/component/popup-set-detail.component.html +++ b/src/app/pages/infos/info/component/popup-config-detail.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/pages/infos/info/component/popup-set-detail.component.scss b/src/app/pages/infos/info/component/popup-config-detail.component.scss similarity index 99% rename from src/app/pages/infos/info/component/popup-set-detail.component.scss rename to src/app/pages/infos/info/component/popup-config-detail.component.scss index c47e481..27b4203 100644 --- a/src/app/pages/infos/info/component/popup-set-detail.component.scss +++ b/src/app/pages/infos/info/component/popup-config-detail.component.scss @@ -1,6 +1,6 @@ @import "src/@fuse/scss/fuse"; -#popup-set-detail { +#popup-config-detail { .header { diff --git a/src/app/pages/infos/info/component/popup-set-detail.component.ts b/src/app/pages/infos/info/component/popup-config-detail.component.ts similarity index 82% rename from src/app/pages/infos/info/component/popup-set-detail.component.ts rename to src/app/pages/infos/info/component/popup-config-detail.component.ts index 2649145..7abc4f3 100644 --- a/src/app/pages/infos/info/component/popup-set-detail.component.ts +++ b/src/app/pages/infos/info/component/popup-config-detail.component.ts @@ -5,13 +5,13 @@ import { takeUntil } from 'rxjs/operators'; import { fuseAnimations } from 'src/@fuse/animations'; @Component({ - selector: 'app-popup-set-detail', - templateUrl: './popup-set-detail.component.html', - styleUrls: ['./popup-set-detail.component.scss'], + selector: 'app-popup-config-detail', + templateUrl: './popup-config-detail.component.html', + styleUrls: ['./popup-config-detail.component.scss'], encapsulation: ViewEncapsulation.None, animations: fuseAnimations }) -export class PopupSetDetailComponent implements OnInit, OnDestroy { +export class PopupConfigDetailComponent implements OnInit, OnDestroy { private unsubscribeAll: Subject; constructor(private fb: FormBuilder) { diff --git a/src/app/pages/infos/info/component/popup-config.component.html b/src/app/pages/infos/info/component/popup-config.component.html new file mode 100644 index 0000000..bae1db6 --- /dev/null +++ b/src/app/pages/infos/info/component/popup-config.component.html @@ -0,0 +1,221 @@ +
+ +
+ + + +
+ +
+ + + + + + +
+ + + +
+ + + + 번호 + +

{{ i + 1 }}

+ + + + + + + 썸네일 + +

{{ popup.thumbNail }}

+ + + + + + 제목 + +

+ {{ popup.title }} +

+ + + + + + 이미지 넒이 + +

+ {{ popup.imgWidth }} +

+ + px + + + + + 이미지 높이 + +

+ {{ popup.imgHeight }} +

+ + px + + + + + 이미지 X + +

+ {{ popup.imgX }} +

+ + + + + + 이미지 Y + +

+ {{ popup.imgY }} +

+ + + + + + 상태 + +

+ {{ popup.openStatus }} +

+ + + + + + 수정 + +

+ 6 +

+ + + + + + + + + + + + +
+ +
+ +
diff --git a/src/app/pages/infos/info/component/popup-set.component.scss b/src/app/pages/infos/info/component/popup-config.component.scss similarity index 96% rename from src/app/pages/infos/info/component/popup-set.component.scss rename to src/app/pages/infos/info/component/popup-config.component.scss index 62ddb45..716b4dd 100644 --- a/src/app/pages/infos/info/component/popup-set.component.scss +++ b/src/app/pages/infos/info/component/popup-config.component.scss @@ -1,7 +1,7 @@ @import 'src/@fuse/scss/fuse'; -app-popup-set { - #popup-set { +app-popup-config { + #popup-config { .top-bg { @include media-breakpoint('xs') { height: 224px; @@ -56,7 +56,7 @@ app-popup-set { max-width: 100%; } - .popup-set-table { + .popup-config-table { flex: 1 1 auto; border-bottom: 1px solid rgba(0, 0, 0, 0.12); overflow: auto; @@ -66,7 +66,7 @@ app-popup-set { min-height: 64px; } - .popup-set { + .popup-config { position: relative; cursor: pointer; height: 84px; diff --git a/src/app/pages/infos/info/component/popup-set.component.ts b/src/app/pages/infos/info/component/popup-config.component.ts similarity index 76% rename from src/app/pages/infos/info/component/popup-set.component.ts rename to src/app/pages/infos/info/component/popup-config.component.ts index a34d7f8..62bef00 100644 --- a/src/app/pages/infos/info/component/popup-set.component.ts +++ b/src/app/pages/infos/info/component/popup-config.component.ts @@ -15,25 +15,27 @@ import { takeUntil } from 'rxjs/operators'; import { fuseAnimations } from 'src/@fuse/animations'; -import { PopupSetService } from 'src/modules/infos/popup-set/service/popup-set.service'; -import { PopupSetDataSource } from './popup-set.data-source'; +import { PopupConfigService } from 'src/modules/infos/service/popup-config.service'; +import { PopupConfigDataSource } from './popup-config.data-source'; @Component({ - selector: 'app-popup-set', - templateUrl: './popup-set.component.html', - styleUrls: ['./popup-set.component.scss'], + selector: 'app-popup-config', + templateUrl: './popup-config.component.html', + styleUrls: ['./popup-config.component.scss'], encapsulation: ViewEncapsulation.None, animations: fuseAnimations }) -export class PopupSetComponent implements OnInit, OnDestroy { - dataSource: PopupSetDataSource = new PopupSetDataSource(this.popupSetService); +export class PopupConfigComponent implements OnInit, OnDestroy { + dataSource: PopupConfigDataSource = new PopupConfigDataSource( + this.popupConfigService + ); displayedColumns = [ 'idx', 'thumbNail', 'title', - 'imageWidth', - 'imageHegith', - 'imageX', - 'imageY', + 'imgWidth', + 'imgHegith', + 'imgX', + 'imgY', 'openStatus', 'saveBtn' ]; @@ -55,7 +57,7 @@ export class PopupSetComponent implements OnInit, OnDestroy { constructor( private fb: FormBuilder, - private popupSetService: PopupSetService + private popupConfigService: PopupConfigService ) { // Set the private defaults this.unsubscribeAll = new Subject(); diff --git a/src/app/pages/infos/info/component/popup-set.data-source.ts b/src/app/pages/infos/info/component/popup-config.data-source.ts similarity index 59% rename from src/app/pages/infos/info/component/popup-set.data-source.ts rename to src/app/pages/infos/info/component/popup-config.data-source.ts index 80caf41..44a5bcc 100644 --- a/src/app/pages/infos/info/component/popup-set.data-source.ts +++ b/src/app/pages/infos/info/component/popup-config.data-source.ts @@ -5,63 +5,69 @@ import { map } from 'rxjs/operators'; import { CollectionViewer } from '@angular/cdk/collections'; -import { PopupSet } from 'src/modules/infos/popup-set/model/popup-set.model'; -import { PopupSetService } from 'src/modules/infos/popup-set/service/popup-set.service'; +import { PopupConfig } from 'src/modules/infos/model/popup-config.model'; +import { PopupConfigService } from 'src/modules/infos/service/popup-config.service'; import { FormControl, FormGroup, Validators, FormArray } from '@angular/forms'; -const ELEMENT_DATA: PopupSet[] = [ +const ELEMENT_DATA: PopupConfig[] = [ { id: 1, thumbNail: '/images/thumbname/1.jpg', title: '오픈기념 이벤트', - imageWidth: 200, - imageHeight: 200, - imageX: 100, - imageY: 100, + imgWidth: 200, + imgHeight: 200, + imgX: 100, + imgY: 100, openStatus: true, updatedAt: null, - createdAt: null + createdAt: null, + createdBy: null, + updatedBy: null }, { id: 2, thumbNail: '/images/thumbname/2.jpg', title: '첫충전 이벤트', - imageWidth: 200, - imageHeight: 200, - imageX: 100, - imageY: 100, + imgWidth: 200, + imgHeight: 200, + imgX: 100, + imgY: 100, openStatus: true, updatedAt: null, - createdAt: null + createdAt: null, + createdBy: null, + updatedBy: null }, { id: 3, thumbNail: '/images/thumbname/3.jpg', title: '친구초대 이벤트', - imageWidth: 200, - imageHeight: 200, - imageX: 100, - imageY: 100, + imgWidth: 200, + imgHeight: 200, + imgX: 100, + imgY: 100, openStatus: true, updatedAt: null, - createdAt: null + createdAt: null, + createdBy: null, + updatedBy: null } ]; -export class PopupSetDataSource extends DataSource { - private _objectStore: PopupSet[] = []; - private _ObjectsSubject$ = new BehaviorSubject([]); +export class PopupConfigDataSource extends DataSource { + private _objectStore: PopupConfig[] = []; + private _ObjectsSubject$ = new BehaviorSubject([]); private _loadingSubject$ = new BehaviorSubject(false); public loading$ = this._loadingSubject$.asObservable(); public formg: FormGroup; - constructor(private fixBonusService: PopupSetService) { + constructor(private fixBonusService: PopupConfigService) { super(); } - connect(collectionViewer: CollectionViewer): Observable { + connect(collectionViewer: CollectionViewer): Observable { // return this.fixBonusService.getAll().pipe( // map(res => { // res.forEach(m => this._objectStore.push(m as FixBonus)); @@ -73,7 +79,7 @@ export class PopupSetDataSource extends DataSource { // ); return of(ELEMENT_DATA).pipe( map(res => { - res.forEach(m => this._objectStore.push(m as PopupSet)); + res.forEach(m => this._objectStore.push(m as PopupConfig)); this._ObjectsSubject$.next(this._objectStore); let fa = this.formg.get('formarray'); res.forEach(r => fa.push(this.createRowFormGroup(r))); @@ -85,26 +91,28 @@ export class PopupSetDataSource extends DataSource { // id: 3, // thumbNail: '/images/thumbname/3.jpg', // title: '친구초대 이벤트', - // imageWidth: 200, - // imageHeight: 200, - // imageX: 100, - // imageY: 100, + // imgWidth: 200, + // imgHeight: 200, + // imgX: 100, + // imgY: 100, // openStatus: true, // updatedAt: null, - // createdAt: null - createRowFormGroup(r: PopupSet): FormGroup { + // createdAt: null, + // createdBy: null, + // updatedBy: null + createRowFormGroup(r: PopupConfig): FormGroup { let f = new FormGroup({ title: this.createNewFormContorl(r, 'title'), - imageWidth: this.createNewFormContorl(r, 'imageWidth'), - imageHeight: this.createNewFormContorl(r, 'imageHeight'), - imageX: this.createNewFormContorl(r, 'imageX'), - imageY: this.createNewFormContorl(r, 'imageY'), + imgWidth: this.createNewFormContorl(r, 'imgWidth'), + imgHeight: this.createNewFormContorl(r, 'imgHeight'), + imgX: this.createNewFormContorl(r, 'imgX'), + imgY: this.createNewFormContorl(r, 'imgY'), openStatus: this.createNewFormContorl(r, 'openStatus') }); return f; } - createNewFormContorl(r: PopupSet, propName: string): FormControl { + createNewFormContorl(r: PopupConfig, propName: string): FormControl { let m = new FormControl(r[propName], Validators.required); m.valueChanges.subscribe(val => { r[propName] = val; diff --git a/src/app/pages/infos/info/component/popup-set.component.html b/src/app/pages/infos/info/component/popup-set.component.html deleted file mode 100644 index 4305fc7..0000000 --- a/src/app/pages/infos/info/component/popup-set.component.html +++ /dev/null @@ -1,254 +0,0 @@ -
- -
- - - -
- -
- - - - - - -
- - - -
- - - - 번호 - -

{{ i + 1 }}

- - - - - - - 썸네일 - -

{{ popup.thumbNail }}

- - - - - - 제목 - -

- {{ popup.title }} -

- - - - - - 이미지 넒이 - -

- {{ popup.imageWidth }} -

- - px - - - - - 이미지 높이 - -

- {{ popup.imageHeight }} -

- - px - - - - - 이미지 X - -

- {{ popup.imageX }} -

- - - - - - 이미지 Y - -

- {{ popup.imageY }} -

- - - - - - 상태 - -

- {{ popup.openStatus }} -

- - - - - - 수정 - -

- 6 -

- - - - - - - - - - - - -
- -
- -
diff --git a/src/app/pages/infos/info/component/service-center.component.ts b/src/app/pages/infos/info/component/service-center.component.ts index 1766de4..ad61c9b 100644 --- a/src/app/pages/infos/info/component/service-center.component.ts +++ b/src/app/pages/infos/info/component/service-center.component.ts @@ -16,7 +16,7 @@ import { takeUntil } from 'rxjs/operators'; import { fuseAnimations } from 'src/@fuse/animations'; -import { ServiceCenterService } from 'src/modules/infos/service-center/service/service-center.service'; +import { ServiceCenterService } from 'src/modules/infos/service/service-center.service'; import { ServiceCenterDataSource } from './service-center.data-source'; @Component({ diff --git a/src/app/pages/infos/info/component/service-center.data-source.ts b/src/app/pages/infos/info/component/service-center.data-source.ts index 9e4541d..5a8098a 100644 --- a/src/app/pages/infos/info/component/service-center.data-source.ts +++ b/src/app/pages/infos/info/component/service-center.data-source.ts @@ -7,8 +7,8 @@ import { MatPaginator } from '@angular/material/paginator'; import { MatSort } from '@angular/material/sort'; import { CollectionViewer } from '@angular/cdk/collections'; -import { ServiceCenter } from 'src/modules/infos/service-center/model/service-center.model'; -import { ServiceCenterService } from 'src/modules/infos/service-center/service/service-center.service'; +import { ServiceCenter } from 'src/modules/infos/model/service-center.model'; +import { ServiceCenterService } from 'src/modules/infos/service/service-center.service'; export class ServiceCenterDataSource extends DataSource { private filterSubject = new BehaviorSubject(''); diff --git a/src/app/pages/infos/info/info-routing.module.ts b/src/app/pages/infos/info/info-routing.module.ts index 83ac31b..55b3d03 100644 --- a/src/app/pages/infos/info/info-routing.module.ts +++ b/src/app/pages/infos/info/info-routing.module.ts @@ -3,13 +3,13 @@ import { Routes, RouterModule } from '@angular/router'; import { ServiceCenterComponent } from './component/service-center.component'; import { SendMessageComponent } from './component/send-message.component'; import { FreeBoardComponent } from './component/free-board.component'; -import { BetRuleComponent } from './component/bet-rule.component'; -import { PopupSetComponent } from './component/popup-set.component'; +import { BettingRuleComponent } from './component/betting-rule.component'; +import { PopupConfigComponent } from './component/popup-config.component'; import { EventRegistComponent } from './component/event-regist.component'; import { NoticeBoardComponent } from './component/notice-board.component'; import { FreeBoardRegistComponent } from './component/free-board-regist.component'; -import { PopupSetDetailComponent } from './component/popup-set-detail.component'; -import { PopupSetDetailResolver } from './resolver/popup-set-detail.resolver'; +import { PopupConfigDetailComponent } from './component/popup-config-detail.component'; +import { PopupConfigDetailResolver } from './resolver/popup-config-detail.resolver'; const routes: Routes = [ { @@ -25,18 +25,18 @@ const routes: Routes = [ component: FreeBoardComponent }, { - path: 'bet-rule', - component: BetRuleComponent + path: 'betting-rule', + component: BettingRuleComponent }, { - path: 'popup-set', - component: PopupSetComponent + path: 'popup-config', + component: PopupConfigComponent }, { - path: 'popup-set/:id', - component: PopupSetDetailComponent, + path: 'popup-config/:id', + component: PopupConfigDetailComponent, resolve: { - popupSet: PopupSetDetailResolver + popupSet: PopupConfigDetailResolver } }, { diff --git a/src/app/pages/infos/info/resolver/index.ts b/src/app/pages/infos/info/resolver/index.ts index 01430ab..649797a 100644 --- a/src/app/pages/infos/info/resolver/index.ts +++ b/src/app/pages/infos/info/resolver/index.ts @@ -1,3 +1,3 @@ -import { PopupSetDetailResolver } from './popup-set-detail.resolver'; +import { PopupConfigDetailResolver } from './popup-config-detail.resolver'; -export const RESOLVERS = [PopupSetDetailResolver]; +export const RESOLVERS = [PopupConfigDetailResolver]; diff --git a/src/app/pages/infos/info/resolver/popup-set-detail.resolver.ts b/src/app/pages/infos/info/resolver/popup-config-detail.resolver.ts similarity index 59% rename from src/app/pages/infos/info/resolver/popup-set-detail.resolver.ts rename to src/app/pages/infos/info/resolver/popup-config-detail.resolver.ts index a2b9c25..66de84d 100644 --- a/src/app/pages/infos/info/resolver/popup-set-detail.resolver.ts +++ b/src/app/pages/infos/info/resolver/popup-config-detail.resolver.ts @@ -5,15 +5,15 @@ import { RouterStateSnapshot } from '@angular/router'; import { Observable, of } from 'rxjs'; -import { PopupSet } from 'src/modules/infos/popup-set/model/popup-set.model'; -import { PopupSetService } from 'src/modules/infos/popup-set/service/popup-set.service'; +import { PopupConfig } from 'src/modules/infos/model/popup-config.model'; +import { PopupConfigService } from 'src/modules/infos/service/popup-config.service'; @Injectable() -export class PopupSetDetailResolver implements Resolve { +export class PopupConfigDetailResolver implements Resolve { /** * Constructor */ - constructor(private popupSetService: PopupSetService) {} + constructor(private popupConfigService: PopupConfigService) {} /** * Resolver @@ -21,7 +21,7 @@ export class PopupSetDetailResolver implements Resolve { resolve( route: ActivatedRouteSnapshot, state: RouterStateSnapshot - ): Observable | Promise | any { + ): Observable | Promise | any { const id = route.params.id; if ('0' === id) { return of({}); diff --git a/src/modules/infos/infos.module.ts b/src/modules/infos/infos.module.ts index efa26f8..e3df065 100644 --- a/src/modules/infos/infos.module.ts +++ b/src/modules/infos/infos.module.ts @@ -1,7 +1,7 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { POPUP_SET_SERVICES } from './popup-set/service'; -import { SERVICE_CENTER_SERVICES } from './service-center/service'; + +import { SERVICES } from './service/index'; @NgModule({ imports: [], @@ -18,7 +18,7 @@ export class InfosModule { public static forRoot(): ModuleWithProviders { return { ngModule: InfosRootModule, - providers: [POPUP_SET_SERVICES, SERVICE_CENTER_SERVICES] + providers: [SERVICES] }; } } diff --git a/src/modules/infos/model/betting-rule.model.ts b/src/modules/infos/model/betting-rule.model.ts new file mode 100644 index 0000000..d5f9b22 --- /dev/null +++ b/src/modules/infos/model/betting-rule.model.ts @@ -0,0 +1,7 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; + +export interface BettingRule extends UserDateAuditEntity { + id?: number; + title?: string; + contents?: string; +} diff --git a/src/modules/infos/model/free-board.model.ts b/src/modules/infos/model/free-board.model.ts new file mode 100644 index 0000000..6264a8f --- /dev/null +++ b/src/modules/infos/model/free-board.model.ts @@ -0,0 +1,8 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; + +export interface FreeBoard extends UserDateAuditEntity { + id?: number; + title?: string; + contents?: string; + attachFile?: number; +} diff --git a/src/modules/infos/model/main-event.model.ts b/src/modules/infos/model/main-event.model.ts new file mode 100644 index 0000000..3262101 --- /dev/null +++ b/src/modules/infos/model/main-event.model.ts @@ -0,0 +1,7 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; + +export interface MainEvent extends UserDateAuditEntity { + id?: number; + openState?: boolean; + attachFile?: number; +} diff --git a/src/modules/infos/model/message.model.ts b/src/modules/infos/model/message.model.ts new file mode 100644 index 0000000..44c34d5 --- /dev/null +++ b/src/modules/infos/model/message.model.ts @@ -0,0 +1,9 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; +import { MessageStateName } from '../type/message-state.type'; + +export interface Message extends UserDateAuditEntity { + id?: number; + title?: string; + contents?: string; + stateName?: MessageStateName; +} diff --git a/src/modules/infos/model/notice-board.model.ts b/src/modules/infos/model/notice-board.model.ts new file mode 100644 index 0000000..38b754c --- /dev/null +++ b/src/modules/infos/model/notice-board.model.ts @@ -0,0 +1,10 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; +import { NoticeStateName } from '../type/notice-state.type'; + +export interface NoticeBoard extends UserDateAuditEntity { + id?: number; + title?: string; + contents?: string; + attachFile?: number; + noticeType?: NoticeStateName; +} diff --git a/src/modules/infos/model/popup-config.model.ts b/src/modules/infos/model/popup-config.model.ts new file mode 100644 index 0000000..e865f3c --- /dev/null +++ b/src/modules/infos/model/popup-config.model.ts @@ -0,0 +1,13 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; + +export interface PopupConfig extends UserDateAuditEntity { + id?: number; + thumbNail?: string; + title?: string; + imgWidth?: number; + imgHeight?: number; + imgX?: number; + imgY?: number; + openStatus?: boolean; + popupEffect?: number; +} diff --git a/src/modules/infos/model/reply.model.ts b/src/modules/infos/model/reply.model.ts new file mode 100644 index 0000000..7f3cd18 --- /dev/null +++ b/src/modules/infos/model/reply.model.ts @@ -0,0 +1,8 @@ +import { UserDateAuditEntity } from 'src/modules/common/data/model/audit'; + +export interface Reply extends UserDateAuditEntity { + id?: number; + title?: string; + contents?: string; + freeBoard?: number; +} diff --git a/src/modules/infos/model/service-center.model.ts b/src/modules/infos/model/service-center.model.ts new file mode 100644 index 0000000..8fe92ee --- /dev/null +++ b/src/modules/infos/model/service-center.model.ts @@ -0,0 +1,12 @@ +import { DateAudit } from 'src/modules/common/data/model/audit'; +import { AnswerStateName } from '../type/answer-state.type'; +import { QuestionStateName } from '../type/question-state.type'; + +export interface ServiceCenter extends DateAudit { + id?: number; + title?: string; + contents?: string; + attachFile?: number; + answerStatus?: AnswerStateName; + questionStatus?: QuestionStateName; +} diff --git a/src/modules/infos/popup-set/model/popup-set.model.ts b/src/modules/infos/popup-set/model/popup-set.model.ts deleted file mode 100644 index d2503b1..0000000 --- a/src/modules/infos/popup-set/model/popup-set.model.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { DateAudit } from 'src/modules/common/data/model/audit'; - -export interface PopupSet extends DateAudit { - id?: number; - thumbNail?: string; - title?: string; - imageWidth?: number; - imageHeight?: number; - imageX?: number; - imageY?: number; - openStatus?: boolean; - popupEffect?: number; -} diff --git a/src/modules/infos/popup-set/service/index.ts b/src/modules/infos/popup-set/service/index.ts deleted file mode 100644 index 31b81e9..0000000 --- a/src/modules/infos/popup-set/service/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { PopupSetService } from './popup-set.service'; - -export const POPUP_SET_SERVICES = [PopupSetService]; diff --git a/src/modules/infos/service-center/model/service-center.model.ts b/src/modules/infos/service-center/model/service-center.model.ts deleted file mode 100644 index 666b849..0000000 --- a/src/modules/infos/service-center/model/service-center.model.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { DateAudit } from 'src/modules/common/data/model/audit'; - -export interface ServiceCenter extends DateAudit { - id?: number; - thumbNail?: string; - title?: string; - imageWidth?: number; - imageHeight?: number; - imageX?: number; - imageY?: number; - openStatus?: boolean; - popupEffect?: number; -} diff --git a/src/modules/infos/service-center/service/index.ts b/src/modules/infos/service-center/service/index.ts deleted file mode 100644 index 7796c45..0000000 --- a/src/modules/infos/service-center/service/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { ServiceCenterService } from './service-center.service'; - -export const SERVICE_CENTER_SERVICES = [ServiceCenterService]; diff --git a/src/modules/infos/service/index.ts b/src/modules/infos/service/index.ts new file mode 100644 index 0000000..76d5cf1 --- /dev/null +++ b/src/modules/infos/service/index.ts @@ -0,0 +1,4 @@ +import { PopupConfigService } from './popup-config.service'; +import { ServiceCenterService } from './service-center.service'; + +export const SERVICES = [PopupConfigService, ServiceCenterService]; diff --git a/src/modules/infos/popup-set/service/popup-set.service.ts b/src/modules/infos/service/popup-config.service.ts similarity index 88% rename from src/modules/infos/popup-set/service/popup-set.service.ts rename to src/modules/infos/service/popup-config.service.ts index f1407c2..c3f8a1e 100644 --- a/src/modules/infos/popup-set/service/popup-set.service.ts +++ b/src/modules/infos/service/popup-config.service.ts @@ -3,7 +3,7 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Observable } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; -import { PopupSet } from '../model/popup-set.model'; +import { PopupConfig } from '../model/popup-config.model'; import { API_BASE_URL } from 'src/modules/common/type/injection-token.type'; import { Page } from 'src/modules/common/data/model/page'; import { FormArray } from '@angular/forms'; @@ -11,7 +11,7 @@ import { FormArray } from '@angular/forms'; @Injectable({ providedIn: 'root' }) -export class PopupSetService { +export class PopupConfigService { constructor( @Inject(API_BASE_URL) private apiBaseUrl: string, private httpClient: HttpClient diff --git a/src/modules/infos/service-center/service/service-center.service.ts b/src/modules/infos/service/service-center.service.ts similarity index 100% rename from src/modules/infos/service-center/service/service-center.service.ts rename to src/modules/infos/service/service-center.service.ts diff --git a/src/modules/infos/type/answer-state.type.ts b/src/modules/infos/type/answer-state.type.ts new file mode 100644 index 0000000..cd25d18 --- /dev/null +++ b/src/modules/infos/type/answer-state.type.ts @@ -0,0 +1,6 @@ +export enum AnswerStateName { + UNANSWERED = 'UNANSWERED', + ANSWER_DONE = 'ANSWER_DONE', + CHECKING_USER = 'CHECKING_USER', + CONFIRMED_USER = 'CONFIRMED_USER' +} diff --git a/src/modules/infos/type/message-state.type.ts b/src/modules/infos/type/message-state.type.ts new file mode 100644 index 0000000..0281a22 --- /dev/null +++ b/src/modules/infos/type/message-state.type.ts @@ -0,0 +1,4 @@ +export enum MessageStateName { + WAITING = 'WAITING', + READ = 'READ' +} diff --git a/src/modules/infos/type/notice-state.type.ts b/src/modules/infos/type/notice-state.type.ts new file mode 100644 index 0000000..bf91b2c --- /dev/null +++ b/src/modules/infos/type/notice-state.type.ts @@ -0,0 +1,4 @@ +export enum NoticeStateName { + NOTICE = 'NOTICE', + EVENT = 'EVENT' +} diff --git a/src/modules/infos/type/question-state.type.ts b/src/modules/infos/type/question-state.type.ts new file mode 100644 index 0000000..357b67c --- /dev/null +++ b/src/modules/infos/type/question-state.type.ts @@ -0,0 +1,4 @@ +export enum QuestionStateName { + NORMAL = 'NORMAL', + BANK_ACCOUNT = 'BANK_ACCOUNT' +}