feat: refactor password input handling across multiple components

- Replaced individual password and confirm password fields with a shared-password-input component in the following components:
  - Partner Account Password Form
  - Consumer Account Form
  - Consumer User Form
  - Consumer Pos Form
  - Super Admin Consumer Account Form
  - Super Admin Partner Account Form
  - Super Admin Provider Form
  - Super Admin User Account Form
  - Modify Login Info Page

- Introduced a new SharedPasswordInputComponent to encapsulate password input logic and validation messages.
- Updated form handling to utilize reactive forms with shared components for better maintainability and consistency.
- Added a ChangePasswordFormDialogComponent for changing passwords with validation.
- Created API routes for business activity goods in the consumer module.
This commit is contained in:
2026-04-26 20:26:30 +03:30
parent baa9409e9e
commit c085104976
54 changed files with 293 additions and 601 deletions
@@ -46,17 +46,17 @@
<div class="grid grid-cols-3 gap-4 items-center"> <div class="grid grid-cols-3 gap-4 items-center">
@if (invoice.customer.type === "INDIVIDUAL") { @if (invoice.customer.type === "INDIVIDUAL") {
<app-key-value label="نوع مشتری" value="حقیقی" /> <app-key-value label="نوع مشتری" value="حقیقی" />
<app-key-value label="نام" [value]="invoice.customer.customer_individual?.first_name" /> <app-key-value label="نام" [value]="invoice.customer.individual?.first_name" />
<app-key-value label="نام خانوادگی" [value]="invoice.customer.customer_individual?.last_name" /> <app-key-value label="نام خانوادگی" [value]="invoice.customer.individual?.last_name" />
<app-key-value label="کد اقتصادی" [value]="invoice.customer.customer_individual?.economic_code" /> <app-key-value label="کد اقتصادی" [value]="invoice.customer.individual?.economic_code" />
<app-key-value label="کد ملی" [value]="invoice.customer.customer_individual?.national_id" /> <app-key-value label="کد ملی" [value]="invoice.customer.individual?.national_id" />
<app-key-value label="کد پستی" [value]="invoice.customer.customer_individual?.postal_code" /> <app-key-value label="کد پستی" [value]="invoice.customer.individual?.postal_code" />
} @else { } @else {
<app-key-value label="نوع مشتری" value="حقوقی" /> <app-key-value label="نوع مشتری" value="حقوقی" />
<app-key-value label="نام شرکت" [value]="invoice.customer.customer_legal?.company_name" /> <app-key-value label="نام شرکت" [value]="invoice.customer.legal?.company_name" />
<app-key-value label="کد اقتصادی" [value]="invoice.customer.customer_legal?.economic_code" /> <app-key-value label="کد اقتصادی" [value]="invoice.customer.legal?.economic_code" />
<app-key-value label="کد ثبتی" [value]="invoice.customer.customer_legal?.registration_number" /> <app-key-value label="کد ثبتی" [value]="invoice.customer.legal?.registration_number" />
<app-key-value label="کد پستی" [value]="invoice.customer.customer_legal?.postal_code" /> <app-key-value label="کد پستی" [value]="invoice.customer.legal?.postal_code" />
} }
</div> </div>
} @else if (invoice.unknown_customer) { } @else if (invoice.unknown_customer) {
@@ -30,8 +30,8 @@ interface Payment {
interface Customer { interface Customer {
id: string; id: string;
type: string; type: string;
customer_legal?: CustomerLegal; legal?: CustomerLegal;
customer_individual?: CustomerIndividual; individual?: CustomerIndividual;
} }
interface CustomerIndividual { interface CustomerIndividual {
@@ -7,34 +7,10 @@
(onHide)="close()" (onHide)="close()"
> >
<form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4"> <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-1 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form> </form>
@@ -1,18 +1,17 @@
import { MustMatch, password } from '@/core/validators'; import { MustMatch, password } from '@/core/validators';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Password } from 'primeng/password';
import { IAccountRequest, IAccountResponse } from '../models'; import { IAccountRequest, IAccountResponse } from '../models';
import { AccountsService } from '../services/main.service'; import { AccountsService } from '../services/main.service';
@Component({ @Component({
selector: 'account-password-form', selector: 'account-password-form',
templateUrl: './form.component.html', templateUrl: './form.component.html',
imports: [ReactiveFormsModule, Dialog, FormFooterActionsComponent, UikitFieldComponent, Password], imports: [ReactiveFormsModule, Dialog, FormFooterActionsComponent, SharedPasswordInputComponent],
}) })
export class ConsumerAccountPasswordFormComponent extends AbstractFormDialog< export class ConsumerAccountPasswordFormComponent extends AbstractFormDialog<
IAccountRequest, IAccountRequest,
@@ -7,11 +7,14 @@ import { Dialog } from 'primeng/dialog';
import { EnumSelectComponent } from '@/shared/apiEnum/select.component'; import { EnumSelectComponent } from '@/shared/apiEnum/select.component';
import { CatalogGuildGoodCategoriesSelectComponent } from '@/shared/catalog/guildGoodCategories'; import { CatalogGuildGoodCategoriesSelectComponent } from '@/shared/catalog/guildGoodCategories';
import { IConsumerComplexGoodRequest, IConsumerComplexGoodResponse } from '../../models/goods_io'; import {
import { GuildGoodsService } from '../../services/goods.service'; IConsumerBusinessActivityGoodRequest,
IConsumerBusinessActivityGoodResponse,
} from '../../models/goods_io';
import { BusinessActivityGoodsService } from '../../services/goods.service';
@Component({ @Component({
selector: 'consumer-complex-good-form', selector: 'consumer-businessActivity-good-form',
templateUrl: './form.component.html', templateUrl: './form.component.html',
imports: [ imports: [
ReactiveFormsModule, ReactiveFormsModule,
@@ -22,16 +25,15 @@ import { GuildGoodsService } from '../../services/goods.service';
CatalogGuildGoodCategoriesSelectComponent, CatalogGuildGoodCategoriesSelectComponent,
], ],
}) })
export class ConsumerComplexGoodFormComponent extends AbstractFormDialog< export class ConsumerBusinessActivityGoodFormComponent extends AbstractFormDialog<
IConsumerComplexGoodRequest, IConsumerBusinessActivityGoodRequest,
IConsumerComplexGoodResponse IConsumerBusinessActivityGoodResponse
> { > {
@Input({ required: true }) businessId!: string; @Input({ required: true }) businessId!: string;
@Input({ required: true }) complexId!: string;
@Input({ required: true }) guildId!: string; @Input({ required: true }) guildId!: string;
@Input() categoryId?: string; @Input() categoryId?: string;
private service = inject(GuildGoodsService); private service = inject(BusinessActivityGoodsService);
form = this.fb.group({ form = this.fb.group({
name: [this.initialValues?.name || '', [Validators.required]], name: [this.initialValues?.name || '', [Validators.required]],
@@ -46,10 +48,10 @@ export class ConsumerComplexGoodFormComponent extends AbstractFormDialog<
return `${this.editMode ? 'ویرایش' : 'ایجاد'} کالا`; return `${this.editMode ? 'ویرایش' : 'ایجاد'} کالا`;
} }
override submitForm(payload: IConsumerComplexGoodRequest) { override submitForm(payload: IConsumerBusinessActivityGoodRequest) {
if (this.editMode) { if (this.editMode) {
return this.service.update(this.businessId, this.complexId, this.categoryId!, payload); return this.service.update(this.businessId, this.categoryId!, payload);
} }
return this.service.create(this.businessId, this.complexId, payload); return this.service.create(this.businessId, payload);
} }
} }
@@ -14,9 +14,8 @@
(onAdd)="openAddForm()" (onAdd)="openAddForm()"
(onRefresh)="refresh()" (onRefresh)="refresh()"
/> />
<consumer-complex-good-form <consumer-businessActivity-good-form
[businessId]="businessId" [businessId]="businessId"
[complexId]="complexId"
[guildId]="guildId" [guildId]="guildId"
[(visible)]="visibleForm" [(visible)]="visibleForm"
[initialValues]="selectedItemForEdit() || undefined" [initialValues]="selectedItemForEdit() || undefined"
@@ -5,18 +5,17 @@ import {
PageDataListComponent, PageDataListComponent,
} from '@/shared/components/pageDataList/page-data-list.component'; } from '@/shared/components/pageDataList/page-data-list.component';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { IConsumerComplexGoodResponse } from '../../models/goods_io'; import { IConsumerBusinessActivityGoodResponse } from '../../models/goods_io';
import { GuildGoodsService } from '../../services/goods.service'; import { BusinessActivityGoodsService } from '../../services/goods.service';
import { ConsumerComplexGoodFormComponent } from './form.component'; import { ConsumerBusinessActivityGoodFormComponent } from './form.component';
@Component({ @Component({
selector: 'consumer-complex-goods-list', selector: 'consumer-businessActivity-goods-list',
templateUrl: './list.component.html', templateUrl: './list.component.html',
imports: [PageDataListComponent, ConsumerComplexGoodFormComponent], imports: [PageDataListComponent, ConsumerBusinessActivityGoodFormComponent],
}) })
export class ConsumerComplexGoodsListComponent extends AbstractList<IConsumerComplexGoodResponse> { export class ConsumerBusinessActivityGoodsListComponent extends AbstractList<IConsumerBusinessActivityGoodResponse> {
@Input({ required: true }) businessId!: string; @Input({ required: true }) businessId!: string;
@Input({ required: true }) complexId!: string;
@Input({ required: true }) guildId!: string; @Input({ required: true }) guildId!: string;
@Input() fullHeight?: boolean; @Input() fullHeight?: boolean;
@Input() header: IColumn[] = [ @Input() header: IColumn[] = [
@@ -35,13 +34,13 @@ export class ConsumerComplexGoodsListComponent extends AbstractList<IConsumerCom
type: 'date', type: 'date',
}, },
]; ];
service = inject(GuildGoodsService); service = inject(BusinessActivityGoodsService);
override setColumns(): void { override setColumns(): void {
this.columns = this.header; this.columns = this.header;
} }
override getDataRequest() { override getDataRequest() {
return this.service.getAll(this.businessId, this.complexId); return this.service.getAll(this.businessId);
} }
} }
@@ -20,41 +20,10 @@
@if (!editMode) { @if (!editMode) {
<p-divider align="center"> اطلاعات ورود </p-divider> <p-divider align="center"> اطلاعات ورود </p-divider>
<app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" />
<uikit-field label="رمز عبور" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="new-password"
class="w-full"
[toggleMask]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
[inputStyle]="{
width: '100%',
}"
/>
<span class="text-xs mt-1 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
class="w-full"
[toggleMask]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
[inputStyle]="{
width: '100%',
}"
/>
</uikit-field>
} }
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
@@ -4,14 +4,12 @@ import { AbstractFormDialog } from '@/shared/abstractClasses';
import { EnumSelectComponent } from '@/shared/apiEnum/select.component'; import { EnumSelectComponent } from '@/shared/apiEnum/select.component';
import { CatalogProviderSelectComponent } from '@/shared/catalog'; import { CatalogProviderSelectComponent } from '@/shared/catalog';
import { CatalogDeviceSelectComponent } from '@/shared/catalog/devices'; import { CatalogDeviceSelectComponent } from '@/shared/catalog/devices';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Divider } from 'primeng/divider'; import { Divider } from 'primeng/divider';
import { Password } from 'primeng/password';
import { IPosRequest, IPosResponse } from '../../models'; import { IPosRequest, IPosResponse } from '../../models';
import { ConsumerPosesService } from '../../services/poses.service'; import { ConsumerPosesService } from '../../services/poses.service';
@@ -26,9 +24,8 @@ import { ConsumerPosesService } from '../../services/poses.service';
CatalogDeviceSelectComponent, CatalogDeviceSelectComponent,
CatalogProviderSelectComponent, CatalogProviderSelectComponent,
EnumSelectComponent, EnumSelectComponent,
UikitFieldComponent,
Password,
Divider, Divider,
SharedPasswordInputComponent,
], ],
}) })
export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IPosResponse> { export class ConsumerPosFormComponent extends AbstractFormDialog<IPosRequest, IPosResponse> {
@@ -0,0 +1,6 @@
const baseUrl = (businessId: string) => `/api/v1/consumer/business_activities/${businessId}/goods`;
export const CONSUMER_BUSINESS_ACTIVITY_GOODS_API_ROUTES = {
list: (businessId: string) => `${baseUrl(businessId)}`,
single: (businessId: string, id: string) => `${baseUrl(businessId)}/${id}`,
};
@@ -1,8 +0,0 @@
const baseUrl = (businessId: string, complexId: string) =>
`/api/v1/consumer/business_activities/${businessId}/complexes/${complexId}/goods`;
export const CONSUMER_COMPLEX_GOODS_API_ROUTES = {
list: (businessId: string, complexId: string) => `${baseUrl(businessId, complexId)}`,
single: (businessId: string, complexId: string, id: string) =>
`${baseUrl(businessId, complexId)}/${id}`,
};
@@ -3,18 +3,19 @@ import { Routes } from '@angular/router';
export type TGoodsRouteNames = 'goods'; export type TGoodsRouteNames = 'goods';
const baseUrl = (businessId: string, complexId: string) => const baseUrl = (businessId: string) => `/consumer/business_activities/${businessId}/goods`;
`/consumer/business_activities/${businessId}/complexes/${complexId}/goods`;
export const consumerComplexGoodsNamedRoutes: NamedRoutes<TGoodsRouteNames> = { export const consumerBusinessActivityGoodsNamedRoutes: NamedRoutes<TGoodsRouteNames> = {
goods: { goods: {
path: 'goods', path: 'goods',
loadComponent: () => loadComponent: () =>
import('../../views/goods/list.component').then((m) => m.ConsumerComplexGoodsComponent), import('../../views/goods/list.component').then(
(m) => m.ConsumerBusinessActivityGoodsComponent,
),
// @ts-ignore // @ts-ignore
meta: { meta: {
title: 'کالاها', title: 'کالاها',
pagePath: (businessId: string, complexId: string) => baseUrl(businessId, complexId), pagePath: (businessId: string) => baseUrl(businessId),
}, },
}, },
// good: { // good: {
@@ -25,15 +26,15 @@ export const consumerComplexGoodsNamedRoutes: NamedRoutes<TGoodsRouteNames> = {
// meta: { // meta: {
// title: 'پایانه‌ی فروش', // title: 'پایانه‌ی فروش',
// pagePath: (businessId: string, complexId: string, goodId: string) => // pagePath: (businessId: string, complexId: string, goodId: string) =>
// `${baseUrl(businessId, complexId)}/${goodId}`, // `${baseUrl(businessId)}/${goodId}`,
// }, // },
// }, // },
}; };
export const CONSUMER_COMPLEX_GOODS_ROUTES: Routes = [ export const CONSUMER_BUSINESS_ACTIVITY_GOODS_ROUTES: Routes = [
consumerComplexGoodsNamedRoutes.goods, consumerBusinessActivityGoodsNamedRoutes.goods,
// { // {
// path: consumerComplexGoodsNamedRoutes.good.path, // path: consumerBusinessActivityGoodsNamedRoutes.good.path,
// loadComponent: () => // loadComponent: () =>
// import('../../components/goods/layout.component').then( // import('../../components/goods/layout.component').then(
// (m) => m.SuperAdminConsumerPosLayoutComponent, // (m) => m.SuperAdminConsumerPosLayoutComponent,
@@ -41,7 +42,7 @@ export const CONSUMER_COMPLEX_GOODS_ROUTES: Routes = [
// children: [ // children: [
// { // {
// path: '', // path: '',
// loadComponent: consumerComplexGoodsNamedRoutes.good.loadComponent, // loadComponent: consumerBusinessActivityGoodsNamedRoutes.good.loadComponent,
// }, // },
// ], // ],
// }, // },
@@ -1,6 +1,7 @@
import { NamedRoutes } from '@/core'; import { NamedRoutes } from '@/core';
import { Routes } from '@angular/router'; import { Routes } from '@angular/router';
import { CONSUMER_COMPLEXES_ROUTES } from './complexes'; import { CONSUMER_COMPLEXES_ROUTES } from './complexes';
import { CONSUMER_BUSINESS_ACTIVITY_GOODS_ROUTES } from './goods';
export type TConsumerBusinessActivityRouteNames = 'businessActivities' | 'businessActivity'; export type TConsumerBusinessActivityRouteNames = 'businessActivities' | 'businessActivity';
@@ -38,6 +39,7 @@ export const CONSUMER_BUSINESS_ACTIVITIES_ROUTES: Routes = [
...consumerBusinessActivityNamedRoutes.businessActivity, ...consumerBusinessActivityNamedRoutes.businessActivity,
path: '', path: '',
}, },
...CONSUMER_BUSINESS_ACTIVITY_GOODS_ROUTES,
...CONSUMER_COMPLEXES_ROUTES, ...CONSUMER_COMPLEXES_ROUTES,
], ],
}, },
@@ -1,6 +1,6 @@
import ISummary from '@/core/models'; import ISummary from '@/core/models';
export interface IConsumerComplexGoodRawResponse { export interface IConsumerBusinessActivityGoodRawResponse {
id: string; id: string;
name: string; name: string;
sku: string; sku: string;
@@ -11,9 +11,9 @@ export interface IConsumerComplexGoodRawResponse {
created_at: string; created_at: string;
updated_at: string; updated_at: string;
} }
export interface IConsumerComplexGoodResponse extends IConsumerComplexGoodRawResponse {} export interface IConsumerBusinessActivityGoodResponse extends IConsumerBusinessActivityGoodRawResponse {}
export interface IConsumerComplexGoodRequest { export interface IConsumerBusinessActivityGoodRequest {
name: string; name: string;
sku: string; sku: string;
category_id: string; category_id: string;
@@ -2,56 +2,49 @@ import { IPaginatedResponse } from '@/core/models/service.model';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { CONSUMER_COMPLEX_GOODS_API_ROUTES } from '../constants/apiRoutes/complexGoods'; import { CONSUMER_BUSINESS_ACTIVITY_GOODS_API_ROUTES } from '../constants/apiRoutes/businessActivityGoods';
import { import {
IConsumerComplexGoodRawResponse, IConsumerBusinessActivityGoodRawResponse,
IConsumerComplexGoodRequest, IConsumerBusinessActivityGoodRequest,
IConsumerComplexGoodResponse, IConsumerBusinessActivityGoodResponse,
} from '../models/goods_io'; } from '../models/goods_io';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class GuildGoodsService { export class BusinessActivityGoodsService {
constructor(private http: HttpClient) {} constructor(private http: HttpClient) {}
private apiRoutes = CONSUMER_COMPLEX_GOODS_API_ROUTES; private apiRoutes = CONSUMER_BUSINESS_ACTIVITY_GOODS_API_ROUTES;
getAll( getAll(
businessId: string, businessId: string,
complexId: string, ): Observable<IPaginatedResponse<IConsumerBusinessActivityGoodResponse>> {
): Observable<IPaginatedResponse<IConsumerComplexGoodResponse>> { return this.http.get<IPaginatedResponse<IConsumerBusinessActivityGoodRawResponse>>(
return this.http.get<IPaginatedResponse<IConsumerComplexGoodRawResponse>>( this.apiRoutes.list(businessId),
this.apiRoutes.list(businessId, complexId),
); );
} }
getSingle( getSingle(businessId: string, id: string): Observable<IConsumerBusinessActivityGoodResponse> {
businessId: string, return this.http.get<IConsumerBusinessActivityGoodRawResponse>(
complexId: string, this.apiRoutes.single(businessId, id),
id: string,
): Observable<IConsumerComplexGoodResponse> {
return this.http.get<IConsumerComplexGoodRawResponse>(
this.apiRoutes.single(businessId, complexId, id),
); );
} }
create( create(
businessId: string, businessId: string,
complexId: string, data: IConsumerBusinessActivityGoodRequest,
data: IConsumerComplexGoodRequest, ): Observable<IConsumerBusinessActivityGoodResponse> {
): Observable<IConsumerComplexGoodResponse> { return this.http.post<IConsumerBusinessActivityGoodResponse>(
return this.http.post<IConsumerComplexGoodResponse>( this.apiRoutes.list(businessId),
this.apiRoutes.list(businessId, complexId),
data, data,
); );
} }
update( update(
businessId: string, businessId: string,
complexId: string,
id: string, id: string,
data: IConsumerComplexGoodRequest, data: IConsumerBusinessActivityGoodRequest,
): Observable<IConsumerComplexGoodResponse> { ): Observable<IConsumerBusinessActivityGoodResponse> {
return this.http.patch<IConsumerComplexGoodResponse>( return this.http.patch<IConsumerBusinessActivityGoodResponse>(
this.apiRoutes.single(businessId, complexId, id), this.apiRoutes.single(businessId, id),
data, data,
); );
} }
@@ -10,7 +10,6 @@
</app-card-data> </app-card-data>
<consumer-poses-list [businessId]="businessId()" [complexId]="complexId()" /> <consumer-poses-list [businessId]="businessId()" [complexId]="complexId()" />
<consumer-complex-goods-list [businessId]="businessId()" [complexId]="complexId()" [guildId]="business()!.guild.id" />
<consumer-complex-form <consumer-complex-form
[(visible)]="editMode" [(visible)]="editMode"
@@ -4,7 +4,6 @@ import pageParamsUtils from '@/utils/page-params.utils';
import { Component, computed, effect, inject, signal } from '@angular/core'; import { Component, computed, effect, inject, signal } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { ConsumerComplexFormComponent } from '../../components/complexes/form.component'; import { ConsumerComplexFormComponent } from '../../components/complexes/form.component';
import { ConsumerComplexGoodsListComponent } from '../../components/goods/list.component';
import { ConsumerPosesComponent } from '../../components/poses/list.component'; import { ConsumerPosesComponent } from '../../components/poses/list.component';
import { BusinessActivityStore } from '../../store/businessActivity.store'; import { BusinessActivityStore } from '../../store/businessActivity.store';
import { ConsumerComplexStore } from '../../store/complex.store'; import { ConsumerComplexStore } from '../../store/complex.store';
@@ -17,7 +16,6 @@ import { ConsumerComplexStore } from '../../store/complex.store';
KeyValueComponent, KeyValueComponent,
ConsumerComplexFormComponent, ConsumerComplexFormComponent,
ConsumerPosesComponent, ConsumerPosesComponent,
ConsumerComplexGoodsListComponent,
], ],
}) })
export class ConsumerComplexComponent { export class ConsumerComplexComponent {
@@ -1 +1 @@
<consumer-complex-goods-list [businessId]="businessId()" [complexId]="complexId()" [guildId]="business()?.guild!.id" /> <consumer-businessActivity-goods-list [businessId]="businessId()" [guildId]="business()?.guild!.id" />
@@ -3,26 +3,23 @@ import { BreadcrumbService } from '@/core/services';
import pageParamsUtils from '@/utils/page-params.utils'; import pageParamsUtils from '@/utils/page-params.utils';
import { Component, computed, inject, signal } from '@angular/core'; import { Component, computed, inject, signal } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { ConsumerComplexGoodsListComponent } from '../../components/goods/list.component'; import { ConsumerBusinessActivityGoodsListComponent } from '../../components/goods/list.component';
import { consumerComplexGoodsNamedRoutes } from '../../constants/routes/goods'; import { consumerBusinessActivityGoodsNamedRoutes } from '../../constants/routes/goods';
import { BusinessActivityStore } from '../../store/businessActivity.store'; import { BusinessActivityStore } from '../../store/businessActivity.store';
import { ConsumerComplexStore } from '../../store/complex.store';
@Component({ @Component({
selector: 'consumer-complex-goods', selector: 'consumer-businessActivity-goods',
templateUrl: './list.component.html', templateUrl: './list.component.html',
imports: [ConsumerComplexGoodsListComponent], imports: [ConsumerBusinessActivityGoodsListComponent],
}) })
export class ConsumerComplexGoodsComponent { export class ConsumerBusinessActivityGoodsComponent {
private readonly route = inject(ActivatedRoute); private readonly route = inject(ActivatedRoute);
private readonly breadcrumbService = inject(BreadcrumbService); private readonly breadcrumbService = inject(BreadcrumbService);
private readonly businessStore = inject(BusinessActivityStore); private readonly businessStore = inject(BusinessActivityStore);
private readonly complexStore = inject(ConsumerComplexStore);
pageParams = computed(() => pageParamsUtils(this.route)); pageParams = computed(() => pageParamsUtils(this.route));
businessId = signal<string>(this.pageParams()['businessActivityId']); businessId = signal<string>(this.pageParams()['businessActivityId']);
complexId = signal<string>(this.pageParams()['complexId']);
business = computed(() => this.businessStore.entity()); business = computed(() => this.businessStore.entity());
@@ -33,12 +30,10 @@ export class ConsumerComplexGoodsComponent {
setBreadcrumb() { setBreadcrumb() {
this.breadcrumbService.setItems([ this.breadcrumbService.setItems([
...this.businessStore.breadcrumbItems(), ...this.businessStore.breadcrumbItems(),
...this.complexStore.breadcrumbItems(),
{ {
title: consumerComplexGoodsNamedRoutes.goods.meta.title, title: consumerBusinessActivityGoodsNamedRoutes.goods.meta.title,
routerLink: consumerComplexGoodsNamedRoutes.goods.meta.pagePath!( routerLink: consumerBusinessActivityGoodsNamedRoutes.goods.meta.pagePath!(
this.businessId(), this.businessId(),
this.complexId(),
), ),
}, },
]); ]);
@@ -1,6 +1,8 @@
<div class="flex flex-col gap-6"> <div class="flex flex-col gap-6">
<app-card-data cardTitle="اطلاعات فعالیت اقتصادی" [editable]="true" [(editMode)]="editMode"> <app-card-data cardTitle="اطلاعات فعالیت اقتصادی" [editable]="true" [(editMode)]="editMode">
<ng-template #moreActions> </ng-template> <ng-template #moreActions>
<a routerLink pButton [routerLink]="goodsPageRoute()" outlined>مدیریت کالاها</a>
</ng-template>
<div class="flex flex-col gap-4"> <div class="flex flex-col gap-4">
<div class="grid grid-cols-3 gap-4 items-center"> <div class="grid grid-cols-3 gap-4 items-center">
<app-key-value label="عنوان" [value]="business()?.name" /> <app-key-value label="عنوان" [value]="business()?.name" />
@@ -1,10 +1,12 @@
import { BreadcrumbService } from '@/core/services'; import { BreadcrumbService } from '@/core/services';
import { AppCardComponent, KeyValueComponent } from '@/shared/components'; import { AppCardComponent, KeyValueComponent } from '@/shared/components';
import { Component, computed, effect, inject, signal } from '@angular/core'; import { Component, computed, effect, inject, signal } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute, RouterLink } from '@angular/router';
import { ButtonDirective } from 'primeng/button';
import { Divider } from 'primeng/divider'; import { Divider } from 'primeng/divider';
import { ConsumerComplexListComponent } from '../components/complexes/list.component'; import { ConsumerComplexListComponent } from '../components/complexes/list.component';
import { ConsumerBusinessActivityFormComponent } from '../components/form.component'; import { ConsumerBusinessActivityFormComponent } from '../components/form.component';
import { consumerBusinessActivityGoodsNamedRoutes } from '../constants/routes/goods';
import { BusinessActivityStore } from '../store/businessActivity.store'; import { BusinessActivityStore } from '../store/businessActivity.store';
@Component({ @Component({
@@ -16,9 +18,19 @@ import { BusinessActivityStore } from '../store/businessActivity.store';
ConsumerBusinessActivityFormComponent, ConsumerBusinessActivityFormComponent,
ConsumerComplexListComponent, ConsumerComplexListComponent,
Divider, Divider,
ButtonDirective,
RouterLink,
], ],
}) })
export class ConsumerBusinessActivityComponent { export class ConsumerBusinessActivityComponent {
constructor() {
effect(() => {
if (this.business()?.id) {
this.setBreadcrumb();
}
});
}
private readonly store = inject(BusinessActivityStore); private readonly store = inject(BusinessActivityStore);
private readonly route = inject(ActivatedRoute); private readonly route = inject(ActivatedRoute);
private readonly breadcrumbService = inject(BreadcrumbService); private readonly breadcrumbService = inject(BreadcrumbService);
@@ -30,13 +42,11 @@ export class ConsumerBusinessActivityComponent {
readonly business = computed(() => this.store.entity()); readonly business = computed(() => this.store.entity());
readonly businessBreadcrumb = computed(() => this.store.breadcrumbItems()); readonly businessBreadcrumb = computed(() => this.store.breadcrumbItems());
constructor() { readonly goodsPageRoute = computed(() =>
effect(() => { this.business()
if (this.business()?.id) { ? consumerBusinessActivityGoodsNamedRoutes.goods.meta.pagePath!(this.business()!.id)
this.setBreadcrumb(); : '',
} );
});
}
getData() { getData() {
this.store.getData(this.businessId()); this.store.getData(this.businessId());
@@ -25,18 +25,15 @@ export class ConsumerCustomerIndividualFormComponent extends AbstractForm<
initForm = () => { initForm = () => {
return this.fb.group({ return this.fb.group({
first_name: [ first_name: [this.initialValues?.individual?.first_name || '', [Validators.required]],
this.initialValues?.customer_individual?.first_name || '', last_name: [this.initialValues?.individual?.last_name || '', [Validators.required]],
[Validators.required],
],
last_name: [this.initialValues?.customer_individual?.last_name || '', [Validators.required]],
national_id: [ national_id: [
this.initialValues?.customer_individual?.national_id || '', this.initialValues?.individual?.national_id || '',
[Validators.required, nationalIdValidator()], [Validators.required, nationalIdValidator()],
], ],
economic_code: [this.initialValues?.customer_individual?.economic_code || ''], economic_code: [this.initialValues?.individual?.economic_code || ''],
postal_code: [ postal_code: [
this.initialValues?.customer_individual?.postal_code || '', this.initialValues?.individual?.postal_code || '',
[Validators.required, postalCodeValidator()], [Validators.required, postalCodeValidator()],
], ],
}); });
@@ -23,17 +23,14 @@ export class ConsumerCustomerLegalFormComponent extends AbstractForm<
private initForm() { private initForm() {
const form = this.fb.group({ const form = this.fb.group({
company_name: [this.initialValues?.customer_legal?.company_name || '', [Validators.required]], company_name: [this.initialValues?.legal?.company_name || '', [Validators.required]],
registration_number: [ registration_number: [
this.initialValues?.customer_legal?.registration_number || '', this.initialValues?.legal?.registration_number || '',
[Validators.required],
],
economic_code: [
this.initialValues?.customer_legal?.economic_code || '',
[Validators.required], [Validators.required],
], ],
economic_code: [this.initialValues?.legal?.economic_code || '', [Validators.required]],
postal_code: [ postal_code: [
this.initialValues?.customer_legal?.postal_code || '', this.initialValues?.legal?.postal_code || '',
[Validators.required, postalCodeValidator()], [Validators.required, postalCodeValidator()],
], ],
}); });
@@ -33,9 +33,9 @@ export class ConsumerCustomerListComponent extends AbstractList<ICustomerRespons
header: 'عنوان', header: 'عنوان',
customDataModel(item: ICustomerResponse) { customDataModel(item: ICustomerResponse) {
if (item.type === 'LEGAL') { if (item.type === 'LEGAL') {
return item.customer_legal!.company_name; return item.legal!.company_name;
} }
return `${item.customer_individual!.first_name} ${item.customer_individual!.last_name}`; return `${item.individual!.first_name} ${item.individual!.last_name}`;
}, },
}, },
{ {
@@ -43,9 +43,9 @@ export class ConsumerCustomerListComponent extends AbstractList<ICustomerRespons
header: 'کد اقتصادی', header: 'کد اقتصادی',
customDataModel(item: ICustomerResponse) { customDataModel(item: ICustomerResponse) {
if (item.type === 'LEGAL') { if (item.type === 'LEGAL') {
return item.customer_legal!.economic_code; return item.legal!.economic_code;
} }
return item.customer_individual!.economic_code; return item.individual!.economic_code;
}, },
}, },
{ {
+2 -2
View File
@@ -5,8 +5,8 @@ export interface ICustomerRawResponse {
type: string; type: string;
is_favorite: boolean; is_favorite: boolean;
created_at: string; created_at: string;
customer_individual: Maybe<CustomerIndividual>; individual: Maybe<CustomerIndividual>;
customer_legal: Maybe<CustomerLegal>; legal: Maybe<CustomerLegal>;
} }
export interface ICustomerResponse extends ICustomerRawResponse {} export interface ICustomerResponse extends ICustomerRawResponse {}
@@ -38,8 +38,8 @@ export class ConsumerCustomerStore extends EntityStore<ICustomerResponse, Consum
{ {
title: title:
this.entity()?.type === 'LEGAL' this.entity()?.type === 'LEGAL'
? this.entity()?.customer_legal!.company_name ? this.entity()?.legal!.company_name
: `${this.entity()?.customer_individual!.first_name} ${this.entity()?.customer_individual!.last_name}`, : `${this.entity()?.individual!.first_name} ${this.entity()?.individual!.last_name}`,
routerLink: consumerCustomersNamedRoutes.customer.meta.pagePath!(customerId), routerLink: consumerCustomersNamedRoutes.customer.meta.pagePath!(customerId),
}, },
], ],
@@ -7,18 +7,18 @@
<div class="flex flex-col gap-4"> <div class="flex flex-col gap-4">
@if (customer()?.type === "LEGAL") { @if (customer()?.type === "LEGAL") {
<div class="grid grid-cols-3 gap-4 items-center"> <div class="grid grid-cols-3 gap-4 items-center">
<app-key-value label="عنوان" [value]="customer()?.customer_legal?.company_name" /> <app-key-value label="عنوان" [value]="customer()?.legal?.company_name" />
<app-key-value label="کد اقتصادی" [value]="customer()?.customer_legal?.economic_code" /> <app-key-value label="کد اقتصادی" [value]="customer()?.legal?.economic_code" />
<app-key-value label="شماره ثبت" [value]="customer()?.customer_legal?.registration_number" /> <app-key-value label="شماره ثبت" [value]="customer()?.legal?.registration_number" />
<app-key-value label="کد پستی" [value]="customer()?.customer_legal?.postal_code" /> <app-key-value label="کد پستی" [value]="customer()?.legal?.postal_code" />
</div> </div>
} @else if (customer()?.type === "INDIVIDUAL") { } @else if (customer()?.type === "INDIVIDUAL") {
<div class="grid grid-cols-3 gap-4 items-center"> <div class="grid grid-cols-3 gap-4 items-center">
<app-key-value label="نام" [value]="customer()?.customer_individual?.first_name" /> <app-key-value label="نام" [value]="customer()?.individual?.first_name" />
<app-key-value label="نام خانوادگی" [value]="customer()?.customer_individual?.last_name" /> <app-key-value label="نام خانوادگی" [value]="customer()?.individual?.last_name" />
<app-key-value label="عنوان" [value]="customer()?.customer_individual?.national_id" /> <app-key-value label="عنوان" [value]="customer()?.individual?.national_id" />
<app-key-value label="کد اقتصادی" [value]="customer()?.customer_individual?.economic_code" /> <app-key-value label="کد اقتصادی" [value]="customer()?.individual?.economic_code" />
<app-key-value label="کد پستی" [value]="customer()?.customer_individual?.postal_code" /> <app-key-value label="کد پستی" [value]="customer()?.individual?.postal_code" />
</div> </div>
} }
</div> </div>
@@ -7,34 +7,10 @@
(onHide)="close()" (onHide)="close()"
> >
<form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4"> <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-1 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form> </form>
@@ -1,18 +1,17 @@
import { MustMatch, password } from '@/core/validators'; import { MustMatch, password } from '@/core/validators';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Password } from 'primeng/password';
import { IAccountRequest, IAccountResponse } from '../models'; import { IAccountRequest, IAccountResponse } from '../models';
import { AccountsService } from '../services/main.service'; import { AccountsService } from '../services/main.service';
@Component({ @Component({
selector: 'account-password-form', selector: 'account-password-form',
templateUrl: './form.component.html', templateUrl: './form.component.html',
imports: [ReactiveFormsModule, Dialog, FormFooterActionsComponent, UikitFieldComponent, Password], imports: [ReactiveFormsModule, Dialog, FormFooterActionsComponent, SharedPasswordInputComponent],
}) })
export class PartnerAccountPasswordFormComponent extends AbstractFormDialog< export class PartnerAccountPasswordFormComponent extends AbstractFormDialog<
IAccountRequest, IAccountRequest,
@@ -9,34 +9,10 @@
<form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4"> <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
<app-input label="نام کاربری" [control]="form.controls.username" name="username" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" />
<app-enum-select [control]="form.controls.role" name="role" type="consumerRole" /> <app-enum-select [control]="form.controls.role" name="role" type="consumerRole" />
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-2 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form> </form>
</p-dialog> </p-dialog>
@@ -2,13 +2,11 @@ import { MustMatch, password } from '@/core/validators';
// import { CatalogRolesComponent } from '@/shared/catalog/roles'; // import { CatalogRolesComponent } from '@/shared/catalog/roles';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { EnumSelectComponent } from '@/shared/apiEnum/select.component'; import { EnumSelectComponent } from '@/shared/apiEnum/select.component';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Password } from 'primeng/password';
import { IConsumerAccountRequest, IConsumerAccountResponse } from '../../models'; import { IConsumerAccountRequest, IConsumerAccountResponse } from '../../models';
import { PartnerConsumerAccountsService } from '../../services/accounts.service'; import { PartnerConsumerAccountsService } from '../../services/accounts.service';
@@ -20,8 +18,7 @@ import { PartnerConsumerAccountsService } from '../../services/accounts.service'
Dialog, Dialog,
InputComponent, InputComponent,
FormFooterActionsComponent, FormFooterActionsComponent,
UikitFieldComponent, SharedPasswordInputComponent,
Password,
EnumSelectComponent, EnumSelectComponent,
], ],
}) })
@@ -16,34 +16,10 @@
<p-divider align="center"> اطلاعات ورود </p-divider> <p-divider align="center"> اطلاعات ورود </p-divider>
<!-- @ts-ignore --> <!-- @ts-ignore -->
<app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" />
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-1 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
<p-divider align="center"> اطلاعات لایسنس </p-divider> <p-divider align="center"> اطلاعات لایسنس </p-divider>
<uikit-datepicker <uikit-datepicker
label="تاریخ شروع لایسنس" label="تاریخ شروع لایسنس"
@@ -1,15 +1,14 @@
import { mobileValidator, MustMatch } from '@/core/validators'; import { mobileValidator, MustMatch } from '@/core/validators';
import { nationalIdValidator } from '@/core/validators/national-id.validator'; import { nationalIdValidator } from '@/core/validators/national-id.validator';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent, UikitFlatpickrJalaliComponent } from '@/uikit'; import { UikitFlatpickrJalaliComponent } from '@/uikit';
import { nowJalali } from '@/utils'; import { nowJalali } from '@/utils';
import { Component, computed, inject, Input } from '@angular/core'; import { Component, computed, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Divider } from 'primeng/divider'; import { Divider } from 'primeng/divider';
import { Password } from 'primeng/password';
import { IConsumerRequest, IConsumerResponse } from '../models'; import { IConsumerRequest, IConsumerResponse } from '../models';
import { ConsumersService } from '../services/main.service'; import { ConsumersService } from '../services/main.service';
@@ -22,9 +21,8 @@ import { ConsumersService } from '../services/main.service';
InputComponent, InputComponent,
FormFooterActionsComponent, FormFooterActionsComponent,
Divider, Divider,
UikitFieldComponent,
Password,
UikitFlatpickrJalaliComponent, UikitFlatpickrJalaliComponent,
SharedPasswordInputComponent,
], ],
}) })
export class ConsumerUserFormComponent extends AbstractFormDialog< export class ConsumerUserFormComponent extends AbstractFormDialog<
@@ -11,31 +11,10 @@
@if (!editMode) { @if (!editMode) {
<p-divider align="center"> اطلاعات ورود </p-divider> <p-divider align="center"> اطلاعات ورود </p-divider>
<app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" />
<uikit-field label="رمز عبور" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="new-password"
inputStyleClass="w-full"
[toggleMask]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
</uikit-field>
<uikit-field label="تکرار رمز عبور" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
inputStyleClass="w-full"
[toggleMask]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
} }
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
@@ -4,13 +4,11 @@ import { AbstractForm } from '@/shared/abstractClasses';
import { EnumSelectComponent } from '@/shared/apiEnum/select.component'; import { EnumSelectComponent } from '@/shared/apiEnum/select.component';
import { CatalogProviderSelectComponent } from '@/shared/catalog'; import { CatalogProviderSelectComponent } from '@/shared/catalog';
import { CatalogDeviceSelectComponent } from '@/shared/catalog/devices'; import { CatalogDeviceSelectComponent } from '@/shared/catalog/devices';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Divider } from 'primeng/divider'; import { Divider } from 'primeng/divider';
import { Password } from 'primeng/password';
import { IPosRequest, IPosResponse } from '../../models'; import { IPosRequest, IPosResponse } from '../../models';
import { PartnerPosesService } from '../../services/poses.service'; import { PartnerPosesService } from '../../services/poses.service';
@@ -24,9 +22,8 @@ import { PartnerPosesService } from '../../services/poses.service';
CatalogDeviceSelectComponent, CatalogDeviceSelectComponent,
CatalogProviderSelectComponent, CatalogProviderSelectComponent,
EnumSelectComponent, EnumSelectComponent,
UikitFieldComponent,
Password,
Divider, Divider,
SharedPasswordInputComponent,
], ],
}) })
export class ConsumerPosFormContentComponent extends AbstractForm<IPosRequest, IPosResponse> { export class ConsumerPosFormContentComponent extends AbstractForm<IPosRequest, IPosResponse> {
@@ -9,34 +9,10 @@
<form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4"> <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
<app-input label="نام کاربری" [control]="form.controls.username" name="username" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" />
<app-enum-select [control]="form.controls.role" name="role" type="consumerRole" /> <app-enum-select [control]="form.controls.role" name="role" type="consumerRole" />
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-2 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form> </form>
</p-dialog> </p-dialog>
@@ -2,13 +2,11 @@ import { MustMatch, password } from '@/core/validators';
// import { CatalogRolesComponent } from '@/shared/catalog/roles'; // import { CatalogRolesComponent } from '@/shared/catalog/roles';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { EnumSelectComponent } from '@/shared/apiEnum/select.component'; import { EnumSelectComponent } from '@/shared/apiEnum/select.component';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Password } from 'primeng/password';
import { IConsumerAccountRequest, IConsumerAccountResponse } from '../../models'; import { IConsumerAccountRequest, IConsumerAccountResponse } from '../../models';
import { AdminConsumerAccountsService } from '../../services/accounts.service'; import { AdminConsumerAccountsService } from '../../services/accounts.service';
@@ -20,8 +18,7 @@ import { AdminConsumerAccountsService } from '../../services/accounts.service';
Dialog, Dialog,
InputComponent, InputComponent,
FormFooterActionsComponent, FormFooterActionsComponent,
UikitFieldComponent, SharedPasswordInputComponent,
Password,
EnumSelectComponent, EnumSelectComponent,
], ],
}) })
@@ -14,34 +14,10 @@
<p-divider align="center"> اطلاعات ورود </p-divider> <p-divider align="center"> اطلاعات ورود </p-divider>
<!-- @ts-ignore --> <!-- @ts-ignore -->
<app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" />
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-1 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
<p-divider align="center"> اطلاعات لایسنس </p-divider> <p-divider align="center"> اطلاعات لایسنس </p-divider>
<uikit-datepicker <uikit-datepicker
label="تاریخ شروع لایسنس" label="تاریخ شروع لایسنس"
@@ -1,13 +1,12 @@
import { mobileValidator, MustMatch } from '@/core/validators'; import { mobileValidator, MustMatch } from '@/core/validators';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent, UikitFlatpickrJalaliComponent } from '@/uikit'; import { UikitFlatpickrJalaliComponent } from '@/uikit';
import { Component, computed, inject, Input } from '@angular/core'; import { Component, computed, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Divider } from 'primeng/divider'; import { Divider } from 'primeng/divider';
import { Password } from 'primeng/password';
import { PartnerSelectComponent } from '../../partners/shared/select.component'; import { PartnerSelectComponent } from '../../partners/shared/select.component';
import { IConsumerRequest, IConsumerResponse } from '../models'; import { IConsumerRequest, IConsumerResponse } from '../models';
import { ConsumersService } from '../services/main.service'; import { ConsumersService } from '../services/main.service';
@@ -21,10 +20,9 @@ import { ConsumersService } from '../services/main.service';
InputComponent, InputComponent,
FormFooterActionsComponent, FormFooterActionsComponent,
Divider, Divider,
UikitFieldComponent,
Password,
UikitFlatpickrJalaliComponent, UikitFlatpickrJalaliComponent,
PartnerSelectComponent, PartnerSelectComponent,
SharedPasswordInputComponent,
], ],
}) })
export class ConsumerUserFormComponent extends AbstractFormDialog< export class ConsumerUserFormComponent extends AbstractFormDialog<
@@ -9,34 +9,10 @@
<form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4"> <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
<app-input label="نام کاربری" [control]="form.controls.username" name="username" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" />
<app-enum-select [control]="form.controls.type" name="type" type="accountType" /> <app-enum-select [control]="form.controls.type" name="type" type="accountType" />
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-2 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form> </form>
</p-dialog> </p-dialog>
@@ -2,13 +2,11 @@ import { MustMatch, password } from '@/core/validators';
// import { CatalogRolesComponent } from '@/shared/catalog/roles'; // import { CatalogRolesComponent } from '@/shared/catalog/roles';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { EnumSelectComponent } from '@/shared/apiEnum/select.component'; import { EnumSelectComponent } from '@/shared/apiEnum/select.component';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Password } from 'primeng/password';
import { IPartnerAccountRequest, IPartnerAccountResponse } from '../../models'; import { IPartnerAccountRequest, IPartnerAccountResponse } from '../../models';
import { AdminPartnerAccountsService } from '../../services/accounts.service'; import { AdminPartnerAccountsService } from '../../services/accounts.service';
@@ -20,8 +18,7 @@ import { AdminPartnerAccountsService } from '../../services/accounts.service';
Dialog, Dialog,
InputComponent, InputComponent,
FormFooterActionsComponent, FormFooterActionsComponent,
UikitFieldComponent, SharedPasswordInputComponent,
Password,
EnumSelectComponent, EnumSelectComponent,
], ],
}) })
@@ -13,34 +13,10 @@
<p-divider align="center"> اطلاعات ورود </p-divider> <p-divider align="center"> اطلاعات ورود </p-divider>
<!-- @ts-ignore --> <!-- @ts-ignore -->
<app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" />
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-1 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
} }
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
@@ -1,13 +1,11 @@
import { MustMatch } from '@/core/validators'; import { MustMatch } from '@/core/validators';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, computed, inject, Input } from '@angular/core'; import { Component, computed, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Divider } from 'primeng/divider'; import { Divider } from 'primeng/divider';
import { Password } from 'primeng/password';
import { IPartnerRequest, IPartnerResponse } from '../models'; import { IPartnerRequest, IPartnerResponse } from '../models';
import { PartnersService } from '../services/main.service'; import { PartnersService } from '../services/main.service';
@@ -20,8 +18,7 @@ import { PartnersService } from '../services/main.service';
InputComponent, InputComponent,
FormFooterActionsComponent, FormFooterActionsComponent,
Divider, Divider,
UikitFieldComponent, SharedPasswordInputComponent,
Password,
], ],
}) })
export class GuildFormComponent extends AbstractFormDialog<IPartnerRequest, IPartnerResponse> { export class GuildFormComponent extends AbstractFormDialog<IPartnerRequest, IPartnerResponse> {
@@ -14,34 +14,10 @@
<p-divider align="center"> اطلاعات ورود </p-divider> <p-divider align="center"> اطلاعات ورود </p-divider>
<!-- @ts-ignore --> <!-- @ts-ignore -->
<app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" [isLtrInput]="true" />
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-1 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
} }
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
@@ -1,13 +1,11 @@
import { MustMatch } from '@/core/validators'; import { MustMatch } from '@/core/validators';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, computed, inject, Input } from '@angular/core'; import { Component, computed, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Divider } from 'primeng/divider'; import { Divider } from 'primeng/divider';
import { Password } from 'primeng/password';
import { IProviderRequest, IProviderResponse } from '../models'; import { IProviderRequest, IProviderResponse } from '../models';
import { ProvidersService } from '../services/main.service'; import { ProvidersService } from '../services/main.service';
@@ -20,8 +18,7 @@ import { ProvidersService } from '../services/main.service';
InputComponent, InputComponent,
FormFooterActionsComponent, FormFooterActionsComponent,
Divider, Divider,
UikitFieldComponent, SharedPasswordInputComponent,
Password,
], ],
}) })
export class ProviderFormComponent extends AbstractFormDialog<IProviderRequest, IProviderResponse> { export class ProviderFormComponent extends AbstractFormDialog<IProviderRequest, IProviderResponse> {
@@ -9,34 +9,10 @@
<form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4"> <form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
<app-input label="نام کاربری" [control]="form.controls.username" name="username" /> <app-input label="نام کاربری" [control]="form.controls.username" name="username" />
<app-enum-select [control]="form.controls.type" name="type" type="accountType" /> <app-enum-select [control]="form.controls.type" name="type" type="accountType" />
<uikit-field label="رمز عبور" class="" [control]="form.controls.password"> <shared-password-input
<p-password [passwordControl]="form.controls.password"
id="password1" [confirmPasswordControl]="form.controls.confirmPassword"
name="password" />
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.password.touched && form.controls.password.invalid"
/>
<span class="text-xs mt-2 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.controls.confirmPassword">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.controls.confirmPassword.touched && form.controls.confirmPassword.invalid"
/>
</uikit-field>
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form> </form>
</p-dialog> </p-dialog>
@@ -2,13 +2,11 @@ import { MustMatch, password } from '@/core/validators';
// import { CatalogRolesComponent } from '@/shared/catalog/roles'; // import { CatalogRolesComponent } from '@/shared/catalog/roles';
import { AbstractFormDialog } from '@/shared/abstractClasses'; import { AbstractFormDialog } from '@/shared/abstractClasses';
import { EnumSelectComponent } from '@/shared/apiEnum/select.component'; import { EnumSelectComponent } from '@/shared/apiEnum/select.component';
import { InputComponent } from '@/shared/components'; import { InputComponent, SharedPasswordInputComponent } from '@/shared/components';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component'; import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { UikitFieldComponent } from '@/uikit';
import { Component, inject, Input } from '@angular/core'; import { Component, inject, Input } from '@angular/core';
import { ReactiveFormsModule, Validators } from '@angular/forms'; import { ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog'; import { Dialog } from 'primeng/dialog';
import { Password } from 'primeng/password';
import { IAccountRequest, IAccountResponse } from '../../models'; import { IAccountRequest, IAccountResponse } from '../../models';
import { AdminUserAccountsService } from '../../services/accounts.service'; import { AdminUserAccountsService } from '../../services/accounts.service';
@@ -20,9 +18,8 @@ import { AdminUserAccountsService } from '../../services/accounts.service';
Dialog, Dialog,
InputComponent, InputComponent,
FormFooterActionsComponent, FormFooterActionsComponent,
UikitFieldComponent,
Password,
EnumSelectComponent, EnumSelectComponent,
SharedPasswordInputComponent,
], ],
}) })
export class UserAccountFormComponent extends AbstractFormDialog< export class UserAccountFormComponent extends AbstractFormDialog<
@@ -10,36 +10,7 @@
<app-input label="نام" [control]="form.controls.first_name" name="first_name" /> <app-input label="نام" [control]="form.controls.first_name" name="first_name" />
<app-input label="نام خانوادگی" [control]="form.controls.last_name" name="last_name" /> <app-input label="نام خانوادگی" [control]="form.controls.last_name" name="last_name" />
<app-input label="شماره موبایل" [control]="form.controls.mobile_number" name="mobile_number" type="mobile" /> <app-input label="شماره موبایل" [control]="form.controls.mobile_number" name="mobile_number" type="mobile" />
<!-- <app-enum-select [control]="form.controls.role" name="role" type="accountType" /> -->
<!-- <catalog-roles-select [control]="form.controls.roleId" /> -->
<!-- <uikit-field label="رمز عبور" class="" [control]="form.get('password')">
<p-password
id="password1"
name="password"
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.get('password')?.touched && form.get('password')?.invalid"
/>
<span class="text-xs mt-2 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="form.get('confirmPassword')">
<p-password
id="confirmPassword"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="form.get('confirmPassword')?.touched && form.get('confirmPassword')?.invalid"
/>
</uikit-field> -->
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" /> <app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="submitLoading()" (onCancel)="close()" />
</form> </form>
</p-dialog> </p-dialog>
@@ -11,37 +11,10 @@
[invalid]="infoForm.get('username')?.touched && infoForm.get('username')?.invalid" [invalid]="infoForm.get('username')?.touched && infoForm.get('username')?.invalid"
/> />
</uikit-field> </uikit-field>
<shared-password-input
<uikit-field label="رمز عبور" pSize="large" class="" [control]="infoForm.get('password')"> [passwordControl]="form.controls.password"
<p-password [confirmPasswordControl]="form.controls.confirmPassword"
id="password1" />
size="large"
name="password"
formControlName="password"
autocomplete="password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="infoForm.get('password')?.touched && infoForm.get('password')?.invalid"
/>
<span class="text-xs mt-2 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.
</span>
</uikit-field>
<uikit-field label="تکرار رمز عبور" pSize="large" class="" [control]="infoForm.get('confirmPassword')">
<p-password
id="confirmPassword"
size="large"
name="confirmPassword"
formControlName="confirmPassword"
autocomplete="new-password"
[toggleMask]="true"
[fluid]="true"
[feedback]="false"
[invalid]="infoForm.get('confirmPassword')?.touched && infoForm.get('confirmPassword')?.invalid"
/>
</uikit-field>
<uikit-field label="شماره تلفن همراه" pSize="large" class="" [control]="infoForm.get('mobile')"> <uikit-field label="شماره تلفن همراه" pSize="large" class="" [control]="infoForm.get('mobile')">
<input <input
@@ -0,0 +1,17 @@
<p-dialog
[header]="dialogHeader"
[(visible)]="visible"
[modal]="true"
[style]="{ width: '500px' }"
[closable]="true"
(onHide)="close()"
>
<form [formGroup]="form" (submit)="submit()" class="flex flex-col gap-4">
<shared-password-input
[passwordControl]="form.controls.password"
[confirmPasswordControl]="form.controls.confirmPassword"
/>
<app-form-footer-actions [submitLabel]="'ذخیره'" [loading]="loading()" (onCancel)="close()" />
</form>
</p-dialog>
@@ -0,0 +1,54 @@
import { MustMatch, password } from '@/core/validators';
import { AbstractDialog } from '@/shared/abstractClasses/abstract-dialog';
import { FormFooterActionsComponent } from '@/shared/components/formFooterActions/form-footer-actions.component';
import { Component, EventEmitter, Output, input } from '@angular/core';
import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms';
import { Dialog } from 'primeng/dialog';
import { SharedPasswordInputComponent } from '../passwordInput/password-input.component';
export interface IChangePasswordSubmitPayload {
password: string;
confirmPassword: string;
}
@Component({
selector: 'shared-change-password-form-dialog',
templateUrl: './change-password-form-dialog.component.html',
imports: [ReactiveFormsModule, Dialog, FormFooterActionsComponent, SharedPasswordInputComponent],
})
export class ChangePasswordFormDialogComponent extends AbstractDialog {
title = input<string>('');
loading = input<boolean>(false);
@Output() onSubmit = new EventEmitter<IChangePasswordSubmitPayload>();
private readonly fb = new FormBuilder();
form = this.fb.group(
{
password: ['', [Validators.required, password()]],
confirmPassword: ['', [Validators.required]],
},
{
validators: [MustMatch('password', 'confirmPassword')],
},
);
get dialogHeader() {
return this.title() ? `تغییر گذرواژه‌ی ${this.title()}` : 'تغییر گذرواژه';
}
submit() {
this.form.markAllAsTouched();
if (this.form.invalid) {
return;
}
this.onSubmit.emit(this.form.getRawValue() as IChangePasswordSubmitPayload);
}
override close() {
this.form.reset();
super.close();
}
}
+2
View File
@@ -1,8 +1,10 @@
// export * from './abstract-select.component'; // export * from './abstract-select.component';
export * from './breadcrumb.component'; export * from './breadcrumb.component';
export * from './card-data.component'; export * from './card-data.component';
export * from './changePasswordFormDialog/change-password-form-dialog.component';
export * from './inlineConfirmation/inline-confirmation.component'; export * from './inlineConfirmation/inline-confirmation.component';
export * from './inlineEdit/inline-edit.component'; export * from './inlineEdit/inline-edit.component';
export * from './input/input.component'; export * from './input/input.component';
export * from './key-value.component/key-value.component'; export * from './key-value.component/key-value.component';
export * from './passwordInput/password-input.component';
export * from './table-action-row.component'; export * from './table-action-row.component';
@@ -1,28 +1,30 @@
<uikit-field label="رمز عبور" class="" [control]="passwordControl"> <uikit-field label="رمز عبور" [pSize]="size" [control]="passwordControl">
<p-password <p-password
id="password1" id="password1"
name="password" name="password"
formControlName="password" formControlName="password"
autocomplete="password" autocomplete="password"
[toggleMask]="true" [toggleMask]="true"
[fluid]="true" [fluid]="fluid"
[feedback]="false" [feedback]="false"
[size]="size"
[invalid]="passwordControl.touched && passwordControl.invalid" [invalid]="passwordControl.touched && passwordControl.invalid"
/> />
<span class="text-xs mt-1 mb-3 text-muted-color"> <span class="text-xs mt-1 mb-3 text-muted-color">
رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد. {{ hint }}
</span> </span>
</uikit-field> </uikit-field>
<uikit-field label="تکرار رمز عبور" class="" [control]="confirmPasswordControl"> <uikit-field label="تکرار رمز عبور" [pSize]="size" [control]="confirmPasswordControl">
<p-password <p-password
id="confirmPassword" id="confirmPassword"
name="confirmPassword" name="confirmPassword"
formControlName="confirmPassword" formControlName="confirmPassword"
autocomplete="new-password" autocomplete="new-password"
[toggleMask]="true" [toggleMask]="true"
[fluid]="true" [fluid]="fluid"
[feedback]="false" [feedback]="false"
[size]="size"
[invalid]="confirmPasswordControl.touched && confirmPasswordControl.invalid" [invalid]="confirmPasswordControl.touched && confirmPasswordControl.invalid"
/> />
</uikit-field> </uikit-field>
@@ -1,6 +1,6 @@
import { UikitFieldComponent } from '@/uikit'; import { UikitFieldComponent } from '@/uikit';
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; import { FormControl, ReactiveFormsModule } from '@angular/forms';
import { Password } from 'primeng/password'; import { Password } from 'primeng/password';
@Component({ @Component({
@@ -11,5 +11,8 @@ import { Password } from 'primeng/password';
export class SharedPasswordInputComponent { export class SharedPasswordInputComponent {
@Input({ required: true }) passwordControl = new FormControl<string>(''); @Input({ required: true }) passwordControl = new FormControl<string>('');
@Input({ required: true }) confirmPasswordControl = new FormControl<string>(''); @Input({ required: true }) confirmPasswordControl = new FormControl<string>('');
@Input({ required: true }) formGroup!: FormGroup<any>; @Input() hint: string =
'رمز باید حداقل ۸ کاراکتر بوده و شامل حداقل یک حرف بزرگ، یک حرف کوچک، یک عدد و یک کاراکتر ویژه باشد.';
@Input() fluid: boolean = true;
@Input() size: 'small' | 'large' = 'small';
} }