diff --git a/controllers/AccountController.ts b/controllers/AccountController.ts index 61c7ca2..08f24d4 100644 --- a/controllers/AccountController.ts +++ b/controllers/AccountController.ts @@ -1,12 +1,14 @@ +import type APIViewModel from "../models/account/APIViewModel"; import type LoginViewModel from "../models/account/LoginViewModel"; import type RegisterViewModel from "../models/account/RegisterViewModel"; -import type DashboardViewModel from "../models/home/DashboardViewModel"; +import type DashboardViewModel from "../models/account/DashboardViewModel"; import Config from "../objects/Config"; import Session from "../objects/Session"; import DomainService from "../services/DomainService"; import UserService from "../services/UserService"; import ArrayUtility from "../utilities/ArrayUtility"; import Controller from "./Controller"; +import type DomainsViewModel from "../models/account/DomainsViewModel"; export default class AccountController extends Controller { public async Login_Get_AllowAnonymous() { @@ -88,22 +90,50 @@ export default class AccountController extends Controller { } public async Dashboard_Get() { - if (this.session) { - const dashboardViewModel: DashboardViewModel = { - recentUploads: await UserService.GetRecentUploads(this.session.userId), - domains: ArrayUtility.ToIdKeyedDict(await DomainService.LoadDomains()) - } - - return this.view(dashboardViewModel); + if (!this.session) { + return this.redirect("/"); } - return this.redirect("/"); + const dashboardViewModel: DashboardViewModel = { + recentUploads: await UserService.GetRecentUploads(this.session.userId), + domains: ArrayUtility.ToIdKeyedDict(await DomainService.LoadDomains()), + + mediaCounts: await UserService.GetUserMediaCounts(this.session.userId), + mediaCount: await UserService.GetTotalMediaCount(this.session.userId), + mediaSize: await UserService.GetTotalMediaSize(this.session.userId) + } + + return this.view(dashboardViewModel); } - public async ImageList_Get() { + public async Domains_Get() { + const domainsViewModel: DomainsViewModel = { + domains: await UserService.GetDomains(this.session.userId) + }; + + console.log(domainsViewModel); + + return this.view(domainsViewModel); + } + + public async Media_Get() { return this.view(); } + public async API_Get() { + const user = await UserService.GetUser(this.session.userId); + if (!user) { + return this.forbidden(); + } + + const apiViewModel: APIViewModel = { + apiKey: user.ApiKey, + uploadKey: user.UploadKey + }; + + return this.view(apiViewModel); + } + public async Logout_Get_AllowAnonymous() { Session.Clear(this.req.cookies, this.res); diff --git a/controllers/HomeController.ts b/controllers/HomeController.ts index 2757aca..4d4f111 100644 --- a/controllers/HomeController.ts +++ b/controllers/HomeController.ts @@ -2,6 +2,10 @@ import Controller from "./Controller"; export default class HomeController extends Controller { public Index_Get_AllowAnonymous() { + if (this.session) { + this.redirectToAction("dashboard", "account"); + } + return this.view(); } } \ No newline at end of file diff --git a/entities/Domain.ts b/entities/Domain.ts index ecfe0e1..19bc8fb 100644 --- a/entities/Domain.ts +++ b/entities/Domain.ts @@ -2,8 +2,14 @@ export default class Domain { public Id: number = Number.MIN_VALUE; public UserId: number = Number.MIN_VALUE; public HasHttps: boolean = false; + public get HasHttpsString() { + return this.HasHttps ? "Yes" : "No"; + } public Domain: string = ""; public Active: boolean = false; + public get ActiveString() { + return this.Active ? "Yes" : "No"; + } public CreatedByUserId = Number.MIN_VALUE; public CreatedDatetime = new Date(0); public LastModifiedByUserId?: number; diff --git a/entities/MediaCount.ts b/entities/MediaCount.ts new file mode 100644 index 0000000..64766bb --- /dev/null +++ b/entities/MediaCount.ts @@ -0,0 +1,4 @@ +export default class MediaCount { + public Type: string = ""; + public Count: number = Number.MIN_VALUE; +} \ No newline at end of file diff --git a/models/account/APIViewModel.ts b/models/account/APIViewModel.ts new file mode 100644 index 0000000..9cc9d92 --- /dev/null +++ b/models/account/APIViewModel.ts @@ -0,0 +1,4 @@ +export default interface APIViewModel { + apiKey: string, + uploadKey: string +} \ No newline at end of file diff --git a/models/home/DashboardViewModel.ts b/models/account/DashboardViewModel.ts similarity index 50% rename from models/home/DashboardViewModel.ts rename to models/account/DashboardViewModel.ts index 1c9ec84..2e79516 100644 --- a/models/home/DashboardViewModel.ts +++ b/models/account/DashboardViewModel.ts @@ -1,7 +1,12 @@ import type Domain from "../../entities/Domain"; import Media from "../../entities/Media"; +import type MediaCount from "../../entities/MediaCount"; export default interface DashboardViewModel { recentUploads: Array, - domains: { [key: string]: Domain } + domains: { [key: string]: Domain }, + + mediaCount: number, + mediaCounts: Array, + mediaSize: number } \ No newline at end of file diff --git a/models/account/DomainsViewModel.ts b/models/account/DomainsViewModel.ts new file mode 100644 index 0000000..b7f1b46 --- /dev/null +++ b/models/account/DomainsViewModel.ts @@ -0,0 +1,5 @@ +import type Domain from "../../entities/Domain"; + +export default interface DomainsViewModel { + domains: Array +} \ No newline at end of file diff --git a/objects/RequestCtx.ts b/objects/RequestCtx.ts index 38f30ca..512fc6b 100644 --- a/objects/RequestCtx.ts +++ b/objects/RequestCtx.ts @@ -1,6 +1,7 @@ import { type FastifyReply, type FastifyRequest } from "fastify"; import SessionUser from "./SessionUser"; import UserType from "../enums/UserType"; +import FormattingUtility from "../utilities/FormattingUtility"; export default class RequestCtx { public controllerName:string; @@ -32,6 +33,8 @@ export default class RequestCtx { viewModel["session"] = this.session; // @ts-ignore inject enums viewModel["UserType"] = UserType; + // @ts-ignore inject classes + viewModel["FormattingUtility"] = FormattingUtility; return this.res.view(`views/${this.controllerName}/${viewName}.ejs`, viewModel); } diff --git a/repos/DomainRepo.ts b/repos/DomainRepo.ts index ccac6ee..d9ad62c 100644 --- a/repos/DomainRepo.ts +++ b/repos/DomainRepo.ts @@ -3,37 +3,50 @@ import Database from "../objects/Database"; export default class DomainRepo { public static async SelectAll() { - const dbMedia = await Database.Instance.query("SELECT * FROM Domain WHERE IsDeleted = 0"); - const mediaList = new Array(); + const dbDomain = await Database.Instance.query("SELECT * FROM Domain WHERE IsDeleted = 0"); + const domainList = new Array(); - for (const row of dbMedia) { - const media = new Domain(); - PopulateDomainFromDB(media, row); - mediaList.push(media); + for (const row of dbDomain) { + const domain = new Domain(); + PopulateDomainFromDB(domain, row); + domainList.push(domain); } - return mediaList; + return domainList; + } + + public static async SelectByUserId(userId: number) { + const dbDomain = await Database.Instance.query("SELECT * FROM Domain WHERE IsDeleted = 0 AND UserId = ?", [ userId ]); + const domainList = new Array(); + + for (const row of dbDomain) { + const domain = new Domain(); + PopulateDomainFromDB(domain, row); + domainList.push(domain); + } + + return domainList; } public static async SelectById(id: number) { - const dbMedia = await Database.Instance.query("SELECT * FROM Domain WHERE Id = ? LIMIT 1", [id]); - if (dbMedia == null || dbMedia.length === 0) { + const dbDomain = await Database.Instance.query("SELECT * FROM Domain WHERE Id = ? LIMIT 1", [id]); + if (dbDomain == null || dbDomain.length === 0) { return null; } else { - const media = new Domain(); - PopulateDomainFromDB(media, dbMedia[0]); - return media; + const domain = new Domain(); + PopulateDomainFromDB(domain, dbDomain[0]); + return domain; } } public static async SelectByDomain(domain: string) { - const dbMedia = await Database.Instance.query("SELECT * FROM Domain WHERE Domain = ? AND IsDeleted = 0 LIMIT 1", [domain]); - if (dbMedia == null || dbMedia.length === 0) { + const dbDomain = await Database.Instance.query("SELECT * FROM Domain WHERE Domain = ? AND IsDeleted = 0 LIMIT 1", [domain]); + if (dbDomain == null || dbDomain.length === 0) { return null; } else { - const media = new Domain(); - PopulateDomainFromDB(media, dbMedia[0]); - return media; + const domain = new Domain(); + PopulateDomainFromDB(domain, dbDomain[0]); + return domain; } } diff --git a/repos/MediaRepo.ts b/repos/MediaRepo.ts index a7a55ba..3a6c148 100644 --- a/repos/MediaRepo.ts +++ b/repos/MediaRepo.ts @@ -1,5 +1,6 @@ import Database from "../objects/Database"; import Media from "../entities/Media"; +import MediaCount from "../entities/MediaCount"; export default abstract class MediaRepo { public static async SelectAll() { @@ -72,6 +73,31 @@ export default abstract class MediaRepo { return mediaList; } + public static async SelectTotalMediaSizeByUserId(userId: number) { + const dbCount = await Database.Instance.query('SELECT SUM(FileSize) FROM Media WHERE IsDeleted = 0 AND UserId = ?', [ userId ]); + + return dbCount[0]["SUM(FileSize)"]; + } + + public static async SelectTotalMediaByUserId(userId: number) { + const dbCount = await Database.Instance.query('SELECT COUNT(Id) FROM Media WHERE IsDeleted = 0 AND UserId = ?', [ userId ]); + + return dbCount[0]["COUNT(Id)"]; + } + + public static async SelectMediaTypeCountsByUserId(userId: number) { + const dbMedia = await Database.Instance.query('SELECT MediaType AS "Type", COUNT(Id) AS "Count" FROM Media WHERE IsDeleted = 0 AND UserId = ? GROUP BY MediaType ORDER BY "Count"', [ userId ]); + const mediaCountList = new Array(); + + for (const row of dbMedia) { + const mediaCount = new MediaCount(); + PopulateMediaCountFromDB(mediaCount, row); + mediaCountList.push(mediaCount); + } + + return mediaCountList; + } + public static async InsertUpdate(media: Media) { if (media.Id === Number.MIN_VALUE) { media.Id = (await Database.Instance.query("INSERT Media (UserId, DomainId, FileName, MediaTag, MediaType, Hash, FileSize, CreatedByUserId, CreatedDatetime, LastModifiedByUserId, LastModifiedDatetime, DeletedByUserId, DeletedDatetime, IsDeleted) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING Id;", [ @@ -103,4 +129,9 @@ function PopulateMediaFromDB(media: Media, dbMedia: any) { media.DeletedByUserId = dbMedia.DeletedByUserId; media.DeletedDatetime = dbMedia.DeletedDatetime; media.IsDeleted = dbMedia.IsDeleted[0] === 1; +} + +function PopulateMediaCountFromDB(mediaCount: MediaCount, dbMediaCount: any) { + mediaCount.Type = dbMediaCount.Type; + mediaCount.Count = dbMediaCount.Count; } \ No newline at end of file diff --git a/services/UserService.ts b/services/UserService.ts index adeed28..62c123c 100644 --- a/services/UserService.ts +++ b/services/UserService.ts @@ -134,4 +134,40 @@ export default abstract class UserService { throw e; } } + + public static async GetUserMediaCounts(currentUserId: number) { + try { + return await MediaRepo.SelectMediaTypeCountsByUserId(currentUserId); + } catch (e) { + Console.printError(`EUS server service error:\n${e}`); + throw e; + } + } + + public static async GetTotalMediaCount(currentUserId: number) { + try { + return await MediaRepo.SelectTotalMediaByUserId(currentUserId); + } catch (e) { + Console.printError(`EUS server service error:\n${e}`); + throw e; + } + } + + public static async GetTotalMediaSize(currentUserId: number) { + try { + return await MediaRepo.SelectTotalMediaSizeByUserId(currentUserId); + } catch (e) { + Console.printError(`EUS server service error:\n${e}`); + throw e; + } + } + + public static async GetDomains(currentUserId: number) { + try { + return await DomainRepo.SelectByUserId(currentUserId); + } catch (e) { + Console.printError(`EUS server service error:\n${e}`); + throw e; + } + } } \ No newline at end of file diff --git a/utilities/FormattingUtility.ts b/utilities/FormattingUtility.ts new file mode 100644 index 0000000..b37cd87 --- /dev/null +++ b/utilities/FormattingUtility.ts @@ -0,0 +1,20 @@ +const SPACE_VALUES = ["B", "KB", "MB", "GB", "TB", "PB", "EB"]; + +export default class FormattingUtility { + public static NumberHumanReadable(num: number) { + return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); + } + + // HSNOTE: Assumes bytes! + public static NumberAsFileSize(num: number) { + // Converts space values to lower values e.g MB, GB, TB etc depending on the size of the number + let i = 1; + // Loop through until value is at it's lowest + while (num >= 1024) { + num = num / 1024; + if (num >= 1024) i++; + } + + return `${num.toFixed(2)} ${SPACE_VALUES[i]}`; + } +} \ No newline at end of file diff --git a/views/account/api.ejs b/views/account/api.ejs new file mode 100644 index 0000000..bc94934 --- /dev/null +++ b/views/account/api.ejs @@ -0,0 +1,103 @@ +<%- include("../base/header", { title: "API Information", session }) %> + +
+
+ +
+
+ +
+
+
+
+
+
API Information
+
+
+
+
+
+

API Key

+

+ This is the key you need to utilise the EUS API. This can be used with the Authorization header as a Bearer token. +

+
+ + +
+ Request New API Key +
+ Only do this if you really need to, existing applications using this API Key will cease to function until it is replaced. +
+
+

Upload Key

+

+ This is the key you need to upload files to EUS when using the /upload POST endpoint.
+ Simply add a header to your request called "Upload-Key" containing this key. +

+
+ + +
+ Request New Upload Key +
+
+
+
+
+
+ + + +<%- include("../base/footer") %> diff --git a/views/account/dashboard.ejs b/views/account/dashboard.ejs index 52aee37..11d55ac 100644 --- a/views/account/dashboard.ejs +++ b/views/account/dashboard.ejs @@ -1,4 +1,15 @@ -<%- include("../base/header", { title: "Home", session }) %> +<%- include("../base/header", { title: "Account Dashboard", session }) %> + +
+
+ +
+
@@ -7,7 +18,7 @@
Recent Uploads
-
View All >>
+
View All >>
@@ -18,6 +29,8 @@
<% if (upload.MediaType.startsWith("image/")) { %> ://<%= domains[upload.DomainId].Domain %>/<%= upload.MediaTag %>" height="30" width="50"> + <% } else { %> + <% } %>
://<%= domains[upload.DomainId].Domain %>/<%= upload.MediaTag %>" target="_blank"><%= upload.FileName %>
@@ -30,9 +43,31 @@
+
+
Account
+
+
+
+ Account Information + API + Domains + Media +
+
+
+
Stats
-
+
+

Total Media: <%= FormattingUtility.NumberHumanReadable(mediaCount) %>

+

Media By Type:

+
    + <% for (const mediaCount of mediaCounts) { %> +
  1. <%= mediaCount.Type %>: <%= FormattingUtility.NumberHumanReadable(mediaCount.Count) %>
    2. + <% } %> +
+

Total size of Media: <%= FormattingUtility.NumberAsFileSize(mediaSize) %>

+
diff --git a/views/account/domains.ejs b/views/account/domains.ejs new file mode 100644 index 0000000..9823b6f --- /dev/null +++ b/views/account/domains.ejs @@ -0,0 +1,58 @@ +<%- include("../base/header", { title: "Your Domains", session }) %> + +
+
+ +
+
+ +
+
+
+
+
+
Your Domains
+
+
+
+
+
+ + + + + + + + + <% for (const domain of domains) { %> + + + + + + + <% } %> + +
Domain NameHas HTTPSActive 
<%= domain.Domain %><%= domain.HasHttpsString %><%= domain.ActiveString %> + Edit + Delete +
+
+
+
+
+
+
+ + + +<%- include("../base/footer") %> diff --git a/views/account/imagelist.ejs b/views/account/imagelist.ejs deleted file mode 100644 index 6247134..0000000 --- a/views/account/imagelist.ejs +++ /dev/null @@ -1,22 +0,0 @@ -<%- include("../base/header", { title: "Home", session }) %> - -
- -
-
-
-
-
Recent Uploads
-
<< Back to dashboard
-
-
-
-
- -
-
-
-
-
- -<%- include("../base/footer") %> \ No newline at end of file diff --git a/views/account/media.ejs b/views/account/media.ejs new file mode 100644 index 0000000..fabe160 --- /dev/null +++ b/views/account/media.ejs @@ -0,0 +1,33 @@ +<%- include("../base/header", { title: "Your Media", session }) %> + +
+
+ +
+
+ +
+ +
+
+
+
+
Your Media
+
+
+
+
+ +
+
+
+
+
+ +<%- include("../base/footer") %> \ No newline at end of file diff --git a/views/base/header.ejs b/views/base/header.ejs index ee5f58e..9068d76 100644 --- a/views/base/header.ejs +++ b/views/base/header.ejs @@ -29,7 +29,7 @@ -