diff --git a/angular/angular.json b/angular/angular.json index 398fe56..940f69e 100644 --- a/angular/angular.json +++ b/angular/angular.json @@ -1,129 +1,131 @@ { - - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "projects": { - "coffee-like-more": { - "projectType": "application", - "schematics": { - "@schematics/angular:component": { - "style": "scss" - } - }, - - "root": "", - "sourceRoot": "src", - "prefix": "app", - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "/var/www/html/lk.crm4retail.ru/more", - "baseHref": "/", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.app.json", - "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/assets", - "src/manifest.webmanifest", - "src/firebase-messaging-sw.js", - "src/sw-master.js", - "src/sw-custom.js" - ], - "styles": [ - "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", - "node_modules/primeng/resources/themes/bootstrap4-light-blue/theme.css", - "node_modules/primeicons/primeicons.css", - "node_modules/primeng/resources/primeng.min.css", - "node_modules/ngx-sharebuttons/themes/modern.scss", - "node_modules/ngx-sharebuttons/themes/material.scss", - "src/styles.scss" - ], - "scripts": [], - "serviceWorker": true, - "ngswConfigPath": "ngsw-config.json" - }, - "configurations": { - "production": { - "budgets": [ - { - "type": "initial", - "maximumWarning": "4mb", - "maximumError": "5mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "2kb", - "maximumError": "4kb" - } - ], - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" - } - ], - "outputHashing": "all" - }, - "development": { - "buildOptimizer": false, - "optimization": false, - "vendorChunk": true, - "extractLicenses": false, - "sourceMap": true, - "namedChunks": true - } - }, - "defaultConfiguration": "production" - }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "configurations": { - "production": { - "browserTarget": "coffee-like-more:build:production" - }, - "development": { - "browserTarget": "coffee-like-more:build:development", - "proxyConfig": "proxy.confi.json" - } - }, - "defaultConfiguration": "development" - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", - "options": { - "browserTarget": "coffee-like-more:build" - } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "tsconfig.spec.json", - "karmaConfig": "karma.conf.js", - "inlineStyleLanguage": "scss", - "assets": [ - "src/favicon.ico", - "src/firebase-messaging-sw.js", - "src/assets", - "src/manifest.webmanifest" - ], - "styles": [ - "./node_modules/@angular/material/prebuilt-themes/purple-green.css", - "src/styles.scss" - ], - "scripts": [] - } - } - } + + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "coffee-like-more": { + "projectType": "application", + "schematics": { + "@schematics/angular:component": { + "style": "scss" + }, + "i18n": { + "sourceLocale": "ru-RU" + } + }, + "root": "", + "sourceRoot": "src", + "prefix": "app", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "/var/www/html/lk.crm4retail.ru/more", + "baseHref": "/", + "index": "src/index.html", + "main": "src/main.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.app.json", + "inlineStyleLanguage": "scss", + "assets": [ + "src/favicon.ico", + "src/assets", + "src/manifest.webmanifest", + "src/firebase-messaging-sw.js", + "src/sw-master.js", + "src/sw-custom.js" + ], + "styles": [ + "./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", + "node_modules/primeng/resources/themes/bootstrap4-light-blue/theme.css", + "node_modules/primeicons/primeicons.css", + "node_modules/primeng/resources/primeng.min.css", + "node_modules/ngx-sharebuttons/themes/modern.scss", + "node_modules/ngx-sharebuttons/themes/material.scss", + "src/styles.scss" + ], + "scripts": [], + "serviceWorker": true, + "ngswConfigPath": "ngsw-config.json" + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "4mb", + "maximumError": "5mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "2kb", + "maximumError": "4kb" + } + ], + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "outputHashing": "all" + }, + "development": { + "buildOptimizer": false, + "optimization": false, + "vendorChunk": true, + "extractLicenses": false, + "sourceMap": true, + "namedChunks": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "configurations": { + "production": { + "browserTarget": "coffee-like-more:build:production" + }, + "development": { + "browserTarget": "coffee-like-more:build:development", + "proxyConfig": "proxy.confi.json" + } + }, + "defaultConfiguration": "development" + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "coffee-like-more:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "tsconfig.spec.json", + "karmaConfig": "karma.conf.js", + "inlineStyleLanguage": "scss", + "assets": [ + "src/favicon.ico", + "src/firebase-messaging-sw.js", + "src/assets", + "src/manifest.webmanifest" + ], + "styles": [ + "./node_modules/@angular/material/prebuilt-themes/purple-green.css", + "src/styles.scss" + ], + "scripts": [] + } + } + } + } + }, + "cli": { + "analytics": false } - }, - "cli": { - "analytics": false - } } diff --git a/angular/package-lock.json b/angular/package-lock.json index 5934eed..c2d71e6 100644 --- a/angular/package-lock.json +++ b/angular/package-lock.json @@ -16,6 +16,7 @@ "@angular/fire": "^7.5.0", "@angular/forms": "^15.2.9", "@angular/material": "^15.2.9", + "@angular/material-moment-adapter": "^15.2.9", "@angular/platform-browser": "^15.2.9", "@angular/platform-browser-dynamic": "^15.2.9", "@angular/router": "^15.2.9", @@ -27,6 +28,7 @@ "@types/uuid": "^8.3.4", "@types/web": "^0.0.99", "angular-moment-timezone": "^1.7.1", + "angular2-text-mask": "^9.0.0", "barcode-2-svg": "^0.3.3", "firebase": "^9.9.3", "google-libphonenumber": "^3.2.30", @@ -864,6 +866,19 @@ "rxjs": "^6.5.3 || ^7.4.0" } }, + "node_modules/@angular/material-moment-adapter": { + "version": "15.2.9", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-15.2.9.tgz", + "integrity": "sha512-DHG8z8DG1/+oO/bRC/k+1nXwRGg0qDsCEYulUoEUtpYmQRHj8Tid/9V2JiibYqTh4s0DJeAnx64CAO9K/k9EZg==", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/core": "^15.0.0 || ^16.0.0", + "@angular/material": "15.2.9", + "moment": "^2.18.1" + } + }, "node_modules/@angular/platform-browser": { "version": "15.2.9", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.2.9.tgz", @@ -5813,6 +5828,14 @@ "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.29.tgz", "integrity": "sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==" }, + "node_modules/angular2-text-mask": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/angular2-text-mask/-/angular2-text-mask-9.0.0.tgz", + "integrity": "sha512-iALcnhJPS1zvX48d86rgUgDe/crX6XfhZrXC4Gdlo2/YwZW7u7KJZY6/b3ieSCIWVq/E6p+wDCzeo3E6leRjDA==", + "dependencies": { + "text-mask-core": "^5.0.0" + } + }, "node_modules/ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -13564,6 +13587,11 @@ "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" }, + "node_modules/text-mask-core": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/text-mask-core/-/text-mask-core-5.1.2.tgz", + "integrity": "sha512-VfkCMdmRRZqXgQZFlDMiavm3hzsMzBM23CxHZsaeAYg66ZhXCNJWrFmnJwNy8KF9f74YvAUAuQenxsMCfuvhUw==" + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -15118,6 +15146,14 @@ "tslib": "^2.3.0" } }, + "@angular/material-moment-adapter": { + "version": "15.2.9", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-15.2.9.tgz", + "integrity": "sha512-DHG8z8DG1/+oO/bRC/k+1nXwRGg0qDsCEYulUoEUtpYmQRHj8Tid/9V2JiibYqTh4s0DJeAnx64CAO9K/k9EZg==", + "requires": { + "tslib": "^2.3.0" + } + }, "@angular/platform-browser": { "version": "15.2.9", "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.2.9.tgz", @@ -18959,6 +18995,14 @@ } } }, + "angular2-text-mask": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/angular2-text-mask/-/angular2-text-mask-9.0.0.tgz", + "integrity": "sha512-iALcnhJPS1zvX48d86rgUgDe/crX6XfhZrXC4Gdlo2/YwZW7u7KJZY6/b3ieSCIWVq/E6p+wDCzeo3E6leRjDA==", + "requires": { + "text-mask-core": "^5.0.0" + } + }, "ansi-colors": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", @@ -24763,6 +24807,11 @@ "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" }, + "text-mask-core": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/text-mask-core/-/text-mask-core-5.1.2.tgz", + "integrity": "sha512-VfkCMdmRRZqXgQZFlDMiavm3hzsMzBM23CxHZsaeAYg66ZhXCNJWrFmnJwNy8KF9f74YvAUAuQenxsMCfuvhUw==" + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", diff --git a/angular/package.json b/angular/package.json index efb4ea4..8337871 100644 --- a/angular/package.json +++ b/angular/package.json @@ -18,6 +18,7 @@ "@angular/fire": "^7.5.0", "@angular/forms": "^15.2.9", "@angular/material": "^15.2.9", + "@angular/material-moment-adapter": "^15.2.9", "@angular/platform-browser": "^15.2.9", "@angular/platform-browser-dynamic": "^15.2.9", "@angular/router": "^15.2.9", @@ -29,6 +30,7 @@ "@types/uuid": "^8.3.4", "@types/web": "^0.0.99", "angular-moment-timezone": "^1.7.1", + "angular2-text-mask": "^9.0.0", "barcode-2-svg": "^0.3.3", "firebase": "^9.9.3", "google-libphonenumber": "^3.2.30", diff --git a/angular/src/app/app.module.ts b/angular/src/app/app.module.ts index 81054cf..e8fd102 100644 --- a/angular/src/app/app.module.ts +++ b/angular/src/app/app.module.ts @@ -50,7 +50,6 @@ import { } from '@angular/material/bottom-sheet'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { DirectivesModule } from './directives/directives.module'; -import { MAT_DATE_LOCALE } from '@angular/material/core'; @NgModule({ declarations: [ @@ -108,7 +107,7 @@ import { MAT_DATE_LOCALE } from '@angular/material/core'; MatSnackBarModule, MatBottomSheetModule, MatProgressSpinnerModule, - DirectivesModule + DirectivesModule, ], providers: [ DialogService, @@ -116,7 +115,6 @@ import { MAT_DATE_LOCALE } from '@angular/material/core'; MessagingService, { provide: MatBottomSheetRef, useValue: {} }, { provide: MAT_BOTTOM_SHEET_DATA, useValue: {} }, - { provide: MAT_DATE_LOCALE, useValue: 'ru-RU' } ], bootstrap: [AppComponent], }) diff --git a/angular/src/app/presentation-options/default-option/default-option.module.ts b/angular/src/app/presentation-options/default-option/default-option.module.ts index 940e19b..f8b443a 100644 --- a/angular/src/app/presentation-options/default-option/default-option.module.ts +++ b/angular/src/app/presentation-options/default-option/default-option.module.ts @@ -7,9 +7,7 @@ import { SocialMediaButtonsComponent } from './components/social-media-buttons/s import { NavbarComponent } from './components/navbar/navbar.component'; import { MenuItemComponent } from './components/navbar/menu_item.component'; import { MatIconModule } from '@angular/material/icon'; -import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatSelectModule } from '@angular/material/select'; -import { MatNativeDateModule } from '@angular/material/core'; import { GuestCardComponent } from './pages/guest-card/guest-card.component'; import { QrCodeModule } from 'ng-qrcode'; import { AccordionComponent } from './components/accordion/accordion.component'; @@ -26,7 +24,7 @@ import { LoyalityProgramComponent } from './pages/loyality-program/loyality-prog import { MatButtonModule } from '@angular/material/button'; import { ToastModule } from 'primeng/toast'; import { CreateUserComponent } from './pages/create_user/create_user.component'; - +import { TextMaskModule } from 'angular2-text-mask'; @NgModule({ declarations: [ @@ -44,6 +42,7 @@ import { CreateUserComponent } from './pages/create_user/create_user.component'; CreateUserComponent, ], imports: [ + TextMaskModule, ToastModule, CommonModule, DefaultOptionRoutingModule, @@ -57,9 +56,7 @@ import { CreateUserComponent } from './pages/create_user/create_user.component'; MatInputModule, DirectivesModule, MatButtonModule, - MatDatepickerModule, - MatSelectModule, - MatNativeDateModule, + MatSelectModule, ], bootstrap: [IndexComponent], }) diff --git a/angular/src/app/presentation-options/default-option/pages/create_user/create_user.component.html b/angular/src/app/presentation-options/default-option/pages/create_user/create_user.component.html index b75af08..c0c61aa 100644 --- a/angular/src/app/presentation-options/default-option/pages/create_user/create_user.component.html +++ b/angular/src/app/presentation-options/default-option/pages/create_user/create_user.component.html @@ -19,10 +19,8 @@ - Дата рождения - - - + Дата рождения + diff --git a/angular/src/app/presentation-options/default-option/pages/create_user/create_user.component.ts b/angular/src/app/presentation-options/default-option/pages/create_user/create_user.component.ts index b71a90f..38e42ec 100644 --- a/angular/src/app/presentation-options/default-option/pages/create_user/create_user.component.ts +++ b/angular/src/app/presentation-options/default-option/pages/create_user/create_user.component.ts @@ -16,6 +16,12 @@ export class CreateUserComponent implements OnInit { date: new FormControl('', [Validators.required]), }); + public mask = { + guide: true, + showMask: false, + mask: [/\d/, /\d/, '/', /\d/, /\d/, '/', /\d/, /\d/, /\d/, /\d/] + }; + constructor( public authService: AuthService, private messageService: MessageService,