diff --git a/src/components/CommunityComponents/NewCommunityForm.vue b/src/components/CommunityComponents/NewCommunityForm.vue index bfa39aaa8d7c3b3136319565e476ea82d2751191..a64b9f927e1292b6ec346428052b6062ae9b1e62 100644 --- a/src/components/CommunityComponents/NewCommunityForm.vue +++ b/src/components/CommunityComponents/NewCommunityForm.vue @@ -1,28 +1,10 @@ <template> <div - class=" - md:ring-1 - ring-gray-300 - rounded-xl - overflow-hidden - mx-auto - mb-auto - max-w-md - w-full - p-4 - " + class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4" > <!-- Component heading --> <div - class=" - text-xl - md:text-2xl - font-medium - text-center text-gray-600 - dark:text-gray-200 - mt-4 - mb-10 - " + class="text-xl md:text-2xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-10" > Opprett ny gruppe </div> @@ -36,25 +18,7 @@ > <div class="form-check"> <input - class=" - form-check-input - appearance-none - rounded-full - h-4 - w-4 - border border-gray-300 - bg-white - checked:bg-primary-medium checked:border-primary-medium - focus:outline-none - transition - duration-200 - mt-1 - align-top - bg-no-repeat bg-center bg-contain - float-left - mr-2 - cursor-pointer - " + class="form-check-input appearance-none rounded-full h-4 w-4 border border-gray-300 bg-white checked:bg-primary-medium checked:border-primary-medium focus:outline-none transition duration-200 mt-1 align-top bg-no-repeat bg-center bg-contain float-left mr-2 cursor-pointer" type="radio" name="flexRadioDefault" id="flexRadioOpen" @@ -72,25 +36,7 @@ </div> <div class="form-check"> <input - class=" - form-check-input - appearance-none - rounded-full - h-4 - w-4 - border border-gray-300 - bg-white - checked:bg-primary-medium checked:border-primary-medium - focus:outline-none - transition - duration-200 - mt-1 - align-top - bg-no-repeat bg-center bg-contain - float-left - mr-2 - cursor-pointer - " + class="form-check-input appearance-none rounded-full h-4 w-4 border border-gray-300 bg-white checked:bg-primary-medium checked:border-primary-medium focus:outline-none transition duration-200 mt-1 align-top bg-no-repeat bg-center bg-contain float-left mr-2 cursor-pointer" type="radio" name="flexRadioDefault" id="flexRadioPrivate" @@ -117,25 +63,7 @@ <input type="text" id="title" - class=" - block - w-full - px-4 - py-2 - mt-2 - text-gray-700 - placeholder-gray-500 - bg-white - border - rounded-md - dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 - focus:border-primary-light - dark:focus:border-primary-light - focus:ring-opacity-40 - focus:outline-none - focus:ring - focus:ring-primary-light - " + class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light" v-model="v$.group.name.$model" required /> @@ -161,25 +89,7 @@ > <input type="text" - class=" - block - w-full - px-4 - py-2 - mt-2 - text-gray-700 - placeholder-gray-500 - bg-white - border - rounded-md - dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 - focus:border-primary-light - dark:focus:border-primary-light - focus:ring-opacity-40 - focus:outline-none - focus:ring - focus:ring-primary-light - " + class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light" v-model="v$.group.place.$model" required /> @@ -207,25 +117,7 @@ id="description" rows="4" v-model="v$.group.description.$model" - class=" - block - w-full - px-4 - py-2 - mt-2 - text-gray-700 - placeholder-gray-500 - bg-white - border - rounded-md - dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 - focus:border-primary-light - dark:focus:border-primary-light - focus:ring-opacity-40 - focus:outline-none - focus:ring - focus:ring-primary-light - " + class="block w-full px-4 py-2 mt-2 text-gray-700 placeholder-gray-500 bg-white border rounded-md dark:bg-gray-800 dark:border-gray-600 dark:placeholder-gray-400 focus:border-primary-light dark:focus:border-primary-light focus:ring-opacity-40 focus:outline-none focus:ring focus:ring-primary-light" required ></textarea> @@ -264,21 +156,7 @@ <!--<div class="text-error uppercase text-center">Midlertidig fjernet</div> --> <button @click="$refs.file.click()" - class=" - text-black - bg-gray-200 - hover:bg-grey-800 - focus:ring-4 focus:outline-none focus:ring-grey-300 - font-medium - rounded-lg - text-sm - sm:w-auto - px-5 - py-2.5 - text-center - dark:bg-grey-600 dark:hover:bg-grey-700 dark:focus:ring-grey-800 - disabled:opacity-50 - " + class="text-black bg-gray-200 hover:bg-grey-800 focus:ring-4 focus:outline-none focus:ring-grey-300 font-medium rounded-lg text-sm sm:w-auto px-5 py-2.5 text-center dark:bg-grey-600 dark:hover:bg-grey-700 dark:focus:ring-grey-800 disabled:opacity-50" :disabled="imageAdded" > Velg bilde @@ -432,7 +310,6 @@ export default { console.log(id); console.log(API_URL + "images/" + id); that.group.image = API_URL + "images/" + id; - }; fileReader.readAsArrayBuffer(image); this.imageThere = true; diff --git a/src/utils/apiutil.js b/src/utils/apiutil.js index f33d6db9f3ce03cac2a5b9d6dc149c41b1949912..88717abceb23d9a2537ab240708f7bdaaf669b19 100644 --- a/src/utils/apiutil.js +++ b/src/utils/apiutil.js @@ -328,15 +328,15 @@ export function postNewRating(ratingInfo) { export function postNewImageCommunity(image) { return axios - .post(API_URL + "images", image, { - headers: {...tokenHeader(), "Content-Type": "image/png"}, - }) - .then((response) => { - console.log(response.data); - return response.data; - }) - .catch((error) => { - console.log(error); - return error; - }); + .post(API_URL + "images", image, { + headers: { ...tokenHeader(), "Content-Type": "image/png" }, + }) + .then((response) => { + console.log(response.data); + return response.data; + }) + .catch((error) => { + console.log(error); + return error; + }); } diff --git a/src/views/HelpView.vue b/src/views/HelpView.vue index 56f7e0e267f102c5493e80579c7c9c11cf9aed45..585749da03358203863f9f07e23a64c86fec264d 100644 --- a/src/views/HelpView.vue +++ b/src/views/HelpView.vue @@ -114,13 +114,14 @@ export default { { question: "Hvordan kan jeg bli med i en gruppe?", answer: - "På hovedsiden vil alle offentlige og lukkede grupper vises. Når du trykker på ønsket gruppe vil du få muligheten til å bli med/sende medlemsforespørsel.", + "På hovedsiden vil alle offentlige og lukkede grupper vises. Når du trykker på ønsket gruppe vil du få muligheten til å bli med/sende medlemsforespørsel.", toggle: false, }, { - question: "Hva vil jeg ha tilgang til ved å logge inn/opprette en bruker?", + question: + "Hva vil jeg ha tilgang til ved å logge inn/opprette en bruker?", answer: - "Uten å være logget inn vil du kunne se alle grupper, og også se gjenstander som ligger ute til lån i offentlige grupper. For å kunne låne en gjenstand må du være med i gruppen gjenstanden ligger i, og for dette må du være innlogget. Du må også være innlogget for å sende medlemsforespørsel i lukkede grupper.", + "Uten å være logget inn vil du kunne se alle grupper, og også se gjenstander som ligger ute til lån i offentlige grupper. For å kunne låne en gjenstand må du være med i gruppen gjenstanden ligger i, og for dette må du være innlogget. Du må også være innlogget for å sende medlemsforespørsel i lukkede grupper.", toggle: false, }, ],