diff --git a/archer_meta.png b/archer_meta.png deleted file mode 100644 index e598344..0000000 Binary files a/archer_meta.png and /dev/null differ diff --git a/index.html b/index.html index 14313c7..ad68df0 100644 --- a/index.html +++ b/index.html @@ -120,31 +120,8 @@

Filter Images

script.src = map_src document.getElementsByTagName('head')[0].appendChild(script); - - - - - - - + + diff --git a/js/charts.js b/js/charts.js index 8929940..fcd6798 100644 --- a/js/charts.js +++ b/js/charts.js @@ -23,17 +23,7 @@ function addLineChart(id, xlabels, ylabel, values) { pointHoverBorderColor: "#ff0099", pointBorderWidth: 1, data: values - }//, { - // label: "My Second dataset", - // backgroundColor: "rgba(3, 88, 106, 0.3)", - // borderColor: "rgba(3, 88, 106, 0.70)", - // pointBorderColor: "rgba(3, 88, 106, 0.70)", - // pointBackgroundColor: "rgba(3, 88, 106, 0.70)", - // pointHoverBackgroundColor: "#fff", - // pointHoverBorderColor: "rgba(151,187,205,1)", - // pointBorderWidth: 1, - // data: [82, 23, 66, 9, 99, 4, 2] - //}] + } ]}, options: { responsive: true, @@ -41,9 +31,6 @@ function addLineChart(id, xlabels, ylabel, values) { animateScale: true }, scales: { - // xAxes: [{ - // display: false - // }], yAxes: [{ ticks: { beginAtZero: true, diff --git a/js/database.js b/js/database.js index 523720b..e014c8e 100644 --- a/js/database.js +++ b/js/database.js @@ -10,7 +10,6 @@ console.log(db_filename); class Database { constructor(opts) { this.db = this.init_database(); - // this.last_image_id = 0; } /* Uses callback(boolean) to return if Projects contains name. */ @@ -220,62 +219,6 @@ class Database { }); } - /* Uses callback(img_path, proj_name, meta_dict, success) to add metadata in a dictionary. */ - // add_image_meta(img_path, proj_name, meta_dict, callback) { - // var _this = this; - // var db = this.db; - // db.serialize(function() { - // var columns = []; - // db.each("PRAGMA table_info(Images)", function(err, col) { - // if (err) { - // console.error("FAILING: " + err); - // } - // columns.push(col.name); - // }, function() { - // console.log('add_project: columns', columns); - // for (var meta_key in meta_dict) { - // meta_key = meta_key.replace("-", "_"); - // var col_exists = (columns.indexOf(meta_key) >= 0); - // var meta_value = meta_dict[meta_key]; - // if (!col_exists) { - // var meta_type = typeof meta_value; - // db.run("ALTER TABLE Images ADD " + meta_key + " " + meta_type + ";"); - // console.log('add_project: col added', meta_key, meta_type); - // } else { - // console.log('contains column', columns[meta_key]) - // } - // } - // - // var success = false; - // _this.has_image(img_path, proj_name, function(bool) { - // if (bool) { - // var add_meta = ""; - // var meta_length = Object.keys(meta_dict).length; - // var count = 0; - // var meta_values = []; - // for (var meta_key in meta_dict) { - // add_meta += meta_key + "=?"; - // meta_values.push(meta_dict[meta_key]); - // if (count < meta_length - 1) { - // add_meta += ", "; - // } - // count++; - // } - // console.log(meta_values); - // var query = "UPDATE Images SET " + add_meta + " WHERE path=? AND proj_name=?"; - // console.log(query, "query"); - // var stmt = db.prepare(query); - // var params = meta_values + [img_path, proj_name]; - // stmt.run(params); - // stmt.finalize(); - // success = true; - // } - // - // callback(success); - // }); - // }); - // }); - // } add_image_meta(imgname, img_path, proj_name, meta_key, meta_value, callback) { // set metadata for image // if column doesn't exist, add column diff --git a/js/detail.js b/js/detail.js index 21db8b4..16afd85 100644 --- a/js/detail.js +++ b/js/detail.js @@ -3,12 +3,9 @@ const path = require('path') const fs = require('fs') const remote = require('electron').remote const Mustache = require('Mustache') -// const ExifImage = require('exif').ExifImage; const { ExifTool } = require("exiftool-vendored"); const exiftool = new ExifTool(); const Chart = require('chart.js'); -// const echarts = require('echarts'); -// const select2 = require('select2'); const Choices = require('Choices.js') const async = require("async"); @@ -35,13 +32,6 @@ $("#add-image").submit(function(e) { loadDetail(_currentProj); paths_global = null; }); - // for (var index in paths_global) { - // var filename = path.basename(paths_global[index]).split(".")[0]; - // database.add_image(filename, paths_global[index], _currentProj, alert_image_upload); - // } - - // loadDetail(_currentProj); - // paths_global = null; }); function loadDetail(projectName, filter_params = {}) { @@ -58,9 +48,6 @@ function loadDetail(projectName, filter_params = {}) { document.getElementById('removefilter').onclick = removeFilterRow document.getElementById('submitfilter').onclick = performFilter - - // document.getElementById('checknonebtn').onclick = uncheckAll - redirect('detail'); /* Display project header. */ @@ -464,9 +451,7 @@ function loadHeader(project) { if (typeof value != "string") { value = JSON.stringify(value); } - // value.replace(/,/g , ""); value = value.split(',').join(" "); - //value.replace("", ""); csvString += value + ", "; }); csvString += "\n"; @@ -562,9 +547,7 @@ function insertDetailTemplate__NEW(data, id, path, projname) { mediacontents = '<{{media}} class="img-responsive rounded" src="{{path}}" alt="' + data.sorry + '" controls>' data.thumbcontents = '<{{media}} class="img-responsive rounded thumb" src="{{path}}" alt="{{displayName}}" controls>' } else { - //mediacontents = '

