From 3ce8da37eb2b3f8e5692784789b4c6739681efb0 Mon Sep 17 00:00:00 2001 From: Nariman Jelveh Date: Sun, 22 Sep 2024 12:40:38 -0700 Subject: [PATCH] close #772 --- src/dev-center/css/style.css | 18 ++++++++++++++++++ src/dev-center/index.html | 4 ++-- src/dev-center/js/dev-center.js | 32 ++++++++++++++++++++++++-------- 3 files changed, 44 insertions(+), 10 deletions(-) diff --git a/src/dev-center/css/style.css b/src/dev-center/css/style.css index a63c14960..51a88904a 100644 --- a/src/dev-center/css/style.css +++ b/src/dev-center/css/style.css @@ -36,6 +36,16 @@ body{ align-items: center; flex: 1; } + +h1 .app-count{ + font-size: 20px; + color: #6d767d; + font-weight: 400; + margin-left: 10px; + background-color: #EEE; + padding: 2px 10px; + border-radius: 3px; +} /* ------------------------------------ Button ------------------------------------*/ @@ -451,6 +461,14 @@ label { background-color: #3273dc; } +.sidebar-nav > li .app-count{ + font-size: 14px; + color: #f6f6f6; + font-weight: 400; + margin-left: 10px; + float: right; +} + .sidebar hr { margin-top: 20px; margin-bottom: 20px; diff --git a/src/dev-center/index.html b/src/dev-center/index.html index 4046b446e..9f104d14d 100644 --- a/src/dev-center/index.html +++ b/src/dev-center/index.html @@ -51,7 +51,7 @@
@@ -213,7 +213,7 @@
-

My Apps

+

My Apps

diff --git a/src/dev-center/js/dev-center.js b/src/dev-center/js/dev-center.js index f45e958e2..3cff4fc02 100644 --- a/src/dev-center/js/dev-center.js +++ b/src/dev-center/js/dev-center.js @@ -136,6 +136,7 @@ $(document).ready(function () { apps.forEach(app => { $('#app-list-table > tbody').append(generate_app_card(app)); }); + count_apps(); sort_apps(); } else { $('#no-apps-notice').show(); @@ -168,6 +169,7 @@ function refresh_app_list(show_loading = false) { apps.forEach(app => { $('#app-list-table > tbody').append(generate_app_card(app)); }); + count_apps(); sort_apps(); } else { $('#no-apps-notice').show(); @@ -358,7 +360,8 @@ $(document).on('click', '.delete-app', async function (e) { let init_ts = Date.now(); $('.deleting-app-modal')?.get(0)?.showModal(); puter.apps.delete(app_name).then(async (app) => { - setTimeout(() => { + setTimeout( + () => { $('.deleting-app-modal')?.get(0)?.close(); $(`.app-card[data-uid="${app_uid}"]`).fadeOut(200, function name(params) { $(this).remove(); @@ -369,10 +372,11 @@ $(document).on('click', '.delete-app', async function (e) { $('section:not(.sidebar)').hide(); $('#app-list').show(); } + count_apps(); }); }, - // make sure the modal was shown for at least 2 seconds - (Date.now() - init_ts) > 2000 ? 1 : 2000 - (Date.now() - init_ts)); + // make sure the modal was shown for at least 2 seconds + (Date.now() - init_ts) > 2000 ? 1 : 2000 - (Date.now() - init_ts)); // get app directory puter.fs.stat({ @@ -397,8 +401,8 @@ $(document).on('click', '.delete-app', async function (e) { }, ]); }, - // make sure the modal was shown for at least 2 seconds - (Date.now() - init_ts) > 2000 ? 1 : 2000 - (Date.now() - init_ts)); + // make sure the modal was shown for at least 2 seconds + (Date.now() - init_ts) > 2000 ? 1 : 2000 - (Date.now() - init_ts)); }) } }) @@ -1065,13 +1069,23 @@ $(document).on('click', '.back-to-main-btn', function (e) { apps.forEach(app => { $('#app-list-table > tbody').append(generate_app_card(app)); }); - sort_apps() + count_apps(); + sort_apps(); } else $('#no-apps-notice').show(); }) }, 1000); }) +function count_apps() { + let count = 0; + $('.app-card').each(function () { + count++; + }) + $('.app-count').html(count); + return count; +} + // https://stackoverflow.com/a/43467144/1764493 function is_valid_url(string) { let url; @@ -1348,7 +1362,7 @@ function sort_apps() { sorted_apps.forEach(app => { $('#app-list-table > tbody').append(generate_app_card(app)); }); - + count_apps(); // show apps that match search_query and hide apps that don't if (search_query) { // show apps that match search_query and hide apps that don't @@ -1895,7 +1909,7 @@ $('.refresh-app-list').on('click', function (e) { apps.forEach(app => { $('#app-list-table > tbody').append(generate_app_card(app)); }); - + count_apps(); // preserve search query if (search_query) { // show apps that match search_query and hide apps that don't @@ -2024,6 +2038,7 @@ $(document).on('click', '.delete-apps-btn', async function (e) { $('section:not(.sidebar)').hide(); $('#app-list').show(); } + count_apps(); }); try{ @@ -2041,6 +2056,7 @@ $(document).on('click', '.delete-apps-btn', async function (e) { `/${authUsername}/AppData/${dev_center_uid}/${app_uid}`, { recursive: true } ) + count_apps(); } catch(err) { console.log(err); }