From be7a51f621688e2a44dc73f4e7b593443b3af2c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Tue, 4 Mar 2025 07:02:17 +0100 Subject: [PATCH] backend progress --- app/android/.idea/.gitignore | 8 ---- app/android/.idea/compiler.xml | 6 --- .../.idea/deploymentTargetSelector.xml | 10 ---- app/android/.idea/misc.xml | 13 ------ app/android/.idea/runConfigurations.xml | 13 ------ app/android/app/src/main/AndroidManifest.xml | 2 - app/android/build.gradle | 4 +- app/android/daemon/8.9/registry.bin.lock | 0 .../gradle/wrapper/gradle-wrapper.properties | 2 +- app/package-lock.json | 44 +++++++++++++++--- app/package.json | 1 + app/readme.md | 0 app/src/services/PitcherService.ts | 23 ++++++--- backend/database/example-db.sqlite | Bin 0 -> 32768 bytes backend/database/setup.js | 8 ++-- .../migrations/20250213191228-create-user.js | 37 --------------- backend/sequelize/models/user.model.js | 4 ++ 17 files changed, 66 insertions(+), 109 deletions(-) delete mode 100644 app/android/.idea/.gitignore delete mode 100644 app/android/.idea/compiler.xml delete mode 100644 app/android/.idea/deploymentTargetSelector.xml delete mode 100644 app/android/.idea/misc.xml delete mode 100644 app/android/.idea/runConfigurations.xml create mode 100644 app/android/daemon/8.9/registry.bin.lock create mode 100644 app/readme.md create mode 100644 backend/database/example-db.sqlite delete mode 100644 backend/migrations/20250213191228-create-user.js diff --git a/app/android/.idea/.gitignore b/app/android/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/app/android/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/app/android/.idea/compiler.xml b/app/android/.idea/compiler.xml deleted file mode 100644 index b86273d..0000000 --- a/app/android/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/android/.idea/deploymentTargetSelector.xml b/app/android/.idea/deploymentTargetSelector.xml deleted file mode 100644 index b268ef3..0000000 --- a/app/android/.idea/deploymentTargetSelector.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/android/.idea/misc.xml b/app/android/.idea/misc.xml deleted file mode 100644 index 0023c81..0000000 --- a/app/android/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/android/.idea/runConfigurations.xml b/app/android/.idea/runConfigurations.xml deleted file mode 100644 index 931b96c..0000000 --- a/app/android/.idea/runConfigurations.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml index 4e56837..4d7ca38 100644 --- a/app/android/app/src/main/AndroidManifest.xml +++ b/app/android/app/src/main/AndroidManifest.xml @@ -38,6 +38,4 @@ - - diff --git a/app/android/build.gradle b/app/android/build.gradle index f1b3b0e..85a5dda 100644 --- a/app/android/build.gradle +++ b/app/android/build.gradle @@ -7,8 +7,8 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.7.2' - classpath 'com.google.gms:google-services:4.4.2' + classpath 'com.android.tools.build:gradle:8.2.1' + classpath 'com.google.gms:google-services:4.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/app/android/daemon/8.9/registry.bin.lock b/app/android/daemon/8.9/registry.bin.lock new file mode 100644 index 0000000..e69de29 diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties index dedd5d1..c747538 100644 --- a/app/android/gradle/wrapper/gradle-wrapper.properties +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/app/package-lock.json b/app/package-lock.json index 36fd9c7..3e3acdc 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -16,6 +16,7 @@ "@capacitor/status-bar": "6.0.1", "@ionic/vue": "^8.0.0", "@ionic/vue-router": "^8.0.0", + "axios": "^1.8.1", "ionicons": "^7.0.0", "vue": "^3.3.0", "vue-router": "^4.2.0" @@ -4109,7 +4110,6 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true, "license": "MIT" }, "node_modules/at-least-node": { @@ -4139,6 +4139,23 @@ "dev": true, "license": "MIT" }, + "node_modules/axios": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.1.tgz", + "integrity": "sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, "node_modules/babel-plugin-polyfill-corejs2": { "version": "0.4.11", "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz", @@ -4643,7 +4660,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" @@ -4982,7 +4998,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.4.0" @@ -5791,6 +5806,26 @@ "dev": true, "license": "ISC" }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", @@ -5835,7 +5870,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz", "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", - "dev": true, "license": "MIT", "dependencies": { "asynckit": "^0.4.0", @@ -7094,7 +7128,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 0.6" @@ -7104,7 +7137,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, "license": "MIT", "dependencies": { "mime-db": "1.52.0" diff --git a/app/package.json b/app/package.json index 3809f15..05eb686 100644 --- a/app/package.json +++ b/app/package.json @@ -20,6 +20,7 @@ "@capacitor/status-bar": "6.0.1", "@ionic/vue": "^8.0.0", "@ionic/vue-router": "^8.0.0", + "axios": "^1.8.1", "ionicons": "^7.0.0", "vue": "^3.3.0", "vue-router": "^4.2.0" diff --git a/app/readme.md b/app/readme.md new file mode 100644 index 0000000..e69de29 diff --git a/app/src/services/PitcherService.ts b/app/src/services/PitcherService.ts index 36a609c..e9eface 100644 --- a/app/src/services/PitcherService.ts +++ b/app/src/services/PitcherService.ts @@ -1,6 +1,13 @@ import Pitcher from "@/types/Pitcher"; import {pitchers} from "@/data/pitchers"; +import axios, { AxiosInstance } from "axios"; +const apiClient: AxiosInstance = axios.create({ + baseURL: "http://localhost:8080/api", + headers: { + "Content-type": "application/json", + }, +}); class PitcherService { private static instance: PitcherService; @@ -15,16 +22,18 @@ class PitcherService { } async getAllPitchers(): Promise { - return pitchers.values().toArray(); + return apiClient.get('/pitchers') + // return pitchers.values().toArray(); } async getPitcher(id: number): Promise { - const pitcher = pitchers.get(id); - if (pitcher !== undefined) { - return pitcher; - } else { - return Promise.reject(); - } + return apiClient.get(`/pitchers/${id}`) + // const pitcher = pitchers.get(id); + // if (pitcher !== undefined) { + // return pitcher; + // } else { + // return Promise.reject(); + // } } } diff --git a/backend/database/example-db.sqlite b/backend/database/example-db.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..2f452048ec34f2bf038001a065f267ec82a3d923 GIT binary patch literal 32768 zcmeI)&u`mQ00(e8PUCi6V-O&#Dxt3uheq9^G;KkvRBdkRc2N_z%a5U+8mDoo!ErL% zSyztLcH5ahfFta}1^xiUfdl*j>0R(&lwdC$-9*XO;u@{5zw zgS;JBA%z!KjZwR6&+#^H~gc#k&>E79*G{E-GCUyct-eW?_`(jG@Q;;Wq6XIVf zKgRcN{v3aQvPPrWAOHafKmY;|fB*#kdx6uIEUOC(;xjccYmT+vcAS>wmMq`5o34K$ zI-V`+T3IJ$Z9T7(>V?!QnXlUQD#;mTeM>Kr-D0kw75B)tzDKl5c_(Mk>;>H@-y+qP z9UL54UiV~Ur%a4WK2M7Jre4&ItX?A3iqB5rr6y@6({5OG&9lr`v(eNeI~bUDKr;n2 zZ%`#0v;*Z_K_{IWY1VeDJ~Wv&BiGZhi%s-9Z6rGe+0gSkB`WD*f9RpgE~}JewNh5w z(37X_n5@psh|e@mzRM~6@J;R~4v$`iHaKZnuLAYC@>0wEymQ=I-^llNw*%EzME}@d z0uc6=k@WZf{~E~T=~h%$=jOzxdtG;ia7NEVW0&ajgsTjIYc}WrJk*NW`&w~6v$B#r zpKGLICj1>3D# zPy9y?yCf|D0w%h~jLNwYp3>OmTneQ!{GkH2I z%Brf0PZNAV+10}5FOk0d{4&z%;Xk@M9on8B7=wqAj*Mge-5FNHw4DJ%+non3)Ax^? z9=*C;I$=he1Ic70rmm@j28vtlFY-5u{;T2l_ER(vjc*Fd=gNHi8ydg{0SG_<0uX=z z1Rwwb2tWV=5Ev-nM#lwp=B}E{d8S)G`J{Q|`c0RIQ(@#@xZ;#LXf}94CY@QiozC3O zd`L3s)#VRXGs~%!vXa+-|lH%_lw!ratB2-rD%_;pGiaJrZec@7$ra8BND@izlY*(LLp| zSZ_`I!0@t$r{17r8daVP%9qM>-la+RCSuM*e zeKb;OV`1B}?I5tcY^6L(X@#gPBv{+BN2dF+)ox|)k5b&WL>tGu>ezMK)BGrf84+2S z { type: DataTypes.STRING, allowNull: false }, + dateOfBirth: { + type: DataTypes.DATE, + allowNull: false + }, email: { type: DataTypes.STRING, allowNull: false,