Skip to content
Snippets Groups Projects
Commit 56eca77d authored by Titus Netland's avatar Titus Netland
Browse files

Merge remote-tracking branch 'origin/main' into delete_user 

# Conflicts:
#	src/components/UserProfileComponents/UserProfile.vue
#	src/services/user.service.js
parents b14eea24 1c392236
No related branches found
No related tags found
1 merge request!129Delete user
Pipeline #181627 passed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 340 deletions
src/components/CommunityComponents/CommunityRequestForm.vue
+ 4
− 4
View file @ 56eca77d
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
</div> </div>
<notification-modal <notification-modal
@click="routeToHome" @click="routeToHome"
:visible="sendRequestClicked" :visible="sendRequestClicked"
:title="'Vellykket'" :title="'Vellykket'"
:message="'Forespørsel sendt!'" :message="'Forespørsel sendt!'"
> >
</notification-modal> </notification-modal>
</div> </div>
......
src/components/UserProfileComponents/UserItems.vue
+ 2
− 2
View file @ 56eca77d
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
v-for="item in visibleItems" v-for="item in visibleItems"
:key="item" :key="item"
> >
<ItemCard class="ItemCard w-fit h-fit" :item="item" /> <ItemCard id="ItemCardPage" class="ItemCard w-fit h-fit" :item="item" />
<TripleDotButton class="DotButton" @click="openDotMenu(item)"> <TripleDotButton class="DotButton" @click="openDotMenu(item)">
</TripleDotButton> </TripleDotButton>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
v-if="showSearchedItems" v-if="showSearchedItems"
> >
<div class="cardContainer" v-for="item in searchedItems" :key="item"> <div class="cardContainer" v-for="item in searchedItems" :key="item">
<ItemCard class="ItemCard" :item="item" /> <ItemCard id="ItemCardSearch" class="ItemCard" :item="item" />
<TripleDotButton class="DotButton" @click="openDotMenu(item)"> <TripleDotButton class="DotButton" @click="openDotMenu(item)">
</TripleDotButton> </TripleDotButton>
......
src/services/user.service.js
+ 7
− 8
View file @ 56eca77d
...@@ -101,15 +101,14 @@ class UserService { ...@@ -101,15 +101,14 @@ class UserService {
.catch((err) => console.error(err)); .catch((err) => console.error(err));
} }
async deleteUser() { async deleteUser(){
return await axios return await axios
.put(API_URL + "user/delete", { .delete(API_URL + "user/delete",{
headers: tokenHeader(), headers: tokenHeader()})
}) .then((res) => {
.then((res) => { return res.data;
return res.data; })
}) .catch((err) => console.log(err))
.catch((err) => console.error(err));
} }
} }
export default new UserService(); export default new UserService();
tests/unit/component-tests/user-component-tests/__snapshots__/login-form.spec.js.snap deleted 100644 → 0
+ 0
− 77
View file @ b14eea24
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`LoginForm component renders correctly 1`] = `
<div
class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full"
>
<div
class="px-6 py-4 mt-4"
>
<div
class="text-xl md:text-2xl font-medium text-center text-primary-light mt-4 mb-8"
>
Logg på
</div>
<div>
<div
class="w-full mt-6"
>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
placeholder="Skriv inn din e-postadresse *"
required=""
type="email"
/>
<!-- error message -->
</div>
<div
class="w-full mt-6"
>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
placeholder="Vennligst oppgi passordet ditt *"
required=""
type="password"
/>
<!-- error message -->
</div>
<div
class="flex items-center justify-between mt-8"
>
<router-link
class="text-primary-medium"
to="/resetPassword"
>
Glemt passord?
</router-link>
<button
class="block text-white bg-primary-medium hover:bg-primary-dark focus:ring-4 focus:outline-none focus:ring-primary-light font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-medium dark:hover:bg-primary-dark dark:focus:ring-primary-light"
>
Logg på
</button>
</div>
</div>
</div>
<div
class="flex items-center justify-center py-4 text-center bg-gray-50 dark:bg-gray-700"
>
<router-link
class="mx-2 text-sm font-bold text-primary-medium dark:text-primary-light hover:underline"
to="/register"
>
Opprette ny konto
</router-link>
</div>
<div
class="flex items-center justify-center text-center bg-gray-50"
>
<label
class="mx-2 text-sm font-bold text-error-medium dark:text-primary-light hover:underline"
/>
</div>
</div>
`;
tests/unit/component-tests/user-component-tests/__snapshots__/new-password-form.spec.js.snap deleted 100644 → 0
+ 0
− 88
View file @ b14eea24
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`NewPasswordForm component renders correctly 1`] = `
<div
class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4"
>
<h3
class="text-xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-8"
>
Endre passord
</h3>
<div
class=""
id="oldPasswordField"
>
<label
class="block text-sm text-gray-800 dark:text-gray-200"
for="oldPassword"
>
Gammelt passord
</label>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-blue-400 dark:focus:border-blue-300 focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-blue-300"
type="password"
/>
<!-- error message -->
</div>
<div
class="mt-4"
id="firstPasswordField"
>
<label
class="block text-sm text-gray-800 dark:text-gray-200"
for="password"
>
Nytt passord
</label>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-blue-400 dark:focus:border-blue-300 focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-blue-300"
type="password"
/>
<!-- error message -->
</div>
<div
class="mt-4"
id="secondPasswordField"
>
<div
class="flex items-center justify-between"
>
<label
class="block text-sm text-gray-800 dark:text-gray-200"
for="rePassword"
>
Gjenta nytt passord
</label>
</div>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-blue-400 dark:focus:border-blue-300 focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-blue-300"
type="password"
/>
<!-- error message -->
</div>
<div
class="mt-6"
id="buttonsField"
>
<button
class="block text-white bg-primary-medium hover:bg-primary-dark focus:ring-4 focus:outline-none focus:ring-primary-light font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-medium dark:hover:bg-primary-dark dark:focus:ring-primary-light float-right"
>
Sett ny passord
</button>
</div>
<div
class="flex items-center justify-center text-center bg-gray-50"
>
<label
class="mx-2 text-sm font-bold text-error-medium dark:text-primary-light hover:underline"
/>
</div>
</div>
`;
tests/unit/component-tests/user-component-tests/__snapshots__/rating.spec.js.snap deleted 100644 → 0
+ 0
− 22
View file @ b14eea24
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Rating component renders correctly 1`] = `
<ul
class="flex justify-center"
>
<li>
<p
class="ml-2 text-sm font-medium text-gray-500 dark:text-gray-400"
>
:
</p>
</li>
<li>
<p
class="ml-2 text-sm font-medium text-gray-500 dark:text-gray-400"
>
Ingen vurderinger
</p>
</li>
</ul>
`;
tests/unit/component-tests/user-component-tests/__snapshots__/register-user-component.spec.js.snap deleted 100644 → 0
+ 0
− 96
View file @ b14eea24
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`RegisterFormComponent renders correctly 1`] = `
<div
class="w-full max-w-md mx-auto mb-auto md:ring-1 ring-gray-300 overflow-hidden rounded-xl p-4"
>
<div
class="text-xl md:text-2xl font-medium text-center text-primary-light mt-4 mb-8"
id="registerLabel"
>
Opprett ny konto
</div>
<form>
<div
class="grid grid-cols-1 gap-6 mt-4"
>
<div>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
id="email"
placeholder="E-post adresse"
type="email"
/>
<!-- error message -->
</div>
<div>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
id="password"
placeholder="Passord"
type="password"
/>
<!-- error message -->
</div>
<div>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
id="confirmPassword"
placeholder="Bekreft passord"
type="password"
/>
<!-- error message -->
</div>
<div>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
data-test="firstNameTest"
id="firstName"
placeholder="Fornavn"
type="text"
/>
<!-- error message -->
</div>
<div>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
id="lastName"
placeholder="Etternavn"
type="text"
/>
<!-- error message -->
</div>
<div>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light"
id="address"
placeholder="Adresse"
type="text"
/>
<!-- error message -->
</div>
</div>
<div
class="flex justify-end mt-6"
>
<button
class="block text-white bg-primary-medium hover:bg-primary-dark focus:ring-4 focus:outline-none focus:ring-primary-light font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-medium dark:hover:bg-primary-dark dark:focus:ring-primary-light"
>
Opprett
</button>
</div>
</form>
</div>
`;
tests/unit/component-tests/user-component-tests/__snapshots__/reset-password-form.spec.js.snap deleted 100644 → 0
+ 0
− 43
View file @ b14eea24
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`ResetPasswordForm component renders correctly 1`] = `
<div
class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4"
>
<h3
class="text-xl font-medium text-center text-primary-light mt-4 mb-8"
>
Glemt passordet ditt?
</h3>
<div
class="m-6"
id="emailField"
>
<div
class="mb-6"
>
<label
class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
for="email"
>
E-post
</label>
<input
class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-blue-400 dark:focus:border-blue-300 focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-blue-300"
id="email"
placeholder="eksempel@eksempel.no"
required=""
type="email"
/>
<!-- error message -->
</div>
<button
class="block text-white bg-primary-medium hover:bg-primary-dark focus:ring-4 focus:outline-none focus:ring-primary-light font-medium rounded-lg text-sm px-5 py-2.5 text-center dark:bg-primary-medium dark:hover:bg-primary-dark dark:focus:ring-primary-light float-right"
>
Tilbakestill passord
</button>
</div>
</div>
`;
tests/unit/component-tests/user-component-tests/user-items.spec.js 0 → 100644
+ 41
− 0
View file @ 56eca77d
import { mount } from "@vue/test-utils";
import UserItems from "@/components/UserProfileComponents/UserItems.vue";
describe("UserItems component", () => {
let wrapper;
beforeEach(() => {
wrapper = mount(UserItems, {
data() {
return {
items: [
{
listingID: 1,
img: "",
address: "Veien",
title: "Matboks",
pricePerDay: 50,
toggle: false,
}
]
}
}
});
});
it("renders correctly", () => {
expect(wrapper.element).toMatchSnapshot();
});
it("is instantiated", () => {
expect(wrapper.exists()).toBeTruthy();
});
it("Check headline", () => {
expect(wrapper.find("#headline").text()).toMatch("Mine gjenstander");
});
});
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment