From 3f8f07cf00c8b8f8575dd1124d2fc12fa49d9f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Sun, 7 Mar 2021 17:39:02 +0300 Subject: [PATCH 1/9] Feature: Users can now display a range of KDB entries --- app/src/index.css | 19 ++++------ app/src/index.html | 8 ++++ app/src/index.js | 87 ++++++++++++++++++++++++++++++++++++++------ backend/api/views.py | 5 ++- 4 files changed, 94 insertions(+), 25 deletions(-) diff --git a/app/src/index.css b/app/src/index.css index 50b3709..c897b78 100644 --- a/app/src/index.css +++ b/app/src/index.css @@ -51,6 +51,9 @@ footer { grid-row: 3; padding: 0.25em; } +div.kdb-slice { + text-align: center; +} div.note span { float: right; cursor: pointer; @@ -154,7 +157,7 @@ main#overlay { vertical-align: middle; width: 100vw; } -main#tb-view div, main#tm-view div { +main#tb-view div:not(.kdb-slice), main#tm-view div:not(.kdb-slice) { overflow-y: scroll; max-width: 100%; } @@ -200,31 +203,25 @@ table#tb-hits, table#tm-hits { grid-column: 1/3; grid-row: 2; } -table#tb-hits, table#tb-table, table#tm-hits, table#tm-table, table.segments-table { +table#tb-hits, table#tb-table, table#tm-hits, table#tm-table, table#tb-table, table#tm-table, table.segments-table { overflow-wrap: break-word; table-layout: fixed; } -table#tb-hits th, table#tm-hits th, table.segments-table th { +table#tb-hits th, table#tm-hits th, table#tb-table th, table#tm-table th, table.segments-table th { border-bottom: 1px solid #c5c5c5; border-top: 1px solid #c5c5c5; user-select: none; width: 4%; } -table#tb-hits td, table#tm-hits td, table.segments-table td.source, table.segments-table td.target { +table#tb-hits td, table#tm-hits td, table#tb-table td, table#tm-table td, table.segments-table td.source, table.segments-table td.target { border-bottom: 1px solid #c5c5c5; border-left: 1px solid #c5c5c5; border-top: 1px solid #c5c5c5; user-select: text; } -table#tb-hits td, table#tm-hits td { +table#tb-hits td, table#tm-hits td, table#tb-table td, table#tm-table td { width: 48%; } -table#tb-table td, table#tm-table td { - border-bottom: 1px solid #c5c5c5; - border-top: 1px solid #c5c5c5; - padding: 0.5rem; - width: 50%; -} table.segments-table td.source, table.segments-table td.target { width: 35%; } diff --git a/app/src/index.html b/app/src/index.html index f60f7f1..5694646 100644 --- a/app/src/index.html +++ b/app/src/index.html @@ -99,6 +99,10 @@ +
+
+ - / - +
@@ -119,6 +123,10 @@ +
+
+ - / - +
diff --git a/app/src/index.js b/app/src/index.js index fcd8697..6351a88 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -33,7 +33,7 @@ function fireOnReady() { }, 1000); // Fetches the entries in a kdb file - function fetchEntries(kdb_role, kdb_id) { + function fetchEntries(kdb_role, kdb_id, firstRow=0, lastRow=100) { let entries; let entry; let entryKeys; @@ -54,23 +54,24 @@ function fireOnReady() { kDBEntries.innerHTML = null; - tr = document.createElement("tr"); - - th = document.createElement("th"); - th.textContent = "Source"; - tr.appendChild(th); - - th = document.createElement("th"); - th.textContent = "Target"; - tr.appendChild(th); + if (firstRow !== 0) { + firstRow = firstRow - 1; + } - kDBEntries.appendChild(tr); + if (lastRow === 0 || lastRow > entryKeys.length) { + lastRow = entryKeys.length; + } - for (i = 0; i < entryKeys.length; i++) { + for (i = firstRow; i < lastRow; i++) { entry = entries[entryKeys[i]]; tr = document.createElement("tr"); + th = document.createElement("th"); + th.id = entry.id; + th.textContent = entry.id; + tr.appendChild(th); + td = document.createElement("td"); td.textContent = entry.source; tr.appendChild(td); @@ -82,6 +83,14 @@ function fireOnReady() { kDBEntries.appendChild(tr); } + let entry_count_message; + if (entryKeys.length === 1) { entry_count_message = "1 entry"} + else { entry_count_message = entryKeys.length + " entries"} + if (kdb_role === "tm") { + document.getElementById("tm-entry-count").textContent = entry_count_message; + } else { + document.getElementById("tb-entry-count").textContent = entry_count_message; + } } } @@ -753,6 +762,60 @@ function fireOnReady() { } window.fetchSegments = fetchSegments; + + document.getElementById("tm-first-row").onkeyup = function() { + if (this.value === "" || activeTM == null) { + return + } + firstRow = parseInt(this.value); + lastRow = firstRow + 100; + if (document.getElementById("tm-last-row").value) { + lastRow = parseInt(document.getElementById("tm-last-row").value); + } + fetchEntries("tm", activeTM.id, firstRow, lastRow); + } + document.getElementById("tm-last-row").onkeyup = function() { + if (this.value === "" || activeTM == null) { + return + } + lastRow = parseInt(this.value); + if (lastRow > 100) { + firstRow = lastRow - 100; + } else { + firstRow = 0; + } + if (document.getElementById("tm-first-row").value) { + firstRow = parseInt(document.getElementById("tm-last-row").value); + } + fetchEntries("tm", activeTM.id, firstRow, lastRow); + } + + document.getElementById("tb-first-row").onkeyup = function() { + if (this.value === "" || activeTB == null) { + return + } + firstRow = parseInt(this.value); + lastRow = firstRow + 100; + if (document.getElementById("tb-last-row").value) { + lastRow = parseInt(document.getElementById("tb-last-row").value); + } + fetchEntries("tb", activeTB.id, firstRow, lastRow); + } + document.getElementById("tb-last-row").onkeyup = function() { + if (this.value === "" || activeTB == null) { + return + } + lastRow = parseInt(this.value); + if (lastRow > 100) { + firstRow = lastRow - 100; + } else { + firstRow = 0; + } + if (document.getElementById("tb-first-row").value) { + firstRow = parseInt(document.getElementById("tb-last-row").value); + } + fetchEntries("tb", activeTB.id, firstRow, lastRow); + } }; if (document.readyState === "complete") { diff --git a/backend/api/views.py b/backend/api/views.py index 839ed6d..9273235 100644 --- a/backend/api/views.py +++ b/backend/api/views.py @@ -502,8 +502,9 @@ def kdb_view(request, kdb_id): kdb_entry_i = 0 for kdb_entry in kdb.conn.execute('''SELECT * FROM main''').fetchall(): kdb_entries[kdb_entry_i] = { - 'source': kdb_entry[0], - 'target': kdb_entry[1], + 'id': kdb_entry[0], + 'source': kdb_entry[1], + 'target': kdb_entry[2], } kdb_entry_i += 1 From 6889b7ad84ed603e172db565cf63b92c4851c3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Sun, 14 Mar 2021 18:51:41 +0300 Subject: [PATCH 2/9] Bug fix: KDB entry ranges now displayed properly --- app/src/index.js | 56 +++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/app/src/index.js b/app/src/index.js index 6351a88..2173c3d 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -764,55 +764,63 @@ function fireOnReady() { window.fetchSegments = fetchSegments; document.getElementById("tm-first-row").onkeyup = function() { - if (this.value === "" || activeTM == null) { + if (activeTM == null) { return + } else if (this.value === "") { + firstRow = 0; + } else { + firstRow = parseInt(this.value); } - firstRow = parseInt(this.value); - lastRow = firstRow + 100; - if (document.getElementById("tm-last-row").value) { + if (document.getElementById("tm-last-row").value === "") { + lastRow = 0 + } else { lastRow = parseInt(document.getElementById("tm-last-row").value); } fetchEntries("tm", activeTM.id, firstRow, lastRow); } document.getElementById("tm-last-row").onkeyup = function() { - if (this.value === "" || activeTM == null) { + if (activeTM == null) { return - } - lastRow = parseInt(this.value); - if (lastRow > 100) { - firstRow = lastRow - 100; + } else if (this.value === "") { + lastRow = 0; } else { - firstRow = 0; + lastRow = parseInt(this.value); } - if (document.getElementById("tm-first-row").value) { - firstRow = parseInt(document.getElementById("tm-last-row").value); + if (document.getElementById("tm-first-row").value === "") { + firstRow = 0; + } else { + firstRow = parseInt(document.getElementById("tm-first-row").value); } fetchEntries("tm", activeTM.id, firstRow, lastRow); } document.getElementById("tb-first-row").onkeyup = function() { - if (this.value === "" || activeTB == null) { + if (activeTB == null) { return + } else if (this.value === "") { + firstRow = 0; + } else { + firstRow = parseInt(this.value); } - firstRow = parseInt(this.value); - lastRow = firstRow + 100; - if (document.getElementById("tb-last-row").value) { + if (document.getElementById("tb-last-row").value === "") { + lastRow = 0 + } else { lastRow = parseInt(document.getElementById("tb-last-row").value); } fetchEntries("tb", activeTB.id, firstRow, lastRow); } document.getElementById("tb-last-row").onkeyup = function() { - if (this.value === "" || activeTB == null) { + if (activeTB == null) { return - } - lastRow = parseInt(this.value); - if (lastRow > 100) { - firstRow = lastRow - 100; + } else if (this.value === "") { + lastRow = 0; } else { - firstRow = 0; + lastRow = parseInt(this.value); } - if (document.getElementById("tb-first-row").value) { - firstRow = parseInt(document.getElementById("tb-last-row").value); + if (document.getElementById("tb-first-row").value === "") { + firstRow = 0; + } else { + firstRow = parseInt(document.getElementById("tb-first-row").value); } fetchEntries("tb", activeTB.id, firstRow, lastRow); } From fcd41c4fa315789d0bc14c00a71bbb9ba1505236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Sun, 14 Mar 2021 18:52:52 +0300 Subject: [PATCH 3/9] kdb_view now returns all row columns --- backend/api/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/api/views.py b/backend/api/views.py index 9273235..209d27b 100644 --- a/backend/api/views.py +++ b/backend/api/views.py @@ -500,11 +500,14 @@ def kdb_view(request, kdb_id): else: kdb_entries = {} kdb_entry_i = 0 - for kdb_entry in kdb.conn.execute('''SELECT * FROM main''').fetchall(): + for kdb_entry in kdb.get_entries(): kdb_entries[kdb_entry_i] = { 'id': kdb_entry[0], 'source': kdb_entry[1], 'target': kdb_entry[2], + 'state': kdb_entry[3], + 'time': kdb_entry[4], + 'submitted_by': kdb_entry[5] } kdb_entry_i += 1 From 827a0bb03561450e116fd8bfdafeac578c557750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Sun, 14 Mar 2021 20:39:13 +0300 Subject: [PATCH 4/9] Bug fix: fetchKDBs will now reattempt when it fails Consistency: Set console output for when fetchProjects fails from console.log to console.error --- app/src/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/index.js b/app/src/index.js index 2173c3d..1d75048 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -187,7 +187,7 @@ function fireOnReady() { console.log("Projects fetched.") } else if (this.readyState == 4 && this.status != 200) { - console.log("Projects not fetched. Trying again in 2 seconds.") + console.error("Projects not fetched. Trying again in 2 seconds.") setTimeout(() => { fetchProjects(); }, 2000) @@ -512,9 +512,9 @@ function fireOnReady() { console.log(role.toUpperCase() + "s fetched."); } else if (this.readyState == 4 && this.status != 200) { - console.log(role.toUpperCase() + "s not fetched. Trying again in 2 seconds.") + console.error(role.toUpperCase() + "s not fetched. Trying again in 2 seconds.") setTimeout(() => { - fetchKDBs(role, tableHeader); + fetchKDBs(role, tableHeader, kDBtable); }, 2000) } } From a7212b5a639235a5999f25d64d30d0c50de34d06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Sun, 14 Mar 2021 23:32:29 +0300 Subject: [PATCH 5/9] Upgrade Python dependencies --- backend/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/requirements.txt b/backend/requirements.txt index 7f6705b..10231af 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,3 +1,3 @@ -Django==2.2.14 -kaplan==0.9.0 -mysql-connector-python==8.0.22 +Django==2.2.19 +kaplan==0.10.0 +mysql-connector-python==8.0.23 From 8f2c52dabbd68e0ae9badc8ac3becf03a215f196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Mon, 15 Mar 2021 12:36:13 +0300 Subject: [PATCH 6/9] Applying a TM hit now flags the segment as draft --- app/src/editor.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/editor.js b/app/src/editor.js index 0fc62a5..8250d76 100644 --- a/app/src/editor.js +++ b/app/src/editor.js @@ -266,6 +266,7 @@ function lookupSegment(sourceSegment) { tr.onclick = function() { activeSegment.getElementsByTagName("td")[1].innerHTML = this.getElementsByTagName("td")[1].innerHTML; + activeSegment.className = "draft"; } tMHitsTable.append(tr); }) From ed83c914f11bf11f55cf0efc2085bd2f73ea532b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Mon, 15 Mar 2021 12:37:05 +0300 Subject: [PATCH 7/9] The Python backend should now terminate when the UI is terminated --- app/src/main.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main.js b/app/src/main.js index 2b40451..ea912d8 100644 --- a/app/src/main.js +++ b/app/src/main.js @@ -4,6 +4,8 @@ const fs = require('fs'); const path = require('path'); const { exec, spawn, spawnSync } = require('child_process'); +let backendServer; + // Handle creating/removing shortcuts on Windows when installing/uninstalling. if (require('electron-squirrel-startup')) { // eslint-disable-line global-require app.quit(); @@ -39,9 +41,8 @@ else if (fs.existsSync(path.join(app.getAppPath(), 'backend'))) process.env.KAPLAN_SETTINGS = JSON.stringify(settingsJSON); - const child = spawn(pathToBackend, - ['runserver'], - {detached: true}); + backendServer = spawn(pathToBackend, + ['runserver', '--noreload']); } let pathToIcon; @@ -75,9 +76,7 @@ const createWindow = () => { app.on('ready', createWindow); // This method will be called by app.quit(). -app.on('before-quit', () => { - if (fs.existsSync(path.join(app.getAppPath(), 'backend'))) {process.kill(-child.pid)} -}); +app.on('before-quit', () => { backendServer.kill() }); // Quit when all windows are closed. app.on('window-all-closed', () => { From 1bbe628d3b9937317cde058d0fe235b7bde97c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Mon, 15 Mar 2021 17:15:47 +0300 Subject: [PATCH 8/9] Upgrade node dependencies --- app/yarn.lock | 78 +++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/app/yarn.lock b/app/yarn.lock index 8cc9740..ad7f6fc 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -308,9 +308,9 @@ "@types/responselike" "*" "@types/fs-extra@^9.0.1": - version "9.0.7" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.7.tgz#a9ef2ffdab043def080c5bec94c03402f793577f" - integrity sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== + version "9.0.8" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.8.tgz#32c3c07ddf8caa5020f84b5f65a48470519f78ba" + integrity sha512-bnlTVTwq03Na7DpWxFJ1dvnORob+Otb8xHyUqUWhqvz/Ksg8+JXPlR52oeMSZ37YEOa5PyccbgUNutiQdi13TA== dependencies: "@types/node" "*" @@ -340,14 +340,14 @@ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== "@types/node@*": - version "14.14.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" - integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== + version "14.14.34" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.34.tgz#07935194fc049069a1c56c0c274265abeddf88da" + integrity sha512-dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA== "@types/node@^12.0.12": - version "12.20.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.4.tgz#73687043dd00fcb6962c60fbf499553a24d6bdf2" - integrity sha512-xRCgeE0Q4pT5UZ189TJ3SpYuX/QGl6QIAOAIeDSbAVAd2gX1NxSZup4jNVK7cxIeP8KDSbJgcckun495isP1jQ== + version "12.20.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.5.tgz#4ca82a766f05c359fd6c77505007e5a272f4bb9b" + integrity sha512-5Oy7tYZnu3a4pnJ//d4yVvOImExl4Vtwf0D40iKUlU+XlUsyV9iyFWyCFlwy489b72FMAik/EFwRkNLjjOdSPg== "@types/responselike@*", "@types/responselike@^1.0.0": version "1.0.0" @@ -781,9 +781,9 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= core-js@^3.6.5: - version "3.9.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.0.tgz#790b1bb11553a2272b36e2625c7179db345492f8" - integrity sha512-PyFBJaLq93FlyYdsndE5VaueA9K5cNB7CGzeCj191YYLhkQM0gdZR2SKihM70oF0wdqKSKClv/tEBOpoRmdOVQ== + version "3.9.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae" + integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -894,9 +894,9 @@ defer-to-connect@^1.0.1: integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== defer-to-connect@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1" - integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg== + version "2.0.1" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" + integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== define-properties@^1.1.3: version "1.1.3" @@ -1088,9 +1088,9 @@ end-of-stream@^1.1.0: once "^1.4.0" env-paths@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43" - integrity sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA== + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== error-ex@^1.2.0: version "1.3.2" @@ -1483,9 +1483,9 @@ globalthis@^1.0.1: define-properties "^1.1.3" got@^11.7.0: - version "11.8.1" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.1.tgz#df04adfaf2e782babb3daabc79139feec2f7e85d" - integrity sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q== + version "11.8.2" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.2.tgz#7abb3959ea28c31f3576f1576c1effce23f33599" + integrity sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ== dependencies: "@sindresorhus/is" "^4.0.0" "@szmarczak/http-timer" "^4.0.5" @@ -1578,9 +1578,9 @@ http-signature@~1.2.0: sshpk "^1.7.0" http2-wrapper@^1.0.0-beta.5.2: - version "1.0.0-beta.5.2" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz#8b923deb90144aea65cf834b016a340fc98556f3" - integrity sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ== + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== dependencies: quick-lru "^5.1.1" resolve-alpn "^1.0.0" @@ -2106,9 +2106,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^2.19.2: - version "2.19.3" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d" - integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg== + version "2.21.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz#c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48" + integrity sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg== dependencies: semver "^5.4.1" @@ -2328,9 +2328,9 @@ p-cancelable@^1.0.0: integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== p-cancelable@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e" - integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg== + version "2.1.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.0.tgz#4d51c3b91f483d02a0d300765321fca393d758dd" + integrity sha512-HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ== p-defer@^1.0.0: version "1.0.0" @@ -2816,9 +2816,9 @@ run-async@^2.4.0: integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== rxjs@^6.6.0: - version "6.6.3" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552" - integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== + version "6.6.6" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70" + integrity sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg== dependencies: tslib "^1.9.0" @@ -2999,9 +2999,9 @@ string-width@^1.0.1: strip-ansi "^4.0.0" string-width@^4.1.0, string-width@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" @@ -3422,9 +3422,9 @@ yargs-parser@^18.1.2: decamelize "^1.2.0" yargs-parser@^20.0.0, yargs-parser@^20.2.2: - version "20.2.6" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.6.tgz#69f920addf61aafc0b8b89002f5d66e28f2d8b20" - integrity sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA== + version "20.2.7" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" + integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== yargs@^15.0.1: version "15.4.1" From a2d6d59c4f233684c507027b93280cd40c5eb7c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fatay=20Onur=20=C5=9Eeng=C3=B6r?= Date: Mon, 15 Mar 2021 17:16:01 +0300 Subject: [PATCH 9/9] version 0.4.2 --- app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/package.json b/app/package.json index ab97bf1..5a9c42c 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "kaplan-desktop", "productName": "Kaplan Desktop", - "version": "0.4.0", + "version": "0.4.2", "description": "An open-source CAT tool.", "homepage": "https://kaplan.pro", "main": "src/main.js",