types-salon-management 1.0.24 → 1.0.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. package/dist/api/clients/client.dto.d.ts +47 -0
  2. package/dist/api/clients/client.dto.d.ts.map +1 -0
  3. package/dist/api/clients/client.dto.js +3 -0
  4. package/dist/api/clients/client.dto.js.map +1 -0
  5. package/dist/api/clients/client.requests.d.ts +45 -0
  6. package/dist/api/clients/client.requests.d.ts.map +1 -0
  7. package/dist/api/clients/client.requests.js +3 -0
  8. package/dist/api/clients/client.requests.js.map +1 -0
  9. package/dist/api/clients/index.d.ts +3 -0
  10. package/dist/api/clients/index.d.ts.map +1 -0
  11. package/dist/api/clients/index.js +19 -0
  12. package/dist/api/clients/index.js.map +1 -0
  13. package/dist/api/index.d.ts +1 -0
  14. package/dist/api/index.d.ts.map +1 -1
  15. package/dist/api/index.js +1 -0
  16. package/dist/api/index.js.map +1 -1
  17. package/package.json +1 -1
  18. package/src/api/clients/client.dto.ts +51 -0
  19. package/src/api/clients/client.requests.ts +49 -0
  20. package/src/api/clients/index.ts +2 -0
  21. package/src/api/index.ts +1 -0
package/dist/api/clients/client.dto.d.ts ADDED
@@ -0,0 +1,47 @@
1
+ import type { PhoneNumberModel } from '../../models/phone-number-model';
2
+ import type { AuditActor } from '../audit';
3
+ import type { ContraindicationPickerDto } from '../contraindications/contraindication.dto';
4
+ export interface ClientAddressDto {
5
+ addressLine1: string;
6
+ street: string;
7
+ city: string;
8
+ state: string;
9
+ country: string;
10
+ postalCode: string;
11
+ location: unknown | null;
12
+ }
13
+ export interface ClientMarketingConsentDto {
14
+ sms: boolean;
15
+ whatsApp: boolean;
16
+ email: boolean;
17
+ smsConsentedAt: string | null;
18
+ whatsAppConsentedAt: string | null;
19
+ emailConsentedAt: string | null;
20
+ }
21
+ export interface ClientSummaryDto {
22
+ id: string;
23
+ firstName: string;
24
+ lastName: string | null;
25
+ email: string | null;
26
+ phone: PhoneNumberModel;
27
+ color: string | null;
28
+ active: boolean;
29
+ consumerId: string | null;
30
+ createdAt: string;
31
+ }
32
+ export interface ClientDetailDto extends ClientSummaryDto {
33
+ gender: string | null;
34
+ dob: string | null;
35
+ notes: string | null;
36
+ address: ClientAddressDto | null;
37
+ marketingConsent: ClientMarketingConsentDto;
38
+ contraindications: ContraindicationPickerDto[];
39
+ updatedAt: string | null;
40
+ createdBy: AuditActor | null;
41
+ updatedBy: AuditActor | null;
42
+ deletedBy: AuditActor | null;
43
+ }
44
+ export interface ClientCountDto {
45
+ count: number;
46
+ }
47
+ //# sourceMappingURL=client.dto.d.ts.map
package/dist/api/clients/client.dto.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client.dto.d.ts","sourceRoot":"","sources":["../../../src/api/clients/client.dto.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAE3F,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAC;CAC1B;AAED,MAAM,WAAW,yBAAyB;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,gBAAgB,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAgB,SAAQ,gBAAgB;IACvD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,OAAO,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACjC,gBAAgB,EAAE,yBAAyB,CAAC;IAC5C,iBAAiB,EAAE,yBAAyB,EAAE,CAAC;IAC/C,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,UAAU,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,UAAU,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,UAAU,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,MAAM,CAAC;CACf"}
package/dist/api/clients/client.dto.js ADDED
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=client.dto.js.map
package/dist/api/clients/client.dto.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client.dto.js","sourceRoot":"","sources":["../../../src/api/clients/client.dto.ts"],"names":[],"mappings":""}
package/dist/api/clients/client.requests.d.ts ADDED
@@ -0,0 +1,45 @@
1
+ import type { PhoneNumberModel } from '../../models/phone-number-model';
2
+ import type { ClientAddressDto } from './client.dto';
3
+ export type ClientSortBy = 'name' | 'createdAt';
4
+ export type ClientSortDirection = 'asc' | 'desc';
5
+ export interface ListClientsQuery {
6
+ page?: number;
7
+ pageSize?: number;
8
+ search?: string;
9
+ sortBy?: ClientSortBy;
10
+ sortDir?: ClientSortDirection;
11
+ }
12
+ export interface ClientMarketingConsentInput {
13
+ sms?: boolean;
14
+ whatsApp?: boolean;
15
+ email?: boolean;
16
+ }
17
+ export interface CreateClientRequest {
18
+ firstName: string;
19
+ lastName?: string | null;
20
+ phone: PhoneNumberModel;
21
+ email?: string | null;
22
+ gender?: string | null;
23
+ dob?: string | null;
24
+ notes?: string | null;
25
+ address?: ClientAddressDto | null;
26
+ color?: string | null;
27
+ active?: boolean;
28
+ marketingConsent?: ClientMarketingConsentInput;
29
+ contraindicationIds?: string[];
30
+ }
31
+ export interface UpdateClientRequest {
32
+ firstName?: string;
33
+ lastName?: string | null;
34
+ phone?: PhoneNumberModel;
35
+ email?: string | null;
36
+ gender?: string | null;
37
+ dob?: string | null;
38
+ notes?: string | null;
39
+ address?: ClientAddressDto | null;
40
+ color?: string | null;
41
+ active?: boolean;
42
+ marketingConsent?: ClientMarketingConsentInput;
43
+ contraindicationIds?: string[];
44
+ }
45
+ //# sourceMappingURL=client.requests.d.ts.map
package/dist/api/clients/client.requests.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client.requests.d.ts","sourceRoot":"","sources":["../../../src/api/clients/client.requests.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACxE,OAAO,KAAK,EAAE,gBAAgB,EAA6B,MAAM,cAAc,CAAC;AAEhF,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,WAAW,CAAC;AAChD,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,MAAM,CAAC;AAEjD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B;AAED,MAAM,WAAW,2BAA2B;IAC1C,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,EAAE,gBAAgB,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,2BAA2B,CAAC;IAC/C,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,gBAAgB,CAAC,EAAE,2BAA2B,CAAC;IAC/C,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC"}
package/dist/api/clients/client.requests.js ADDED
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=client.requests.js.map
package/dist/api/clients/client.requests.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"client.requests.js","sourceRoot":"","sources":["../../../src/api/clients/client.requests.ts"],"names":[],"mappings":""}
package/dist/api/clients/index.d.ts ADDED
@@ -0,0 +1,3 @@
1
+ export * from './client.dto';
2
+ export * from './client.requests';
3
+ //# sourceMappingURL=index.d.ts.map
package/dist/api/clients/index.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/api/clients/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC"}
package/dist/api/clients/index.js ADDED
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./client.dto"), exports);
18
+ __exportStar(require("./client.requests"), exports);
19
+ //# sourceMappingURL=index.js.map
package/dist/api/clients/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/clients/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,oDAAkC"}
package/dist/api/index.d.ts CHANGED
@@ -20,4 +20,5 @@ export * from './services/index';
20
20
  export * from './user-roles/index';
