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

New rent fixed, changed colors to navbar and communityview, fixed double datepickerrange

parent da31f113
No related branches found
No related tags found
1 merge request!94New rent fixed, changed colors to navbar and communityview, fixed double datepickerrange
Pipeline #180350 passed
...@@ -13,21 +13,21 @@ ...@@ -13,21 +13,21 @@
<ul class="flex"> <ul class="flex">
<li> <li>
<PlusIcon <PlusIcon
class="m-6 cursor-pointer h-7" class="m-6 cursor-pointer h-7 text-primary-medium"
alt="Legg til" alt="Legg til"
@click="$router.push('/newItem')" @click="$router.push('/newItem')"
/> />
</li> </li>
<li> <li>
<ChatAlt2Icon <ChatAlt2Icon
class="m-6 cursor-pointer h-7" class="m-6 cursor-pointer h-7 text-primary-medium"
alt="Meldinger" alt="Meldinger"
@click="$router.push('/messages')" @click="$router.push('/messages')"
/> />
</li> </li>
<li> <li>
<UserCircleIcon <UserCircleIcon
class="m-6 cursor-pointer h-7" class="m-6 cursor-pointer h-7 text-primary-medium"
alt="Profil" alt="Profil"
@click="loadProfile" @click="loadProfile"
/> />
......
...@@ -26,22 +26,6 @@ ...@@ -26,22 +26,6 @@
:blockedDaysRange="blockedDaysRange" :blockedDaysRange="blockedDaysRange"
></calendar-component> ></calendar-component>
</div> </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>
<div class="footer"> <div class="footer">
<p v-if="error" class="error">{{ errorMessage }}</p> <p v-if="error" class="error">{{ errorMessage }}</p>
......
...@@ -7,7 +7,7 @@ const API_URL = process.env.VUE_APP_BASEURL; ...@@ -7,7 +7,7 @@ const API_URL = process.env.VUE_APP_BASEURL;
class UserService { class UserService {
async getUserFromId(userId) { async getUserFromId(userId) {
return await axios return await axios
.get(API_URL + "/users/" + userId + "/profile", { .get(API_URL + "users/" + userId + "/profile", {
headers: tokenHeader(), headers: tokenHeader(),
}) })
.then((res) => { .then((res) => {
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
Mine grupper Mine grupper
</div> </div>
<UserAddIcon <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')" @click="$router.push('/newCommunity')"
alt="Opprett ny gruppe" alt="Opprett ny gruppe"
/> />
......
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