' + data.sorry + '

' var path_nospace = data.path.replace(/ /g, '%20') - console.log(path_nospace) mediacontents = '' data.thumbcontents = '' } @@ -731,12 +714,6 @@ function loadCharts(proj_name, filter_params) { '', '', '', - // '
', - // '
', - // '
', - // '', - // '
', - // '
', '', ].join("\n"); @@ -921,6 +898,7 @@ function setPhotoRemove(name) { }; } +// TODO: a project for the future // function setPhotoRename(name) { // var projName = document.getElementById('project-name').innerHTML; // document.getElementById("rename" + name).onclick = function() { @@ -949,7 +927,6 @@ function clearDetailsHtml() { document.getElementById("detail-charts").innerHTML = "" document.getElementById("name-menu").innerHTML = "" document.getElementById("thumb-menu").innerHTML = "" - // document.getElementById("file-label2").innerHTML = "" } module.exports = { diff --git a/js/home.js b/js/home.js index 1c85f4e..c81d4c9 100644 --- a/js/home.js +++ b/js/home.js @@ -5,19 +5,8 @@ function slideDrawer() { var wid = menu.style.width if (wid != '0px') { menu.style.width = '0px' - //wrapper.style.marginLeft = '15px' - // wid = document.getElementById('side-nav').offsetWidth - // var newWidth = body.offsetWidth + wid - // body.style.width = newWidth.toString() + 'px' } else { - menu.style.width = '170px' //"16.666%" - //wid = document.getElementById('side-nav').offsetWidth + 15 - //wrapper.style.marginLeft = wid.toString() + 'px' - // body.style.width = "83.333%" - // body.style.marginLeft = wid.toString() + 'px' - //body.style.width = "66.666%" - // var newWidth = body.offsetWidth - wid - // body.style.width = newWidth.toString() + 'px' + menu.style.width = '170px' } } diff --git a/js/landing.js b/js/landing.js index 3ac395f..392a55f 100644 --- a/js/landing.js +++ b/js/landing.js @@ -81,11 +81,6 @@ function insertSearchResults(error, results) { "", "", ].join("\n"); - // data = { - // displayName: results.proj_name, - // name: results.proj_name, - // imgsrc: results.path, - // }; } var filler = Mustache.render(template, results); diff --git a/js/projects.js b/js/projects.js index 6472bb0..158c32d 100644 --- a/js/projects.js +++ b/js/projects.js @@ -65,7 +65,6 @@ function showNewProject() { function populateProjectsScreen() { document.getElementById("projects-body").innerHTML = ""; database.get_projects(function (projects_list) { - console.log(projects_list); projects_list.sort(compareTimestamp); diff --git a/js/settings.js b/js/settings.js index 50f9760..f51606d 100644 --- a/js/settings.js +++ b/js/settings.js @@ -39,7 +39,6 @@ function populate_settings_view(fields, favorite_fields, csv_fields) { /* Update settings when a box is checked. */ $("#favcheck" + tag).click(function() { - console.log('triggering click fxn for ' + $(this).val() + ", " + $(this).is(":checked")) database.update_favorites_field($(this).val(), "f", $(this).is(":checked")); }); diff --git a/main.js b/main.js index a7c936f..3ab30bf 100644 --- a/main.js +++ b/main.js @@ -41,7 +41,7 @@ function createWindow () { slashes: true })) - // Open the DevTools. + // Open the DevTools (not for prod) // mainWindow.webContents.openDevTools() // Emitted when the window is closed. @@ -80,6 +80,3 @@ if (app) { } }) } - -// In this file you can include the rest of your app's specific main process -// code. You can also put them in separate files and require them here. diff --git a/sections/about.html b/sections/about.html index dfd2da6..fdd9cf7 100644 --- a/sections/about.html +++ b/sections/about.html @@ -38,8 +38,6 @@

Contact us

We want to hear your thoughts! Drop us a line at team@archerimpact.com or give us feedback on our metadata extractor in the feedback form below. Thanks!

- -

diff --git a/sections/new.html b/sections/new.html index bcf6178..445c662 100644 --- a/sections/new.html +++ b/sections/new.html @@ -33,7 +33,6 @@

- diff --git a/undefined.csv b/undefined.csv deleted file mode 100644 index 8b13789..0000000 --- a/undefined.csv +++ /dev/null @@ -1 +0,0 @@ -