From 997b31fe42d9617467a0b8e2606810ee14586b49 Mon Sep 17 00:00:00 2001 From: Titus Kristiansen <titusk@stud.ntnu.no> Date: Fri, 6 May 2022 20:48:29 +0200 Subject: [PATCH] Linting --- .../CommunityComponents/CommunityHome.vue | 12 +++---- .../UserAuthComponents/NewPasswordForm.vue | 9 ++--- .../UserAuthComponents/RegisterForm.vue | 1 - .../UserProfileComponents/UserItems.vue | 34 +++++++++---------- src/router/index.js | 5 +-- .../base-component-tests/color-button.spec.js | 2 +- .../base-component-tests/footer-bar.spec.js | 2 +- .../form-image-display.spec.js | 4 +-- .../triple-dot-button.spec.js | 2 +- 9 files changed, 32 insertions(+), 39 deletions(-) diff --git a/src/components/CommunityComponents/CommunityHome.vue b/src/components/CommunityComponents/CommunityHome.vue index c653ab6..b564a97 100644 --- a/src/components/CommunityComponents/CommunityHome.vue +++ b/src/components/CommunityComponents/CommunityHome.vue @@ -55,14 +55,14 @@ <!-- Shows items based on search field input --> <div - class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 lg:grid-cols-5 w-full" - v-if="showSearchedItems" + class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 lg:grid-cols-5 w-full" + v-if="showSearchedItems" > <ItemCard - v-for="item in searchedItems" - :key="item" - :item="item" - @click="goToItemInfoPage(item.listingID)" + v-for="item in searchedItems" + :key="item" + :item="item" + @click="goToItemInfoPage(item.listingID)" /> </div> </div> diff --git a/src/components/UserAuthComponents/NewPasswordForm.vue b/src/components/UserAuthComponents/NewPasswordForm.vue index 4adb535..6eda88b 100644 --- a/src/components/UserAuthComponents/NewPasswordForm.vue +++ b/src/components/UserAuthComponents/NewPasswordForm.vue @@ -15,8 +15,7 @@ id="oldPasswordField" :class="{ error: v$.user.oldPassword.$errors.length }" > - <label - class="block text-sm text-gray-800 dark:text-gray-200" + <label class="block text-sm text-gray-800 dark:text-gray-200" >Gammelt passord</label > <input @@ -42,8 +41,7 @@ class="mt-4" :class="{ error: v$.user.password.$errors.length }" > - <label - class="block text-sm text-gray-800 dark:text-gray-200" + <label class="block text-sm text-gray-800 dark:text-gray-200" >Nytt passord</label > <input @@ -70,8 +68,7 @@ :class="{ error: v$.user.rePassword.$errors.length }" > <div class="flex items-center justify-between"> - <label - class="block text-sm text-gray-800 dark:text-gray-200" + <label class="block text-sm text-gray-800 dark:text-gray-200" >Gjenta nytt passord</label > </div> diff --git a/src/components/UserAuthComponents/RegisterForm.vue b/src/components/UserAuthComponents/RegisterForm.vue index b47d6ad..466a9ab 100644 --- a/src/components/UserAuthComponents/RegisterForm.vue +++ b/src/components/UserAuthComponents/RegisterForm.vue @@ -182,7 +182,6 @@ import { import Button from "@/components/BaseComponents/ColoredButton"; import UserService from "@/services/user.service"; - export default { components: { Button, diff --git a/src/components/UserProfileComponents/UserItems.vue b/src/components/UserProfileComponents/UserItems.vue index 02a06fe..be1cc04 100644 --- a/src/components/UserProfileComponents/UserItems.vue +++ b/src/components/UserProfileComponents/UserItems.vue @@ -110,23 +110,23 @@ </div> <!-- Shows items based on search field input --> - <div - class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 lg:grid-cols-5 w-full" - v-if="showSearchedItems" - > - <div - class="cardContainer" - id="item" - v-for="item in searchedItems" - :key="item" - > - <div class="w-full"> - <ItemCard - id="ItemCardSearch" - class="ItemCard w-full h-full" - :item="item" - /> - </div> + <div + class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 lg:grid-cols-5 w-full" + v-if="showSearchedItems" + > + <div + class="cardContainer" + id="item" + v-for="item in searchedItems" + :key="item" + > + <div class="w-full"> + <ItemCard + id="ItemCardSearch" + class="ItemCard w-full h-full" + :item="item" + /> + </div> <!-- Dropdown menu with options for editing an item and deleting an item --> <TripleDotButton class="DotButton" @click="openDotMenu(item)" /> diff --git a/src/router/index.js b/src/router/index.js index 7804eca..563131c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -152,10 +152,7 @@ const routes = [ * Catch all for wrong/non-existing routes * Must be last to catch all */ - { path: "/:pathMatch(.*)*", - name: "not-found", - component: NotFound - }, + { path: "/:pathMatch(.*)*", name: "not-found", component: NotFound }, ]; const router = createRouter({ diff --git a/tests/unit/component-tests/base-component-tests/color-button.spec.js b/tests/unit/component-tests/base-component-tests/color-button.spec.js index 90c7a43..ca9efb4 100644 --- a/tests/unit/component-tests/base-component-tests/color-button.spec.js +++ b/tests/unit/component-tests/base-component-tests/color-button.spec.js @@ -16,7 +16,7 @@ describe("ColoredButtonComponent", () => { it("renders correctly", () => { expect(wrapper.element).toMatchSnapshot(); }); - + it("is instantiated", () => { expect(wrapper.exists()).toBeTruthy(); }); diff --git a/tests/unit/component-tests/base-component-tests/footer-bar.spec.js b/tests/unit/component-tests/base-component-tests/footer-bar.spec.js index c50efb9..f730e97 100644 --- a/tests/unit/component-tests/base-component-tests/footer-bar.spec.js +++ b/tests/unit/component-tests/base-component-tests/footer-bar.spec.js @@ -15,4 +15,4 @@ describe("FooterBar component", () => { it("is instantiated", () => { expect(wrapper.exists()).toBeTruthy(); }); -}); \ No newline at end of file +}); diff --git a/tests/unit/component-tests/base-component-tests/form-image-display.spec.js b/tests/unit/component-tests/base-component-tests/form-image-display.spec.js index 3cb8f55..2e2a348 100644 --- a/tests/unit/component-tests/base-component-tests/form-image-display.spec.js +++ b/tests/unit/component-tests/base-component-tests/form-image-display.spec.js @@ -8,7 +8,7 @@ describe("FormImageDisplay component", () => { wrapper = mount(FormImageDisplay, { //passing prop to component props: { - image: "http://localhost:3000/api/images/5" + image: "http://localhost:3000/api/images/5", }, }); }); @@ -20,4 +20,4 @@ describe("FormImageDisplay component", () => { it("is instantiated", () => { expect(wrapper.exists()).toBeTruthy(); }); -}); \ No newline at end of file +}); diff --git a/tests/unit/component-tests/base-component-tests/triple-dot-button.spec.js b/tests/unit/component-tests/base-component-tests/triple-dot-button.spec.js index f796516..12657b3 100644 --- a/tests/unit/component-tests/base-component-tests/triple-dot-button.spec.js +++ b/tests/unit/component-tests/base-component-tests/triple-dot-button.spec.js @@ -15,4 +15,4 @@ describe("TripleDotButton component", () => { it("is instantiated", () => { expect(wrapper.exists()).toBeTruthy(); }); -}); \ No newline at end of file +}); -- GitLab