diff --git a/src/components/BaseComponents/NavBar.vue b/src/components/BaseComponents/NavBar.vue index f12e691777c15a59e01ec4b1eec9d3002c621556..39941c5321ede2b107b3750ae38f38d198202e67 100644 --- a/src/components/BaseComponents/NavBar.vue +++ b/src/components/BaseComponents/NavBar.vue @@ -13,21 +13,21 @@ <ul class="flex"> <li> <PlusIcon - class="m-6 cursor-pointer h-7" + class="m-6 cursor-pointer h-7 text-primary-medium" alt="Legg til" @click="$router.push('/newItem')" /> </li> <li> <ChatAlt2Icon - class="m-6 cursor-pointer h-7" + class="m-6 cursor-pointer h-7 text-primary-medium" alt="Meldinger" @click="$router.push('/messages')" /> </li> <li> <UserCircleIcon - class="m-6 cursor-pointer h-7" + class="m-6 cursor-pointer h-7 text-primary-medium" alt="Profil" @click="loadProfile" /> diff --git a/src/components/TimepickerComponents/DatepickerRange/DatepickerRange.vue b/src/components/TimepickerComponents/DatepickerRange/DatepickerRange.vue index 53c92481e3318bfe86ccc699f80c6ed24ffbceb7..49fd65dc1249dc57add5e7c73d69a60bca2a1736 100644 --- a/src/components/TimepickerComponents/DatepickerRange/DatepickerRange.vue +++ b/src/components/TimepickerComponents/DatepickerRange/DatepickerRange.vue @@ -26,22 +26,6 @@ :blockedDaysRange="blockedDaysRange" ></calendar-component> </div> - <div class="split"></div> - <div> - <month-selector - @back="back" - type="monghM" - @forward="forward('monghM')" - :month="monghM" - ></month-selector> - <calendar-component - :month="monghM" - :start="startDate" - :end="endDate" - @selectDate="selectDate" - :blockedDaysRange="blockedDaysRange" - ></calendar-component> - </div> </div> <div class="footer"> <p v-if="error" class="error">{{ errorMessage }}</p> diff --git a/src/services/user.service.js b/src/services/user.service.js index 59de28f4c4e7bd21b5be1d26e8e5bcf3fa967ab9..f07ef8c3acda54f54fa1189b63cbb07aa0412c87 100644 --- a/src/services/user.service.js +++ b/src/services/user.service.js @@ -7,7 +7,7 @@ const API_URL = process.env.VUE_APP_BASEURL; class UserService { async getUserFromId(userId) { return await axios - .get(API_URL + "/users/" + userId + "/profile", { + .get(API_URL + "users/" + userId + "/profile", { headers: tokenHeader(), }) .then((res) => { diff --git a/src/views/CommunityViews/CommunityView.vue b/src/views/CommunityViews/CommunityView.vue index 4bf6345d4af82773fc196bc0847648692b1bd3e0..5343a95ffab5429f269005077a1f87a9e99ca173 100644 --- a/src/views/CommunityViews/CommunityView.vue +++ b/src/views/CommunityViews/CommunityView.vue @@ -6,7 +6,7 @@ Mine grupper </div> <UserAddIcon - class="cursor-pointer max-h-6 max-w-6 float-right grow" + class="cursor-pointer max-h-6 max-w-6 float-right grow text-primary-dark" @click="$router.push('/newCommunity')" alt="Opprett ny gruppe" />