Skip to content
Snippets Groups Projects
Commit a85b2160 authored by henrikburmann's avatar henrikburmann
Browse files

Gonna fix bug. Safety commit

parent 1aaceeaa
No related branches found
No related tags found
1 merge request!110Delete listing
Hide whitespace changes
Inline Side-by-side
src/components/CommunityComponents/NewCommunityForm.vue
+ 8
− 131
View file @ a85b2160
<template> <template>
<div <div
class=" class="md:ring-1 ring-gray-300 rounded-xl overflow-hidden mx-auto mb-auto max-w-md w-full p-4"
md:ring-1
ring-gray-300
rounded-xl
overflow-hidden
mx-auto
mb-auto
max-w-md
w-full
p-4
"
> >
<!-- Component heading --> <!-- Component heading -->
<div <div
class=" class="text-xl md:text-2xl font-medium text-center text-gray-600 dark:text-gray-200 mt-4 mb-10"
text-xl
md:text-2xl
font-medium
text-center text-gray-600
dark:text-gray-200
mt-4
mb-10
"
> >
Opprett ny gruppe Opprett ny gruppe
</div> </div>
...@@ -36,25 +18,7 @@ ...@@ -36,25 +18,7 @@
> >
<div class="form-check"> <div class="form-check">
<input <input
class=" 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"
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" type="radio"
name="flexRadioDefault" name="flexRadioDefault"
id="flexRadioOpen" id="flexRadioOpen"
...@@ -72,25 +36,7 @@ ...@@ -72,25 +36,7 @@
</div> </div>
<div class="form-check"> <div class="form-check">
<input <input
class=" 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"
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" type="radio"
name="flexRadioDefault" name="flexRadioDefault"
id="flexRadioPrivate" id="flexRadioPrivate"
...@@ -117,25 +63,7 @@ ...@@ -117,25 +63,7 @@
<input <input
type="text" type="text"
id="title" id="title"
class=" 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"
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" v-model="v$.group.name.$model"
required required
/> />
...@@ -161,25 +89,7 @@ ...@@ -161,25 +89,7 @@
> >
<input <input
type="text" type="text"
class=" 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"
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" v-model="v$.group.place.$model"
required required
/> />
...@@ -207,25 +117,7 @@ ...@@ -207,25 +117,7 @@
id="description" id="description"
rows="4" rows="4"
v-model="v$.group.description.$model" v-model="v$.group.description.$model"
class=" 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"
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 required
></textarea> ></textarea>
...@@ -264,21 +156,7 @@ ...@@ -264,21 +156,7 @@
<!--<div class="text-error uppercase text-center">Midlertidig fjernet</div> --> <!--<div class="text-error uppercase text-center">Midlertidig fjernet</div> -->
<button <button
@click="$refs.file.click()" @click="$refs.file.click()"
class=" 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"
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" :disabled="imageAdded"
> >
Velg bilde Velg bilde
...@@ -432,7 +310,6 @@ export default { ...@@ -432,7 +310,6 @@ export default {
console.log(id); console.log(id);
console.log(API_URL + "images/" + id); console.log(API_URL + "images/" + id);
that.group.image = API_URL + "images/" + id; that.group.image = API_URL + "images/" + id;
}; };
fileReader.readAsArrayBuffer(image); fileReader.readAsArrayBuffer(image);
this.imageThere = true; this.imageThere = true;
......
src/components/UserProfileComponents/UserItems.vue
+ 2
− 10
View file @ a85b2160
...@@ -250,6 +250,7 @@ export default { ...@@ -250,6 +250,7 @@ export default {
} }
}, },
goToDeleteItem(item) { goToDeleteItem(item) {
console.log("Halllllo: " + item)
this.chosenItem = item; this.chosenItem = item;
this.readyToDelete = true; this.readyToDelete = true;
}, },
...@@ -282,14 +283,5 @@ export default { ...@@ -282,14 +283,5 @@ export default {
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
/* #deleteButtons{
display: grid;
grid-template-columns: 1fr 1fr;
}
#cancelDeleteButton{
grid-column: 1/2;
}
#confirmDeleteButton{
grid-column: 2/3;
} */
</style> </style>
src/utils/apiutil.js
+ 11
− 11
View file @ a85b2160
...@@ -328,15 +328,15 @@ export function postNewRating(ratingInfo) { ...@@ -328,15 +328,15 @@ export function postNewRating(ratingInfo) {
export function postNewImageCommunity(image) { export function postNewImageCommunity(image) {
return axios return axios
.post(API_URL + "images", image, { .post(API_URL + "images", image, {
headers: {...tokenHeader(), "Content-Type": "image/png"}, headers: { ...tokenHeader(), "Content-Type": "image/png" },
}) })
.then((response) => { .then((response) => {
console.log(response.data); console.log(response.data);
return response.data; return response.data;
}) })
.catch((error) => { .catch((error) => {
console.log(error); console.log(error);
return error; return error;
}); });
} }
src/views/HelpView.vue
+ 4
− 3
View file @ a85b2160
...@@ -114,13 +114,14 @@ export default { ...@@ -114,13 +114,14 @@ export default {
{ {
question: "Hvordan kan jeg bli med i en gruppe?", question: "Hvordan kan jeg bli med i en gruppe?",
answer: 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, 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: 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, toggle: false,
}, },
], ],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment