bet/beteran-backend-app-browser
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/BETERAN-BACKEND-APP-BROWSER-init' of https://gitlab.loafle.net/bet/beteran-backend-app-browser into feature/BETERAN-BACKEND-APP-BROWSER-init

Browse Source
This commit is contained in:
병준 박 2022-08-15 04:34:12 +00:00
commit 4860a698a5
2 changed files with 118 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/app/modules/admin/member/current-user/components/list.component.html
View File

@ -167,18 +167,15 @@
</div> </div>
<!-- Budget details --> <!-- Budget details -->
<div <div
class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden" class="relative flex flex-col items-center flex-auto px-6 sm:px-12 sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden"
>
<div>
<div
class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden"
>
<div
class="text-lg font-medium tracking-tight leading-6 truncate"
> >
<div class="text-lg font-medium tracking-tight leading-6 truncate">
현재 접속자 & 전체회원 쪽지보내기 현재 접속자 & 전체회원 쪽지보내기
</div> </div>
<div class="flex flex-col flex-auto"> <div
class="flex md:w-full md:max-w-6xl sm:rounded-2xl sm:shadow overflow-hidden sm:bg-card"
>
<div class="w-full sm:w-auto py-8 px-4 sm:p-12 md:p-16">
<form <form
[formGroup]="targetForm" [formGroup]="targetForm"
autocomplete="off" autocomplete="off"
@ -186,41 +183,45 @@
> >
<mat-card> <mat-card>
<mat-card-content> <mat-card-content>
<div> <div layout="row">
<span class="font-semibold mb-2">구분</span> <span class="font-semibold mb-2">구분</span>
<mat-radio-group <mat-radio-group
class="flex flex-col w-1/3 pr-2" class="flex flex-row"
[color]="'primary'" [color]="'primary'"
[value]="'b'" [value]="'b'"
layout="row"
> >
<mat-radio-button class="mb-2" [value]="'a'"> <mat-radio-button class="mb-2 pr-2" [value]="'a'">
전체 전체
</mat-radio-button> </mat-radio-button>
<mat-radio-button class="mb-2" [value]="'b'"> <mat-radio-button class="mb-2 pr-2" [value]="'b'">
현재접속자 현재접속자
</mat-radio-button> </mat-radio-button>
<mat-radio-button [value]="'c'"> <mat-radio-button class="mb-2 pr-2" [value]="'c'">
본사 본사
</mat-radio-button> </mat-radio-button>
<mat-radio-button [value]="'d'"> <mat-radio-button class="mb-2 pr-2" [value]="'d'">
대본 대본
</mat-radio-button> </mat-radio-button>
<mat-radio-button [value]="'e'"> <mat-radio-button class="mb-2 pr-2" [value]="'e'">
부본 부본
</mat-radio-button> </mat-radio-button>
<mat-radio-button [value]="'f'"> <mat-radio-button class="mb-2 pr-2" [value]="'f'">
총판 총판
</mat-radio-button> </mat-radio-button>
<mat-radio-button [value]="'g'"> <mat-radio-button class="mb-2 pr-2" [value]="'g'">
매장 매장
</mat-radio-button> </mat-radio-button>
<mat-radio-button [value]="'h'"> <mat-radio-button class="mb-2 pr-2" [value]="'h'">
회원 회원
</mat-radio-button> </mat-radio-button>
</mat-radio-group> </mat-radio-group>
</div> </div>
<div> <div class="mt-8">
<span class="font-semibold mb-2">대본아이디</span> <span class="font-semibold mb-2 mt-8">대본아이디</span>
<div
class="inline-flex items-end justify-between w-full mt-1.5"
>
<mat-radio-group <mat-radio-group
class="flex flex-col w-1/3 pr-2" class="flex flex-col w-1/3 pr-2"
[color]="'primary'" [color]="'primary'"
@ -245,10 +246,14 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div> </div>
<div class="mt-8">
<span class="font-semibold mb-2">부본아이디</span> <span class="font-semibold mb-2">부본아이디</span>
<div
class="inline-flex items-end justify-between w-full mt-1.5"
>
<mat-radio-group <mat-radio-group
class="flex flex-col w-1/3 pr-2" class="flex flex-col w-2/3 pr-2"
[color]="'primary'" [color]="'primary'"
[value]="'j'" [value]="'j'"
> >
@ -271,13 +276,16 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="flex"> </div>
<mat-form-field class="w-1/3 pr-2"> <div class="mt-1.5">
<mat-form-field
class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full"
>
<mat-label>제목</mat-label> <mat-label>제목</mat-label>
<input matInput /> <input matInput [formControlName]="'title'" />
</mat-form-field> </mat-form-field>
</div> </div>
<div class="mt-8"> <div class="mt-1.5">
<mat-form-field <mat-form-field
class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full" class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full"
> >
@ -285,8 +293,9 @@
<input matInput [formControlName]="'writer'" /> <input matInput [formControlName]="'writer'" />
</mat-form-field> </mat-form-field>
</div> </div>
<div class="mt-1.5">
<mat-form-field <mat-form-field
class="mt-8 fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full" class="mt-1.5 fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full"
> >
<textarea <textarea
matInput matInput
@ -297,6 +306,7 @@
></textarea> ></textarea>
<mat-label>내용</mat-label> <mat-label>내용</mat-label>
</mat-form-field> </mat-form-field>
</div>
</mat-card-content> </mat-card-content>
<div> <div>
<button <button
@ -319,6 +329,23 @@
</mat-card> </mat-card>
</form> </form>
</div> </div>
<div
class="relative hidden md:flex flex-auto justify-center h-full w-full pt-16 pr-16 overflow-hidden"
>
<div class="mt-1.5" style="width: 100%">
<mat-form-field
class="mt-1.5 fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full"
>
<textarea
matInput
[required]="true"
[rows]="5"
matTextareaAutosize
[formControlName]="'content'"
></textarea>
<mat-label>내용</mat-label>
</mat-form-field>
</div>
</div> </div>
</div> </div>
</div> </div>

2
src/app/modules/admin/member/partner/compose/regist-compose.component.ts
View File

@ -162,7 +162,7 @@ export class RegistComposeComponent implements OnInit {
member.setSiteId(siteId); member.setSiteId(siteId);
member.setUsername(username); member.setUsername(username);
member.setPassword('beteran'); member.setPassword(password);
member.setMemberClassId(this.data.classId); member.setMemberClassId(this.data.classId);
member.setMemberLevelId('c56231ac-2120-4a81-a30a-5d41fafb6c57'); member.setMemberLevelId('c56231ac-2120-4a81-a30a-5d41fafb6c57');
member.setReferrerMemberUsername(this.data.parent.getUsername()); member.setReferrerMemberUsername(this.data.parent.getUsername());