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

This commit is contained in:
병준 박 2022-08-15 04:34:12 +00:00
commit 4860a698a5
2 changed files with 118 additions and 91 deletions

View File

@ -167,60 +167,61 @@
</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="text-lg font-medium tracking-tight leading-6 truncate">
<div 현재 접속자 & 전체회원 쪽지보내기
class="sm:col-span-6 flex flex-col flex-auto p-6 bg-card shadow rounded-2xl overflow-hidden" </div>
> <div
<div class="flex md:w-full md:max-w-6xl sm:rounded-2xl sm:shadow overflow-hidden sm:bg-card"
class="text-lg font-medium tracking-tight leading-6 truncate" >
<div class="w-full sm:w-auto py-8 px-4 sm:p-12 md:p-16">
<form
[formGroup]="targetForm"
autocomplete="off"
class="flex flex-col flex-auto p-6 sm:p-8 overflow-y-auto"
> >
현재 접속자 & 전체회원 쪽지보내기 <mat-card>
</div> <mat-card-content>
<div class="flex flex-col flex-auto"> <div layout="row">
<form <span class="font-semibold mb-2">구분</span>
[formGroup]="targetForm" <mat-radio-group
autocomplete="off" class="flex flex-row"
class="flex flex-col flex-auto p-6 sm:p-8 overflow-y-auto" [color]="'primary'"
> [value]="'b'"
<mat-card> layout="row"
<mat-card-content> >
<div> <mat-radio-button class="mb-2 pr-2" [value]="'a'">
<span class="font-semibold mb-2">구분</span> 전체
<mat-radio-group </mat-radio-button>
class="flex flex-col w-1/3 pr-2" <mat-radio-button class="mb-2 pr-2" [value]="'b'">
[color]="'primary'" 현재접속자
[value]="'b'" </mat-radio-button>
> <mat-radio-button class="mb-2 pr-2" [value]="'c'">
<mat-radio-button class="mb-2" [value]="'a'"> 본사
전체 </mat-radio-button>
</mat-radio-button> <mat-radio-button class="mb-2 pr-2" [value]="'d'">
<mat-radio-button class="mb-2" [value]="'b'"> 대본
현재접속자 </mat-radio-button>
</mat-radio-button> <mat-radio-button class="mb-2 pr-2" [value]="'e'">
<mat-radio-button [value]="'c'"> 부본
본사 </mat-radio-button>
</mat-radio-button> <mat-radio-button class="mb-2 pr-2" [value]="'f'">
<mat-radio-button [value]="'d'"> 총판
대본 </mat-radio-button>
</mat-radio-button> <mat-radio-button class="mb-2 pr-2" [value]="'g'">
<mat-radio-button [value]="'e'"> 매장
부본 </mat-radio-button>
</mat-radio-button> <mat-radio-button class="mb-2 pr-2" [value]="'h'">
<mat-radio-button [value]="'f'"> 회원
총판 </mat-radio-button>
</mat-radio-button> </mat-radio-group>
<mat-radio-button [value]="'g'"> </div>
매장 <div class="mt-8">
</mat-radio-button> <span class="font-semibold mb-2 mt-8">대본아이디</span>
<mat-radio-button [value]="'h'"> <div
회원 class="inline-flex items-end justify-between w-full mt-1.5"
</mat-radio-button> >
</mat-radio-group>
</div>
<div>
<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-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>
<span class="font-semibold mb-2">부본아이디</span> <div class="mt-8">
<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,22 +276,26 @@
</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-label>제목</mat-label>
<input matInput />
</mat-form-field>
</div>
<div class="mt-8">
<mat-form-field
class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full"
>
<mat-label>글쓴이</mat-label>
<input matInput [formControlName]="'writer'" />
</mat-form-field>
</div>
<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="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full"
>
<mat-label>제목</mat-label>
<input matInput [formControlName]="'title'" />
</mat-form-field>
</div>
<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>
<input matInput [formControlName]="'writer'" />
</mat-form-field>
</div>
<div class="mt-1.5">
<mat-form-field
class="mt-1.5 fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded fuse-mat-bold w-full"
> >
<textarea <textarea
matInput matInput
@ -297,27 +306,45 @@
></textarea> ></textarea>
<mat-label>내용</mat-label> <mat-label>내용</mat-label>
</mat-form-field> </mat-form-field>
</mat-card-content>
<div>
<button
mat-flat-button
class="bet-mat-small-8"
[color]="'primary'"
>
쪽지보내기
</button>
</div> </div>
<div> </mat-card-content>
<button <div>
mat-flat-button <button
class="bet-mat-small-8" mat-flat-button
[color]="'warn'" class="bet-mat-small-8"
> [color]="'primary'"
취소 >
</button> 쪽지보내기
</div> </button>
</mat-card> </div>
</form> <div>
<button
mat-flat-button
class="bet-mat-small-8"
[color]="'warn'"
>
취소
</button>
</div>
</mat-card>
</form>
</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>

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());