From ab330e31d7b0b15ab22843fa6a978af4f6cdbf97 Mon Sep 17 00:00:00 2001 From: solderq35 Date: Thu, 14 Sep 2023 22:40:34 -0700 Subject: [PATCH 1/8] fix errors --- jest.config.js | 1 - src/components/account/account.vue | 8 ++++++++ src/components/account/card.vue | 18 +++--------------- src/components/account/featured.vue | 1 - src/components/account/storyCard.vue | 4 ---- src/components/admin/campaigns.vue | 4 ---- 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/jest.config.js b/jest.config.js index cb461acc..6bec3965 100644 --- a/jest.config.js +++ b/jest.config.js @@ -44,7 +44,6 @@ module.exports = { // watchman: true, transform: { '^.+\\.js$': '/node_modules/babel-jest', - '.*\\.(vue)$': '/node_modules/jest-vue-preprocessor', '.*\\.(vue)$': '/node_modules/vue-jest', '.+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$': 'jest-transform-stub', '^.+\\.jsx?$': 'babel-jest' diff --git a/src/components/account/account.vue b/src/components/account/account.vue index 811eb359..c157d0f6 100644 --- a/src/components/account/account.vue +++ b/src/components/account/account.vue @@ -56,6 +56,8 @@ export default { break } return d.toISOString() + } else { + return '' } } }, @@ -64,6 +66,8 @@ export default { if ( this.$route.path.search( 'building' ) > 0 || this.$route.path.search( 'compare' ) > 0 ) { let d = new Date() return d.toISOString() + } else { + return '' } } }, @@ -80,6 +84,8 @@ export default { default: return 'minute' } + } else { + return '' } } }, @@ -96,6 +102,8 @@ export default { default: return 15 } + } else { + return '' } } } diff --git a/src/components/account/card.vue b/src/components/account/card.vue index 4d7b829d..1cdc4f44 100644 --- a/src/components/account/card.vue +++ b/src/components/account/card.vue @@ -32,15 +32,12 @@ - - diff --git a/src/components/account/card.vue b/src/components/account/card.vue deleted file mode 100644 index 1cdc4f44..00000000 --- a/src/components/account/card.vue +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - diff --git a/src/components/account/featureController.vue b/src/components/account/featureController.vue deleted file mode 100644 index ff9dffd4..00000000 --- a/src/components/account/featureController.vue +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - diff --git a/src/components/account/featured.vue b/src/components/account/featured.vue deleted file mode 100644 index d1178192..00000000 --- a/src/components/account/featured.vue +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - - - diff --git a/src/components/account/mediapicker.vue b/src/components/account/mediapicker.vue deleted file mode 100644 index 454d8143..00000000 --- a/src/components/account/mediapicker.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - - - diff --git a/src/components/account/navdir.vue b/src/components/account/navdir.vue deleted file mode 100644 index 02d39cef..00000000 --- a/src/components/account/navdir.vue +++ /dev/null @@ -1,285 +0,0 @@ - - - - - - - diff --git a/src/components/account/storyCard.vue b/src/components/account/storyCard.vue deleted file mode 100644 index 906d0d5a..00000000 --- a/src/components/account/storyCard.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - diff --git a/src/components/admin/admin.vue b/src/components/admin/admin.vue deleted file mode 100644 index 20ec3ada..00000000 --- a/src/components/admin/admin.vue +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - diff --git a/src/components/admin/building_edit_map.vue b/src/components/admin/building_edit_map.vue deleted file mode 100644 index 34929047..00000000 --- a/src/components/admin/building_edit_map.vue +++ /dev/null @@ -1,253 +0,0 @@ - - - - diff --git a/src/components/admin/building_edit_meters.vue b/src/components/admin/building_edit_meters.vue deleted file mode 100644 index 7ec876a6..00000000 --- a/src/components/admin/building_edit_meters.vue +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - diff --git a/src/components/admin/building_edit_modal.vue b/src/components/admin/building_edit_modal.vue deleted file mode 100644 index 4a5d95d4..00000000 --- a/src/components/admin/building_edit_modal.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - diff --git a/src/components/admin/building_group_edit_form.vue b/src/components/admin/building_group_edit_form.vue deleted file mode 100644 index 846a7aaf..00000000 --- a/src/components/admin/building_group_edit_form.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - diff --git a/src/components/admin/buildings.vue b/src/components/admin/buildings.vue deleted file mode 100644 index b99a5c3a..00000000 --- a/src/components/admin/buildings.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - diff --git a/src/components/admin/campaigns.vue b/src/components/admin/campaigns.vue deleted file mode 100644 index da25e83f..00000000 --- a/src/components/admin/campaigns.vue +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - diff --git a/src/components/admin/modals/edit_building.vue b/src/components/admin/modals/edit_building.vue deleted file mode 100644 index 0e166e9e..00000000 --- a/src/components/admin/modals/edit_building.vue +++ /dev/null @@ -1,202 +0,0 @@ -/* * @Author: you@you.you * @Date: Sunday February 2nd 2020 * @Last Modified By: Brogan Miner * @Last Modified Time: -Sunday February 2nd 2020 * @Copyright: (c) Oregon State University 2020 */ - - - - - diff --git a/src/components/admin/users.vue b/src/components/admin/users.vue deleted file mode 100644 index 37366966..00000000 --- a/src/components/admin/users.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - diff --git a/src/components/building_list/modals/confirm_delete.vue b/src/components/building_list/modals/confirm_delete.vue index 83d1e283..4732fbbb 100644 --- a/src/components/building_list/modals/confirm_delete.vue +++ b/src/components/building_list/modals/confirm_delete.vue @@ -1,7 +1,7 @@ /* * @Author: you@you.you * @Date: Friday December 13th 2019 * @Last Modified By: Brogan Miner * @Last Modified Time: Friday December 13th 2019 * @Copyright: (c) Oregon State University 2019 */