From fefd2d352b8a06f8a4ec02cc47633c0d4fc2081d Mon Sep 17 00:00:00 2001 From: lonewanderer27 Date: Mon, 28 Aug 2023 22:35:39 +0800 Subject: [PATCH] fix(EditProfile): - add missing deps - update tsconfig & vite config to include aliases --- apps/app/package.json | 4 + apps/app/tsconfig.json | 10 +- apps/app/vite.config.ts | 15 +++ pnpm-lock.yaml | 205 ++++++++++++++++++++++++++++++++++++++-- 4 files changed, 225 insertions(+), 9 deletions(-) diff --git a/apps/app/package.json b/apps/app/package.json index a2c638a..84a4e2e 100644 --- a/apps/app/package.json +++ b/apps/app/package.json @@ -10,9 +10,11 @@ "lint": "eslint" }, "dependencies": { + "@capacitor-community/camera-preview": "^5.0.0", "@capacitor-firebase/authentication": "^5.1.0", "@capacitor/android": "5.2.1", "@capacitor/app": "5.0.6", + "@capacitor/camera": "^5.0.7", "@capacitor/core": "5.2.1", "@capacitor/geolocation": "^5.0.6", "@capacitor/haptics": "5.0.6", @@ -20,6 +22,7 @@ "@capacitor/preferences": "^5.0.6", "@capacitor/status-bar": "5.0.6", "@dotlottie/react-player": "^1.2.1", + "@ionic/pwa-elements": "^3.2.2", "@ionic/react": "^7.3.1", "@ionic/react-router": "^7.3.1", "@maskito/core": "^1.4.0", @@ -81,6 +84,7 @@ "tailwindcss": "^3.3.3", "typescript": "^5.1.6", "vite": "^4.4.9", + "vite-plugin-mkcert": "^1.16.0", "workbox-window": "^7.0.0" }, "description": "The Coffee Lounge is an E-commerce coffee app built with Ionic React. It features a unique 3D View that allows our customers to virtually visit the cafe, using only their mobile phone." diff --git a/apps/app/tsconfig.json b/apps/app/tsconfig.json index de8e891..f28ee38 100644 --- a/apps/app/tsconfig.json +++ b/apps/app/tsconfig.json @@ -14,7 +14,15 @@ "resolveJsonModule": true, "isolatedModules": true, "noEmit": true, - "jsx": "react-jsx" + "jsx": "react-jsx", + "baseUrl": ".", + "paths": { + "@/*": ["./src/*", "./dist/*", ""], + "@components/*": ["src/components/*"], + "@pages/*": ["src/pages/*"], + "@hooks/*": ["src/hooks/*"], + "@atoms/*": ["src/utils/*"], + } }, "include": ["src", "node_modules/vite-plugin-pwa/client.d.ts"], "references": [{ "path": "./tsconfig.node.json" }] diff --git a/apps/app/vite.config.ts b/apps/app/vite.config.ts index 390a818..3c944f1 100644 --- a/apps/app/vite.config.ts +++ b/apps/app/vite.config.ts @@ -1,11 +1,26 @@ import { VitePWA } from "vite-plugin-pwa"; import { defineConfig } from "vite"; import legacy from "@vitejs/plugin-legacy"; +import mkcert from 'vite-plugin-mkcert' +import path from "path"; import react from "@vitejs/plugin-react"; /** @type {import('vite').UserConfig} */ export default defineConfig({ + server: { + https: true + }, + resolve: { + alias: { + "@": path.resolve(__dirname, "./src"), + components: path.resolve(__dirname, "./src/components"), + pages: path.resolve(__dirname, "./src/pages"), + hooks: path.resolve(__dirname, "./src/hooks"), + atoms: path.resolve(__dirname, "./src/atoms"), + } + }, plugins: [ + mkcert(), react(), legacy(), VitePWA({ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 12cb31c..dba8d7e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,6 +29,9 @@ importers: apps/app: dependencies: + '@capacitor-community/camera-preview': + specifier: ^5.0.0 + version: 5.0.0(@capacitor/core@5.2.1) '@capacitor-firebase/authentication': specifier: ^5.1.0 version: 5.1.0(@capacitor/core@5.2.1)(firebase@10.3.0) @@ -38,6 +41,9 @@ importers: '@capacitor/app': specifier: 5.0.6 version: 5.0.6(@capacitor/core@5.2.1) + '@capacitor/camera': + specifier: ^5.0.7 + version: 5.0.7(@capacitor/core@5.2.1) '@capacitor/core': specifier: 5.2.1 version: 5.2.1 @@ -59,6 +65,9 @@ importers: '@dotlottie/react-player': specifier: ^1.2.1 version: 1.2.1(react@18.2.0) + '@ionic/pwa-elements': + specifier: ^3.2.2 + version: 3.2.2 '@ionic/react': specifier: ^7.3.1 version: 7.3.1(react-dom@18.2.0)(react@18.2.0) @@ -100,7 +109,7 @@ importers: version: 5.3.3 axios: specifier: ^1.4.0 - version: 1.4.0 + version: 1.4.0(debug@4.3.4) azure-maps-control: specifier: 3.0.0-preview.10 version: 3.0.0-preview.10 @@ -237,6 +246,9 @@ importers: vite: specifier: ^4.4.9 version: 4.4.9(@types/node@18.17.6)(terser@5.19.2) + vite-plugin-mkcert: + specifier: ^1.16.0 + version: 1.16.0(vite@4.4.9) workbox-window: specifier: ^7.0.0 version: 7.0.0 @@ -1579,6 +1591,14 @@ packages: '@babel/helper-validator-identifier': 7.22.5 to-fast-properties: 2.0.0 + /@capacitor-community/camera-preview@5.0.0(@capacitor/core@5.2.1): + resolution: {integrity: sha512-pnoWs8DpKpjoJGVanJ/tRzplp5kZL6iEpKUsRUwyf5BUH77SutZaLo1kF32CaHUaMGawNzvx/rep5Wa5TnxScg==} + peerDependencies: + '@capacitor/core': ^5.0.0 + dependencies: + '@capacitor/core': 5.2.1 + dev: false + /@capacitor-firebase/authentication@5.1.0(@capacitor/core@5.2.1)(firebase@10.3.0): resolution: {integrity: sha512-zGnHesTO7aPeorFZejcrQ7qqMqWeUsYlesuf8u31tuyuKb2y/vlSKLDOSdvR4RZe7vzOPWXVVdXinhn6GHoOAA==} peerDependencies: @@ -1634,6 +1654,14 @@ packages: - typescript dev: true + /@capacitor/camera@5.0.7(@capacitor/core@5.2.1): + resolution: {integrity: sha512-1Wk3Dk0UhhNHdBB07UrPvUOSL7Wi5gFZRyLY1LZL2awt34iqy2cnajtfJplFmEZHk8lD0i7NAl3HbkWm4td4OQ==} + peerDependencies: + '@capacitor/core': ^5.0.0 + dependencies: + '@capacitor/core': 5.2.1 + dev: false + /@capacitor/cli@3.9.0: resolution: {integrity: sha512-NkbVZhYb0oPdh/XArE2ZmOwPFJbla5meShGhv3DxKCXeKn1rt92ile+2xOgtB/j+mL7f9cqQzTQM/11sGQzMAg==} engines: {node: '>=12.4.0'} @@ -4080,6 +4108,11 @@ packages: tslib: 2.6.2 dev: false + /@ionic/pwa-elements@3.2.2: + resolution: {integrity: sha512-gCQsHdvkaWa83T3ToKsr6FOtzSmLIYFWy+zZisXVDqU3ry4Hv581dFSxDUgokgoWSxIERe/nvYnhoN8zIIEKQQ==} + engines: {node: '>=16.0.0', npm: '>=8.0.0'} + dev: false + /@ionic/react-router@7.3.1(react-dom@18.2.0)(react-router-dom@5.3.4)(react-router@5.3.4)(react@18.2.0): resolution: {integrity: sha512-wVCG78DH4S8x9w2ZB6X3V8Y6SJQxb4oWULpw/rK+8koeQHoSxx8nCvf9WQuRkmsNp+ztCKVzXY2zJA6kDXpu/A==} peerDependencies: @@ -4478,6 +4511,130 @@ packages: '@nodelib/fs.scandir': 2.1.5 fastq: 1.15.0 + /@octokit/auth-token@3.0.4: + resolution: {integrity: sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==} + engines: {node: '>= 14'} + dev: true + + /@octokit/core@4.2.4: + resolution: {integrity: sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==} + engines: {node: '>= 14'} + dependencies: + '@octokit/auth-token': 3.0.4 + '@octokit/graphql': 5.0.6 + '@octokit/request': 6.2.8 + '@octokit/request-error': 3.0.3 + '@octokit/types': 9.3.2 + before-after-hook: 2.2.3 + universal-user-agent: 6.0.0 + transitivePeerDependencies: + - encoding + dev: true + + /@octokit/endpoint@7.0.6: + resolution: {integrity: sha512-5L4fseVRUsDFGR00tMWD/Trdeeihn999rTMGRMC1G/Ldi1uWlWJzI98H4Iak5DB/RVvQuyMYKqSK/R6mbSOQyg==} + engines: {node: '>= 14'} + dependencies: + '@octokit/types': 9.3.2 + is-plain-object: 5.0.0 + universal-user-agent: 6.0.0 + dev: true + + /@octokit/graphql@5.0.6: + resolution: {integrity: sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==} + engines: {node: '>= 14'} + dependencies: + '@octokit/request': 6.2.8 + '@octokit/types': 9.3.2 + universal-user-agent: 6.0.0 + transitivePeerDependencies: + - encoding + dev: true + + /@octokit/openapi-types@18.0.0: + resolution: {integrity: sha512-V8GImKs3TeQRxRtXFpG2wl19V7444NIOTDF24AWuIbmNaNYOQMWRbjcGDXV5B+0n887fgDcuMNOmlul+k+oJtw==} + dev: true + + /@octokit/plugin-paginate-rest@6.1.2(@octokit/core@4.2.4): + resolution: {integrity: sha512-qhrmtQeHU/IivxucOV1bbI/xZyC/iOBhclokv7Sut5vnejAIAEXVcGQeRpQlU39E0WwK9lNvJHphHri/DB6lbQ==} + engines: {node: '>= 14'} + peerDependencies: + '@octokit/core': '>=4' + dependencies: + '@octokit/core': 4.2.4 + '@octokit/tsconfig': 1.0.2 + '@octokit/types': 9.3.2 + dev: true + + /@octokit/plugin-request-log@1.0.4(@octokit/core@4.2.4): + resolution: {integrity: sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==} + peerDependencies: + '@octokit/core': '>=3' + dependencies: + '@octokit/core': 4.2.4 + dev: true + + /@octokit/plugin-rest-endpoint-methods@7.2.3(@octokit/core@4.2.4): + resolution: {integrity: sha512-I5Gml6kTAkzVlN7KCtjOM+Ruwe/rQppp0QU372K1GP7kNOYEKe8Xn5BW4sE62JAHdwpq95OQK/qGNyKQMUzVgA==} + engines: {node: '>= 14'} + peerDependencies: + '@octokit/core': '>=3' + dependencies: + '@octokit/core': 4.2.4 + '@octokit/types': 10.0.0 + dev: true + + /@octokit/request-error@3.0.3: + resolution: {integrity: sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==} + engines: {node: '>= 14'} + dependencies: + '@octokit/types': 9.3.2 + deprecation: 2.3.1 + once: 1.4.0 + dev: true + + /@octokit/request@6.2.8: + resolution: {integrity: sha512-ow4+pkVQ+6XVVsekSYBzJC0VTVvh/FCTUUgTsboGq+DTeWdyIFV8WSCdo0RIxk6wSkBTHqIK1mYuY7nOBXOchw==} + engines: {node: '>= 14'} + dependencies: + '@octokit/endpoint': 7.0.6 + '@octokit/request-error': 3.0.3 + '@octokit/types': 9.3.2 + is-plain-object: 5.0.0 + node-fetch: 2.7.0 + universal-user-agent: 6.0.0 + transitivePeerDependencies: + - encoding + dev: true + + /@octokit/rest@19.0.13: + resolution: {integrity: sha512-/EzVox5V9gYGdbAI+ovYj3nXQT1TtTHRT+0eZPcuC05UFSWO3mdO9UY1C0i2eLF9Un1ONJkAk+IEtYGAC+TahA==} + engines: {node: '>= 14'} + dependencies: + '@octokit/core': 4.2.4 + '@octokit/plugin-paginate-rest': 6.1.2(@octokit/core@4.2.4) + '@octokit/plugin-request-log': 1.0.4(@octokit/core@4.2.4) + '@octokit/plugin-rest-endpoint-methods': 7.2.3(@octokit/core@4.2.4) + transitivePeerDependencies: + - encoding + dev: true + + /@octokit/tsconfig@1.0.2: + resolution: {integrity: sha512-I0vDR0rdtP8p2lGMzvsJzbhdOWy405HcGovrspJ8RRibHnyRgggUSNO5AIox5LmqiwmatHKYsvj6VGFHkqS7lA==} + dev: true + + /@octokit/types@10.0.0: + resolution: {integrity: sha512-Vm8IddVmhCgU1fxC1eyinpwqzXPEYu0NrYzD3YZjlGjyftdLBTeqNblRC0jmJmgxbJIsQlyogVeGnrNaaMVzIg==} + dependencies: + '@octokit/openapi-types': 18.0.0 + dev: true + + /@octokit/types@9.3.2: + resolution: {integrity: sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==} + dependencies: + '@octokit/openapi-types': 18.0.0 + dev: true + /@pkgr/utils@2.4.0: resolution: {integrity: sha512-2OCURAmRtdlL8iUDTypMrrxfwe8frXTeXaxGsVOaYtc/wrUyk8Z/0OBetM7cdlsy7ZFWlMX72VogKeh+A4Xcjw==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} @@ -6750,15 +6907,14 @@ packages: engines: {node: '>=4'} dev: false - /axios@1.4.0: + /axios@1.4.0(debug@4.3.4): resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==} dependencies: - follow-redirects: 1.15.2 + follow-redirects: 1.15.2(debug@4.3.4) form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: - debug - dev: false /axobject-query@3.1.1: resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==} @@ -6841,6 +6997,10 @@ packages: /base64-js@1.5.1: resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==} + /before-after-hook@2.2.3: + resolution: {integrity: sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==} + dev: true + /better-path-resolve@1.0.0: resolution: {integrity: sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==} engines: {node: '>=4'} @@ -7806,6 +7966,10 @@ packages: resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==} engines: {node: '>=0.4.0'} + /deprecation@2.3.1: + resolution: {integrity: sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==} + dev: true + /detect-indent@6.1.0: resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==} engines: {node: '>=8'} @@ -8821,7 +8985,7 @@ packages: tslib: 2.6.2 dev: false - /follow-redirects@1.15.2: + /follow-redirects@1.15.2(debug@4.3.4): resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} engines: {node: '>=4.0'} peerDependencies: @@ -8829,7 +8993,8 @@ packages: peerDependenciesMeta: debug: optional: true - dev: false + dependencies: + debug: 4.3.4(supports-color@5.5.0) /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -9769,6 +9934,11 @@ packages: resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==} engines: {node: '>=0.10.0'} + /is-plain-object@5.0.0: + resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==} + engines: {node: '>=0.10.0'} + dev: true + /is-potential-custom-element-name@1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} dev: true @@ -11637,7 +11807,6 @@ packages: /proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} - dev: false /pseudomap@1.0.2: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} @@ -13303,7 +13472,7 @@ packages: '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 '@types/node': 18.17.6 - acorn: 8.10.0 + acorn: 8.8.2 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 @@ -13566,6 +13735,10 @@ packages: dependencies: crypto-random-string: 2.0.0 + /universal-user-agent@6.0.0: + resolution: {integrity: sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==} + dev: true + /universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -13734,6 +13907,22 @@ packages: resolution: {integrity: sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==} dev: false + /vite-plugin-mkcert@1.16.0(vite@4.4.9): + resolution: {integrity: sha512-5r+g8SB9wZzLNUFekGwZo3e0P6QlS6rbxK5p9z/itxNAimsYohgjK/YfVPVxM9EuglP9hjridq0lUejo9v1nVg==} + engines: {node: '>=v16.7.0'} + peerDependencies: + vite: '>=3' + dependencies: + '@octokit/rest': 19.0.13 + axios: 1.4.0(debug@4.3.4) + debug: 4.3.4(supports-color@5.5.0) + picocolors: 1.0.0 + vite: 4.4.9(@types/node@18.17.6)(terser@5.19.2) + transitivePeerDependencies: + - encoding + - supports-color + dev: true + /vite-plugin-pwa@0.16.4(vite@4.4.9)(workbox-build@7.0.0)(workbox-window@7.0.0): resolution: {integrity: sha512-lmwHFIs9zI2H9bXJld/zVTbCqCQHZ9WrpyDMqosICDV0FVnCJwniX1NMDB79HGTIZzOQkY4gSZaVTJTw6maz/Q==} engines: {node: '>=16.0.0'}