From c6caa1daa5459699d50177e9e2cc5235704e6750 Mon Sep 17 00:00:00 2001
From: Titus Kristiansen <titusk@stud.ntnu.no>
Date: Wed, 4 May 2022 09:07:14 +0200
Subject: [PATCH] New rent fixed, changed colors to navbar and communityview,
fixed double datepickerrange
---
src/components/BaseComponents/NavBar.vue | 6 +++---
.../DatepickerRange/DatepickerRange.vue | 16 ----------------
src/services/user.service.js | 2 +-
src/views/CommunityViews/CommunityView.vue | 2 +-
4 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/src/components/BaseComponents/NavBar.vue b/src/components/BaseComponents/NavBar.vue
index f12e691..39941c5 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 53c9248..49fd65d 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 59de28f..f07ef8c 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 4bf6345..5343a95 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"
/>
--
GitLab