Skip to content

Commit

Permalink
memeLab#407 - remove console.logs from jinja files
Browse files Browse the repository at this point in the history
  • Loading branch information
GabrielDVpereira committed Apr 8, 2021
1 parent 2bf9537 commit bb9e9f4
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 100 deletions.
2 changes: 0 additions & 2 deletions src/ARte/core/jinja2/core/exhibit.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
requestURLS(tentativas + 1)
})
console.log(website)
let marker_names = ['{{artwork.marker.source.name}}']
let object_names = ['{{artwork.augmented.source.name}}']
let patt_names = ['{{artwork.marker.patt}}']
Expand All @@ -65,7 +64,6 @@
requestURLS(tentativas + 1)
})
console.log(response)
})
})
Expand Down
9 changes: 4 additions & 5 deletions src/ARte/core/static/js/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
if ('serviceWorker' in navigator) {
console.log("aisdjasdijdsaijdsaiasdjidsajisdajigdsjifjidjgiesjjaisrejaSJ")
if ("serviceWorker" in navigator) {
// Use the window load event to keep the page load performant
window.addEventListener('load', () => {
navigator.serviceWorker.register('/sw.js');
window.addEventListener("load", () => {
navigator.serviceWorker.register("/sw.js");
});
}
}
194 changes: 106 additions & 88 deletions src/ARte/core/static/js/pdfGenerator.js
Original file line number Diff line number Diff line change
@@ -1,122 +1,140 @@
var dialogElement = document.querySelector('#dialog-info')
var dialogElement = document.querySelector("#dialog-info");

if (!dialogElement.showModal) {
// dialogElementPolyfill.registerDialog(dialogElement)
// dialogElementPolyfill.registerDialog(dialogElement)
}

dialogElement.querySelector('.mdl-dialog__actions button').addEventListener('click', function() {
dialogElement.close()
})
dialogElement
.querySelector(".mdl-dialog__actions button")
.addEventListener("click", function () {
dialogElement.close();
});

var showDialogButton = document.querySelector('#show-info')
showDialogButton.addEventListener('click', function() {
dialogElement.showModal()
})
var showDialogButton = document.querySelector("#show-info");
showDialogButton.addEventListener("click", function () {
dialogElement.showModal();
});

var innerImageURL = null
var fullMarkerURL = null
var innerImageURL = null;
var fullMarkerURL = null;

innerImageURL = "https://raw.githubusercontent.com/memeLab/ARte/master/src/ARte/core/static/markers/gueixa.png"
updateFullMarkerImage()
innerImageURL =
"https://raw.githubusercontent.com/memeLab/ARte/master/src/ARte/core/static/markers/gueixa.png";
updateFullMarkerImage();

document.querySelector('#buttonDownloadEncoded').addEventListener('click', function() {
document
.querySelector("#buttonDownloadEncoded")
.addEventListener("click", function () {
if (innerImageURL === null) {
alert('upload a file first')
return
alert("upload a file first");
return;
}
console.assert(innerImageURL)
THREEx.ArPatternFile.encodeImageURL(innerImageURL, function onComplete(patternFileString) {
THREEx.ArPatternFile.triggerDownload(patternFileString)
})
})


document.querySelector('#buttonDownloadFullImage').addEventListener('click', function() {
console.assert(innerImageURL);
THREEx.ArPatternFile.encodeImageURL(
innerImageURL,
function onComplete(patternFileString) {
THREEx.ArPatternFile.triggerDownload(patternFileString);
}
);
});

document
.querySelector("#buttonDownloadFullImage")
.addEventListener("click", function () {
// debugger
if (innerImageURL === null) {
alert('upload a file first')
return
alert("upload a file first");
return;
}

// tech from https://stackoverflow.com/questions/3665115/create-a-file-in-memory-for-user-to-download-not-through-server
var domElement = window.document.createElement('a');
var domElement = window.document.createElement("a");
domElement.href = fullMarkerURL;
domElement.download = 'marker.png';
document.body.appendChild(domElement)
domElement.download = "marker.png";
document.body.appendChild(domElement);
domElement.click();
document.body.removeChild(domElement)
})

document.querySelector('#fileinput').addEventListener('change', function() {
var file = this.files[0];
// debugger
document.body.removeChild(domElement);
});

var reader = new FileReader();
reader.onload = function(event) {
innerImageURL = event.target.result
updateFullMarkerImage()
};
reader.readAsDataURL(file);
})
document.querySelector("#fileinput").addEventListener("change", function () {
var file = this.files[0];
// debugger

var reader = new FileReader();
reader.onload = function (event) {
innerImageURL = event.target.result;
updateFullMarkerImage();
};
reader.readAsDataURL(file);
});

function updateFullMarkerImage() {
var patternRatio = 0.6
console.log("aodsdaoksado")
THREEx.ArPatternFile.buildFullMarker(innerImageURL, patternRatio, function onComplete(markerUrl) {
fullMarkerURL = markerUrl

var fullMarkerImage = document.createElement('img')
fullMarkerImage.src = fullMarkerURL

// put fullMarkerImage into #imageContainer
var container = document.querySelector('#imageContainer')
while (container.firstChild) container.removeChild(container.firstChild);
container.appendChild(fullMarkerImage)
})
var patternRatio = 0.6;
THREEx.ArPatternFile.buildFullMarker(
innerImageURL,
patternRatio,
function onComplete(markerUrl) {
fullMarkerURL = markerUrl;

var fullMarkerImage = document.createElement("img");
fullMarkerImage.src = fullMarkerURL;

// put fullMarkerImage into #imageContainer
var container = document.querySelector("#imageContainer");
while (container.firstChild) container.removeChild(container.firstChild);
container.appendChild(fullMarkerImage);
}
);
}


//////////////////////////////////////////////////////////////////////////////
// Handle PDF
//////////////////////////////////////////////////////////////////////////////
document.querySelector('#buttonDownloadPDFOnePerPage').addEventListener('click', generatePdfOnePerPage)
document.querySelector('#buttonDownloadPDFTwoPerPage').addEventListener('click', generatePdfTwoPerPage)
document.querySelector('#buttonDownloadPDFSixPerPage').addEventListener('click', generatePdfSixPerPage)
document
.querySelector("#buttonDownloadPDFOnePerPage")
.addEventListener("click", generatePdfOnePerPage);
document
.querySelector("#buttonDownloadPDFTwoPerPage")
.addEventListener("click", generatePdfTwoPerPage);
document
.querySelector("#buttonDownloadPDFSixPerPage")
.addEventListener("click", generatePdfSixPerPage);

function generatePdfOnePerPage() {
var docDefinition = {
content: [{
image: fullMarkerURL,
width: 600,
alignment: 'center',
}]
}
pdfMake.createPdf(docDefinition).open();
var docDefinition = {
content: [
{
image: fullMarkerURL,
width: 600,
alignment: "center",
},
],
};
pdfMake.createPdf(docDefinition).open();
}

function generatePdfTwoPerPage() {
const column = {
image: fullMarkerURL,
width: 300,
alignment: 'center',
}
var docDefinition = {
content: [column, column]
}
pdfMake.createPdf(docDefinition).open();
const column = {
image: fullMarkerURL,
width: 300,
alignment: "center",
};
var docDefinition = {
content: [column, column],
};
pdfMake.createPdf(docDefinition).open();
}

function generatePdfSixPerPage() {
const column = {
image: fullMarkerURL,
width: 250,
}
const columns = {
columns: [column, column]
}
var docDefinition = {
content: [columns, columns, columns]
}
pdfMake.createPdf(docDefinition).open();
}
const column = {
image: fullMarkerURL,
width: 250,
};
const columns = {
columns: [column, column],
};
var docDefinition = {
content: [columns, columns, columns],
};
pdfMake.createPdf(docDefinition).open();
}
2 changes: 0 additions & 2 deletions src/ARte/users/jinja2/users/components/artworks-list.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,11 @@
{% endif %}
$('.repository-item').click(function(){
console.log("cl");
let elementId = $(this).attr('id').split('-')[1];
let sectionId = $(this).parent().attr('id');
// reset background
if($(this).css('border-bottom-style') != "none"){
console.log("ASDF");
$(this).css("border-bottom","none");
delete artworks[elementId]
}else{
Expand Down
1 change: 0 additions & 1 deletion src/ARte/users/jinja2/users/components/item-list.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@
<script>
$(".exhibit-slug").each(function(i,exhibit_slug){
highlight_part = "<b>" + exhibit_slug.innerHTML.split("<b>")[1]
console.log(highlight_part)
site_url = window.location.protocol + "//" + window.location.host + "/"
exhibit_slug.innerHTML = site_url + highlight_part
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<script>
$(".exhibit-slug").each(function(i,exhibit_slug){
highlight_part = "<b>" + exhibit_slug.innerHTML.split("<b>")[1]
console.log(highlight_part)
site_url = window.location.protocol + "//" + window.location.host + "/"
exhibit_slug.innerHTML = site_url + highlight_part
})
Expand Down
1 change: 0 additions & 1 deletion src/ARte/users/jinja2/users/upload.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
$('#author-chk').click(function(){
if($(this).prop('checked') == true){
let user = $('div.welcome > p > a')[0].innerText;
console.log(user);
$('#author-field > input').val(user);
$('#author-field > input').prop('readonly', true);
}else{
Expand Down

0 comments on commit bb9e9f4

Please sign in to comment.