diff --git a/.vscode/extensions.json b/.vscode/extensions.json index af3c0b2..6d2c885 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,5 +1,5 @@ { - "recommendations": [ - "Webnative.webnative" - ] -} + "recommendations": [ + "Webnative.webnative" + ] +} \ No newline at end of file diff --git a/android/.idea/.gitignore b/android/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/android/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/android/.idea/AndroidProjectSystem.xml b/android/.idea/AndroidProjectSystem.xml deleted file mode 100644 index 4a53bee..0000000 --- a/android/.idea/AndroidProjectSystem.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml deleted file mode 100644 index b86273d..0000000 --- a/android/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/.idea/deploymentTargetSelector.xml b/android/.idea/deploymentTargetSelector.xml deleted file mode 100644 index f0ede7b..0000000 --- a/android/.idea/deploymentTargetSelector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/android/.idea/deviceManager.xml b/android/.idea/deviceManager.xml deleted file mode 100644 index 91f9558..0000000 --- a/android/.idea/deviceManager.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/.idea/migrations.xml b/android/.idea/migrations.xml deleted file mode 100644 index f8051a6..0000000 --- a/android/.idea/migrations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/.idea/misc.xml b/android/.idea/misc.xml deleted file mode 100644 index b2c751a..0000000 --- a/android/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml deleted file mode 100644 index 16660f1..0000000 --- a/android/.idea/runConfigurations.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 64aadf6..f1b3b0e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.android.tools.build:gradle:8.7.2' classpath 'com.google.gms:google-services:4.4.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ed4c299..c1d5e01 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/package-lock.json b/package-lock.json index 2a20c15..a02f3d5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,14 +18,14 @@ "@ionic/vue-router": "^8.0.0", "ionicons": "^7.0.0", "pinia": "^3.0.3", - "updaterweblibrary": "git+ssh://git@git.emaker.limited:MicrocontrollerCD/UpdaterWebLibrary.git#main", + "updaterweblibrary": "^1.0.4", "vue": "^3.3.0", "vue-router": "^4.2.0" }, "devDependencies": { "@capacitor/cli": "7.4.3", "@vitejs/plugin-legacy": "^5.0.0", - "@vitejs/plugin-vue": "^4.0.0", + "@vitejs/plugin-vue": "^4.6.2", "@vue/eslint-config-typescript": "^12.0.0", "@vue/test-utils": "^2.3.0", "cypress": "^13.5.0", @@ -2822,6 +2822,15 @@ "node": ">=14" } }, + "node_modules/@rgrove/parse-xml": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@rgrove/parse-xml/-/parse-xml-4.2.0.tgz", + "integrity": "sha512-UuBOt7BOsKVOkFXRe4Ypd/lADuNIfqJXv8GvHqtXaTYXPPKkj2nS2zPllVsrtRjcomDhIJVBnZwfmlI222WH8g==", + "license": "ISC", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rollup/rollup-android-arm-eabi": { "version": "4.44.0", "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.0.tgz", @@ -9315,9 +9324,13 @@ } }, "node_modules/updaterweblibrary": { - "version": "1.0.1", - "resolved": "git+ssh://git@git.emaker.limited:MicrocontrollerCD/UpdaterWebLibrary.git#c18f6d3ffe2ba790addcf0f219ca595a855f873d", - "license": "MIT" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/updaterweblibrary/-/updaterweblibrary-1.0.4.tgz", + "integrity": "sha512-+8dYAx5ieJivYBNHzWfQZmEiNvojAGzBUa+PoYe7KjfVIsHcf9HOTTWtNarPwUK+yk87UCNr8uqPoctYpMmOAw==", + "license": "MIT", + "dependencies": { + "@rgrove/parse-xml": "^4.2.0" + } }, "node_modules/uri-js": { "version": "4.4.1", diff --git a/package.json b/package.json index 5ec8abf..b6447ec 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "dev": "ionic serve", "build": "vue-tsc && vite build && npx cap sync", + "android": "npm run build && npx cap run android", "preview": "vite preview", "test:e2e": "cypress run", "test:unit": "vitest", @@ -22,13 +23,14 @@ "@ionic/vue-router": "^8.0.0", "ionicons": "^7.0.0", "pinia": "^3.0.3", + "updaterweblibrary": "^1.0.4", "vue": "^3.3.0", "vue-router": "^4.2.0" }, "devDependencies": { "@capacitor/cli": "7.4.3", "@vitejs/plugin-legacy": "^5.0.0", - "@vitejs/plugin-vue": "^4.0.0", + "@vitejs/plugin-vue": "^4.6.2", "@vue/eslint-config-typescript": "^12.0.0", "@vue/test-utils": "^2.3.0", "cypress": "^13.5.0", diff --git a/src/components/SettingsCard.vue b/src/components/SettingsCard.vue index 38032ce..cb63d9d 100644 --- a/src/components/SettingsCard.vue +++ b/src/components/SettingsCard.vue @@ -17,7 +17,9 @@ const back = () => { } const setSource = () => { + console.log(url.value) archive.setUrl(url.value); + archive.testArchive(); } diff --git a/src/stores/archive.ts b/src/stores/archive.ts index 2c255de..4802dad 100644 --- a/src/stores/archive.ts +++ b/src/stores/archive.ts @@ -13,10 +13,10 @@ const useArchiveStore = defineStore("archive", { }, actions: { setUrl(value: string): void { - this.updater = new Updater(value, "rss"); + this.updater = new Updater(value, "rss"); }, async testArchive(): Promise { - this.updater.getArchive(); + console.log(await this.updater.getArchive()); } } }); diff --git a/vite.config.js b/vite.config.js new file mode 100644 index 0000000..3d9d931 --- /dev/null +++ b/vite.config.js @@ -0,0 +1,13 @@ +import vue from '@vitejs/plugin-vue' +import path from "path"; + +export default { + plugins: [ + vue() + ], + resolve: { + alias: { + "@": path.resolve(__dirname, "./src") + } + } +} \ No newline at end of file diff --git a/vite.config.ts b/vite.config.ts deleted file mode 100644 index 07c35d0..0000000 --- a/vite.config.ts +++ /dev/null @@ -1,23 +0,0 @@ -/// - -import legacy from '@vitejs/plugin-legacy' -import vue from '@vitejs/plugin-vue' -import path from 'path' -import { defineConfig } from 'vite' - -// https://vitejs.dev/config/ -export default defineConfig({ - plugins: [ - vue(), - legacy() - ], - resolve: { - alias: { - '@': path.resolve(__dirname, './src'), - }, - }, - test: { - globals: true, - environment: 'jsdom' - } -})