Skip to content
Snippets Groups Projects
Commit 1f754d95 authored by Erik Borgeteien Hansen's avatar Erik Borgeteien Hansen
Browse files

lint and remove comments

parent 84936721
No related branches found
No related tags found
1 merge request!88Community admin
Pipeline #180176 passed
<template>
<!-- Main modal -->
<div
v-if="visible"
class="fixed grid place-items-center bg-gray-600 bg-opacity-50 top-0 left-0 right-0 z-50 w-full overflow-x-hidden overflow-y-auto inset-0 h-full"
v-if="visible"
class="fixed grid place-items-center bg-gray-600 bg-opacity-50 top-0 left-0 right-0 z-50 w-full overflow-x-hidden overflow-y-auto inset-0 h-full"
>
<div class="relative w-full h-full max-w-2xl p-4 md:h-auto">
<!-- Modal content -->
<div class="relative bg-white rounded-lg shadow dark:bg-gray-700">
<!-- Modal header -->
<div
class="flex p-4 border-b rounded-t dark:border-gray-600"
>
<div class="flex p-4 border-b rounded-t dark:border-gray-600">
<h3 class="text-xl font-semibold text-gray-900 dark:text-white">
{{ name }}
</h3>
<button
@click="close()"
class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
@click="close()"
class="text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
>
<svg
class="w-5 h-5"
fill="currentColor"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
class="w-5 h-5"
fill="currentColor"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
>
<path
fill-rule="evenodd"
d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
clip-rule="evenodd"
fill-rule="evenodd"
d="M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
clip-rule="evenodd"
></path>
</svg>
</button>
</div>
<!-- Modal body -->
<div class="p-6 space-y-6">
<p class="text-lg text-base leading-relaxed text-gray-500 dark:text-gray-400">
<p
class="text-lg text-base leading-relaxed text-gray-500 dark:text-gray-400"
>
{{ title }}
</p>
</div>
<div class="ml-6 mt-4">
<p class=" text-base leading-relaxed text-gray-500 dark:text-gray-400" v-show="renterIsReceiverOfRating">
<p
class="text-base leading-relaxed text-gray-500 dark:text-gray-400"
v-show="renterIsReceiverOfRating"
>
Gi en vurdering til utleieren
</p>
<p class="text-base leading-relaxed text-gray-500 dark:text-gray-400" v-show="!renterIsReceiverOfRating">
<p
class="text-base leading-relaxed text-gray-500 dark:text-gray-400"
v-show="!renterIsReceiverOfRating"
>
Gi en vurdering til leietakeren
</p>
</div>
<div class= "flex justify-center px-4">
<textarea class="w-full h-40 bg-gray-200 mb-4 ring-1 ring-gray-400 rounded-xl"/>
<div class="flex justify-center px-4">
<textarea
class="w-full h-40 bg-gray-200 mb-4 ring-1 ring-gray-400 rounded-xl"
/>
</div>
<div class="flex items-center justify-center mb-8">
<svg class="w-10 h-10 text-warn cursor-pointer" :class="rating[0]" @click="setRating(1)" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<svg
class="w-10 h-10 text-warn cursor-pointer"
:class="rating[0]"
@click="setRating(1)"
fill="currentColor"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z">
</path>
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z"
></path>
</svg>
<svg class="w-10 h-10 text-warn cursor-pointer" :class="rating[1]" @click="setRating(2)" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<svg
class="w-10 h-10 text-warn cursor-pointer"
:class="rating[1]"
@click="setRating(2)"
fill="currentColor"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z">
</path>
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z"
></path>
</svg>
<svg class="w-10 h-10 text-warn cursor-pointer" :class="rating[2]" @click="setRating(3)" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<svg
class="w-10 h-10 text-warn cursor-pointer"
:class="rating[2]"
@click="setRating(3)"
fill="currentColor"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z">
</path>
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z"
></path>
</svg>
<svg class="w-10 h-10 text-warn cursor-pointer" :class="rating[3]" @click="setRating(4)" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<svg
class="w-10 h-10 text-warn cursor-pointer"
:class="rating[3]"
@click="setRating(4)"
fill="currentColor"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z">
</path>
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z"
></path>
</svg>
<svg class="w-10 h-10 text-warn cursor-pointer" :class="rating[4]" @click="setRating(5)" fill="currentColor" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
<svg
class="w-10 h-10 text-warn cursor-pointer"
:class="rating[4]"
@click="setRating(5)"
fill="currentColor"
viewBox="0 0 20 20"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z">
</path>
d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z"
></path>
</svg>
</div>
<div class="flex justify-center mb-4">
<Button
:text="'Send en vurdering'"
@click="sendRating"></Button>
<Button :text="'Send en vurdering'" @click="sendRating"></Button>
</div>
<!-- Modal footer -->
......@@ -98,15 +139,21 @@
<script>
import Button from "@/components/BaseComponents/ColoredButton";
import { postNewRating} from "@/utils/apiutil";
import { postNewRating } from "@/utils/apiutil";
export default {
name: "RatingModal",
data(){
return{
data() {
return {
score: 3,
comment: "",
rating:["text-warn", "text-warn", "text-warn", "text-gray-300", "text-gray-300"],
rating: [
"text-warn",
"text-warn",
"text-warn",
"text-gray-300",
"text-gray-300",
],
};
},
props: {
......@@ -115,42 +162,35 @@ export default {
title: String,
rentID: Number,
renterIsReceiverOfRating: Boolean,
},
components: {
Button,
},
methods: {
setRating(ratingNumber){
setRating(ratingNumber) {
this.score = ratingNumber;
for(let i = 0; i < 5; i++ ){
if(i < ratingNumber) {
this.rating[i] = "text-warn"
}
else {
this.rating[i] = "text-gray-300"
for (let i = 0; i < 5; i++) {
if (i < ratingNumber) {
this.rating[i] = "text-warn";
} else {
this.rating[i] = "text-gray-300";
}
}
},
close() {
this.$emit("close");
},
async sendRating(){
async sendRating() {
const ratingInfo = {
score: this.score,
comment: this.comment,
renterIsReceiverOfRating: this.renterIsReceiverOfRating,
rentID: this.rentID
}
const postResponse = await postNewRating(ratingInfo);
console.log("posted: " + postResponse);
rentID: this.rentID,
};
await postNewRating(ratingInfo);
this.$router.push("/");
},
},
};
......
......@@ -10,7 +10,7 @@
<script>
import UserListItemCard from "@/components/UserProfileComponents/UserListItemCard.vue";
import CommunityService from "@/services/community.service";
import {GetMemberRequestsOfCommunity} from "@/utils/apiutil";
import { GetMemberRequestsOfCommunity } from "@/utils/apiutil";
export default {
name: "MemberList",
......@@ -32,14 +32,15 @@ export default {
},
async created() {
this.loading = true;
if(this.requests){
this.members = await GetMemberRequestsOfCommunity(
this.$route.params.communityID
);
if (this.requests) {
this.members = await GetMemberRequestsOfCommunity(
this.$route.params.communityID
);
} else {
this.members = await CommunityService.getCommunityMembers(
this.$route.params.communityID
);}
this.members = await CommunityService.getCommunityMembers(
this.$route.params.communityID
);
}
this.loading = false;
},
};
......
......@@ -297,15 +297,13 @@ export async function LeaveCommunity(communityID) {
export function postNewRating(ratingInfo) {
return axios
.post(API_URL + "rating/save", ratingInfo, {
headers: tokenHeader(),
})
.then((response) => {
console.log("poster: " + response.data);
return response;
})
.catch((error) => {
console.log(error.response);
return error;
});
}
\ No newline at end of file
.post(API_URL + "rating/save", ratingInfo, {
headers: tokenHeader(),
})
.then((response) => {
return response;
})
.catch((error) => {
return error;
});
}
......@@ -13,8 +13,16 @@
{{ tab }}
</button>
</div>
<MemberList :requests ='false' :buttons="['chat', 'kick']" v-if="currentTab === 0" />
<MemberList :requests ='true' :buttons="['accept', 'reject']" v-if="currentTab === 1" />
<MemberList
:requests="false"
:buttons="['chat', 'kick']"
v-if="currentTab === 0"
/>
<MemberList
:requests="true"
:buttons="['accept', 'reject']"
v-if="currentTab === 1"
/>
<CommunitySettings v-if="currentTab === 2" />
</template>
......
......@@ -45,8 +45,6 @@ export default {
// Double loop is bad; find a better way to do this
for (var i = 0; i < this.publicCommunities.length; i++) {
for (var j = 0; j < this.myCommunities.length; j++) {
console.log(this.publicCommunities[i]);
console.log(this.myCommunities[j]);
if (
this.publicCommunities[i].communityId ===
this.myCommunities[j].communityId
......
<template>
<div >
</div>
<div></div>
</template>
<script>
......@@ -11,8 +9,7 @@ export default {
show: false,
};
},
components: {
},
components: {},
methods: {
toggleModal() {
this.show = !this.show;
......
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