From d602afab99970f6148b9e2c852111232cc6f65a2 Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 19:42:44 +0530 Subject: [PATCH 01/11] Add link to popup.css --- apps/segment/segment.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/segment/segment.html b/apps/segment/segment.html index d7744436..0a47d82c 100644 --- a/apps/segment/segment.html +++ b/apps/segment/segment.html @@ -46,6 +46,8 @@ + + @@ -160,6 +162,7 @@
+ From 5de104e29129793ef05249b2adb71bfa70ac4f52 Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 19:44:54 +0530 Subject: [PATCH 02/11] add popup --- apps/segment/segment.js | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/apps/segment/segment.js b/apps/segment/segment.js index 93630091..5fc6379b 100644 --- a/apps/segment/segment.js +++ b/apps/segment/segment.js @@ -631,9 +631,18 @@ function uploadModel() { const req = store.put(data); req.onsuccess = function(e) { console.log('SUCCESS, ID:', e.target.result); - status.innerHTML = 'Done! Click refresh below.'; - status.classList.remove('blink'); - modelName.push(_name.value); + let popups = document.getElementById('popup-container'); + if (popups.childElementCount < 2) { + let popupBox = document.createElement('div'); + popupBox.classList.add('popup-msg', 'slide-in'); + popupBox.innerHTML = `info` + _name.value + ` model uploaded sucessfully`; + popups.insertBefore(popupBox, popups.childNodes[0]); + setTimeout(function() { + popups.removeChild(popups.lastChild); + }, 3000); + } + $UI.uploadModal.close(); + initUIcomponents(); }; req.onerror = function(e) { status.innerHTML = 'Some error this way!'; @@ -1123,9 +1132,18 @@ async function deleteModel(name) { alert(err); } finally { if (status) { - alert('Deleted', name); - showInfo(); - modelName.splice(modelName.indexOf(name.split('_').splice(1).join('_').slice(0, -3)), 1); + let popups = document.getElementById('popup-container'); + if (popups.childElementCount < 2) { + let popupBox = document.createElement('div'); + popupBox.classList.add('popup-msg', 'slide-in'); + popupBox.innerHTML = `info` + modelName + ` model deleted successfully`; + popups.insertBefore(popupBox, popups.childNodes[0]); + setTimeout(function() { + popups.removeChild(popups.lastChild); + }, 3000); + } + $UI.infoModal.close(); + initUIcomponents(); } } } else { @@ -1140,7 +1158,6 @@ async function showInfo() { var table = document.querySelector('#mdata'); var tx = db.transaction('models_store', 'readonly'); var store = tx.objectStore('models_store'); - var modelCount=0; empty(table); // Update table data @@ -1166,13 +1183,12 @@ async function showInfo() { td = row.insertCell(); td.innerHTML = date; td = row.insertCell(); - td.innerHTML = ''; - document.getElementById('removeModel'+modelCount).addEventListener('click', () => { + document.getElementById('removeModel').addEventListener('click', () => { deleteModel(name); }); - modelCount+=1; }; } } From cf71e90fed4d651758ca724e23f0a68b34ea41c5 Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 19:47:05 +0530 Subject: [PATCH 03/11] Update UI of final class change btn --- apps/model/model.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/model/model.css b/apps/model/model.css index 422c55dd..1df6b3a6 100644 --- a/apps/model/model.css +++ b/apps/model/model.css @@ -306,6 +306,14 @@ ul.disabled { font-size: 14px; cursor: pointer; } +.btn-final-change{ + background-color: rgb(138, 175, 35); + border: none; + color: white; + padding: 12px 16px; + font-size: 14px; + cursor: pointer; +} body{ color: black; } From 9d66f70fe3c930e00d88a4c2008c1f35fcb9fc56 Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 19:47:52 +0530 Subject: [PATCH 04/11] Update model.js --- apps/model/model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/model/model.js b/apps/model/model.js index 0a249cd3..232e2886 100644 --- a/apps/model/model.js +++ b/apps/model/model.js @@ -835,7 +835,7 @@ function showNewClassInput(name) { const self = $UI.chngClassLst; self.body.innerHTML = ` - + `; $UI.chngClassLst.open(); // Open the box to take input from user document.getElementById('chngbtn').addEventListener('click', () => { From 7affced02045d6472b6505a8a23427bf7fc6c2d6 Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 20:56:11 +0530 Subject: [PATCH 05/11] Update model.js --- apps/model/model.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/model/model.js b/apps/model/model.js index 232e2886..8116014f 100644 --- a/apps/model/model.js +++ b/apps/model/model.js @@ -835,7 +835,7 @@ function showNewClassInput(name) { const self = $UI.chngClassLst; self.body.innerHTML = ` - + `; $UI.chngClassLst.open(); // Open the box to take input from user document.getElementById('chngbtn').addEventListener('click', () => { From 6334202b9884e7471a3194a528ec9d9786f95d6e Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 21:23:28 +0530 Subject: [PATCH 06/11] Update segment.js --- apps/segment/segment.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/segment/segment.js b/apps/segment/segment.js index 5fc6379b..5135b4d5 100644 --- a/apps/segment/segment.js +++ b/apps/segment/segment.js @@ -1158,7 +1158,7 @@ async function showInfo() { var table = document.querySelector('#mdata'); var tx = db.transaction('models_store', 'readonly'); var store = tx.objectStore('models_store'); - + var modelCount=0; empty(table); // Update table data (function(callback) { @@ -1183,8 +1183,8 @@ async function showInfo() { td = row.insertCell(); td.innerHTML = date; td = row.insertCell(); - td.innerHTML = ''; document.getElementById('removeModel').addEventListener('click', () => { deleteModel(name); From bda440a8c2704c2911a1efe71a6b483aea20a28f Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 21:47:12 +0530 Subject: [PATCH 07/11] Update segment.js --- apps/segment/segment.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/segment/segment.js b/apps/segment/segment.js index 5135b4d5..2bd3fe1f 100644 --- a/apps/segment/segment.js +++ b/apps/segment/segment.js @@ -631,6 +631,7 @@ function uploadModel() { const req = store.put(data); req.onsuccess = function(e) { console.log('SUCCESS, ID:', e.target.result); + modelName.push(_name.value); let popups = document.getElementById('popup-container'); if (popups.childElementCount < 2) { let popupBox = document.createElement('div'); @@ -1186,9 +1187,10 @@ async function showInfo() { td.innerHTML = ''; - document.getElementById('removeModel').addEventListener('click', () => { + document.getElementById('removeModel'+modelCount).addEventListener('click', () => { deleteModel(name); }); + modelCount+=1; }; } } From 9707c2c610bf5c3ea047499deb848d0089839f96 Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 21:48:44 +0530 Subject: [PATCH 08/11] Update segment.js --- apps/segment/segment.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/segment/segment.js b/apps/segment/segment.js index 2bd3fe1f..871d6376 100644 --- a/apps/segment/segment.js +++ b/apps/segment/segment.js @@ -1133,6 +1133,7 @@ async function deleteModel(name) { alert(err); } finally { if (status) { + modelName.splice(modelName.indexOf(name.split('_').splice(1).join('_').slice(0, -3)), 1); let popups = document.getElementById('popup-container'); if (popups.childElementCount < 2) { let popupBox = document.createElement('div'); From 2c92701afcedeb56d08e1726391307d2bff9b972 Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 22:35:18 +0530 Subject: [PATCH 09/11] Update segment.js --- apps/segment/segment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/segment/segment.js b/apps/segment/segment.js index 871d6376..ce1faf39 100644 --- a/apps/segment/segment.js +++ b/apps/segment/segment.js @@ -1191,7 +1191,7 @@ async function showInfo() { document.getElementById('removeModel'+modelCount).addEventListener('click', () => { deleteModel(name); }); - modelCount+=1; + modelCount+=1; }; } } From fd7f05663ed2b80deeaaf71c61d1299a19512fab Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 23:02:16 +0530 Subject: [PATCH 10/11] popup on change class list --- apps/model/model.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/model/model.js b/apps/model/model.js index 8116014f..918885f5 100644 --- a/apps/model/model.js +++ b/apps/model/model.js @@ -861,7 +861,16 @@ async function changeClassList(newList, name) { }; } } - alert('Classes Changed'); + let popups = document.getElementById('popup-container'); + if (popups.childElementCount < 2) { + let popupBox = document.createElement('div'); + popupBox.classList.add('popup-msg', 'slide-in'); + popupBox.innerHTML = `info` + ` Classes changed successfuly`; + popups.insertBefore(popupBox, popups.childNodes[0]); + setTimeout(function() { + popups.removeChild(popups.lastChild); + }, 3000); + } } function openHelp() { From a5cadc796e59a5e6c6d7fef0b5a995ea482dbefd Mon Sep 17 00:00:00 2001 From: Amritansh Vajpayee Date: Fri, 17 Apr 2020 23:08:24 +0530 Subject: [PATCH 11/11] Fix lint issues --- apps/model/model.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/model/model.js b/apps/model/model.js index 918885f5..91925437 100644 --- a/apps/model/model.js +++ b/apps/model/model.js @@ -869,8 +869,8 @@ async function changeClassList(newList, name) { popups.insertBefore(popupBox, popups.childNodes[0]); setTimeout(function() { popups.removeChild(popups.lastChild); - }, 3000); - } + }, 3000); + } } function openHelp() {