21
21
  export * from './permissions/index';
22
22
  export * from './payment-methods/index';
23
+ export * from './clients/index';
23
24
  //# sourceMappingURL=index.d.ts.map
package/dist/api/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,iBAAiB,CAAC"}
package/dist/api/index.js CHANGED
@@ -36,4 +36,5 @@ __exportStar(require("./services/index"), exports);
36
36
  __exportStar(require("./user-roles/index"), exports);
37
37
  __exportStar(require("./permissions/index"), exports);
38
38
  __exportStar(require("./payment-methods/index"), exports);
39
+ __exportStar(require("./clients/index"), exports);
39
40
  //# sourceMappingURL=index.js.map
package/dist/api/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qEAAqE;AACrE,0CAAwB;AACxB,4CAA0B;AAC1B,iDAA+B;AAC/B,+CAA6B;AAC7B,2CAAyB;AACzB,+CAA6B;AAC7B,8CAA4B;AAC5B,qDAAmC;AACnC,wDAAsC;AACtC,6CAA2B;AAC3B,mDAAiC;AACjC,+CAA6B;AAC7B,2DAAyC;AACzC,gDAA8B;AAC9B,oDAAkC;AAClC,4DAA0C;AAC1C,6DAA2C;AAC3C,mDAAiC;AACjC,qDAAmC;AACnC,sDAAoC;AACpC,0DAAwC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qEAAqE;AACrE,0CAAwB;AACxB,4CAA0B;AAC1B,iDAA+B;AAC/B,+CAA6B;AAC7B,2CAAyB;AACzB,+CAA6B;AAC7B,8CAA4B;AAC5B,qDAAmC;AACnC,wDAAsC;AACtC,6CAA2B;AAC3B,mDAAiC;AACjC,+CAA6B;AAC7B,2DAAyC;AACzC,gDAA8B;AAC9B,oDAAkC;AAClC,4DAA0C;AAC1C,6DAA2C;AAC3C,mDAAiC;AACjC,qDAAmC;AACnC,sDAAoC;AACpC,0DAAwC;AACxC,kDAAgC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "types-salon-management",
3
- "version": "1.0.24",
3
+ "version": "1.0.25",
4
4
  "description": "Types for Salon Management",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/api/clients/client.dto.ts ADDED
