From 6b568905d31ec28cf5f8afcc6132ab97c428cb99 Mon Sep 17 00:00:00 2001 From: tdurieux Date: Fri, 20 Aug 2021 16:10:39 +0200 Subject: [PATCH] add: new version of the dashboard --- public/css/style.css | 7 +- public/partials/dashboard.htm | 553 +++++++++++++++++++--------------- public/partials/header.htm | 2 +- public/script/app.js | 67 ++-- 4 files changed, 367 insertions(+), 262 deletions(-) diff --git a/public/css/style.css b/public/css/style.css index be066f6..6dc5835 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -25,7 +25,7 @@ color: var(--color); } body { - --canvas-bg-color: #dddddd; + --canvas-bg-color: #ffffff; --sidebar-bg-color: #ffffff; --header-bg-color: #4a507b; --header-color: #ffffff; @@ -192,6 +192,10 @@ a:hover { min-height: 100%; } +.badge { + font-size: 45%; +} + .dropdown-item:focus, .dropdown-item:hover { background-color: var(--hover-bg-color); @@ -207,6 +211,7 @@ a:hover { border: 1px solid var(--border-color); background: transparent; border-radius: 4px; + white-space: nowrap; } .btn:hover, diff --git a/public/partials/dashboard.htm b/public/partials/dashboard.htm index fda0c1b..382cbb1 100644 --- a/public/partials/dashboard.htm +++ b/public/partials/dashboard.htm @@ -1,250 +1,323 @@ -
-
-
-
-
-
- - Anonymize - +
+
+
+
+
+
+
+ +
+ +
+
+ +
+
Select order
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ +
+
Select status
+
+ + +
+
+ + +
+
+ + +
+
+
+
-
- +
+ + Anonymize + + + Claim + +
+
+
+
    +
  • +
    +
    +

    + + +

    + + + + + + + + + + + @ + + anonymized + {{repo.anonymizeDate | humanTime}} + +
    +
    + - Claim repository - + + {{repo.options.terms.length | number}} + + + {{repo.size | + humanFileSize}} + + + {{repo.pageView | number}} + + + + Last view: {{repo.lastView | humanTime}} + + + Expire: {{repo.options.expirationDate | humanTime}}
    -
- -

Filters

-
- -
-
-
- -
- -
-
Status
-
- - -
-
- - -
-
- - -
-
Quota
- {{quota.used | humanFileSize}}/{{quota.total| humanFileSize}} -
-
-
-
- - - - - - - - - - - - - - - - - - - - +
+ +
+ + Edit + + -
- - - - - - - - - - - - - - - - - - - -
#Repository IDAnonymized repositoryBranch - # Terms - Status - Expiration - - Anonymize date - - Size - - # Views - - Last view - Actions
- {{$index + 1}} - - {{repo.repoId}} - - {{repo.source.fullName}} - - {{repo.source.branch.name}} - - {{repo.options.terms.length}} - - {{repo.status | title}} - - {{repo.anonymizeDate | date}} - - {{repo.size | humanFileSize}} - - {{repo.pageView}} - - {{repo.lastView | date}} - -
- -
- - Edit - - - Force - update - - - - Enable - - - Remove - - - View Repo - - - View Page - -
-
-
No Repository
+ Force update + + + + Enable + + + Remove + + + View Repo + + + View Page + +
+
-
-
+ +
diff --git a/public/partials/header.htm b/public/partials/header.htm index 35473d9..5134a59 100644 --- a/public/partials/header.htm +++ b/public/partials/header.htm @@ -47,7 +47,7 @@ target="_blank" href="https://github.com/tdurieux/anonymous_github/" data-offset="30" - >
  • diff --git a/public/script/app.js b/public/script/app.js index af265b1..364e682 100644 --- a/public/script/app.js +++ b/public/script/app.js @@ -88,7 +88,7 @@ angular bytes = bytes / 8; if (Math.abs(bytes) < thresh) { - return bytes + " B"; + return bytes + "B"; } const units = si @@ -102,7 +102,45 @@ angular ++u; } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1); - return bytes.toFixed(dp) + " " + units[u]; + return bytes.toFixed(dp) + "" + units[u]; + }; + }) + .filter("humanTime", function () { + return function humanTime(seconds) { + if (seconds instanceof Date) + seconds = Math.round((Date.now() - seconds) / 1000); + if (typeof seconds == "string") + seconds = Math.round((Date.now() - new Date(seconds)) / 1000); + var suffix = seconds < 0 ? "from now" : "ago"; + + // more than 2 days ago display Date + if (Math.abs(seconds) > 2 * 60 * 60 * 24) { + const now = new Date(); + now.setSeconds(now.getSeconds() - seconds); + return "on " + now.toLocaleDateString(); + } + + seconds = Math.abs(seconds); + + var times = [ + seconds / 60 / 60 / 24 / 365, // years + seconds / 60 / 60 / 24 / 30, // months + seconds / 60 / 60 / 24 / 7, // weeks + seconds / 60 / 60 / 24, // days + seconds / 60 / 60, // hours + seconds / 60, // minutes + seconds, // seconds + ]; + var names = ["year", "month", "week", "day", "hour", "minute", "second"]; + + for (var i = 0; i < names.length; i++) { + var time = Math.floor(times[i]); + var name = names[i]; + if (time > 1) name += "s"; + + if (time >= 1) return time + " " + name + " " + suffix; + } + return "0 seconds " + suffix; }; }) .filter("title", function () { @@ -515,6 +553,7 @@ angular if (!repo.lastView) { repo.lastView = ""; } + repo.options.terms = repo.options.terms.filter((f) => f); } }, (err) => { @@ -529,7 +568,7 @@ angular $scope.quota = res.data; }, console.error); } - getQuota(); + // getQuota(); $scope.removeRepository = (repo) => { if ( @@ -555,7 +594,7 @@ angular if ($scope.search.trim().length == 0) return true; - if (repo.fullName.indexOf($scope.search) > -1) return true; + if (repo.source.fullName.indexOf($scope.search) > -1) return true; if (repo.repoId.indexOf($scope.search) > -1) return true; return false; @@ -839,7 +878,10 @@ angular if ($scope.readme) return $scope.readme; const o = parseGithubUrl($scope.repoUrl); const res = await $http.get(`/api/repo/${o.owner}/${o.repo}/readme`, { - params: { force: force === true ? "1" : "0", branch: $scope.branch }, + params: { + force: force === true ? "1" : "0", + branch: $scope.source.branch, + }, }); $scope.readme = res.data; } @@ -1068,17 +1110,6 @@ angular ); } - function getStats() { - $http.get(`/api/repo/${$scope.repoId}/stats/`).then( - (res) => { - $scope.stats = res.data; - }, - (err) => { - console.log(err); - } - ); - } - async function getOptions(callback) { $http.get(`/api/repo/${$scope.repoId}/options`).then( (res) => { @@ -1261,10 +1292,6 @@ angular getOptions((options) => { getFiles(() => { updateContent(); - - if (options.mode == "GitHubDownload") { - getStats(); - } }); }); }