resoved conflicts

master
nooahe 2022-11-15 15:11:14 +01:00
commit 93bab0b3c5
3 changed files with 98 additions and 44 deletions

View File

@ -48,6 +48,7 @@ h1 {
height: 60px; height: 60px;
} }
<<<<<<< HEAD
p.commentText{ p.commentText{
display: inline-block; display: inline-block;
padding-right: 20px; padding-right: 20px;
@ -62,3 +63,24 @@ img.commentLike{
width: 15px; width: 15px;
display: inline-block; display: inline-block;
} }
=======
.image-preview ._list {
padding-top: 20px;
}
.image-preview ._item {
padding: 0 0 10px;
display: inline-block;
text-align: center;
vertical-align: top;
width: 100px;
word-break: break-word;
font-size: 12px;
line-height: normal;
}
.image-preview ._item img {
display: block;
width: 80px;
height: 80px;
padding: 0 10px 6px;
}
>>>>>>> 0e5f580c74883f876fdcee5c7870c58168ae8893

View File

@ -12,6 +12,19 @@ dbVerbindungErzeugen()
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>SPINN MIT!</title> <title>SPINN MIT!</title>
<link rel="stylesheet" href="/css/style.css"> <link rel="stylesheet" href="/css/style.css">
<script>UPLOADCARE_LOCALE="de"
UPLOADCARE_LOCALE_TRANSLATIONS = {
buttons: {
choose: {
files: {
other: 'Bild hochladen'
}
}
}
}</script>
</head> </head>
<body> <body>
<h1>spinn mit!!</h1> <h1>spinn mit!!</h1>
@ -29,11 +42,17 @@ dbVerbindungErzeugen()
<div id="idee"> <div id="idee">
</div>
<div class="image-preview" id="image-upload">
</div> </div>
</div> </div>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script src="https://ucarecdn.com/libs/widget/3.x/uploadcare.full.min.js"></script>
<script src="js/functions.js"></script> <script src="js/functions.js"></script>
<script src="js/main.js"></script> <script src="js/main.js"></script>

View File

@ -114,6 +114,8 @@ function chageLocalStorrage(typ, id, addRemove){
// IDEE ANZEIGEN // IDEE ANZEIGEN
function ideeAnzeigen(data) { function ideeAnzeigen(data) {
document.getElementById("idee").innerHTML = ""; document.getElementById("idee").innerHTML = "";
@ -373,6 +375,21 @@ function formularErstellen(koordianten) {
document.getElementById("form").appendChild(submit_input); document.getElementById("form").appendChild(submit_input);
document.getElementById("form").appendChild(koordinaten_lat); document.getElementById("form").appendChild(koordinaten_lat);
document.getElementById("form").appendChild(koordinaten_lng); document.getElementById("form").appendChild(koordinaten_lng);
document.getElementById("image-upload").innerHTML = '<input type="hidden" role="uploadcare-uploader" data-public-key="3a3c37e85850c6cfe077" data-multiple="true" data-images-only data-public- data-clearable data-tabs="file camera" data-image-shrink: "1024x1024" data-system-dialog="false"/>';
// get a widget reference
const widget = uploadcare.Widget("[role=uploadcare-uploader]", { multiple: true});
// listen to the "upload completed" event
widget.onUploadComplete(fileGroupInfo => {
// get a information about uploaded group
// check https://uploadcare.com/docs/file-uploader-api/file-groups/#file-group-info
for (var i = 0; i < fileGroupInfo.count; i++) {
console.log("https://ucarecdn.com/" + fileGroupInfo.uuid + "/nth/" + i + "/-/preview/-/quality/smart/-/format/auto/");
}
});
}; };
@ -463,7 +480,3 @@ function kommentareAnzeigen(idee_id){
} }