-
-
-
-
-
-
-
-
-
-
-
+ {{ i18n.t("userActivity.title", [route.params.user]) }}
-
-
-
+
-
- {{ i18n.t("author.management") }}
-
-
-
-
-
diff --git a/frontend/src/pages/[user]/settings/api-keys.vue b/frontend/src/pages/[user]/settings/api-keys.vue
index 8f2635c2f..78cd166c8 100644
--- a/frontend/src/pages/[user]/settings/api-keys.vue
+++ b/frontend/src/pages/[user]/settings/api-keys.vue
@@ -1,13 +1,14 @@
-
+
+
+
+
+ {{ i18n.t("author.management") }}
+
+
+
+
+
+
+
+
+
+ {{ i18n.t(`author.tooltips.${btn.name}`) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.t("author.stars") }}
+
+
+
+
+ {{ i18n.t("author.watching") }}
+
+
-
-
-
- {{ i18n.t(`author.tooltips.${btn.name}`) }}
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.t("author.stars") }}
-
-
-
-
- {{ i18n.t("author.watching") }}
-
-
-
-
+ {{ i18n.t("author.orgs") }}
+
+
+
+ -
+
-
+
+ ++ {{ orgName }} ({{ orgRole.role.title }}) + + +
+
-
+
- + + {{ star.namespace.owner }}/{{ star.name }} + + + + + {{ i18n.t("author.noStarred", [props.user.name]) }} + +
-
+
- + {{ watch.namespace.owner }}/{{ watch.name }} + + + + {{ i18n.t("author.noWatching", [props.user.name]) }} + +
- {{ i18n.t("author.orgs") }}
-
-
-
- -
-
-
-
- -- {{ orgName }} ({{ orgRole.role.title }}) - - -
-
-
-
- - - {{ star.namespace.owner }}/{{ star.name }} - - - - - {{ i18n.t("author.noStarred", [props.user.name]) }} - -
-
-
- - {{ watch.namespace.owner }}/{{ watch.name }} - - - - {{ i18n.t("author.noWatching", [props.user.name]) }} - -
-
- {{ i18n.t("userActivity.reviews") }}
+
-meta:
- requireGlobalPerm: ["REVIEWER"]
-
diff --git a/frontend/src/pages/admin/approval/projects.vue b/frontend/src/pages/admin/approval/projects.vue
index 412170a96..0a65ea517 100644
--- a/frontend/src/pages/admin/approval/projects.vue
+++ b/frontend/src/pages/admin/approval/projects.vue
@@ -1,25 +1,28 @@
-
- {{ i18n.t("versionApproval.approvalQueue") }}
+
-
-
-meta:
- requireGlobalPerm: ["REVIEWER"]
-
diff --git a/frontend/src/pages/admin/flags.vue b/frontend/src/pages/admin/flags.vue
index 2e721e71c..399951545 100644
--- a/frontend/src/pages/admin/flags.vue
+++ b/frontend/src/pages/admin/flags.vue
@@ -1,20 +1,23 @@
- {{ i18n.t("flagReview.title") }}
-
-
-
+
-meta:
- requireGlobalPerm: ["MOD_NOTES_AND_FLAGS"]
-
diff --git a/frontend/src/pages/admin/health.vue b/frontend/src/pages/admin/health.vue
index 430f3c25e..5851a6e09 100644
--- a/frontend/src/pages/admin/health.vue
+++ b/frontend/src/pages/admin/health.vue
@@ -1,108 +1,108 @@
- {{ i18n.t("health.title") }}
-
+ {{ i18n.t("userActivity.title", [route.params.user]) }}
+
-
-
+
+ {{ i18n.t("userActivity.reviews") }}
-
-
-
-
- {{ i18n.t("health.empty") }}
-
-
-
- {{ i18n.t("userActivity.flags") }}
+
+
+
+
+ {{ i18n.t("health.empty") }}
+
+
+
+ {{ i18n.t("userActivity.flags") }}
-
-
-
-
- {{ i18n.t("health.empty") }}
-
-
+
+
+
+
+ {{ i18n.t("health.empty") }}
+
+
+
| {{ i18n.t("userActivity.reviewApproved") }} | -{{ activity.endedAt ? i18n.d(activity.endedAt, "time") : "" }} | -- {{ `${activity.namespace.owner}/${activity.namespace.slug}/${activity.versionString}: ${activity.platforms[0].toLowerCase()}` }} - | -
-
- |
-
| {{ i18n.t("userActivity.reviewApproved") }} | +{{ activity.endedAt ? i18n.d(activity.endedAt, "time") : "" }} | ++ {{ `${activity.namespace.owner}/${activity.namespace.slug}/${activity.versionString}: ${activity.platforms[0].toLowerCase()}` }} + | +
+
+ |
+
| {{ i18n.t("userActivity.flagResolved") }} | -{{ activity.resolvedAt ? i18n.d(activity.resolvedAt, "time") : "" }} | -- - {{ `${activity.namespace.owner}/${activity.namespace.slug}` }} - - | -
| {{ i18n.t("userActivity.flagResolved") }} | +{{ activity.resolvedAt ? i18n.d(activity.resolvedAt, "time") : "" }} | ++ + {{ `${activity.namespace.owner}/${activity.namespace.slug}` }} + + | +
+
+ {{ i18n.t("versionApproval.approvalQueue") }}
-
-
-
- {{ `${item.namespace.owner}/${item.namespace.slug}` }}
-
-
-
- {{ i18n.d(item.versionCreatedAt, "time") }}
-
-
-
-
-
+
+
+
+ {{ `${item.namespace.owner}/${item.namespace.slug}` }}
+
+
+
+ {{ i18n.d(item.versionCreatedAt, "time") }}
+
+
+
+
+
-
- {{ i18n.t("versionApproval.inReview") }}
+
+ {{ i18n.t("versionApproval.inReview") }}
-
-
-
- {{ `${item.namespace.owner}/${item.namespace.slug}` }}
-
-
-
-
-
- {{ i18n.d(item.versionCreatedAt, "time") }} - - - - {{ i18n.t("versionApproval.statuses.ongoing", [getOngoingCount(item)]) }} - -
- - {{ i18n.t("versionApproval.statuses.stopped", [getStoppedCount(item)]) }} - -
- {{ i18n.t("versionApproval.statuses.approved", [getApprovedCount(item)]) }} - - - -
-
-
-
-
+
+
+
+ {{ `${item.namespace.owner}/${item.namespace.slug}` }}
+
+
+
+
+
+ {{ i18n.d(item.versionCreatedAt, "time") }} + + + + {{ i18n.t("versionApproval.statuses.ongoing", [getOngoingCount(item)]) }} + +
+ + {{ i18n.t("versionApproval.statuses.stopped", [getStoppedCount(item)]) }} + +
+ {{ i18n.t("versionApproval.statuses.approved", [getApprovedCount(item)]) }} + + + +
+
+
+
+
+
- {{ i18n.d(item.versionCreatedAt, "time") }} - - - - {{ i18n.t("versionApproval.statuses.ongoing", [getOngoingCount(item)]) }} - -
- - {{ i18n.t("versionApproval.statuses.stopped", [getStoppedCount(item)]) }} - -
- {{ i18n.t("versionApproval.statuses.approved", [getApprovedCount(item)]) }} - - - -
-
-
- - {{ entry.reviewerName }} - {{ i18n.t("versionApproval.started", [i18n.d(entry.reviewStarted, "time")]) }} - {{ - i18n.t("versionApproval.ended", [i18n.d(entry.reviewEnded, "time")]) - }} - -
+ {{ i18n.d(item.versionCreatedAt, "time") }} + + + + {{ i18n.t("versionApproval.statuses.ongoing", [getOngoingCount(item)]) }} + +
+ + {{ i18n.t("versionApproval.statuses.stopped", [getStoppedCount(item)]) }} + +
+ {{ i18n.t("versionApproval.statuses.approved", [getApprovedCount(item)]) }} + + + +
-
+
- + {{ entry.reviewerName }} + {{ i18n.t("versionApproval.started", [i18n.d(entry.reviewStarted, "time")]) }} + {{ + i18n.t("versionApproval.ended", [i18n.d(entry.reviewEnded, "time")]) + }} + +
+ {{ i18n.t("flagReview.title") }}
+
+
+
+
-
-
-
- {{ i18n.t("health.noTopicProject") }}
+
-meta:
- requireGlobalPerm: ["VIEW_HEALTH"]
-
diff --git a/frontend/src/pages/admin/log.vue b/frontend/src/pages/admin/log.vue
index 59423c7c4..1fa367528 100644
--- a/frontend/src/pages/admin/log.vue
+++ b/frontend/src/pages/admin/log.vue
@@ -1,8 +1,8 @@
- {{ i18n.t("userActionLog.title") }}
-
-
-
- {{ item.userName }}
-
-
- {{ i18n.d(item.createdAt, "time") }}
-
-
- {{ i18n.t(item.action.description) }}
-
-
-
-
- {{ item.project.owner + "/" + item.project.slug + "/" + item.page.slug }}
-
+
-meta:
- requireGlobalPerm: ["VIEW_LOGS"]
-
diff --git a/frontend/src/pages/admin/stats.vue b/frontend/src/pages/admin/stats.vue
index 920c5a4fa..62d18b8a2 100644
--- a/frontend/src/pages/admin/stats.vue
+++ b/frontend/src/pages/admin/stats.vue
@@ -1,20 +1,38 @@
- {{ i18n.t("stats.title") }}
-
- {{ i18n.t("stats.plugins") }}
-
-
-
-
- {{ i18n.t("stats.downloads") }}
-
-
-
-
- {{ i18n.t("stats.flags") }}
-
-
-
+
-meta:
- requireGlobalPerm: ["VIEW_STATS"]
-
diff --git a/frontend/src/pages/admin/user/[user].vue b/frontend/src/pages/admin/user/[user].vue
index 1012f15d9..448b21c3a 100644
--- a/frontend/src/pages/admin/user/[user].vue
+++ b/frontend/src/pages/admin/user/[user].vue
@@ -1,18 +1,18 @@
- {{ i18n.t("userAdmin.title") }}
-
- {{ $route.params.user }}
-
-
-
+ {{ i18n.t("health.title") }}
+
-
-
+
+ {{ i18n.t("health.noTopicProject") }}
-
-
- {{ i18n.t("health.erroredJobs") }}
+
+
+ {{ i18n.t("health.erroredJobs") }}
-
-
- {{ i18n.t("health.staleProjects") }}
+
+
+ {{ i18n.t("health.staleProjects") }}
-
-
- {{ i18n.t("health.notPublicProjects") }}
+
+
+ {{ i18n.t("health.notPublicProjects") }}
-
-
- {{ i18n.t("health.noPlatform") }}
+
+
+ {{ i18n.t("health.noPlatform") }}
-
-
- {{ i18n.t("health.missingFileProjects") }}
+
+
+ {{ i18n.t("health.missingFileProjects") }}
-
+
-
-
- - - {{ project.namespace.owner + "/" + project.namespace.slug }} - - -
- - {{ i18n.t("health.empty") }} - -
-
+
- + + {{ project.namespace.owner + "/" + project.namespace.slug }} + + +
- + {{ i18n.t("health.empty") }} + +
-
-
- - {{ i18n.t("health.jobText", [job.jobType, job.lastErrorDescriptor, i18n.d(job.lastUpdated, "time")]) }} - -
- - {{ i18n.t("health.empty") }} - -
-
+
- + {{ i18n.t("health.jobText", [job.jobType, job.lastErrorDescriptor, i18n.d(job.lastUpdated, "time")]) }} + +
- + {{ i18n.t("health.empty") }} + +
-
-
- - - {{ project.namespace.owner + "/" + project.namespace.slug }} - - -
- - {{ i18n.t("health.empty") }} - -
-
+
- + + {{ project.namespace.owner + "/" + project.namespace.slug }} + + +
- + {{ i18n.t("health.empty") }} + +
-
-
- - - {{ project.namespace.owner + "/" + project.namespace.slug }} - {{ i18n.t("visibility.name." + project.visibility) }} - - -
- - {{ i18n.t("health.empty") }} - -
-
+
- + + {{ project.namespace.owner + "/" + project.namespace.slug }} + {{ i18n.t("visibility.name." + project.visibility) }} + + +
- + {{ i18n.t("health.empty") }} + +
-
-
- TODO: Implementation - - -
-
+
- TODO: Implementation + + +
-
-
- - - {{ project.namespace.owner + "/" + project.namespace.slug }} - - -
- - {{ i18n.t("health.empty") }} - -
-
+
- + + {{ project.namespace.owner + "/" + project.namespace.slug }} + + +
- + {{ i18n.t("health.empty") }} + +
+ {{ i18n.t("userActionLog.title") }}
+
+
+
+ {{ item.userName }}
-
-
- {{ `${item.project.owner}/${item.project.slug}/${item.version.versionString}` }}
-
+
+ {{ i18n.d(item.createdAt, "time") }}
-
- {{ item.project.owner + "/" + item.project.slug }}
+
+ {{ i18n.t(item.action.description) }}
-
- {{ item.subject.name }}
+
+
+
+ {{ item.project.owner + "/" + item.project.slug + "/" + item.page.slug }}
+
+
+
+
+ {{ `${item.project.owner}/${item.project.slug}/${item.version.versionString}` }}
+
+
+
+ {{ item.project.owner + "/" + item.project.slug }}
+
+
+ {{ item.subject.name }}
+
-
-
-
-
-
-
-
-
-
-
- default
- ![]()
-
-
- {{ item.oldState && i18n.te(item.oldState) ? i18n.t(item.oldState) : item.oldState }}
-
-
-
-
- ![]()
+
+
+ {{ item.oldState && i18n.te(item.oldState) ? i18n.t(item.oldState) : item.oldState }}
+
-
- default
- ![]()
+
+
+ ![]()
+
+
+ {{ i18n.te(item.newState) ? i18n.t(item.newState) : item.newState }}
+
-
- {{ i18n.te(item.newState) ? i18n.t(item.newState) : item.newState }}
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+ default
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ default
+
+ {{ i18n.t("stats.title") }}
+
+ {{ i18n.t("stats.plugins") }}
+
+
+
+
+ {{ i18n.t("stats.downloads") }}
+
+
+
+
+ {{ i18n.t("stats.flags") }}
+
+
+
+
-
-
-
- {{ i18n.t("userAdmin.roles") }}
-
-layout: error
-
diff --git a/frontend/src/pages/guidelines.vue b/frontend/src/pages/guidelines.vue
index 610104273..a7cbe9988 100644
--- a/frontend/src/pages/guidelines.vue
+++ b/frontend/src/pages/guidelines.vue
@@ -1,9 +1,9 @@
- {{ i18n.t("guidelines.title") }}
-
- {{ i18n.t("hangar.loggedOut") }}
-
-
-
-
-
-
+
+ {{ i18n.t("userAdmin.title") }}
+
+ {{ $route.params.user }}
+
+
+
- {{ i18n.t("userAdmin.organizations") }}
-
-
-
-
- {{ item.name }}
-
-
-
-
- {{ orgs[item.name].ownerName }}
-
-
-
- {{ orgs[item.name].role.title }}
-
-
-
-
-
- {{ i18n.t("userAdmin.projects") }}
-
-
-
-
- {{ item.name }}
-
-
-
-
- {{ item.namespace.owner }}
-
-
-
-
- <{{ item.name }}'s role>
-
-
-
-
-
-
-meta:
- requireGlobalPerm: ["EDIT_ALL_USER_SETTINGS"]
-
diff --git a/frontend/src/pages/admin/versions.vue b/frontend/src/pages/admin/versions.vue
index a6a206ca0..c6860db01 100644
--- a/frontend/src/pages/admin/versions.vue
+++ b/frontend/src/pages/admin/versions.vue
@@ -1,22 +1,25 @@
- {{ i18n.t("platformVersions.title") }}
-
-
-
-
+
-
-
-meta:
- requireGlobalPerm: ["MANUAL_VALUE_CHANGES"]
-
diff --git a/frontend/src/pages/api.vue b/frontend/src/pages/api.vue
index f037f9f39..1c1fa0874 100644
--- a/frontend/src/pages/api.vue
+++ b/frontend/src/pages/api.vue
@@ -1,9 +1,9 @@
- Authors
-
-
+
-
-
+
+ {{ i18n.t("userAdmin.roles") }}
+
+ {{ i18n.t("userAdmin.organizations") }}
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ {{ orgs[item.name].ownerName }}
+
+
+
+ {{ orgs[item.name].role.title }}
+
+
+
-
- {{ i18n.t("userAdmin.sidebar") }}
-
+ {{ i18n.t("userAdmin.projects") }}
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ {{ item.namespace.owner }}
+
+
+
+
+ <{{ item.name }}'s role>
+
+
+
-
-
+
-
-
+ {{ i18n.t("userAdmin.sidebar") }}
+
+
+
+
-
+
+
+
-
+
+
+
+
+
+
+
-
-
-
-
-
- -
+
- + {{ i18n.t("userAdmin.hangarAuth") }} + +
- + {{ i18n.t("userAdmin.forum") }} + +
-
-
- - {{ i18n.t("userAdmin.hangarAuth") }} - -
- - {{ i18n.t("userAdmin.forum") }} - -
| {{ i18n.t("platformVersions.platform") }} | -{{ i18n.t("platformVersions.versions") }} | -
|---|---|
| {{ platform.name }} | -
- |
-
+ {{ i18n.t("platformVersions.title") }}
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
| {{ i18n.t("platformVersions.platform") }} | +{{ i18n.t("platformVersions.versions") }} | +
|---|---|
| {{ platform.name }} | +
+ |
+
+ Authors
+
+
+
diff --git a/frontend/src/pages/error.vue b/frontend/src/pages/error.vue
index 2b2b748b3..d50b557a0 100644
--- a/frontend/src/pages/error.vue
+++ b/frontend/src/pages/error.vue
@@ -19,7 +19,3 @@ useHead(useSeo((route.params.status || 404) + " " + (route.params.msg || "Not fo
+ {{ i18n.t("guidelines.title") }}
+
diff --git a/frontend/src/pages/index.vue b/frontend/src/pages/index.vue
index 6f6aa01b7..f3645a0b0 100644
--- a/frontend/src/pages/index.vue
+++ b/frontend/src/pages/index.vue
@@ -1,20 +1,19 @@
- {{ i18n.t("hangar.projectSearch.title") }}
-{{ i18n.t("hangar.projectSearch.subTitle") }}
- -
-
-
-
-
-
-
-
-
-
-
- - {{ i18n.t("hangar.projectSearch.platforms") }} - - {{ i18n.t("hangar.projectSearch.clear") }} - -
-
-
- -
-
-
-
- --
-
-
- {{ i18n.t("hangar.projectSearch.versions") }}
-
-
-
-
-meta:
- layout: wide
-
diff --git a/frontend/src/pages/linkout.vue b/frontend/src/pages/linkout.vue
index 76b8c4d5b..d60ffd625 100644
--- a/frontend/src/pages/linkout.vue
+++ b/frontend/src/pages/linkout.vue
@@ -1,13 +1,13 @@
- {{ "Hangar Markdown" }}
-
-meta:
- requireLoggedIn: true
-
diff --git a/frontend/src/pages/notifications.vue b/frontend/src/pages/notifications.vue
index 976423684..b98e681a0 100644
--- a/frontend/src/pages/notifications.vue
+++ b/frontend/src/pages/notifications.vue
@@ -1,14 +1,14 @@
- Staff
-
-
+ BBCode to Markdown Converter
+
{{ i18n.t("hangar.projectSearch.categories") }}
-
-
+
+ {{ i18n.t("hangar.loggedOut") }}
+
+
+
+
+
- {{ i18n.t("hangar.projectSearch.title") }}
+{{ i18n.t("hangar.projectSearch.subTitle") }}
+ +
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-{{ i18n.t("hangar.projectSearch.licenses") }}
-
-
-
-
+
+
+
-
-
+
+ + {{ i18n.t("hangar.projectSearch.platforms") }} + + {{ i18n.t("hangar.projectSearch.clear") }} + +
+
+
+ -
+
-
+
+ ++
+
+
+ {{ i18n.t("hangar.projectSearch.versions") }}
+
+
+
+
+ {{ i18n.t("hangar.projectSearch.categories") }}
+
+
+
+
+
+
+ {{ i18n.t("hangar.projectSearch.licenses") }}
+
+
+
+
+
+ {{ "Hangar Markdown" }}
+
diff --git a/frontend/src/pages/new.vue b/frontend/src/pages/new.vue
index 73867beb3..940e23ad6 100644
--- a/frontend/src/pages/new.vue
+++ b/frontend/src/pages/new.vue
@@ -1,15 +1,15 @@
@@ -75,8 +78,3 @@ async function create() {
-
-
-
-
-
- {{ item.name }}
-
-
+ Staff
+
+
+
diff --git a/frontend/src/pages/tools/bbcode.vue b/frontend/src/pages/tools/bbcode.vue
index bdc356df2..eed09f356 100644
--- a/frontend/src/pages/tools/bbcode.vue
+++ b/frontend/src/pages/tools/bbcode.vue
@@ -1,18 +1,16 @@
-
+
+
+
+ {{ item.name }}
+
+
+ BBCode to Markdown Converter
- Hangar Version
-
- Please remember, these are estimates, not promises, they can change at any time as the team shifts focus. Although you can always speed up a particular task
- by contributing!
-
+ , to: RouteLocationNormalized) => Promise };
+type handlersType = {
+ [key: string]: (
+ authStore: ReturnType,
+ to: RouteLocationNormalized
+ ) => Promise | RouteLocationRaw | undefined;
+};
const handlers: handlersType = {
- requireLoggedIn: requireLoggedIn,
- requireNotLoggedIn: requireNotLoggedIn,
- requireCurrentUser: requireCurrentUser,
- requireGlobalPerm: requireGlobalPerm,
- requireProjectPerm: requireProjectPerm,
- require404: require404,
+ currentUserRequired,
+ globalPermsRequired,
+ projectPermsRequired,
};
-async function requireLoggedIn(authStore: ReturnType, to: RouteLocationNormalized) {
- routePermLog("route requireLoggedIn");
- const result = checkLogin(authStore, to, 401, "You must be logged in to perform this action");
- if (result) return result;
-}
-
-async function requireNotLoggedIn(authStore: ReturnType, to: RouteLocationNormalized) {
- routePermLog("route requireNotLoggedIn");
- if (authStore.authenticated) {
- return {
- path: "/",
- };
- }
-}
-
-async function requireCurrentUser(authStore: ReturnType, to: RouteLocationNormalized) {
- routePermLog("route requireCurrentUser");
+function currentUserRequired(authStore: ReturnType, to: RouteLocationNormalized) {
+ routePermLog("route currentUserRequired");
if (!to.params.user) {
throw new TypeError("Must have 'user' as a route param to use CurrentUser");
}
@@ -122,30 +110,30 @@ async function requireCurrentUser(authStore: ReturnType, to
}
}
-async function requireGlobalPerm(authStore: ReturnType, to: RouteLocationNormalized) {
- routePermLog("route requireGlobalPerm", to.meta.requireGlobalPerm);
+async function globalPermsRequired(authStore: ReturnType, to: RouteLocationNormalized) {
+ routePermLog("route globalPermsRequired", to.meta.globalPermsRequired);
const result = checkLogin(authStore, to, 403);
if (result) return result;
const check = await useApi("permissions/hasAll", true, "get", {
- permissions: toNamedPermission(to.meta.requireGlobalPerm as string[]),
+ permissions: toNamedPermission(to.meta.globalPermsRequired as string[]),
}).catch((e) => {
try {
- console.log("error!", e);
- handleRequestError(e, useContext(), useI18n());
+ routePermLog("error!", e);
+ handleRequestError(e, useI18n());
} catch (e2) {
- console.log("error while checking perm", e);
- console.log("encountered additional error while error handling", e2);
+ routePermLog("error while checking perm", e);
+ routePermLog("encountered additional error while error handling", e2);
}
});
- console.debug("result", check);
+ routePermLog("result", check);
if (check && (check.type !== PermissionType.GLOBAL || !check.result)) {
- console.debug("404?");
+ routePermLog("404?");
return useErrorRedirect(to, 404, "Not found");
}
}
-async function requireProjectPerm(authStore: ReturnType, to: RouteLocationNormalized) {
- routePermLog("route requireProjectPerm", to.meta.requireProjectPerm);
+function projectPermsRequired(authStore: ReturnType, to: RouteLocationNormalized) {
+ routePermLog("route projectPermsRequired", to.meta.projectPermsRequired);
if (!to.params.user || !to.params.project) {
throw new Error("Can't use this decorator on a route without `author` and `slug` path params");
}
@@ -154,17 +142,12 @@ async function requireProjectPerm(authStore: ReturnType, to
if (!authStore.routePermissions) {
return useErrorRedirect(to, 404);
}
- routePermLog("check has perms", to.meta.requireProjectPerm);
- if (!hasPerms(...toNamedPermission(to.meta.requireProjectPerm as string[]))) {
+ routePermLog("check has perms", to.meta.projectPermsRequired);
+ if (!hasPerms(...toNamedPermission(to.meta.projectPermsRequired as string[]))) {
return useErrorRedirect(to, 404);
}
}
-async function require404(authStore: ReturnType, to: RouteLocationNormalized) {
- routePermLog("route requireProjectPerm", to.meta.require404);
- return useErrorRedirect(to, 404);
-}
-
function checkLogin(authStore: ReturnType, to: RouteLocationNormalized, status: number, msg?: string) {
if (!authStore.authenticated) {
routePermLog("not logged in!");
diff --git a/frontend/src/plugins/i18n.ts b/frontend/src/plugins/i18n.ts
new file mode 100644
index 000000000..651b07523
--- /dev/null
+++ b/frontend/src/plugins/i18n.ts
@@ -0,0 +1,10 @@
+import { NuxtApp } from "nuxt/app";
+import { defineNuxtPlugin } from "#imports";
+import { installI18n } from "~/lib/i18n";
+import { settingsLog } from "~/lib/composables/useLog";
+
+export default defineNuxtPlugin(async (nuxtApp: NuxtApp) => {
+ // TODO load from settings
+ settingsLog("Load locale " + "en");
+ await installI18n(nuxtApp.vueApp, "en");
+});
diff --git a/frontend/src/plugins/nprogress.ts b/frontend/src/plugins/nprogress.ts
new file mode 100644
index 000000000..024379d21
--- /dev/null
+++ b/frontend/src/plugins/nprogress.ts
@@ -0,0 +1,15 @@
+import NProgress from "nprogress";
+import { nextTick } from "vue";
+import { NuxtApp } from "nuxt/app";
+import { defineNuxtPlugin } from "#imports";
+
+export default defineNuxtPlugin((nuxtApp: NuxtApp) => {
+ if (!process.server) {
+ nuxtApp.$router.beforeEach(() => {
+ NProgress.start();
+ });
+ nuxtApp.$router.afterEach(async () => {
+ await nextTick(() => NProgress.done());
+ });
+ }
+});
diff --git a/frontend/src/shims.d.ts b/frontend/src/shims.d.ts
deleted file mode 100644
index 74e4eba48..000000000
--- a/frontend/src/shims.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-declare interface Window {
- // extend the window
-}
-
-// with vite-plugin-md, markdowns can be treat as Vue components
-declare module "*.md" {
- import type { ComponentOptions } from "vue";
- const component: ComponentOptions;
- export default component;
-}
-
-declare module "domain" {
- const active: Domain;
- declare interface Domain {
- context: Record | null;
- }
-}
diff --git a/frontend/src/store/backendData.ts b/frontend/src/store/backendData.ts
index f974248c0..caba9b69b 100644
--- a/frontend/src/store/backendData.ts
+++ b/frontend/src/store/backendData.ts
@@ -2,9 +2,9 @@ import { defineStore } from "pinia";
import { computed, ref } from "vue";
import { IPlatform, IProjectCategory, IPrompt, IVisibility, Color, FlagReason } from "hangar-internal";
+import { Announcement as AnnouncementObject, Announcement, IPermission, Role } from "hangar-api";
import { NamedPermission, Platform, ProjectCategory, Prompt } from "~/types/enums";
-import { Announcement as AnnouncementObject, Announcement, IPermission, Role } from "hangar-api";
import { fetchIfNeeded, useInternalApi } from "~/composables/useApi";
import { Option } from "~/lib/components/ui/InputSelect.vue";
@@ -91,16 +91,16 @@ export const useBackendDataStore = defineStore("backendData", () => {
return convertToMap(promptsResult, (value) => value.name);
}, prompts),
- fetchIfNeeded(async () => useInternalApi("data/licenses", false), licenses),
- fetchIfNeeded(async () => useInternalApi("data/announcements", false), announcements),
- fetchIfNeeded(async () => useInternalApi("data/visibilities", false), visibilities),
- fetchIfNeeded(async () => useInternalApi>("data/validations", false), validations),
- fetchIfNeeded(async () => useInternalApi>("data/orgRoles", false), orgRoles),
- fetchIfNeeded(async () => useInternalApi>("data/channelColors", false), channelColors),
- fetchIfNeeded(async () => useInternalApi>("data/projectRoles", false), projectRoles),
- fetchIfNeeded(async () => useInternalApi>("data/globalRoles", false), globalRoles),
- fetchIfNeeded(async () => useInternalApi>("data/flagReasons", false), flagReasons),
- fetchIfNeeded(async () => useInternalApi>("data/version-info", false), versionInfo),
+ fetchIfNeeded(() => useInternalApi("data/licenses", false), licenses),
+ fetchIfNeeded(() => useInternalApi("data/announcements", false), announcements),
+ fetchIfNeeded(() => useInternalApi("data/visibilities", false), visibilities),
+ fetchIfNeeded(() => useInternalApi>("data/validations", false), validations),
+ fetchIfNeeded(() => useInternalApi>("data/orgRoles", false), orgRoles),
+ fetchIfNeeded(() => useInternalApi>("data/channelColors", false), channelColors),
+ fetchIfNeeded(() => useInternalApi>("data/projectRoles", false), projectRoles),
+ fetchIfNeeded(() => useInternalApi>("data/globalRoles", false), globalRoles),
+ fetchIfNeeded(() => useInternalApi>("data/flagReasons", false), flagReasons),
+ fetchIfNeeded(() => useInternalApi>("data/version-info", false), versionInfo),
]);
} catch (e) {
console.error("ERROR FETCHING BACKEND DATA");
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
deleted file mode 100644
index 0a0cad404..000000000
--- a/frontend/src/types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { Context } from "vite-ssr/vue";
-import type { App } from "vue";
-import type { Router, RouteRecord } from "vue-router";
-
-export type UserModule = (
- ctx: Context & {
- app: App;
- router: Router;
- initialRoute: RouteRecord;
- }
-) => void;
diff --git a/frontend/src/types/generated/icons.d.ts b/frontend/src/types/generated/icons.d.ts
index f60bde9cd..454efa647 100644
--- a/frontend/src/types/generated/icons.d.ts
+++ b/frontend/src/types/generated/icons.d.ts
@@ -20,39 +20,70 @@ declare module "@vue/runtime-core" {
IconMdiChat: typeof import("~icons/mdi/chat")["default"];
IconMdiCheck: typeof import("~icons/mdi/check")["default"];
IconMdiCheckBold: typeof import("~icons/mdi/check-bold")["default"];
+ IconMdiCheckboxMarkedCircle: typeof import("~icons/mdi/checkbox-marked-circle")["default"];
+ IconMdiCheckDecagram: typeof import("~icons/mdi/check-decagram")["default"];
+ IconMdiCheckDecagramOutline: typeof import("~icons/mdi/check-decagram-outline")["default"];
+ IconMdiChevronDoubleDown: typeof import("~icons/mdi/chevron-double-down")["default"];
IconMdiCircle: typeof import("~icons/mdi/circle")["default"];
IconMdiClipboardOutline: typeof import("~icons/mdi/clipboard-outline")["default"];
IconMdiClose: typeof import("~icons/mdi/close")["default"];
+ IconMdiCloseCircle: typeof import("~icons/mdi/close-circle")["default"];
+ IconMdiCloudSearch: typeof import("~icons/mdi/cloud-search")["default"];
IconMdiCodeBracesBox: typeof import("~icons/mdi/code-braces-box")["default"];
+ IconMdiCogTransfer: typeof import("~icons/mdi/cog-transfer")["default"];
+ IconMdiComment: typeof import("~icons/mdi/comment")["default"];
IconMdiContentSave: typeof import("~icons/mdi/content-save")["default"];
IconMdiController: typeof import("~icons/mdi/controller")["default"];
IconMdiDelete: typeof import("~icons/mdi/delete")["default"];
+ IconMdiDeleteAlert: typeof import("~icons/mdi/delete-alert")["default"];
IconMdiDownload: typeof import("~icons/mdi/download")["default"];
IconMdiDownloadOutline: typeof import("~icons/mdi/download-outline")["default"];
IconMdiEarth: typeof import("~icons/mdi/earth")["default"];
IconMdiEye: typeof import("~icons/mdi/eye")["default"];
IconMdiEyeOff: typeof import("~icons/mdi/eye-off")["default"];
IconMdiFeather: typeof import("~icons/mdi/feather")["default"];
+ IconMdiFile: typeof import("~icons/mdi/file")["default"];
IconMdiFlag: typeof import("~icons/mdi/flag")["default"];
+ IconMdiFormatListNumbered: typeof import("~icons/mdi/format-list-numbered")["default"];
IconMdiGamepadRoundLeft: typeof import("~icons/mdi/gamepad-round-left")["default"];
IconMdiGavel: typeof import("~icons/mdi/gavel")["default"];
IconMdiHelp: typeof import("~icons/mdi/help")["default"];
IconMdiHome: typeof import("~icons/mdi/home")["default"];
IconMdiHorseVariant: typeof import("~icons/mdi/horse-variant")["default"];
IconMdiInformation: typeof import("~icons/mdi/information")["default"];
+ IconMdiInformationOutline: typeof import("~icons/mdi/information-outline")["default"];
IconMdiKeyOutline: typeof import("~icons/mdi/key-outline")["default"];
+ IconMdiLicense: typeof import("~icons/mdi/license")["default"];
+ IconMdiLink: typeof import("~icons/mdi/link")["default"];
+ IconMdiListStatus: typeof import("~icons/mdi/list-status")["default"];
+ IconMdiLockOpenOutline: typeof import("~icons/mdi/lock-open-outline")["default"];
+ IconMdiLockOutline: typeof import("~icons/mdi/lock-outline")["default"];
IconMdiMenu: typeof import("~icons/mdi/menu")["default"];
IconMdiMenuDown: typeof import("~icons/mdi/menu-down")["default"];
IconMdiOpenInNew: typeof import("~icons/mdi/open-in-new")["default"];
IconMdiPencil: typeof import("~icons/mdi/pencil")["default"];
+ IconMdiPin: typeof import("~icons/mdi/pin")["default"];
+ IconMdiPinOff: typeof import("~icons/mdi/pin-off")["default"];
+ IconMdiPlay: typeof import("~icons/mdi/play")["default"];
IconMdiPlus: typeof import("~icons/mdi/plus")["default"];
+ IconMdiRefresh: typeof import("~icons/mdi/refresh")["default"];
+ IconMdiRenameBox: typeof import("~icons/mdi/rename-box")["default"];
+ IconMdiSend: typeof import("~icons/mdi/send")["default"];
IconMdiShape: typeof import("~icons/mdi/shape")["default"];
IconMdiShieldSun: typeof import("~icons/mdi/shield-sun")["default"];
+ IconMdiSort: typeof import("~icons/mdi/sort")["default"];
+ IconMdiSortAscending: typeof import("~icons/mdi/sort-ascending")["default"];
+ IconMdiSortDescending: typeof import("~icons/mdi/sort-descending")["default"];
IconMdiSortVariant: typeof import("~icons/mdi/sort-variant")["default"];
IconMdiStar: typeof import("~icons/mdi/star")["default"];
IconMdiStarOutline: typeof import("~icons/mdi/star-outline")["default"];
+ IconMdiStop: typeof import("~icons/mdi/stop")["default"];
+ IconMdiSubdirectoryArrowLeft: typeof import("~icons/mdi/subdirectory-arrow-left")["default"];
+ IconMdiTag: typeof import("~icons/mdi/tag")["default"];
IconMdiTools: typeof import("~icons/mdi/tools")["default"];
IconMdiTrophy: typeof import("~icons/mdi/trophy")["default"];
+ IconMdiUndo: typeof import("~icons/mdi/undo")["default"];
+ IconMdiUpload: typeof import("~icons/mdi/upload")["default"];
IconMdiWeatherNight: typeof import("~icons/mdi/weather-night")["default"];
IconMdiWhiteBalanceSunny: typeof import("~icons/mdi/white-balance-sunny")["default"];
RouterLink: typeof import("vue-router")["RouterLink"];
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index ed9baff5c..953570855 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,4 +1,6 @@
{
+ // https://v3.nuxtjs.org/concepts/typescript
+ "extends": "./.nuxt/tsconfig.json",
"compilerOptions": {
"baseUrl": ".",
"module": "ESNext",
@@ -13,10 +15,10 @@
"noUnusedLocals": true,
"strictNullChecks": true,
"forceConsistentCasingInFileNames": true,
- "types": ["vite/client", "vite-plugin-pages/client", "vite-plugin-vue-layouts/client", "unplugin-icons/types/vue"],
+ "types": ["vite/client", "vite-plugin-pages/client", "vite-plugin-vue-layouts/client", "unplugin-icons/types/vue", "nuxt-windicss"],
"paths": {
"~/*": ["src/*"],
- "~icons/*": ["src/types/generated/icons.d.ts"]
+ "#imports": [".nuxt/imports"]
}
},
"exclude": ["dist", "node_modules"]
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
deleted file mode 100644
index 8eb81a084..000000000
--- a/frontend/vite.config.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import VueI18n from "@intlify/vite-plugin-vue-i18n";
-import Vue from "@vitejs/plugin-vue";
-import path from "node:path";
-import IconsResolver from "unplugin-icons/resolver";
-import Icons from "unplugin-icons/vite";
-import Components from "unplugin-vue-components/vite";
-import { defineConfig } from "vite";
-import EslintPlugin from "vite-plugin-eslint";
-import Pages from "vite-plugin-pages";
-import { VitePWA } from "vite-plugin-pwa";
-import Layouts from "vite-plugin-vue-layouts";
-import WindiCSS from "vite-plugin-windicss";
-import viteSSR from "vite-ssr/plugin";
-import prettier from "./src/lib/plugins/prettier";
-// seriously? just shit up, lol
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { default as proxyConfig } from "./proxy.config";
-
-export default defineConfig({
- resolve: {
- alias: {
- "~/": `${path.resolve(__dirname, "src")}/`,
- },
- },
- plugins: [
- viteSSR(),
-
- Vue({
- include: [/\.vue$/, /\.md$/],
- }),
-
- // https://github.com/hannoeru/vite-plugin-pages
- Pages({
- extensions: ["vue", "md"],
- }),
-
- // https://github.com/JohnCampionJr/vite-plugin-vue-layouts
- Layouts(),
-
- // https://github.com/antfu/unplugin-vue-components
- Components({
- // we don't want to import components, just icons
- dirs: ["none"],
- // auto import icons
- resolvers: [
- // https://github.com/antfu/vite-plugin-icons
- IconsResolver({
- componentPrefix: "icon",
- enabledCollections: ["mdi"],
- }),
- ],
- dts: "src/types/generated/icons.d.ts",
- }),
-
- // https://github.com/antfu/unplugin-icons
- Icons({
- autoInstall: true,
- }),
-
- // https://github.com/windicss/vite-plugin-windicss
- WindiCSS({
- safelist: "prose prose-sm m-auto",
- }),
-
- // https://github.com/antfu/vite-plugin-pwa
- VitePWA({
- includeAssets: ["favicon/*"],
- strategies: "injectManifest",
- disable: true,
- manifest: {
- name: "Hangar | PaperMC",
- short_name: "Hangar",
- description: "Plugin repository for Paper plugins and more!",
- theme_color: "#ffffff",
- icons: [
- {
- src: "/favicon/android-chrome-192x192.png",
- sizes: "192x192",
- type: "image/png",
- },
- {
- src: "/favicon/android-chrome-512x512.png",
- sizes: "512x512",
- type: "image/png",
- },
- {
- src: "/favicon/android-chrome-512x512.png",
- sizes: "512x512",
- type: "image/png",
- purpose: "any maskable",
- },
- ],
- },
- }),
-
- // https://github.com/intlify/bundle-tools/tree/main/packages/vite-plugin-vue-i18n
- VueI18n({
- runtimeOnly: false,
- include: [path.resolve(__dirname, "src/locales/*.json")],
- }),
-
- EslintPlugin({
- fix: true,
- }),
- prettier(),
- ],
-
- optimizeDeps: {
- include: ["vue", "vue-router", "@vueuse/core", "@vueuse/head", "swagger-ui-dist"],
- exclude: ["vue-demi"],
- },
-
- envDir: ".env",
- envPrefix: "HANGAR",
-
- server: {
- proxy: proxyConfig.default,
- },
-
- // ssr options aren't part of release types for vite cause its still marked as experimental
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
- ssr: {
- noExternal: ["lodash-es"],
- },
-});
Enter your BBCode below:
-Enter your BBCode below:
+
-
+
-
-
+
+
+
+ Markdown output
+Markdown preview
+Markdown output
-Markdown preview
-This instance is running Hangar {{ version.version }}
-
- The last commit was {{ version.commitShort }} by
- {{ version.committer }} at {{ version.time }} with message:
- {{ version.message }}
-
Last Tag: {{ version.tag }} ({{ version.behind || 0 }} commits since tag)
-Milestones
-The next development steps of Hangar have been set to the following milestones
--
-
-
- Before Alpha:
- Once this is done, we will look for Alpha Testers on our Staging Instance on hangar.papermc.dev.
- At this point, DB resets are unlikely, but not impossible. -
- -
- Before Beta:
- Once this is done, we will look for Beta Testers on our Prod Instance on hangar.papermc.io.
- At this point we promise to no longer reset the DB, so you can upload all your plugins! Stuff might still be rough around the edges, so expect breakage, - please report any findings to our issue tracker! -
- - - During Beta we aim to fix all bugs and introduce a few new exciting features. - Hangar might be in this period for a while. - -
- - The Future is looking bright for Hangar, so this milestone captures all tasks - that we are interested in, but might be out of reach for a while for various reasons. But that should not stop you from suggesting new stuff! - -
You can see a graphical display of those milestones here.
-
+ Hangar Version
+
+ Please remember, these are estimates, not promises, they can change at any time as the team shifts focus. Although you can always speed up a particular
+ task by contributing!
+
+
diff --git a/frontend/src/modules/auth.ts b/frontend/src/plugins/auth.ts
similarity index 61%
rename from frontend/src/modules/auth.ts
rename to frontend/src/plugins/auth.ts
index c991d2dc1..f6293b42e 100644
--- a/frontend/src/modules/auth.ts
+++ b/frontend/src/plugins/auth.ts
@@ -1,22 +1,20 @@
-import type { UserModule } from "~/types";
+import { RouteLocationNormalized, RouteLocationRaw } from "vue-router";
+import { PermissionCheck, UserPermissions } from "hangar-api";
+import { useI18n } from "vue-i18n";
+import { NuxtApp } from "nuxt/app";
import { useAuth } from "~/composables/useAuth";
import { routePermLog } from "~/lib/composables/useLog";
import { useAuthStore } from "~/store/auth";
-import { RouteLocationNormalized, RouteLocationRaw } from "vue-router";
-import { useContext } from "vite-ssr/vue";
import { useApi } from "~/composables/useApi";
-import { PermissionCheck, UserPermissions } from "hangar-api";
import { useErrorRedirect } from "~/lib/composables/useErrorRedirect";
import { hasPerms, toNamedPermission } from "~/composables/usePerm";
import { NamedPermission, PermissionType } from "~/types/enums";
import { handleRequestError } from "~/composables/useErrorHandling";
-import { useI18n } from "vue-i18n";
import { useSettingsStore } from "~/store/useSettingsStore";
-import * as domain from "~/composables/useDomain";
+import { defineNuxtPlugin, useRequestEvent, useRouter } from "#imports";
-export const install: UserModule = async ({ request, response, router, redirect }) => {
- router.beforeEach(async (to, from, next) => {
- const d = domain.create(request, response);
+export default defineNuxtPlugin(async (nuxtApp: NuxtApp) => {
+ useRouter().beforeEach(async (to, from, next) => {
if (to.fullPath.startsWith("/@vite")) {
// really don't need to do stuff for such meta routes
return;
@@ -30,15 +28,18 @@ export const install: UserModule = async ({ request, response, router, redirect
} else {
next();
}
- domain.exit(d);
});
- if (request?.url.includes("/@vite")) {
+ await useAuth.updateUser();
+ if (!process.server) return;
+ const event = useRequestEvent();
+ const request = event.node.res;
+ const response = event.node.res;
+ if (request?.url?.includes("/@vite")) {
// really don't need to do stuff for such meta routes
return;
}
- await useAuth.updateUser();
await useSettingsStore().loadSettingsServer(request, response);
-};
+});
async function loadPerms(to: RouteLocationNormalized) {
const authStore = useAuthStore();
@@ -83,33 +84,20 @@ async function handleRoutePerms(to: RouteLocationNormalized) {
}
}
-type handlersType = { [key: string]: (authStore: ReturnTypeThis instance is running Hangar {{ version.version }}
+
+ The last commit was {{ version.commitShort }} by
+ {{ version.committer }} at {{ version.time }} with message:
+ {{ version.message }}
+
Last Tag: {{ version.tag }} ({{ version.behind || 0 }} commits since tag)
+Milestones
+The next development steps of Hangar have been set to the following milestones
+-
+
-
+ Before Alpha:
+ Once this is done, we will look for Alpha Testers on our Staging Instance on hangar.papermc.dev.
+ At this point, DB resets are unlikely, but not impossible. +
+ -
+ Before Beta:
+ Once this is done, we will look for Beta Testers on our Prod Instance on hangar.papermc.io.
+ At this point we promise to no longer reset the DB, so you can upload all your plugins! Stuff might still be rough around the edges, so expect breakage, + please report any findings to our issue tracker! +
+ - + During Beta we aim to fix all bugs and introduce a few new exciting features. + Hangar might be in this period for a while. + +
- + The Future is looking bright for Hangar, so this milestone captures all tasks + that we are interested in, but might be out of reach for a while for various reasons. But that should not stop you from suggesting new stuff! + +
You can see a graphical display of those milestones here.
+