@@ -0,0 +1,51 @@
1
+ import type { PhoneNumberModel } from '../../models/phone-number-model';
2
+ import type { AuditActor } from '../audit';
3
+ import type { ContraindicationPickerDto } from '../contraindications/contraindication.dto';
4
+
5
+ export interface ClientAddressDto {
6
+ addressLine1: string;
7
+ street: string;
8
+ city: string;
9
+ state: string;
10
+ country: string;
11
+ postalCode: string;
12
+ location: unknown | null;
13
+ }
14
+
15
+ export interface ClientMarketingConsentDto {
16
+ sms: boolean;
17
+ whatsApp: boolean;
18
+ email: boolean;
19
+ smsConsentedAt: string | null;
20
+ whatsAppConsentedAt: string | null;
21
+ emailConsentedAt: string | null;
22
+ }
23
+
24
+ export interface ClientSummaryDto {
25
+ id: string;
26
+ firstName: string;
27
+ lastName: string | null;
28
+ email: string | null;
29
+ phone: PhoneNumberModel;
30
+ color: string | null;
31
+ active: boolean;
32
+ consumerId: string | null;
33
+ createdAt: string;
34
+ }
35
+
36
+ export interface ClientDetailDto extends ClientSummaryDto {
37
+ gender: string | null;
38
+ dob: string | null;
39
+ notes: string | null;
40
+ address: ClientAddressDto | null;
41
+ marketingConsent: ClientMarketingConsentDto;
42
+ contraindications: ContraindicationPickerDto[];
43
+ updatedAt: string | null;
44
+ createdBy: AuditActor | null;
45
+ updatedBy: AuditActor | null;
46
+ deletedBy: AuditActor | null;
47
+ }
48
+
49
+ export interface ClientCountDto {
50
+ count: number;
51
+ }
package/src/api/clients/client.requests.ts ADDED
@@ -0,0 +1,49 @@
1
+ import type { PhoneNumberModel } from '../../models/phone-number-model';
2
+ import type { ClientAddressDto, ClientMarketingConsentDto } from './client.dto';
3
+
4
+ export type ClientSortBy = 'name' | 'createdAt';
5
+ export type ClientSortDirection = 'asc' | 'desc';
6
+
7
+ export interface ListClientsQuery {
8
+ page?: number;
9
+ pageSize?: number;
10
+ search?: string;
11
+ sortBy?: ClientSortBy;
12
+ sortDir?: ClientSortDirection;
13
+ }
14
+
15
+ export interface ClientMarketingConsentInput {
16
+ sms?: boolean;
17
+ whatsApp?: boolean;
18
+ email?: boolean;
19
+ }
20
+
21
+ export interface CreateClientRequest {
22
+ firstName: string;
23
+ lastName?: string | null;
24
+ phone: PhoneNumberModel;
25
+ email?: string | null;
26
+ gender?: string | null;
27
+ dob?: string | null;
28
+ notes?: string | null;
29
+ address?: ClientAddressDto | null;
30
+ color?: string | null;
31
+ active?: boolean;
32
+ marketingConsent?: ClientMarketingConsentInput;
33
+ contraindicationIds?: string[];
34
+ }
35
+
36
+ export interface UpdateClientRequest {
37
+ firstName?: string;
38
+ lastName?: string | null;
39
+ phone?: PhoneNumberModel;
40
+ email?: string | null;
41
+ gender?: string | null;
42
+ dob?: string | null;
43
+ notes?: string | null;
44
+ address?: ClientAddressDto | null;
45
+ color?: string | null;
46
+ active?: boolean;
47
+ marketingConsent?: ClientMarketingConsentInput;
48
+ contraindicationIds?: string[];
49
+ }
package/src/api/clients/index.ts ADDED
@@ -0,0 +1,2 @@
1
+ export * from './client.dto';
2
+ export * from './client.requests';
package/src/api/index.ts CHANGED
@@ -20,3 +20,4 @@ export * from './services/index';
20
20
  export * from './user-roles/index';
21
21
  export * from './permissions/index';
22
22
  export * from './payment-methods/index';
23
+ export * from './clients/index';