From 197c84f29ccd6ef0967fd944ea106209cf1acb6a Mon Sep 17 00:00:00 2001 From: gofnnp Date: Tue, 11 Oct 2022 10:40:59 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#12797=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=20=D1=80=D0=B0=D1=81=D0=BF=D0=BE=D0=BB=D0=BE=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B9=20=D0=B8=20=D0=B8=D0=B7=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=BB=20=D1=84=D0=B0=D0=B9=D0=BB=D1=8B=20Jenkinsfi?= =?UTF-8?q?le=20=D0=B8=20gitignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 58 +++++++++--------- .vscode/extensions.json | 4 -- .vscode/launch.json | 20 ------ .vscode/tasks.json | 42 ------------- Jenkinsfile | 6 +- .browserslistrc => angular/.browserslistrc | 0 .editorconfig => angular/.editorconfig | 0 README.md => angular/README.md | 0 angular.json => angular/angular.json | 0 karma.conf.js => angular/karma.conf.js | 0 ngsw-config.json => angular/ngsw-config.json | 0 .../package-lock.json | 4 +- package.json => angular/package.json | 2 +- .../src}/app/app-routing.module.ts | 0 {src => angular/src}/app/app.component.html | 0 {src => angular/src}/app/app.component.scss | 0 .../src}/app/app.component.spec.ts | 0 {src => angular/src}/app/app.component.ts | 0 {src => angular/src}/app/app.constants.ts | 0 {src => angular/src}/app/app.module.ts | 0 .../app/components/card/card.component.html | 0 .../app/components/card/card.component.scss | 0 .../components/card/card.component.spec.ts | 0 .../app/components/card/card.component.ts | 0 .../app/components/exit/exit.component.html | 0 .../app/components/exit/exit.component.scss | 0 .../components/exit/exit.component.spec.ts | 0 .../app/components/exit/exit.component.ts | 0 .../footer-buttons.component.html | 0 .../footer-buttons.component.scss | 0 .../footer-buttons.component.spec.ts | 0 .../footer-buttons.component.ts | 0 .../components/navbar/navbar.component.html | 0 .../components/navbar/navbar.component.scss | 0 .../navbar/navbar.component.spec.ts | 0 .../app/components/navbar/navbar.component.ts | 0 .../order-info/order-info.component.html | 0 .../order-info/order-info.component.scss | 0 .../order-info/order-info.component.spec.ts | 0 .../order-info/order-info.component.ts | 0 {src => angular/src}/app/interface/data.ts | 0 .../src}/app/models/order-product.ts | 0 {src => angular/src}/app/models/order.ts | 0 .../app/pages/account/account.component.html | 0 .../app/pages/account/account.component.scss | 0 .../app/pages/account/account.component.ts | 0 .../pages/account/auth/auth.component.html | 0 .../pages/account/auth/auth.component.scss | 0 .../pages/account/auth/auth.component.spec.ts | 0 .../app/pages/account/auth/auth.component.ts | 0 .../bonus-program.component.html | 0 .../bonus-program.component.scss | 0 .../bonus-program.component.spec.ts | 0 .../bonus-program/bonus-program.component.ts | 0 .../account/orders/orders.component.html | 0 .../account/orders/orders.component.scss | 0 .../account/orders/orders.component.spec.ts | 0 .../pages/account/orders/orders.component.ts | 0 .../ref-system/ref-system.component.html | 0 .../ref-system/ref-system.component.scss | 0 .../ref-system/ref-system.component.spec.ts | 0 .../ref-system/ref-system.component.ts | 0 .../user-data/user-data.component.html | 0 .../user-data/user-data.component.scss | 0 .../user-data/user-data.component.spec.ts | 0 .../account/user-data/user-data.component.ts | 0 .../src}/app/pages/main/main.component.html | 0 .../src}/app/pages/main/main.component.scss | 0 .../src}/app/pages/main/main.component.ts | 0 .../pages/not-found/not-found.component.html | 0 .../pages/not-found/not-found.component.scss | 0 .../not-found/not-found.component.spec.ts | 0 .../pages/not-found/not-found.component.ts | 0 .../src}/app/services/apple-wallet.service.ts | 0 .../src}/app/services/cookies.service.ts | 0 .../src}/app/services/format-phone.service.ts | 0 .../src}/app/services/jsonrpc.service.ts | 0 .../src}/app/services/messaging.service.ts | 0 .../src}/app/services/wp-json.service.ts | 0 {src => angular/src}/assets/.gitkeep | 0 {src => angular/src}/assets/background.svg | 0 .../src}/assets/card-decorative-pattern.png | Bin .../src}/assets/card-decorative-pattern.svg | 0 {src => angular/src}/assets/download.svg | 0 .../src}/assets/icons/apple-icon-180x180.png | Bin .../src}/assets/icons/icon-128x128.png | Bin .../src}/assets/icons/icon-144x144.png | Bin .../src}/assets/icons/icon-152x152.png | Bin .../src}/assets/icons/icon-192x192.png | Bin .../src}/assets/icons/icon-384x384.png | Bin .../src}/assets/icons/icon-512x512.png | Bin .../src}/assets/icons/icon-72x72.png | Bin .../src}/assets/icons/icon-96x96.png | Bin {src => angular/src}/assets/logo.svg | 0 .../src}/assets/menu-icons/bonus-program.png | Bin .../src}/assets/menu-icons/exit.png | Bin .../src}/assets/menu-icons/orders.png | Bin .../src}/assets/menu-icons/ref-system.png | Bin .../src}/assets/menu-icons/user-data.png | Bin {src => angular/src}/assets/notification.svg | 0 {src => angular/src}/assets/share.svg | 0 .../src}/environments/environment.prod.ts | 3 + .../src}/environments/environment.ts | 0 {src => angular/src}/favicon.ico | Bin {src => angular/src}/firebase-messaging-sw.js | 0 {src => angular/src}/index.html | 0 {src => angular/src}/main.ts | 0 {src => angular/src}/manifest.webmanifest | 0 {src => angular/src}/polyfills.ts | 0 {src => angular/src}/styles.scss | 0 {src => angular/src}/test.ts | 0 .../tsconfig.app.json | 0 tsconfig.json => angular/tsconfig.json | 0 .../tsconfig.spec.json | 0 wallet_meta/config.json | 11 ++++ wallet_meta/icon.png | Bin 0 -> 14215 bytes 116 files changed, 50 insertions(+), 100 deletions(-) delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/tasks.json rename .browserslistrc => angular/.browserslistrc (100%) rename .editorconfig => angular/.editorconfig (100%) rename README.md => angular/README.md (100%) rename angular.json => angular/angular.json (100%) rename karma.conf.js => angular/karma.conf.js (100%) rename ngsw-config.json => angular/ngsw-config.json (100%) rename package-lock.json => angular/package-lock.json (99%) rename package.json => angular/package.json (97%) rename {src => angular/src}/app/app-routing.module.ts (100%) rename {src => angular/src}/app/app.component.html (100%) rename {src => angular/src}/app/app.component.scss (100%) rename {src => angular/src}/app/app.component.spec.ts (100%) rename {src => angular/src}/app/app.component.ts (100%) rename {src => angular/src}/app/app.constants.ts (100%) rename {src => angular/src}/app/app.module.ts (100%) rename {src => angular/src}/app/components/card/card.component.html (100%) rename {src => angular/src}/app/components/card/card.component.scss (100%) rename {src => angular/src}/app/components/card/card.component.spec.ts (100%) rename {src => angular/src}/app/components/card/card.component.ts (100%) rename {src => angular/src}/app/components/exit/exit.component.html (100%) rename {src => angular/src}/app/components/exit/exit.component.scss (100%) rename {src => angular/src}/app/components/exit/exit.component.spec.ts (100%) rename {src => angular/src}/app/components/exit/exit.component.ts (100%) rename {src => angular/src}/app/components/footer-buttons/footer-buttons.component.html (100%) rename {src => angular/src}/app/components/footer-buttons/footer-buttons.component.scss (100%) rename {src => angular/src}/app/components/footer-buttons/footer-buttons.component.spec.ts (100%) rename {src => angular/src}/app/components/footer-buttons/footer-buttons.component.ts (100%) rename {src => angular/src}/app/components/navbar/navbar.component.html (100%) rename {src => angular/src}/app/components/navbar/navbar.component.scss (100%) rename {src => angular/src}/app/components/navbar/navbar.component.spec.ts (100%) rename {src => angular/src}/app/components/navbar/navbar.component.ts (100%) rename {src => angular/src}/app/components/order-info/order-info.component.html (100%) rename {src => angular/src}/app/components/order-info/order-info.component.scss (100%) rename {src => angular/src}/app/components/order-info/order-info.component.spec.ts (100%) rename {src => angular/src}/app/components/order-info/order-info.component.ts (100%) rename {src => angular/src}/app/interface/data.ts (100%) rename {src => angular/src}/app/models/order-product.ts (100%) rename {src => angular/src}/app/models/order.ts (100%) rename {src => angular/src}/app/pages/account/account.component.html (100%) rename {src => angular/src}/app/pages/account/account.component.scss (100%) rename {src => angular/src}/app/pages/account/account.component.ts (100%) rename {src => angular/src}/app/pages/account/auth/auth.component.html (100%) rename {src => angular/src}/app/pages/account/auth/auth.component.scss (100%) rename {src => angular/src}/app/pages/account/auth/auth.component.spec.ts (100%) rename {src => angular/src}/app/pages/account/auth/auth.component.ts (100%) rename {src => angular/src}/app/pages/account/bonus-program/bonus-program.component.html (100%) rename {src => angular/src}/app/pages/account/bonus-program/bonus-program.component.scss (100%) rename {src => angular/src}/app/pages/account/bonus-program/bonus-program.component.spec.ts (100%) rename {src => angular/src}/app/pages/account/bonus-program/bonus-program.component.ts (100%) rename {src => angular/src}/app/pages/account/orders/orders.component.html (100%) rename {src => angular/src}/app/pages/account/orders/orders.component.scss (100%) rename {src => angular/src}/app/pages/account/orders/orders.component.spec.ts (100%) rename {src => angular/src}/app/pages/account/orders/orders.component.ts (100%) rename {src => angular/src}/app/pages/account/ref-system/ref-system.component.html (100%) rename {src => angular/src}/app/pages/account/ref-system/ref-system.component.scss (100%) rename {src => angular/src}/app/pages/account/ref-system/ref-system.component.spec.ts (100%) rename {src => angular/src}/app/pages/account/ref-system/ref-system.component.ts (100%) rename {src => angular/src}/app/pages/account/user-data/user-data.component.html (100%) rename {src => angular/src}/app/pages/account/user-data/user-data.component.scss (100%) rename {src => angular/src}/app/pages/account/user-data/user-data.component.spec.ts (100%) rename {src => angular/src}/app/pages/account/user-data/user-data.component.ts (100%) rename {src => angular/src}/app/pages/main/main.component.html (100%) rename {src => angular/src}/app/pages/main/main.component.scss (100%) rename {src => angular/src}/app/pages/main/main.component.ts (100%) rename {src => angular/src}/app/pages/not-found/not-found.component.html (100%) rename {src => angular/src}/app/pages/not-found/not-found.component.scss (100%) rename {src => angular/src}/app/pages/not-found/not-found.component.spec.ts (100%) rename {src => angular/src}/app/pages/not-found/not-found.component.ts (100%) rename {src => angular/src}/app/services/apple-wallet.service.ts (100%) rename {src => angular/src}/app/services/cookies.service.ts (100%) rename {src => angular/src}/app/services/format-phone.service.ts (100%) rename {src => angular/src}/app/services/jsonrpc.service.ts (100%) rename {src => angular/src}/app/services/messaging.service.ts (100%) rename {src => angular/src}/app/services/wp-json.service.ts (100%) rename {src => angular/src}/assets/.gitkeep (100%) rename {src => angular/src}/assets/background.svg (100%) rename {src => angular/src}/assets/card-decorative-pattern.png (100%) rename {src => angular/src}/assets/card-decorative-pattern.svg (100%) rename {src => angular/src}/assets/download.svg (100%) rename {src => angular/src}/assets/icons/apple-icon-180x180.png (100%) rename {src => angular/src}/assets/icons/icon-128x128.png (100%) rename {src => angular/src}/assets/icons/icon-144x144.png (100%) rename {src => angular/src}/assets/icons/icon-152x152.png (100%) rename {src => angular/src}/assets/icons/icon-192x192.png (100%) rename {src => angular/src}/assets/icons/icon-384x384.png (100%) rename {src => angular/src}/assets/icons/icon-512x512.png (100%) rename {src => angular/src}/assets/icons/icon-72x72.png (100%) rename {src => angular/src}/assets/icons/icon-96x96.png (100%) rename {src => angular/src}/assets/logo.svg (100%) rename {src => angular/src}/assets/menu-icons/bonus-program.png (100%) rename {src => angular/src}/assets/menu-icons/exit.png (100%) rename {src => angular/src}/assets/menu-icons/orders.png (100%) rename {src => angular/src}/assets/menu-icons/ref-system.png (100%) rename {src => angular/src}/assets/menu-icons/user-data.png (100%) rename {src => angular/src}/assets/notification.svg (100%) rename {src => angular/src}/assets/share.svg (100%) rename {src => angular/src}/environments/environment.prod.ts (85%) rename {src => angular/src}/environments/environment.ts (100%) rename {src => angular/src}/favicon.ico (100%) rename {src => angular/src}/firebase-messaging-sw.js (100%) rename {src => angular/src}/index.html (100%) rename {src => angular/src}/main.ts (100%) rename {src => angular/src}/manifest.webmanifest (100%) rename {src => angular/src}/polyfills.ts (100%) rename {src => angular/src}/styles.scss (100%) rename {src => angular/src}/test.ts (100%) rename tsconfig.app.json => angular/tsconfig.app.json (100%) rename tsconfig.json => angular/tsconfig.json (100%) rename tsconfig.spec.json => angular/tsconfig.spec.json (100%) create mode 100644 wallet_meta/config.json create mode 100644 wallet_meta/icon.png diff --git a/.gitignore b/.gitignore index 0711527..2a86dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,42 @@ # See http://help.github.com/ignore-files/ for more about ignoring files. # Compiled output -/dist -/tmp -/out-tsc -/bazel-out +angular/dist +angular/tmp +angular/out-tsc +angular/bazel-out # Node -/node_modules -npm-debug.log -yarn-error.log +angular/node_modules +angular/npm-debug.log +angular/yarn-error.log # IDEs and editors -.idea/ -.project -.classpath -.c9/ -*.launch -.settings/ -*.sublime-workspace +angular/.idea/ +angular/.project +angular/.classpath +angular/.c9/ +angular/*.launch +angular/.settings/ +angular/*.sublime-workspace # Visual Studio Code -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -.history/* +angular/.vscode/* +angular/!.vscode/settings.json +angular/!.vscode/tasks.json +angular/!.vscode/launch.json +angular/!.vscode/extensions.json +angular/.history/* # Miscellaneous -/.angular/cache -.sass-cache/ -/connect.lock -/coverage -/libpeerconnection.log -testem.log -/typings +angular/.angular/cache +angular/.sass-cache/ +angular/connect.lock +angular/coverage +angular/libpeerconnection.log +angular/testem.log +angular/typings # System files -.DS_Store -Thumbs.db +angular/.DS_Store +angular/Thumbs.db diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 77b3745..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846 - "recommendations": ["angular.ng-template"] -} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 740e35a..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "ng serve", - "type": "pwa-chrome", - "request": "launch", - "preLaunchTask": "npm: start", - "url": "http://localhost:4200/" - }, - { - "name": "ng test", - "type": "chrome", - "request": "launch", - "preLaunchTask": "npm: test", - "url": "http://localhost:9876/debug.html" - } - ] -} diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index a298b5b..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558 - "version": "2.0.0", - "tasks": [ - { - "type": "npm", - "script": "start", - "isBackground": true, - "problemMatcher": { - "owner": "typescript", - "pattern": "$tsc", - "background": { - "activeOnStart": true, - "beginsPattern": { - "regexp": "(.*?)" - }, - "endsPattern": { - "regexp": "bundle generation complete" - } - } - } - }, - { - "type": "npm", - "script": "test", - "isBackground": true, - "problemMatcher": { - "owner": "typescript", - "pattern": "$tsc", - "background": { - "activeOnStart": true, - "beginsPattern": { - "regexp": "(.*?)" - }, - "endsPattern": { - "regexp": "bundle generation complete" - } - } - } - } - ] -} diff --git a/Jenkinsfile b/Jenkinsfile index 9a5a622..5c20937 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,8 +16,10 @@ node('Lithium'){ //sh "git submodule update --remote --merge" } stage("build and publish"){ - sh label: '', script: 'npm i' - sh label: '', script: 'npm run build' + dir('angular'){ + sh label: '', script: 'npm i' + sh label: '', script: 'npm run build' + } } } diff --git a/.browserslistrc b/angular/.browserslistrc similarity index 100% rename from .browserslistrc rename to angular/.browserslistrc diff --git a/.editorconfig b/angular/.editorconfig similarity index 100% rename from .editorconfig rename to angular/.editorconfig diff --git a/README.md b/angular/README.md similarity index 100% rename from README.md rename to angular/README.md diff --git a/angular.json b/angular/angular.json similarity index 100% rename from angular.json rename to angular/angular.json diff --git a/karma.conf.js b/angular/karma.conf.js similarity index 100% rename from karma.conf.js rename to angular/karma.conf.js diff --git a/ngsw-config.json b/angular/ngsw-config.json similarity index 100% rename from ngsw-config.json rename to angular/ngsw-config.json diff --git a/package-lock.json b/angular/package-lock.json similarity index 99% rename from package-lock.json rename to angular/package-lock.json index 4d066aa..f4238a0 100644 --- a/package-lock.json +++ b/angular/package-lock.json @@ -1,12 +1,12 @@ { "name": "fashion-logica", - "version": "0.0.0", + "version": "0.0.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "fashion-logica", - "version": "0.0.0", + "version": "0.0.1", "dependencies": { "@angular/animations": "^14.0.0", "@angular/cdk": "^14.2.1", diff --git a/package.json b/angular/package.json similarity index 97% rename from package.json rename to angular/package.json index 4fbf5e4..e80878c 100644 --- a/package.json +++ b/angular/package.json @@ -3,7 +3,7 @@ "version": "0.0.2", "scripts": { "ng": "ng", - "start": "ng serve --host 192.168.0.179", + "start": "ng serve --host 192.168.0.12", "build": "ng build", "watch": "ng build --watch --configuration development", "test": "ng test" diff --git a/src/app/app-routing.module.ts b/angular/src/app/app-routing.module.ts similarity index 100% rename from src/app/app-routing.module.ts rename to angular/src/app/app-routing.module.ts diff --git a/src/app/app.component.html b/angular/src/app/app.component.html similarity index 100% rename from src/app/app.component.html rename to angular/src/app/app.component.html diff --git a/src/app/app.component.scss b/angular/src/app/app.component.scss similarity index 100% rename from src/app/app.component.scss rename to angular/src/app/app.component.scss diff --git a/src/app/app.component.spec.ts b/angular/src/app/app.component.spec.ts similarity index 100% rename from src/app/app.component.spec.ts rename to angular/src/app/app.component.spec.ts diff --git a/src/app/app.component.ts b/angular/src/app/app.component.ts similarity index 100% rename from src/app/app.component.ts rename to angular/src/app/app.component.ts diff --git a/src/app/app.constants.ts b/angular/src/app/app.constants.ts similarity index 100% rename from src/app/app.constants.ts rename to angular/src/app/app.constants.ts diff --git a/src/app/app.module.ts b/angular/src/app/app.module.ts similarity index 100% rename from src/app/app.module.ts rename to angular/src/app/app.module.ts diff --git a/src/app/components/card/card.component.html b/angular/src/app/components/card/card.component.html similarity index 100% rename from src/app/components/card/card.component.html rename to angular/src/app/components/card/card.component.html diff --git a/src/app/components/card/card.component.scss b/angular/src/app/components/card/card.component.scss similarity index 100% rename from src/app/components/card/card.component.scss rename to angular/src/app/components/card/card.component.scss diff --git a/src/app/components/card/card.component.spec.ts b/angular/src/app/components/card/card.component.spec.ts similarity index 100% rename from src/app/components/card/card.component.spec.ts rename to angular/src/app/components/card/card.component.spec.ts diff --git a/src/app/components/card/card.component.ts b/angular/src/app/components/card/card.component.ts similarity index 100% rename from src/app/components/card/card.component.ts rename to angular/src/app/components/card/card.component.ts diff --git a/src/app/components/exit/exit.component.html b/angular/src/app/components/exit/exit.component.html similarity index 100% rename from src/app/components/exit/exit.component.html rename to angular/src/app/components/exit/exit.component.html diff --git a/src/app/components/exit/exit.component.scss b/angular/src/app/components/exit/exit.component.scss similarity index 100% rename from src/app/components/exit/exit.component.scss rename to angular/src/app/components/exit/exit.component.scss diff --git a/src/app/components/exit/exit.component.spec.ts b/angular/src/app/components/exit/exit.component.spec.ts similarity index 100% rename from src/app/components/exit/exit.component.spec.ts rename to angular/src/app/components/exit/exit.component.spec.ts diff --git a/src/app/components/exit/exit.component.ts b/angular/src/app/components/exit/exit.component.ts similarity index 100% rename from src/app/components/exit/exit.component.ts rename to angular/src/app/components/exit/exit.component.ts diff --git a/src/app/components/footer-buttons/footer-buttons.component.html b/angular/src/app/components/footer-buttons/footer-buttons.component.html similarity index 100% rename from src/app/components/footer-buttons/footer-buttons.component.html rename to angular/src/app/components/footer-buttons/footer-buttons.component.html diff --git a/src/app/components/footer-buttons/footer-buttons.component.scss b/angular/src/app/components/footer-buttons/footer-buttons.component.scss similarity index 100% rename from src/app/components/footer-buttons/footer-buttons.component.scss rename to angular/src/app/components/footer-buttons/footer-buttons.component.scss diff --git a/src/app/components/footer-buttons/footer-buttons.component.spec.ts b/angular/src/app/components/footer-buttons/footer-buttons.component.spec.ts similarity index 100% rename from src/app/components/footer-buttons/footer-buttons.component.spec.ts rename to angular/src/app/components/footer-buttons/footer-buttons.component.spec.ts diff --git a/src/app/components/footer-buttons/footer-buttons.component.ts b/angular/src/app/components/footer-buttons/footer-buttons.component.ts similarity index 100% rename from src/app/components/footer-buttons/footer-buttons.component.ts rename to angular/src/app/components/footer-buttons/footer-buttons.component.ts diff --git a/src/app/components/navbar/navbar.component.html b/angular/src/app/components/navbar/navbar.component.html similarity index 100% rename from src/app/components/navbar/navbar.component.html rename to angular/src/app/components/navbar/navbar.component.html diff --git a/src/app/components/navbar/navbar.component.scss b/angular/src/app/components/navbar/navbar.component.scss similarity index 100% rename from src/app/components/navbar/navbar.component.scss rename to angular/src/app/components/navbar/navbar.component.scss diff --git a/src/app/components/navbar/navbar.component.spec.ts b/angular/src/app/components/navbar/navbar.component.spec.ts similarity index 100% rename from src/app/components/navbar/navbar.component.spec.ts rename to angular/src/app/components/navbar/navbar.component.spec.ts diff --git a/src/app/components/navbar/navbar.component.ts b/angular/src/app/components/navbar/navbar.component.ts similarity index 100% rename from src/app/components/navbar/navbar.component.ts rename to angular/src/app/components/navbar/navbar.component.ts diff --git a/src/app/components/order-info/order-info.component.html b/angular/src/app/components/order-info/order-info.component.html similarity index 100% rename from src/app/components/order-info/order-info.component.html rename to angular/src/app/components/order-info/order-info.component.html diff --git a/src/app/components/order-info/order-info.component.scss b/angular/src/app/components/order-info/order-info.component.scss similarity index 100% rename from src/app/components/order-info/order-info.component.scss rename to angular/src/app/components/order-info/order-info.component.scss diff --git a/src/app/components/order-info/order-info.component.spec.ts b/angular/src/app/components/order-info/order-info.component.spec.ts similarity index 100% rename from src/app/components/order-info/order-info.component.spec.ts rename to angular/src/app/components/order-info/order-info.component.spec.ts diff --git a/src/app/components/order-info/order-info.component.ts b/angular/src/app/components/order-info/order-info.component.ts similarity index 100% rename from src/app/components/order-info/order-info.component.ts rename to angular/src/app/components/order-info/order-info.component.ts diff --git a/src/app/interface/data.ts b/angular/src/app/interface/data.ts similarity index 100% rename from src/app/interface/data.ts rename to angular/src/app/interface/data.ts diff --git a/src/app/models/order-product.ts b/angular/src/app/models/order-product.ts similarity index 100% rename from src/app/models/order-product.ts rename to angular/src/app/models/order-product.ts diff --git a/src/app/models/order.ts b/angular/src/app/models/order.ts similarity index 100% rename from src/app/models/order.ts rename to angular/src/app/models/order.ts diff --git a/src/app/pages/account/account.component.html b/angular/src/app/pages/account/account.component.html similarity index 100% rename from src/app/pages/account/account.component.html rename to angular/src/app/pages/account/account.component.html diff --git a/src/app/pages/account/account.component.scss b/angular/src/app/pages/account/account.component.scss similarity index 100% rename from src/app/pages/account/account.component.scss rename to angular/src/app/pages/account/account.component.scss diff --git a/src/app/pages/account/account.component.ts b/angular/src/app/pages/account/account.component.ts similarity index 100% rename from src/app/pages/account/account.component.ts rename to angular/src/app/pages/account/account.component.ts diff --git a/src/app/pages/account/auth/auth.component.html b/angular/src/app/pages/account/auth/auth.component.html similarity index 100% rename from src/app/pages/account/auth/auth.component.html rename to angular/src/app/pages/account/auth/auth.component.html diff --git a/src/app/pages/account/auth/auth.component.scss b/angular/src/app/pages/account/auth/auth.component.scss similarity index 100% rename from src/app/pages/account/auth/auth.component.scss rename to angular/src/app/pages/account/auth/auth.component.scss diff --git a/src/app/pages/account/auth/auth.component.spec.ts b/angular/src/app/pages/account/auth/auth.component.spec.ts similarity index 100% rename from src/app/pages/account/auth/auth.component.spec.ts rename to angular/src/app/pages/account/auth/auth.component.spec.ts diff --git a/src/app/pages/account/auth/auth.component.ts b/angular/src/app/pages/account/auth/auth.component.ts similarity index 100% rename from src/app/pages/account/auth/auth.component.ts rename to angular/src/app/pages/account/auth/auth.component.ts diff --git a/src/app/pages/account/bonus-program/bonus-program.component.html b/angular/src/app/pages/account/bonus-program/bonus-program.component.html similarity index 100% rename from src/app/pages/account/bonus-program/bonus-program.component.html rename to angular/src/app/pages/account/bonus-program/bonus-program.component.html diff --git a/src/app/pages/account/bonus-program/bonus-program.component.scss b/angular/src/app/pages/account/bonus-program/bonus-program.component.scss similarity index 100% rename from src/app/pages/account/bonus-program/bonus-program.component.scss rename to angular/src/app/pages/account/bonus-program/bonus-program.component.scss diff --git a/src/app/pages/account/bonus-program/bonus-program.component.spec.ts b/angular/src/app/pages/account/bonus-program/bonus-program.component.spec.ts similarity index 100% rename from src/app/pages/account/bonus-program/bonus-program.component.spec.ts rename to angular/src/app/pages/account/bonus-program/bonus-program.component.spec.ts diff --git a/src/app/pages/account/bonus-program/bonus-program.component.ts b/angular/src/app/pages/account/bonus-program/bonus-program.component.ts similarity index 100% rename from src/app/pages/account/bonus-program/bonus-program.component.ts rename to angular/src/app/pages/account/bonus-program/bonus-program.component.ts diff --git a/src/app/pages/account/orders/orders.component.html b/angular/src/app/pages/account/orders/orders.component.html similarity index 100% rename from src/app/pages/account/orders/orders.component.html rename to angular/src/app/pages/account/orders/orders.component.html diff --git a/src/app/pages/account/orders/orders.component.scss b/angular/src/app/pages/account/orders/orders.component.scss similarity index 100% rename from src/app/pages/account/orders/orders.component.scss rename to angular/src/app/pages/account/orders/orders.component.scss diff --git a/src/app/pages/account/orders/orders.component.spec.ts b/angular/src/app/pages/account/orders/orders.component.spec.ts similarity index 100% rename from src/app/pages/account/orders/orders.component.spec.ts rename to angular/src/app/pages/account/orders/orders.component.spec.ts diff --git a/src/app/pages/account/orders/orders.component.ts b/angular/src/app/pages/account/orders/orders.component.ts similarity index 100% rename from src/app/pages/account/orders/orders.component.ts rename to angular/src/app/pages/account/orders/orders.component.ts diff --git a/src/app/pages/account/ref-system/ref-system.component.html b/angular/src/app/pages/account/ref-system/ref-system.component.html similarity index 100% rename from src/app/pages/account/ref-system/ref-system.component.html rename to angular/src/app/pages/account/ref-system/ref-system.component.html diff --git a/src/app/pages/account/ref-system/ref-system.component.scss b/angular/src/app/pages/account/ref-system/ref-system.component.scss similarity index 100% rename from src/app/pages/account/ref-system/ref-system.component.scss rename to angular/src/app/pages/account/ref-system/ref-system.component.scss diff --git a/src/app/pages/account/ref-system/ref-system.component.spec.ts b/angular/src/app/pages/account/ref-system/ref-system.component.spec.ts similarity index 100% rename from src/app/pages/account/ref-system/ref-system.component.spec.ts rename to angular/src/app/pages/account/ref-system/ref-system.component.spec.ts diff --git a/src/app/pages/account/ref-system/ref-system.component.ts b/angular/src/app/pages/account/ref-system/ref-system.component.ts similarity index 100% rename from src/app/pages/account/ref-system/ref-system.component.ts rename to angular/src/app/pages/account/ref-system/ref-system.component.ts diff --git a/src/app/pages/account/user-data/user-data.component.html b/angular/src/app/pages/account/user-data/user-data.component.html similarity index 100% rename from src/app/pages/account/user-data/user-data.component.html rename to angular/src/app/pages/account/user-data/user-data.component.html diff --git a/src/app/pages/account/user-data/user-data.component.scss b/angular/src/app/pages/account/user-data/user-data.component.scss similarity index 100% rename from src/app/pages/account/user-data/user-data.component.scss rename to angular/src/app/pages/account/user-data/user-data.component.scss diff --git a/src/app/pages/account/user-data/user-data.component.spec.ts b/angular/src/app/pages/account/user-data/user-data.component.spec.ts similarity index 100% rename from src/app/pages/account/user-data/user-data.component.spec.ts rename to angular/src/app/pages/account/user-data/user-data.component.spec.ts diff --git a/src/app/pages/account/user-data/user-data.component.ts b/angular/src/app/pages/account/user-data/user-data.component.ts similarity index 100% rename from src/app/pages/account/user-data/user-data.component.ts rename to angular/src/app/pages/account/user-data/user-data.component.ts diff --git a/src/app/pages/main/main.component.html b/angular/src/app/pages/main/main.component.html similarity index 100% rename from src/app/pages/main/main.component.html rename to angular/src/app/pages/main/main.component.html diff --git a/src/app/pages/main/main.component.scss b/angular/src/app/pages/main/main.component.scss similarity index 100% rename from src/app/pages/main/main.component.scss rename to angular/src/app/pages/main/main.component.scss diff --git a/src/app/pages/main/main.component.ts b/angular/src/app/pages/main/main.component.ts similarity index 100% rename from src/app/pages/main/main.component.ts rename to angular/src/app/pages/main/main.component.ts diff --git a/src/app/pages/not-found/not-found.component.html b/angular/src/app/pages/not-found/not-found.component.html similarity index 100% rename from src/app/pages/not-found/not-found.component.html rename to angular/src/app/pages/not-found/not-found.component.html diff --git a/src/app/pages/not-found/not-found.component.scss b/angular/src/app/pages/not-found/not-found.component.scss similarity index 100% rename from src/app/pages/not-found/not-found.component.scss rename to angular/src/app/pages/not-found/not-found.component.scss diff --git a/src/app/pages/not-found/not-found.component.spec.ts b/angular/src/app/pages/not-found/not-found.component.spec.ts similarity index 100% rename from src/app/pages/not-found/not-found.component.spec.ts rename to angular/src/app/pages/not-found/not-found.component.spec.ts diff --git a/src/app/pages/not-found/not-found.component.ts b/angular/src/app/pages/not-found/not-found.component.ts similarity index 100% rename from src/app/pages/not-found/not-found.component.ts rename to angular/src/app/pages/not-found/not-found.component.ts diff --git a/src/app/services/apple-wallet.service.ts b/angular/src/app/services/apple-wallet.service.ts similarity index 100% rename from src/app/services/apple-wallet.service.ts rename to angular/src/app/services/apple-wallet.service.ts diff --git a/src/app/services/cookies.service.ts b/angular/src/app/services/cookies.service.ts similarity index 100% rename from src/app/services/cookies.service.ts rename to angular/src/app/services/cookies.service.ts diff --git a/src/app/services/format-phone.service.ts b/angular/src/app/services/format-phone.service.ts similarity index 100% rename from src/app/services/format-phone.service.ts rename to angular/src/app/services/format-phone.service.ts diff --git a/src/app/services/jsonrpc.service.ts b/angular/src/app/services/jsonrpc.service.ts similarity index 100% rename from src/app/services/jsonrpc.service.ts rename to angular/src/app/services/jsonrpc.service.ts diff --git a/src/app/services/messaging.service.ts b/angular/src/app/services/messaging.service.ts similarity index 100% rename from src/app/services/messaging.service.ts rename to angular/src/app/services/messaging.service.ts diff --git a/src/app/services/wp-json.service.ts b/angular/src/app/services/wp-json.service.ts similarity index 100% rename from src/app/services/wp-json.service.ts rename to angular/src/app/services/wp-json.service.ts diff --git a/src/assets/.gitkeep b/angular/src/assets/.gitkeep similarity index 100% rename from src/assets/.gitkeep rename to angular/src/assets/.gitkeep diff --git a/src/assets/background.svg b/angular/src/assets/background.svg similarity index 100% rename from src/assets/background.svg rename to angular/src/assets/background.svg diff --git a/src/assets/card-decorative-pattern.png b/angular/src/assets/card-decorative-pattern.png similarity index 100% rename from src/assets/card-decorative-pattern.png rename to angular/src/assets/card-decorative-pattern.png diff --git a/src/assets/card-decorative-pattern.svg b/angular/src/assets/card-decorative-pattern.svg similarity index 100% rename from src/assets/card-decorative-pattern.svg rename to angular/src/assets/card-decorative-pattern.svg diff --git a/src/assets/download.svg b/angular/src/assets/download.svg similarity index 100% rename from src/assets/download.svg rename to angular/src/assets/download.svg diff --git a/src/assets/icons/apple-icon-180x180.png b/angular/src/assets/icons/apple-icon-180x180.png similarity index 100% rename from src/assets/icons/apple-icon-180x180.png rename to angular/src/assets/icons/apple-icon-180x180.png diff --git a/src/assets/icons/icon-128x128.png b/angular/src/assets/icons/icon-128x128.png similarity index 100% rename from src/assets/icons/icon-128x128.png rename to angular/src/assets/icons/icon-128x128.png diff --git a/src/assets/icons/icon-144x144.png b/angular/src/assets/icons/icon-144x144.png similarity index 100% rename from src/assets/icons/icon-144x144.png rename to angular/src/assets/icons/icon-144x144.png diff --git a/src/assets/icons/icon-152x152.png b/angular/src/assets/icons/icon-152x152.png similarity index 100% rename from src/assets/icons/icon-152x152.png rename to angular/src/assets/icons/icon-152x152.png diff --git a/src/assets/icons/icon-192x192.png b/angular/src/assets/icons/icon-192x192.png similarity index 100% rename from src/assets/icons/icon-192x192.png rename to angular/src/assets/icons/icon-192x192.png diff --git a/src/assets/icons/icon-384x384.png b/angular/src/assets/icons/icon-384x384.png similarity index 100% rename from src/assets/icons/icon-384x384.png rename to angular/src/assets/icons/icon-384x384.png diff --git a/src/assets/icons/icon-512x512.png b/angular/src/assets/icons/icon-512x512.png similarity index 100% rename from src/assets/icons/icon-512x512.png rename to angular/src/assets/icons/icon-512x512.png diff --git a/src/assets/icons/icon-72x72.png b/angular/src/assets/icons/icon-72x72.png similarity index 100% rename from src/assets/icons/icon-72x72.png rename to angular/src/assets/icons/icon-72x72.png diff --git a/src/assets/icons/icon-96x96.png b/angular/src/assets/icons/icon-96x96.png similarity index 100% rename from src/assets/icons/icon-96x96.png rename to angular/src/assets/icons/icon-96x96.png diff --git a/src/assets/logo.svg b/angular/src/assets/logo.svg similarity index 100% rename from src/assets/logo.svg rename to angular/src/assets/logo.svg diff --git a/src/assets/menu-icons/bonus-program.png b/angular/src/assets/menu-icons/bonus-program.png similarity index 100% rename from src/assets/menu-icons/bonus-program.png rename to angular/src/assets/menu-icons/bonus-program.png diff --git a/src/assets/menu-icons/exit.png b/angular/src/assets/menu-icons/exit.png similarity index 100% rename from src/assets/menu-icons/exit.png rename to angular/src/assets/menu-icons/exit.png diff --git a/src/assets/menu-icons/orders.png b/angular/src/assets/menu-icons/orders.png similarity index 100% rename from src/assets/menu-icons/orders.png rename to angular/src/assets/menu-icons/orders.png diff --git a/src/assets/menu-icons/ref-system.png b/angular/src/assets/menu-icons/ref-system.png similarity index 100% rename from src/assets/menu-icons/ref-system.png rename to angular/src/assets/menu-icons/ref-system.png diff --git a/src/assets/menu-icons/user-data.png b/angular/src/assets/menu-icons/user-data.png similarity index 100% rename from src/assets/menu-icons/user-data.png rename to angular/src/assets/menu-icons/user-data.png diff --git a/src/assets/notification.svg b/angular/src/assets/notification.svg similarity index 100% rename from src/assets/notification.svg rename to angular/src/assets/notification.svg diff --git a/src/assets/share.svg b/angular/src/assets/share.svg similarity index 100% rename from src/assets/share.svg rename to angular/src/assets/share.svg diff --git a/src/environments/environment.prod.ts b/angular/src/environments/environment.prod.ts similarity index 85% rename from src/environments/environment.prod.ts rename to angular/src/environments/environment.prod.ts index ccfb9dc..c7d8c4d 100644 --- a/src/environments/environment.prod.ts +++ b/angular/src/environments/environment.prod.ts @@ -18,4 +18,7 @@ export const environment = { measurementId: "G-RQF97ZK7R1" }, version: packageJson.version, + appleWalletEndpoint: 'https://ru-academy.online/apns/api', + appleWalletSecret: 'Token Z_vtuf_flvby!', + clientName: 'fashionlogica' } diff --git a/src/environments/environment.ts b/angular/src/environments/environment.ts similarity index 100% rename from src/environments/environment.ts rename to angular/src/environments/environment.ts diff --git a/src/favicon.ico b/angular/src/favicon.ico similarity index 100% rename from src/favicon.ico rename to angular/src/favicon.ico diff --git a/src/firebase-messaging-sw.js b/angular/src/firebase-messaging-sw.js similarity index 100% rename from src/firebase-messaging-sw.js rename to angular/src/firebase-messaging-sw.js diff --git a/src/index.html b/angular/src/index.html similarity index 100% rename from src/index.html rename to angular/src/index.html diff --git a/src/main.ts b/angular/src/main.ts similarity index 100% rename from src/main.ts rename to angular/src/main.ts diff --git a/src/manifest.webmanifest b/angular/src/manifest.webmanifest similarity index 100% rename from src/manifest.webmanifest rename to angular/src/manifest.webmanifest diff --git a/src/polyfills.ts b/angular/src/polyfills.ts similarity index 100% rename from src/polyfills.ts rename to angular/src/polyfills.ts diff --git a/src/styles.scss b/angular/src/styles.scss similarity index 100% rename from src/styles.scss rename to angular/src/styles.scss diff --git a/src/test.ts b/angular/src/test.ts similarity index 100% rename from src/test.ts rename to angular/src/test.ts diff --git a/tsconfig.app.json b/angular/tsconfig.app.json similarity index 100% rename from tsconfig.app.json rename to angular/tsconfig.app.json diff --git a/tsconfig.json b/angular/tsconfig.json similarity index 100% rename from tsconfig.json rename to angular/tsconfig.json diff --git a/tsconfig.spec.json b/angular/tsconfig.spec.json similarity index 100% rename from tsconfig.spec.json rename to angular/tsconfig.spec.json diff --git a/wallet_meta/config.json b/wallet_meta/config.json new file mode 100644 index 0000000..6044ce5 --- /dev/null +++ b/wallet_meta/config.json @@ -0,0 +1,11 @@ +{ + "style": { + "organizationName": "Fashionlogica", + "logoText": "Fashionlogica", + "description": "Fashionlogica", + "notificationPlaceholder": "Здесь будут уведомления", + "foregroundColor": "rgb(255,255,255)", + "labelColor": "rgb(255,255,255)", + "backgroundColor": "rgb(9,70,127)" + } +} diff --git a/wallet_meta/icon.png b/wallet_meta/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4af4f16172f283cee5310b82e4e18f7ff0635886 GIT binary patch literal 14215 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 literal 0 HcmV?d00001