diff --git a/apps/frontend/.env. b/apps/frontend/.env. new file mode 100644 index 0000000000..29aad1d10a --- /dev/null +++ b/apps/frontend/.env. @@ -0,0 +1,4 @@ +BASE_URL=http://127.0.0.1:8000/v2/ +BROWSER_BASE_URL=http://127.0.0.1:8000/v2/ +PYRO_BASE_URL=https://staging-archon.modrinth.com +PROD_OVERRIDE=true diff --git a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue index 44a50f083d..33a7dbf92e 100644 --- a/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue +++ b/apps/frontend/src/components/ui/moderation/ModerationProjectNags.vue @@ -24,7 +24,7 @@
- diff --git a/apps/frontend/src/composables/featureFlags.ts b/apps/frontend/src/composables/featureFlags.ts index 1becc8b856..c6ffe9eeec 100644 --- a/apps/frontend/src/composables/featureFlags.ts +++ b/apps/frontend/src/composables/featureFlags.ts @@ -48,7 +48,6 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({ useV1ContentTabAPI: true, labrinthApiCanary: false, dismissedExternalProjectsInfo: false, - modpackPermissionsPage: false, showAllBanners: false, alwaysIgnoreErrorBanner: false, showViewProdRouteBanner: false, diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json index ae6e2336a8..76c53c40f3 100644 --- a/apps/frontend/src/locales/en-US/index.json +++ b/apps/frontend/src/locales/en-US/index.json @@ -2888,9 +2888,21 @@ "project.settings.permissions.learn-more": { "message": "Learn more" }, + "project.settings.permissions.no-results": { + "message": "No external projects match your search." + }, "project.settings.permissions.search-placeholder": { "message": "Search {count} {count, plural, one {external project} other {external projects}}..." }, + "project.settings.permissions.sort.most-files": { + "message": "Most files" + }, + "project.settings.permissions.sort.recently-edited": { + "message": "Recently edited" + }, + "project.settings.permissions.sort.status": { + "message": "Status" + }, "project.settings.title": { "message": "Settings" }, diff --git a/apps/frontend/src/pages/[type]/[project]/settings.vue b/apps/frontend/src/pages/[type]/[project]/settings.vue index 45ea37ca34..5a37f4a228 100644 --- a/apps/frontend/src/pages/[type]/[project]/settings.vue +++ b/apps/frontend/src/pages/[type]/[project]/settings.vue @@ -47,10 +47,8 @@ const navItems = computed(() => { projectV3.value?.project_types?.some((type) => ['mod', 'modpack'].includes(type)) && isStaff(currentMember.value?.user) - const hasPermissionsPage = computed( - () => - flags.value.modpackPermissionsPage && - projectV3.value?.project_types?.some((type) => ['modpack'].includes(type)), + const hasPermissionsPage = computed(() => + projectV3.value?.project_types?.some((type) => ['modpack'].includes(type)), ) const items = [ @@ -82,16 +80,16 @@ const navItems = computed(() => { label: formatMessage(commonProjectSettingsMessages.description), icon: AlignLeftIcon, }, - hasPermissionsPage.value && { - link: `/${base}/settings/permissions`, - label: formatMessage(commonProjectSettingsMessages.permissions), - icon: SignatureIcon, - }, !isServerProject.value && { link: `/${base}/settings/versions`, label: formatMessage(commonProjectSettingsMessages.versions), icon: VersionIcon, }, + hasPermissionsPage.value && { + link: `/${base}/settings/permissions`, + label: formatMessage(commonProjectSettingsMessages.permissions), + icon: SignatureIcon, + }, !isServerProject.value && { link: `/${base}/settings/license`, label: formatMessage(commonProjectSettingsMessages.license), diff --git a/apps/frontend/src/pages/[type]/[project]/settings/permissions.vue b/apps/frontend/src/pages/[type]/[project]/settings/permissions.vue index 2d50a45c5d..58bb1e34a1 100644 --- a/apps/frontend/src/pages/[type]/[project]/settings/permissions.vue +++ b/apps/frontend/src/pages/[type]/[project]/settings/permissions.vue @@ -1,38 +1,168 @@