+
{{ noticeOneline.site }}
-
+
{{ noticeOneline.title }}
-
-
+
+
{{ noticeOneline.writer }}
-
-
-
+
-
-
+
+
{{ noticeOneline.views }}
-
-
-
+
+
+
-
-
등록
@@ -204,11 +175,11 @@
-
+
- There are no noticeOnelines!
+ There are no data!
diff --git a/src/app/modules/admin/board/notice-oneline/components/list.component.ts b/src/app/modules/admin/board/notice-oneline/components/list.component.ts
index 27e8944..94bbd15 100644
--- a/src/app/modules/admin/board/notice-oneline/components/list.component.ts
+++ b/src/app/modules/admin/board/notice-oneline/components/list.component.ts
@@ -8,28 +8,13 @@ import {
ViewChild,
ViewEncapsulation,
} from '@angular/core';
-import {
- FormBuilder,
- FormControl,
- FormGroup,
- Validators,
-} from '@angular/forms';
-import { MatCheckboxChange } from '@angular/material/checkbox';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
-import {
- debounceTime,
- map,
- merge,
- Observable,
- Subject,
- switchMap,
- takeUntil,
-} from 'rxjs';
-import { fuseAnimations } from '@fuse/animations';
-import { FuseConfirmationService } from '@fuse/services/confirmation';
+import { FormBuilder, FormControl } from '@angular/forms';
+
+import { MatPaginator } from '@angular/material/paginator';
+
+import { Observable, Subject, takeUntil } from 'rxjs';
+import { fuseAnimations } from '@fuse/animations';
-import { User } from '../../../member/user/models/user';
import { NoticeOneline } from '../models/notice-oneline';
import { NoticeOnelinePagination } from '../models/notice-oneline-pagination';
import { NoticeOnelineService } from '../services/notice-oneline.service';
@@ -42,18 +27,18 @@ import { Router } from '@angular/router';
/* language=SCSS */
`
.inventory-grid {
- grid-template-columns: 60px auto 40px;
+ grid-template-columns: 40px 40px auto 200px 200px;
@screen sm {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px;
+ grid-template-columns: 40px 40px auto 200px 200px;
}
@screen md {
- grid-template-columns: 60px 60px 60px 60px 60px 60px auto 60px 60px;
+ grid-template-columns: 40px 40px auto 300px 200px;
}
@screen lg {
- grid-template-columns: 60px 70px 70px 70px 70px 100px 60px 60px auto 60px 60px 60px 60px;
+ grid-template-columns: 40px 40px auto 300px 200px;
}
}
`,
@@ -64,16 +49,16 @@ import { Router } from '@angular/router';
})
export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
@ViewChild(MatPaginator) private _paginator!: MatPaginator;
- @ViewChild(MatSort) private _sort!: MatSort;
noticeOnelines$!: Observable
;
- users$!: Observable;
isLoading = false;
searchInputControl = new FormControl();
selectedNoticeOneline?: NoticeOneline;
pagination?: NoticeOnelinePagination;
+ __isSearchOpened = false;
+
private _unsubscribeAll: Subject = new Subject();
/**
@@ -81,8 +66,6 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
*/
constructor(
private _changeDetectorRef: ChangeDetectorRef,
- private _fuseConfirmationService: FuseConfirmationService,
- private _formBuilder: FormBuilder,
private _noticeOnelineService: NoticeOnelineService,
private router: Router
) {}
@@ -113,45 +96,7 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
/**
* After view init
*/
- ngAfterViewInit(): void {
- if (this._sort && this._paginator) {
- // Set the initial sort
- this._sort.sort({
- id: 'name',
- start: 'asc',
- disableClear: true,
- });
-
- // Mark for check
- this._changeDetectorRef.markForCheck();
-
- // If the noticeOneline changes the sort order...
- this._sort.sortChange
- .pipe(takeUntil(this._unsubscribeAll))
- .subscribe(() => {
- // Reset back to the first page
- this._paginator.pageIndex = 0;
- });
-
- // Get products if sort or page changes
- merge(this._sort.sortChange, this._paginator.page)
- .pipe(
- switchMap(() => {
- this.isLoading = true;
- return this._noticeOnelineService.getNoticeOnelines(
- this._paginator.pageIndex,
- this._paginator.pageSize,
- this._sort.active,
- this._sort.direction
- );
- }),
- map(() => {
- this.isLoading = false;
- })
- )
- .subscribe();
- }
- }
+ ngAfterViewInit(): void {}
/**
* On destroy
@@ -166,14 +111,24 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
// @ Public methods
// -----------------------------------------------------------------------------------------------------
- viewUserDetail(id: string): void {
- let url: string = 'member/user/' + id;
- this.router.navigateByUrl(url);
- }
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
+ /**
+ * toggle the search
+ * Used in 'bar'
+ */
+ __onClickTItle(noticeOneline: NoticeOneline): void {}
+ __onClickSearch(): void {
+ this.__isSearchOpened = !this.__isSearchOpened;
+ }
+
+ __onClickReditBtn(event: MouseEvent, id: string): void {
+ const param = id === '0' ? '' : id;
+ let url: string = 'board/notice-oneline/redit/' + param;
+ this.router.navigateByUrl(url);
+ }
/**
* Create product
*/
diff --git a/src/app/modules/admin/board/notice-oneline/components/redit.component.html b/src/app/modules/admin/board/notice-oneline/components/redit.component.html
new file mode 100644
index 0000000..c20167f
--- /dev/null
+++ b/src/app/modules/admin/board/notice-oneline/components/redit.component.html
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+ 한줄공지 {{ !noticeOneline ? "등록" : "수정" }}
+
+
+
+
+
+
+
+ 취소
+
+
+
+ {{ !noticeOneline ? "등록" : "수정" }}
+
+
+
+
+
+
+
+
= new Subject();
@@ -77,7 +70,9 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
private _changeDetectorRef: ChangeDetectorRef,
private _fuseConfirmationService: FuseConfirmationService,
private _formBuilder: FormBuilder,
- private _userService: UserService
+ private _route: ActivatedRoute,
+ private _router: Router,
+ private _noticeOnelineService: NoticeOnelineService
) {}
// -----------------------------------------------------------------------------------------------------
@@ -88,53 +83,32 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
* On init
*/
ngOnInit(): void {
- this.selectedProductForm = this._formBuilder.group({
- id: [''],
- signinId: [{ value: '', disabled: true }],
- signinPw: [{ value: '' }],
- exchangePw: [''],
- description: [''],
- tags: [[]],
- nickname: [{ value: '', disabled: true }],
- ownCash: [''],
- phoneNumber: [''],
- level: [''],
- status: [''],
- isExcahngeMoney: [''],
- bankname: [''],
- accountNumber: [''],
- accountHolder: [''],
- comp: [''],
- coupon: [''],
- recommender: [{ value: '', disabled: true }],
- changeSite: [''],
- recommendCount: [''],
- hodingGameMoney: [{ value: '0', disabled: true }],
- memo: [''],
- bacaraRate: [],
- rulletRate: [],
- dragonRate: [],
- etcRate: [],
- slotRate: [],
- casinoRusingRate: [],
- slotRusingRate: [],
+ // Create the contact form
+ this.noticeOnelineForm = this._formBuilder.group({
+ writer: ['관리자'],
+ noticeType: [''],
+ useOrNot: [''],
+ widthSize: [''],
+ site: [''],
+ title: [''],
+ writerDate: [''],
+ views: ['0'],
+ content: [''],
});
- // Get the User
- this._userService.user$
+ this._noticeOnelineService.noticeOneline$
.pipe(takeUntil(this._unsubscribeAll))
- .subscribe((user: User | undefined) => {
- if (!user) {
+ .subscribe((noticeOneline: NoticeOneline | undefined) => {
+ if (!noticeOneline) {
return;
}
- this.selectedUser = user;
- this.selectedProductForm.patchValue(user);
+ this.noticeOneline = noticeOneline;
+ this.noticeOnelineForm.patchValue(noticeOneline);
+
// Mark for check
this._changeDetectorRef.markForCheck();
});
-
- /* this.user$ = this._userService.user$; */
}
/**
@@ -159,6 +133,14 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
// @ Private methods
// -----------------------------------------------------------------------------------------------------
+ __onClickeCancel(): void {
+ /* let url: string = 'board/customer-template/';
+ this._router.navigateByUrl(url); */
+ }
+ __onClickReditBtn(noticeOneline: NoticeOneline): void {
+ console.log('click: ', noticeOneline);
+ }
+
/**
* Create product
*/
@@ -171,6 +153,22 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
*/
__toggleDetails(productId: string): void {}
+ /**
+ * Toggle edit mode
+ *
+ * @param editMode
+ */
+ toggleEditMode(editMode: boolean | null = null): void {
+ if (editMode === null) {
+ this.editMode = !this.editMode;
+ } else {
+ this.editMode = editMode;
+ }
+
+ // Mark for check
+ this._changeDetectorRef.markForCheck();
+ }
+
/**
* Track by function for ngFor loops
*
@@ -181,3 +179,28 @@ export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
return item.id || index;
}
}
+
+export const NOTICE_TYPE = [
+ {
+ key: '0',
+ value: '흐르는공지',
+ },
+];
+
+export const SITE_TYPE = [
+ {
+ key: '0',
+ value: '--전체--',
+ },
+];
+
+export const USE_OR_NOT_TYPE = [
+ {
+ key: '0',
+ value: '사용(노출)',
+ },
+ {
+ key: '1',
+ value: '미사용',
+ },
+];
diff --git a/src/app/modules/admin/board/notice-oneline/components/registration.component.html b/src/app/modules/admin/board/notice-oneline/components/registration.component.html
deleted file mode 100644
index cccc15f..0000000
--- a/src/app/modules/admin/board/notice-oneline/components/registration.component.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/app/modules/admin/board/notice-oneline/components/view.component.html b/src/app/modules/admin/board/notice-oneline/components/view.component.html
deleted file mode 100644
index 79fed21..0000000
--- a/src/app/modules/admin/board/notice-oneline/components/view.component.html
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/src/app/modules/admin/board/notice-oneline/components/view.component.ts b/src/app/modules/admin/board/notice-oneline/components/view.component.ts
deleted file mode 100644
index d7f1a89..0000000
--- a/src/app/modules/admin/board/notice-oneline/components/view.component.ts
+++ /dev/null
@@ -1,183 +0,0 @@
-import {
- AfterViewInit,
- ChangeDetectionStrategy,
- ChangeDetectorRef,
- Component,
- OnDestroy,
- OnInit,
- ViewChild,
- ViewEncapsulation,
-} from '@angular/core';
-import {
- FormBuilder,
- FormControl,
- FormGroup,
- Validators,
-} from '@angular/forms';
-import { MatCheckboxChange } from '@angular/material/checkbox';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
-import {
- debounceTime,
- map,
- merge,
- Observable,
- Subject,
- switchMap,
- takeUntil,
-} from 'rxjs';
-import { fuseAnimations } from '@fuse/animations';
-import { FuseConfirmationService } from '@fuse/services/confirmation';
-
-import { User } from 'app/modules/admin/member/user/models/user';
-import { UserService } from 'app/modules/admin/member/user/services/user.service';
-
-@Component({
- selector: 'notice-oneline-view',
- templateUrl: './view.component.html',
- styles: [
- /* language=SCSS */
- `
- .inventory-grid {
- grid-template-columns: 48px auto 40px;
-
- @screen sm {
- grid-template-columns: 48px auto 112px 72px;
- }
-
- @screen md {
- grid-template-columns: 48px 112px auto 112px 72px;
- }
-
- @screen lg {
- grid-template-columns: 48px 112px auto 112px 96px 96px 72px;
- }
- }
- `,
- ],
- encapsulation: ViewEncapsulation.None,
- changeDetection: ChangeDetectionStrategy.OnPush,
- animations: fuseAnimations,
-})
-export class ViewComponent implements OnInit, AfterViewInit, OnDestroy {
- @ViewChild(MatPaginator) private _paginator!: MatPaginator;
- @ViewChild(MatSort) private _sort!: MatSort;
-
- isLoading = false;
- searchInputControl = new FormControl();
- selectedProductForm!: FormGroup;
- selectedUser?: User;
-
- private _unsubscribeAll: Subject = new Subject();
-
- /**
- * Constructor
- */
- constructor(
- private _changeDetectorRef: ChangeDetectorRef,
- private _fuseConfirmationService: FuseConfirmationService,
- private _formBuilder: FormBuilder,
- private _userService: UserService
- ) {}
-
- // -----------------------------------------------------------------------------------------------------
- // @ Lifecycle hooks
- // -----------------------------------------------------------------------------------------------------
-
- /**
- * On init
- */
- ngOnInit(): void {
- this.selectedProductForm = this._formBuilder.group({
- id: [''],
- signinId: [{ value: '', disabled: true }],
- signinPw: [{ value: '' }],
- exchangePw: [''],
- description: [''],
- tags: [[]],
- nickname: [{ value: '', disabled: true }],
- ownCash: [''],
- phoneNumber: [''],
- level: [''],
- status: [''],
- isExcahngeMoney: [''],
- bankname: [''],
- accountNumber: [''],
- accountHolder: [''],
- comp: [''],
- coupon: [''],
- recommender: [{ value: '', disabled: true }],
- changeSite: [''],
- recommendCount: [''],
- hodingGameMoney: [{ value: '0', disabled: true }],
- memo: [''],
- bacaraRate: [],
- rulletRate: [],
- dragonRate: [],
- etcRate: [],
- slotRate: [],
- casinoRusingRate: [],
- slotRusingRate: [],
- });
-
- // Get the User
- this._userService.user$
- .pipe(takeUntil(this._unsubscribeAll))
- .subscribe((user: User | undefined) => {
- if (!user) {
- return;
- }
- this.selectedUser = user;
-
- this.selectedProductForm.patchValue(user);
- // Mark for check
- this._changeDetectorRef.markForCheck();
- });
-
- /* this.user$ = this._userService.user$; */
- }
-
- /**
- * After view init
- */
- ngAfterViewInit(): void {}
-
- /**
- * On destroy
- */
- ngOnDestroy(): void {
- // Unsubscribe from all subscriptions
- this._unsubscribeAll.next(null);
- this._unsubscribeAll.complete();
- }
-
- // -----------------------------------------------------------------------------------------------------
- // @ Public methods
- // -----------------------------------------------------------------------------------------------------
-
- // -----------------------------------------------------------------------------------------------------
- // @ Private methods
- // -----------------------------------------------------------------------------------------------------
-
- /**
- * Create product
- */
- __createProduct(): void {}
-
- /**
- * Toggle product details
- *
- * @param productId
- */
- __toggleDetails(productId: string): void {}
-
- /**
- * Track by function for ngFor loops
- *
- * @param index
- * @param item
- */
- __trackByFn(index: number, item: any): any {
- return item.id || index;
- }
-}
diff --git a/src/app/modules/admin/board/notice-oneline/models/notice-oneline.ts b/src/app/modules/admin/board/notice-oneline/models/notice-oneline.ts
index 8e8e85d..a744714 100644
--- a/src/app/modules/admin/board/notice-oneline/models/notice-oneline.ts
+++ b/src/app/modules/admin/board/notice-oneline/models/notice-oneline.ts
@@ -1,4 +1,5 @@
export interface NoticeOneline {
+ id: string;
idx?: number;
site?: string;
title?: string;
diff --git a/src/app/modules/admin/board/notice-oneline/notice-oneline.module.ts b/src/app/modules/admin/board/notice-oneline/notice-oneline.module.ts
index a72789f..d888893 100644
--- a/src/app/modules/admin/board/notice-oneline/notice-oneline.module.ts
+++ b/src/app/modules/admin/board/notice-oneline/notice-oneline.module.ts
@@ -15,6 +15,7 @@ import { MatGridListModule } from '@angular/material/grid-list';
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { MatRadioModule } from '@angular/material/radio';
import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatDatepickerModule } from '@angular/material/datepicker';
import { TranslocoModule } from '@ngneat/transloco';
@@ -45,6 +46,7 @@ import { noticeOnelineRoutes } from './notice-oneline.routing';
MatSlideToggleModule,
MatRadioModule,
MatCheckboxModule,
+ MatDatepickerModule,
],
})
export class NoticeOnelineModule {}
diff --git a/src/app/modules/admin/board/notice-oneline/notice-oneline.routing.ts b/src/app/modules/admin/board/notice-oneline/notice-oneline.routing.ts
index 06471ca..9247b39 100644
--- a/src/app/modules/admin/board/notice-oneline/notice-oneline.routing.ts
+++ b/src/app/modules/admin/board/notice-oneline/notice-oneline.routing.ts
@@ -1,24 +1,35 @@
import { Route } from '@angular/router';
import { ListComponent } from './components/list.component';
-import { ViewComponent } from '../../member/user/components/view.component';
+import { ReditComponent } from './components/redit.component';
-import { NoticeOnelinesResolver } from './resolvers/notice-oneline.resolver';
-import { UserResolver } from '../../member/user/resolvers/user.resolver';
+import {
+ NoticeOnelinesResolver,
+ NoticeOnelineResolver,
+} from './resolvers/notice-oneline.resolver';
export const noticeOnelineRoutes: Route[] = [
{
path: '',
+ pathMatch: 'full',
+ redirectTo: 'list',
+ },
+ {
+ path: 'list',
component: ListComponent,
resolve: {
noticeOnelines: NoticeOnelinesResolver,
},
},
{
- path: ':id',
- component: ViewComponent,
+ path: 'redit',
+ component: ReditComponent,
+ },
+ {
+ path: 'redit/:id',
+ component: ReditComponent,
resolve: {
- users: UserResolver,
+ noticeOneline: NoticeOnelineResolver,
},
},
];
diff --git a/src/app/modules/admin/board/notice-oneline/resolvers/notice-oneline.resolver.ts b/src/app/modules/admin/board/notice-oneline/resolvers/notice-oneline.resolver.ts
index 4ca837c..9cf54c8 100644
--- a/src/app/modules/admin/board/notice-oneline/resolvers/notice-oneline.resolver.ts
+++ b/src/app/modules/admin/board/notice-oneline/resolvers/notice-oneline.resolver.ts
@@ -38,7 +38,7 @@ export class NoticeOnelineResolver implements Resolve {
state: RouterStateSnapshot
): Observable {
return this._noticeOnelineService
- .getNoticeOnelineById(route.paramMap.get('title'))
+ .getNoticeOnelineById(route.paramMap.get('id'))
.pipe(
// Error here means the requested product is not available
catchError((error) => {
diff --git a/src/app/modules/admin/board/popup/components/redit.component.ts b/src/app/modules/admin/board/popup/components/redit.component.ts
index cb8f2f3..b889715 100644
--- a/src/app/modules/admin/board/popup/components/redit.component.ts
+++ b/src/app/modules/admin/board/popup/components/redit.component.ts
@@ -55,7 +55,6 @@ export class ReditComponent implements OnInit, AfterViewInit, OnDestroy {
searchInputControl = new FormControl();
popupForm!: FormGroup;
editMode: boolean = false;
- contact = contacts[0];
categories = categories;
popup: Popup | undefined;
@@ -159,20 +158,7 @@ export class ReditComponent implements OnInit, AfterViewInit, OnDestroy {
// Mark for check
this._changeDetectorRef.markForCheck();
}
- /**
- * Get country info by iso code
- *
- * @param iso
- */
- getCountryByIso(iso: string): Country {
- return {
- id: '19430ee3-b0fe-4987-a7c8-74453ad5504d',
- iso: 'af',
- name: 'Afghanistan',
- code: '+93',
- flagImagePos: '-1px -3180px',
- } as Country;
- }
+
/**
* Track by function for ngFor loops
*
@@ -184,52 +170,6 @@ export class ReditComponent implements OnInit, AfterViewInit, OnDestroy {
}
}
-export const contacts = [
- {
- id: 'cd5fa417-b667-482d-b208-798d9da3213c',
- avatar: 'assets/images/avatars/male-01.jpg',
- background: 'assets/images/cards/14-640x480.jpg',
- name: 'Dejesus Michael',
- emails: [
- {
- email: 'dejesusmichael@mail.org',
- label: '가로',
- },
- {
- email: 'michael.dejesus@vitricomp.io',
- label: '세로',
- },
- ],
- phoneNumbers: [
- {
- country: 'bs',
- phoneNumber: 'TOP',
- label: 'Mobile',
- },
- {
- country: 'bs',
- phoneNumber: 'LEFT',
- label: 'Work',
- },
- ],
- title: 'Track Service Worker',
- company: 'Vitricomp',
- birthday: '1975-01-10T12:00:00.000Z',
- address: '279 Independence Avenue, Calvary, Guam, PO4127',
- notes:
- 'Do incididunt cillum duis eu pariatur enim proident minim officia amet proident consequat consequat qui consequat magna magna occaecat aliquip culpa pariatur velit nisi nostrud irure eu ullamco exercitation sint.
Cillum deserunt laborum laborum quis nisi enim et aliquip labore excepteur in excepteur labore amet in ipsum ipsum nostrud deserunt lorem nisi voluptate dolor minim enim ut eu cupidatat enim.
',
- tags: ['56ddbd47-4078-4ddd-8448-73c5e88d5f59'],
- },
-];
-
-export interface Country {
- id: string;
- iso: string;
- name: string;
- code: string;
- flagImagePos: string;
-}
-
export const categories = [
{
id: 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',