From 882cfa4a7364d0c675291c21bb668cad17664930 Mon Sep 17 00:00:00 2001 From: "22969541+Aurelius333@users.noreply.github.com" <22969541+Aurelius333@users.noreply.github.com> Date: Sat, 8 May 2021 22:09:06 -0400 Subject: [PATCH 01/60] Vue migration: somewhat working except router links --- package.json | 17 +- src/App.vue | 5 +- src/components/RoomInput.vue | 4 +- src/components/ScheduleList.vue | 9 +- src/components/TheIOSDownloadSuggestion.vue | 4 +- src/components/TheMaybeInstallButton.vue | 4 +- src/components/TheRoomsDataList.vue | 4 +- src/components/buttons/BasicButton.vue | 4 +- src/components/buttons/CustomButton.vue | 4 +- src/components/buttons/EditButton.vue | 4 +- src/components/buttons/MinusButton.vue | 4 +- src/components/buttons/PlusButton.vue | 4 +- .../settings/AccessibilitySlider.vue | 10 +- .../settings/CheckUpdatesButton.vue | 5 +- src/components/settings/DeleteDataButton.vue | 4 +- src/components/settings/RefreshButton.vue | 4 +- src/components/settings/ThemeSlider.vue | 6 +- src/main.ts | 21 +- src/router/index.ts | 14 +- src/shims-tsx.d.ts | 2 +- src/shims-vue-compat.d.ts | 20 + src/shims-vue.d.ts | 12 +- src/shims-vuex.d.ts | 14 + src/store/index.ts | 4 +- src/views/AboutPage.vue | 4 +- src/views/DirectionsPage.vue | 6 +- src/views/FeedbackPage.vue | 4 +- src/views/IndexPage.vue | 4 +- src/views/MySchedule.vue | 4 +- src/views/MyScheduleEdit.vue | 8 +- src/views/NotFound.vue | 4 +- src/views/SettingsPage.vue | 4 +- src/vue-snack-vue-property.d.ts | 20 +- src/walnut/hallways/arcade.ts | 3 + src/walnut/hallways/classics1.ts | 3 + src/walnut/hallways/classics2.ts | 3 + src/walnut/hallways/classics3.ts | 3 + src/walnut/hallways/index.ts | 3 + src/walnut/hallways/modern-languages.ts | 3 + src/walnut/hallways/music.ts | 3 + src/walnut/hallways/performing-arts-center.ts | 3 + src/walnut/hallways/science.ts | 3 + src/walnut/index.ts | 3 + src/walnut/shared.ts | 3 + vue.config.js | 16 + yarn.lock | 366 ++++++++++++++---- 46 files changed, 481 insertions(+), 175 deletions(-) create mode 100644 src/shims-vue-compat.d.ts create mode 100644 src/shims-vuex.d.ts diff --git a/package.json b/package.json index e365fa5..31d3063 100644 --- a/package.json +++ b/package.json @@ -13,20 +13,21 @@ "tests": "yarn test" }, "dependencies": { + "@vue/compat": "^3.1.0-0", "core-js": "^3.4.3", "register-service-worker": "^1.6.2", "room-finder": "0.3.0-beta.2", - "vue": "^2.6.10", + "vue": "^3.1.0-0", "vue-meta": "^2.3.1", - "vue-router": "^3.1.3", + "vue-router": "4", "vue-slicksort": "^1.1.3", "vue-snack": "^0.1.4", - "vuex": "^3.1.2" + "vuex": "4" }, "devDependencies": { - "@types/jest": "^26.0.21", - "@typescript-eslint/eslint-plugin": "^4.18.0", - "@typescript-eslint/parser": "^4.18.0", + "@types/jest": "^26.0.23", + "@typescript-eslint/eslint-plugin": "^4.22.1", + "@typescript-eslint/parser": "^4.22.1", "@vue/cli-plugin-babel": "~4.5.13", "@vue/cli-plugin-e2e-cypress": "~4.5.13", "@vue/cli-plugin-eslint": "~4.5.13", @@ -36,6 +37,7 @@ "@vue/cli-plugin-unit-jest": "~4.5.13", "@vue/cli-plugin-vuex": "~4.5.13", "@vue/cli-service": "~4.5.13", + "@vue/compiler-sfc": "^3.1.0-0", "@vue/eslint-config-airbnb": "^5.0.0", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", @@ -45,8 +47,7 @@ "eslint-plugin-prettier": "^3.1.1", "eslint-plugin-vue": "^7.7.0", "prettier": "^2.2.1", - "typescript": "~4.1.5", - "vue-template-compiler": "^2.6.10", + "typescript": "~4.2.4", "webpack": "^4.41.4" }, "eslintConfig": { diff --git a/src/App.vue b/src/App.vue index 8dd5209..576c075 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,6 +3,7 @@