diff --git a/.gitignore b/.gitignore
index 0035d70c2cfab2a247a93613b879c88a6b2fba6b..2c398393f2b97663511e4930655c73c511728fee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@ node_modules
.env
.env.local
.env.*.local
+src/env
# Log files
npm-debug.log*
@@ -22,3 +23,4 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?
+
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index 82ba58cdfb84ebc5cf9fa14c76374d5661705cec..660e60d4dd3dc595ede2b0b00b7d62da606dda37 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -101,6 +101,8 @@
import useVuelidate from "@vuelidate/core";
import { required, email, helpers } from "@vuelidate/validators";
import { doLogin } from "@/utils/apiutil";
+import store from "@/store";
+import { parseUserFromToken } from "@/utils/token-utils";
export default {
name: "LoginForm.vue",
@@ -159,6 +161,11 @@ export default {
} else {
this.$store.commit("saveToken", loginResponse);
}
+
+ let user = parseUserFromToken(store.state.user.token);
+ console.log(user);
+ let id = user.account_id;
+ this.$router.push("/profile/" + id);
},
validate() {
diff --git a/src/components/UserProfileComponents/LargeProfileCard.vue b/src/components/UserProfileComponents/LargeProfileCard.vue
index 908c050afccb52163ccd3ff87a70c17f0be73941..c1216df070dea4fee618891bcfba473207315d46 100644
--- a/src/components/UserProfileComponents/LargeProfileCard.vue
+++ b/src/components/UserProfileComponents/LargeProfileCard.vue
@@ -4,8 +4,9 @@
>
<div v-show="isCurrentUser" class="flex justify-end px-4 pt-4">
<button
- id="dropdownButton"
+ id="dropdownDefault"
data-dropdown-toggle="dropdown"
+ @click="dropdown = !dropdown"
class="hidden sm:inline-block text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-700 focus:outline-none focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 rounded-lg text-sm p-1.5"
type="button"
>
@@ -23,18 +24,11 @@
<div
id="dropdown"
- class="hidden z-10 w-44 text-base list-none bg-white rounded divide-y divide-gray-100 shadow dark:bg-gray-700"
- data-popper-reference-hidden=""
- data-popper-escaped=""
- data-popper-placement="top"
- style="
- position: absolute;
- inset: auto auto 0px 0px;
- margin: 0px;
- transform: translate3d(653.6px, 2976.8px, 0px);
- "
+ v-show="dropdown"
+ zindex="2"
+ class="z-10 w-44 text-base list-none bg-white rounded divide-y divide-gray-100 shadow dark:bg-gray-700"
>
- <ul class="py-1" aria-labelledby="dropdownButton">
+ <ul class="py-1" aria-labelledby="dropdownDefault">
<li>
<router-link
to=""
@@ -58,7 +52,7 @@
</li>
<li>
<router-link
- to=""
+ to="/newPassword"
class="block py-2 px-4 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
>Endre passord</router-link
>
@@ -76,11 +70,11 @@
<div class="flex flex-col items-center pb-10">
<img
class="mb-3 w-24 h-24 rounded-full shadow-lg"
- :src="getProfilePicture()"
+ src="../../assets/defaultUserProfileImage.jpg"
alt="Profile picture"
/>
<h5 class="mb-1 text-xl font-medium text-gray-900 dark:text-white">
- {{ user.firstName }} {{ user.lastName }}
+ {{ user.first_name }} {{ user.last_name }}
</h5>
<div>
<rating-component :rating="renterRating" :ratingType="'Leietaker'" />
@@ -111,6 +105,7 @@ export default {
user: this.getUser(),
renterRating: 3, //getRenterRating(this.userID),
ownerRating: 5, //getOwnerRating(this.userID),
+ dropdown: false,
};
},
computed: {
@@ -125,16 +120,18 @@ export default {
methods: {
getUser() {
let id = router.currentRoute.value.params.id;
- if (this.isCurrentUser) {
- return parseUserFromToken();
- }
- return getUser(id);
+ let currentUser = parseUserFromToken();
+ console.log(currentUser);
+ if ((id = currentUser.account_id)) return currentUser;
+ let user = getUser(id);
+ console.log(user);
+ return user;
},
getProfilePicture() {
- if (this.user.picture == "") {
- return "../assets/defaultUserProfileImage.jpg";
- }
- return this.user.picture;
+ /* if (this.user.picture == "") {
+ return this.user.picture;
+ } */
+ return "../assets/defaultUserProfileImage.jpg";
},
},
};
diff --git a/src/components/UserProfileComponents/UserListItemCard.vue b/src/components/UserProfileComponents/UserListItemCard.vue
index 2cb4c7ce5adef6df72a357dabfef2a7dab12363b..5643e6b6b948f825f379c14d9bc72c0b9e20f303 100644
--- a/src/components/UserProfileComponents/UserListItemCard.vue
+++ b/src/components/UserProfileComponents/UserListItemCard.vue
@@ -8,7 +8,9 @@
</router-link>
</div>
<div class="flex-1 pl-1">
- <div class="font-medium dark:text-white">{{ user.firstName }} {{ user.lastName }} </div>
+ <div class="font-medium dark:text-white">
+ {{ user.firstName }} {{ user.lastName }}
+ </div>
</div>
<div class="flex flex-row justify-center">
<button class="w-10 text-right flex justify-end">Ã…pne chat</button>
diff --git a/src/utils/apiutil.js b/src/utils/apiutil.js
index 6ce13a715e6603c24cfff270760f432f44a50f3e..a8d77d5b2630cb1fe35656ee1ad92ffb7a9bdbf2 100644
--- a/src/utils/apiutil.js
+++ b/src/utils/apiutil.js
@@ -1,9 +1,11 @@
import axios from "axios";
import { tokenHeader } from "./token-utils";
+const VUE_APP_BASEURL = "http://65.108.62.223:3000/api/";
+
export function doLogin(loginRequest) {
return axios
- .post(process.env.VUE_APP_BASEURL + "login/authentication", loginRequest)
+ .post(VUE_APP_BASEURL + "login/authentication", loginRequest)
.then((response) => {
return response.data;
})
@@ -15,7 +17,7 @@ export function doLogin(loginRequest) {
export function getUser(userid) {
return axios
- .get(`http://65.108.62.223:3000/api/user/` + userid, {
+ .get(VUE_APP_BASEURL + "users/" + userid + "/profile", {
headers: tokenHeader(),
})
.then((response) => {
@@ -28,7 +30,7 @@ export function getUser(userid) {
export function getRenterRating(userid) {
return axios
- .get(`http://65.108.62.223:3000/api/user/renter-rating/` + userid, {
+ .get(VUE_APP_BASEURL + "users/" + userid + "", {
headers: tokenHeader(),
})
.then((response) => {
@@ -41,7 +43,7 @@ export function getRenterRating(userid) {
export function getOwnerRating(userid) {
return axios
- .get(`http://65.108.62.223:3000/api/user/owner-rating/` + userid, {
+ .get(VUE_APP_BASEURL + "users/" + userid + "", {
headers: tokenHeader(),
})
.then((response) => {
diff --git a/src/utils/token-utils.js b/src/utils/token-utils.js
index 063ddf605565233f03b667723fe0ecb935d651c8..baf77654f57a548de5a335038ed9fed4628d80e2 100644
--- a/src/utils/token-utils.js
+++ b/src/utils/token-utils.js
@@ -8,6 +8,5 @@ export function tokenHeader() {
export function parseUserFromToken() {
let token = store.state.user.token;
- console.log(token);
- return jwt_decode();
+ return jwt_decode(token);
}