Merge branch 'itou' into 'develop'

デザインに合わせたプロトタイプ作成 See merge request !3

Merge branch 'itou' into 'develop'
7ecadc6b · 伊藤雄大 · 57b2a597 · 3a4b2113 · 7ecadc6b · 7ecadc6b
Commit 7ecadc6b authored Oct 24, 2024 by 伊藤雄大
106 changed files
--- a/angular.json
+++ b/angular.json
@@ -29,6 +29,11 @@
                "glob": "**/*.svg",
                "input": "node_modules/ionicons/dist/ionicons/svg",
                "output": "./svg"
+              },
+              {
+                "glob": "**/*.json",
+                "input": "src/data",
+                "output": "data"
              }
            ],
            "styles": [
@@ -116,6 +121,11 @@
                "glob": "**/*.svg",
                "input": "node_modules/ionicons/dist/ionicons/svg",
                "output": "./svg"
+              },
+              {
+                "glob": "**/*.json",
+                "input": "src/data",
+                "output": "data"
              }
            ],
            "styles": [
@@ -150,7 +160,8 @@
  "cli": {
    "schematicCollections": [
      "@ionic/angular-toolkit"
-    ]
+    ],
+    "analytics": false
  },
  "schematics": {
    "@ionic/angular-toolkit:component": {

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
--- a/src/app/card-regist/card-regist.page.html
+++ b/src/app/card-regist/card-regist.page.html
--- a/src/app/card-select/card-info/card-info.component.html
+++ b/src/app/card-select/card-info/card-info.component.html
--- a/src/app/card-select/card-info/card-info.component.ts
+++ b/src/app/card-select/card-info/card-info.component.ts
--- a/src/app/card-select/card-select.page.html
+++ b/src/app/card-select/card-select.page.html
--- a/src/app/card-select/card-select.page.ts
+++ b/src/app/card-select/card-select.page.ts
--- a/src/app/claim-list/claim-info/claim-info.component.html
+++ b/src/app/claim-list/claim-info/claim-info.component.html
--- a/src/app/claim-list/claim-info/claim-info.component.scss
+++ b/src/app/claim-list/claim-info/claim-info.component.scss
--- a/src/app/deny-list/deny-info/deny-info.component.spec.ts
+++ b/src/app/deny-list/deny-info/deny-info.component.spec.ts
--- a/src/app/claim-list/claim-info/claim-info.component.ts
+++ b/src/app/claim-list/claim-info/claim-info.component.ts
--- a/src/app/deny-list/deny-list-routing.module.ts
+++ b/src/app/deny-list/deny-list-routing.module.ts
--- a/src/app/menu/menu.module.ts
+++ b/src/app/menu/menu.module.ts
--- a/src/app/claim-list/claim-list.page.html
+++ b/src/app/claim-list/claim-list.page.html
--- a/src/app/deny-list/deny-info/deny-info.component.scss
+++ b/src/app/deny-list/deny-info/deny-info.component.scss
--- a/src/app/history/history.page.spec.ts
+++ b/src/app/history/history.page.spec.ts
--- a/src/app/claim-list/claim-list.page.ts
+++ b/src/app/claim-list/claim-list.page.ts
--- a/src/app/common/header/header.component.html
+++ b/src/app/common/header/header.component.html
--- a/src/app/common/header/header.component.scss
+++ b/src/app/common/header/header.component.scss
--- a/src/app/common/header/header.component.ts
+++ b/src/app/common/header/header.component.ts
--- a/src/app/deny-list/deny-info/deny-info.component.html
+++ b/src/app/deny-list/deny-info/deny-info.component.html
--- a/src/app/deny-list/deny-info/deny-info.component.ts
+++ b/src/app/deny-list/deny-info/deny-info.component.ts
--- a/src/app/deny-list/deny-list.module.ts
+++ b/src/app/deny-list/deny-list.module.ts
--- a/src/app/deny-list/deny-list.page.html
+++ b/src/app/deny-list/deny-list.page.html
--- a/src/app/deny-list/deny-list.page.scss
+++ b/src/app/deny-list/deny-list.page.scss
--- a/src/app/deny-list/deny-list.page.spec.ts
+++ b/src/app/deny-list/deny-list.page.spec.ts
--- a/src/app/deny-list/deny-list.page.ts
+++ b/src/app/deny-list/deny-list.page.ts
--- a/src/app/history/history-routing.module.ts
+++ b/src/app/history/history-routing.module.ts
--- a/src/app/history/history.module.ts
+++ b/src/app/history/history.module.ts
--- a/src/app/history/history.page.html
+++ b/src/app/history/history.page.html
--- a/src/app/history/history.page.scss
+++ b/src/app/history/history.page.scss
--- a/src/app/history/history.page.ts
+++ b/src/app/history/history.page.ts
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
--- a/src/app/home/home.page.scss
+++ b/src/app/home/home.page.scss
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
--- a/src/app/menu/menu-routing.module.ts
+++ b/src/app/menu/menu-routing.module.ts
--- a/src/app/menu/menu.page.html
+++ b/src/app/menu/menu.page.html
--- a/src/app/menu/menu.page.scss
+++ b/src/app/menu/menu.page.scss
--- a/src/app/menu/menu.page.spec.ts
+++ b/src/app/menu/menu.page.spec.ts
--- a/src/app/menu/menu.page.ts
+++ b/src/app/menu/menu.page.ts
--- a/src/app/model/deny-list.model.ts
+++ b/src/app/model/deny-list.model.ts
--- a/src/app/model/credit-card.model.ts
+++ b/src/app/model/credit-card.model.ts
--- a/src/app/model/history.model.ts
+++ b/src/app/model/history.model.ts
--- a/src/app/model/refund.model.ts
+++ b/src/app/model/refund.model.ts
--- a/src/app/model/user-info.model.ts
+++ b/src/app/model/user-info.model.ts
--- a/src/app/pass-change/pass-change-routing.module.ts
+++ b/src/app/pass-change/pass-change-routing.module.ts
--- a/src/app/pass-change/pass-change.module.ts
+++ b/src/app/pass-change/pass-change.module.ts
--- a/src/app/pass-change/pass-change.page.html
+++ b/src/app/pass-change/pass-change.page.html
--- a/src/app/pass-change/pass-change.page.scss
+++ b/src/app/pass-change/pass-change.page.scss
--- a/src/app/pass-change/pass-change.page.spec.ts
+++ b/src/app/pass-change/pass-change.page.spec.ts
--- a/src/app/pass-change/pass-change.page.ts
+++ b/src/app/pass-change/pass-change.page.ts
--- a/src/app/pass-continue/pass-continue-routing.module.ts
+++ b/src/app/pass-continue/pass-continue-routing.module.ts
--- a/src/app/pass-continue/pass-continue.module.ts
+++ b/src/app/pass-continue/pass-continue.module.ts
--- a/src/app/pass-continue/pass-continue.page.html
+++ b/src/app/pass-continue/pass-continue.page.html
--- a/src/app/pass-continue/pass-continue.page.scss
+++ b/src/app/pass-continue/pass-continue.page.scss
--- a/src/app/pass-continue/pass-continue.page.spec.ts
+++ b/src/app/pass-continue/pass-continue.page.spec.ts
--- a/src/app/pass-continue/pass-continue.page.ts
+++ b/src/app/pass-continue/pass-continue.page.ts
--- a/src/app/pass-refund/pass-refund-routing.module.ts
+++ b/src/app/pass-refund/pass-refund-routing.module.ts
--- a/src/app/pass-refund/pass-refund.module.ts
+++ b/src/app/pass-refund/pass-refund.module.ts
--- a/src/app/pass-refund/pass-refund.page.html
+++ b/src/app/pass-refund/pass-refund.page.html
--- a/src/app/pass-refund/pass-refund.page.scss
+++ b/src/app/pass-refund/pass-refund.page.scss
--- a/src/app/pass-refund/pass-refund.page.spec.ts
+++ b/src/app/pass-refund/pass-refund.page.spec.ts
--- a/src/app/pass-refund/pass-refund.page.ts
+++ b/src/app/pass-refund/pass-refund.page.ts
--- a/src/app/pass-regist/pass-regist.module.ts
+++ b/src/app/pass-regist/pass-regist.module.ts
--- a/src/app/pass-regist/pass-regist.page.html
+++ b/src/app/pass-regist/pass-regist.page.html
--- a/src/app/pass-regist/pass-regist.page.ts
+++ b/src/app/pass-regist/pass-regist.page.ts
--- a/src/app/pass-select/pass-info/pass-info.component.html
+++ b/src/app/pass-select/pass-info/pass-info.component.html
--- a/src/app/pass-select/pass-info/pass-info.component.ts
+++ b/src/app/pass-select/pass-info/pass-info.component.ts
--- a/src/app/pass-select/pass-select.page.html
+++ b/src/app/pass-select/pass-select.page.html
--- a/src/app/pass-select/pass-select.page.ts
+++ b/src/app/pass-select/pass-select.page.ts
--- a/src/app/password-update/password-update-routing.module.ts
+++ b/src/app/password-update/password-update-routing.module.ts
--- a/src/app/password-update/password-update.module.ts
+++ b/src/app/password-update/password-update.module.ts
--- a/src/app/password-update/password-update.page.html
+++ b/src/app/password-update/password-update.page.html
--- a/src/app/password-update/password-update.page.scss
+++ b/src/app/password-update/password-update.page.scss
--- a/src/app/password-update/password-update.page.spec.ts
+++ b/src/app/password-update/password-update.page.spec.ts
--- a/src/app/password-update/password-update.page.ts
+++ b/src/app/password-update/password-update.page.ts
--- a/src/app/pipe/custom-date.pipe.spec.ts
+++ b/src/app/pipe/custom-date.pipe.spec.ts
--- a/src/app/pipe/custom-date.pipe.ts
+++ b/src/app/pipe/custom-date.pipe.ts
--- a/src/app/pipe/custom-datetime.pipe.spec.ts
+++ b/src/app/pipe/custom-datetime.pipe.spec.ts
--- a/src/app/pipe/custom-datetime.pipe.ts
+++ b/src/app/pipe/custom-datetime.pipe.ts
--- a/src/app/services/card.service.ts
+++ b/src/app/services/card.service.ts
--- a/src/app/services/login.service.spec.ts
+++ b/src/app/services/login.service.spec.ts
--- a/src/app/services/claimlist.service.ts
+++ b/src/app/services/claimlist.service.ts
--- a/src/app/services/denylist.service.spec.ts
+++ b/src/app/services/denylist.service.spec.ts
--- a/src/app/services/denylist.service.ts
+++ b/src/app/services/denylist.service.ts
--- a/src/app/services/history.service.spec.ts
+++ b/src/app/services/history.service.spec.ts
--- a/src/app/services/history.service.ts
+++ b/src/app/services/history.service.ts
--- a/src/app/services/login.service.ts
+++ b/src/app/services/login.service.ts
--- a/src/app/services/pass.service.ts
+++ b/src/app/services/pass.service.ts
--- a/src/app/services/route.service.ts
+++ b/src/app/services/route.service.ts
--- a/src/app/services/user.service.spec.ts
+++ b/src/app/services/user.service.spec.ts
--- a/src/app/services/user.service.ts
+++ b/src/app/services/user.service.ts
--- a/src/app/user-regist/user-regist-routing.module.ts
+++ b/src/app/user-regist/user-regist-routing.module.ts
--- a/src/app/user-regist/user-regist.module.ts
+++ b/src/app/user-regist/user-regist.module.ts
--- a/src/app/user-regist/user-regist.page.html
+++ b/src/app/user-regist/user-regist.page.html
--- a/src/app/user-regist/user-regist.page.scss
+++ b/src/app/user-regist/user-regist.page.scss
--- a/src/app/user-regist/user-regist.page.spec.ts
+++ b/src/app/user-regist/user-regist.page.spec.ts
--- a/src/app/user-regist/user-regist.page.ts
+++ b/src/app/user-regist/user-regist.page.ts
--- a/src/assets/icon/mastercard.png
+++ b/src/assets/icon/mastercard.png
--- a/src/data/card.json
+++ b/src/data/card.json
--- a/src/data/claimlist.json
+++ b/src/data/claimlist.json
--- a/src/data/pass.json
+++ b/src/data/pass.json
--- a/src/global.scss
+++ b/src/global.scss