Skip to content
Snippets Groups Projects
Commit 28827f55 authored by Haakon Tideman Kanter's avatar Haakon Tideman Kanter
Browse files

Merge branch 'search_item_fix' into 'main'

Fixed search items view

See merge request !166
parents a99481f5 997b31fe
No related branches found
No related tags found
1 merge request!166Fixed search items view
Pipeline #182747 failed
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<!-- Shows items based on search field input --> <!-- Shows items based on search field input -->
<div <div
class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 lg:grid-cols-5 w-full place-items-center" class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 lg:grid-cols-5 w-full"
v-if="showSearchedItems" v-if="showSearchedItems"
> >
<ItemCard <ItemCard
......
...@@ -15,8 +15,7 @@ ...@@ -15,8 +15,7 @@
id="oldPasswordField" id="oldPasswordField"
:class="{ error: v$.user.oldPassword.$errors.length }" :class="{ error: v$.user.oldPassword.$errors.length }"
> >
<label <label class="block text-sm text-gray-800 dark:text-gray-200"
class="block text-sm text-gray-800 dark:text-gray-200"
>Gammelt passord</label >Gammelt passord</label
> >
<input <input
...@@ -42,8 +41,7 @@ ...@@ -42,8 +41,7 @@
class="mt-4" class="mt-4"
:class="{ error: v$.user.password.$errors.length }" :class="{ error: v$.user.password.$errors.length }"
> >
<label <label class="block text-sm text-gray-800 dark:text-gray-200"
class="block text-sm text-gray-800 dark:text-gray-200"
>Nytt passord</label >Nytt passord</label
> >
<input <input
...@@ -70,8 +68,7 @@ ...@@ -70,8 +68,7 @@
:class="{ error: v$.user.rePassword.$errors.length }" :class="{ error: v$.user.rePassword.$errors.length }"
> >
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
<label <label class="block text-sm text-gray-800 dark:text-gray-200"
class="block text-sm text-gray-800 dark:text-gray-200"
>Gjenta nytt passord</label >Gjenta nytt passord</label
> >
</div> </div>
......
...@@ -182,7 +182,6 @@ import { ...@@ -182,7 +182,6 @@ import {
import Button from "@/components/BaseComponents/ColoredButton"; import Button from "@/components/BaseComponents/ColoredButton";
import UserService from "@/services/user.service"; import UserService from "@/services/user.service";
export default { export default {
components: { components: {
Button, Button,
......
...@@ -111,10 +111,15 @@ ...@@ -111,10 +111,15 @@
<!-- Shows items based on search field input --> <!-- Shows items based on search field input -->
<div <div
class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 lg:grid-cols-5 w-full place-items-center" class="grid grid-flow-row-dense grid-cols-2 md:grid-cols-4 lg:grid-cols-5 w-full"
v-if="showSearchedItems" v-if="showSearchedItems"
> >
<div class="cardContainer" v-for="item in searchedItems" :key="item"> <div
class="cardContainer"
id="item"
v-for="item in searchedItems"
:key="item"
>
<div class="w-full"> <div class="w-full">
<ItemCard <ItemCard
id="ItemCardSearch" id="ItemCardSearch"
......
...@@ -152,10 +152,7 @@ const routes = [ ...@@ -152,10 +152,7 @@ const routes = [
* Catch all for wrong/non-existing routes * Catch all for wrong/non-existing routes
* Must be last to catch all * Must be last to catch all
*/ */
{ path: "/:pathMatch(.*)*", { path: "/:pathMatch(.*)*", name: "not-found", component: NotFound },
name: "not-found",
component: NotFound
},
]; ];
const router = createRouter({ const router = createRouter({
......
...@@ -16,7 +16,7 @@ describe("ColoredButtonComponent", () => { ...@@ -16,7 +16,7 @@ describe("ColoredButtonComponent", () => {
it("renders correctly", () => { it("renders correctly", () => {
expect(wrapper.element).toMatchSnapshot(); expect(wrapper.element).toMatchSnapshot();
}); });
it("is instantiated", () => { it("is instantiated", () => {
expect(wrapper.exists()).toBeTruthy(); expect(wrapper.exists()).toBeTruthy();
}); });
......
...@@ -15,4 +15,4 @@ describe("FooterBar component", () => { ...@@ -15,4 +15,4 @@ describe("FooterBar component", () => {
it("is instantiated", () => { it("is instantiated", () => {
expect(wrapper.exists()).toBeTruthy(); expect(wrapper.exists()).toBeTruthy();
}); });
}); });
\ No newline at end of file
...@@ -8,7 +8,7 @@ describe("FormImageDisplay component", () => { ...@@ -8,7 +8,7 @@ describe("FormImageDisplay component", () => {
wrapper = mount(FormImageDisplay, { wrapper = mount(FormImageDisplay, {
//passing prop to component //passing prop to component
props: { props: {
image: "http://localhost:3000/api/images/5" image: "http://localhost:3000/api/images/5",
}, },
}); });
}); });
...@@ -20,4 +20,4 @@ describe("FormImageDisplay component", () => { ...@@ -20,4 +20,4 @@ describe("FormImageDisplay component", () => {
it("is instantiated", () => { it("is instantiated", () => {
expect(wrapper.exists()).toBeTruthy(); expect(wrapper.exists()).toBeTruthy();
}); });
}); });
\ No newline at end of file
...@@ -15,4 +15,4 @@ describe("TripleDotButton component", () => { ...@@ -15,4 +15,4 @@ describe("TripleDotButton component", () => {
it("is instantiated", () => { it("is instantiated", () => {
expect(wrapper.exists()).toBeTruthy(); expect(wrapper.exists()).toBeTruthy();
}); });
}); });
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment