Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/ar-SA/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@
"app.project.install-context.back-to-browse": {
"message": "العودة إلى الاستكشاف"
},
"app.project.install-context.install-content-to-instance": {
"message": "تثبيت المحتويات الى النموذج"
},
"app.settings.developer-mode-enabled": {
"message": "تم تفعيل وضع المطوّر."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/cs-CZ/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Zpět k Objevování"
},
"app.project.install-context.install-content-to-instance": {
"message": "Nainstalovat obsah do instance"
},
"app.settings.developer-mode-enabled": {
"message": "Vývojářský režim povolen."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/da-DK/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,6 @@
"app.project.install-context.back-to-browse": {
"message": "Tilbage til udforsk"
},
"app.project.install-context.install-content-to-instance": {
"message": "Installer indhold til instance"
},
"app.settings.developer-mode-enabled": {
"message": "Udvikler-tilstand aktiveret."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/de-CH/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Zurück zu Entdecken"
},
"app.project.install-context.install-content-to-instance": {
"message": "Inhalt in Instanz installieren"
},
"app.settings.developer-mode-enabled": {
"message": "Entwicklermodus aktiviert."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/de-DE/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Zurück zum Entdecken"
},
"app.project.install-context.install-content-to-instance": {
"message": "Inhalt in Instanz installieren"
},
"app.settings.developer-mode-enabled": {
"message": "Entwicklermodus aktiviert."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/en-US/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Back to discover"
},
"app.project.install-context.install-content-to-instance": {
"message": "Install content to instance"
},
"app.settings.developer-mode-enabled": {
"message": "Developer mode enabled."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/es-419/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Volver al explorador"
},
"app.project.install-context.install-content-to-instance": {
"message": "Instalar contenido a la instancia"
},
"app.settings.developer-mode-enabled": {
"message": "Modo desarrollador activado."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/es-ES/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,6 @@
"app.project.install-context.back-to-browse": {
"message": "Volver a descubrir"
},
"app.project.install-context.install-content-to-instance": {
"message": "Instalar contenido"
},
"app.settings.developer-mode-enabled": {
"message": "Modo desarrollador activado."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/fi-FI/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Takaisin sisällön löytöön"
},
"app.project.install-context.install-content-to-instance": {
"message": "Asenna sisältöä instanssiin"
},
"app.settings.developer-mode-enabled": {
"message": "Kehittäjätila käytössä."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/fr-FR/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Retour vers la page découvrir"
},
"app.project.install-context.install-content-to-instance": {
"message": "Installer du contenu à l'instance"
},
"app.settings.developer-mode-enabled": {
"message": "Mode développeur activé."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/hu-HU/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,6 @@
"app.project.install-context.back-to-browse": {
"message": "Vissza a böngészéshez"
},
"app.project.install-context.install-content-to-instance": {
"message": "Tartalom telepítése a profilba"
},
"app.settings.developer-mode-enabled": {
"message": "Fejlesztői mód bekapcsolva."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/id-ID/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@
"app.project.install-context.back-to-browse": {
"message": "Kembali ke halaman pencarian"
},
"app.project.install-context.install-content-to-instance": {
"message": "Pasang konten ke instans"
},
"app.settings.developer-mode-enabled": {
"message": "Mode pengembang dihidupkan."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/it-IT/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,6 @@
"app.project.install-context.back-to-browse": {
"message": "Torna a Esplora"
},
"app.project.install-context.install-content-to-instance": {
"message": "Installa il contenuto nell'istanza"
},
"app.settings.developer-mode-enabled": {
"message": "Modalità sviluppatore attiva."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/ko-KR/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,6 @@
"app.project.install-context.back-to-browse": {
"message": "탐색으로 돌아가기"
},
"app.project.install-context.install-content-to-instance": {
"message": "인스턴스에 콘텐츠 설치"
},
"app.settings.developer-mode-enabled": {
"message": "개발자 모드가 활성화되었습니다."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/ms-MY/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,6 @@
"app.project.install-context.back-to-browse": {
"message": "Kembali menemukan"
},
"app.project.install-context.install-content-to-instance": {
"message": "Pasang kandungan ke dalam pemasangan"
},
"app.settings.developer-mode-enabled": {
"message": "Mod pembangun didayakan."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/nl-NL/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@
"app.project.install-context.back-to-browse": {
"message": "Terug naar Ontdekken"
},
"app.project.install-context.install-content-to-instance": {
"message": "Installeer content naar instantie"
},
"app.settings.developer-mode-enabled": {
"message": "Ontwikkelaarsmodus ingeschakeld."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/pl-PL/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,6 @@
"app.project.install-context.back-to-browse": {
"message": "Powróć do odkrywania"
},
"app.project.install-context.install-content-to-instance": {
"message": "Zainstaluj zasoby do instancji"
},
"app.settings.developer-mode-enabled": {
"message": "Tryb dewelopera włączony."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/pt-BR/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Voltar a descobrir"
},
"app.project.install-context.install-content-to-instance": {
"message": "Instalar conteúdo para a instância"
},
"app.settings.developer-mode-enabled": {
"message": "Modo desenvolvedor ativado."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/ru-RU/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -404,9 +404,6 @@
"app.project.install-context.back-to-browse": {
"message": "Вернуться к поиску"
},
"app.project.install-context.install-content-to-instance": {
"message": "Установка контента в сборку"
},
"app.settings.developer-mode-enabled": {
"message": "Режим разработчика включён."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/sv-SE/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,6 @@
"app.project.install-context.back-to-browse": {
"message": "Tillbaka till upptäck"
},
"app.project.install-context.install-content-to-instance": {
"message": "Installera innehåll till instans"
},
"app.settings.developer-mode-enabled": {
"message": "Utvecklarläge aktiverat."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/th-TH/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@
"app.project.install-context.back-to-browse": {
"message": "กลับไปที่หน้าค้นหา"
},
"app.project.install-context.install-content-to-instance": {
"message": "ติดตั้งเนื้อหาลงสู่อินสแตนซ์"
},
"app.settings.developer-mode-enabled": {
"message": "โหมดนักพัฒนาเปิดอยู่"
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/tr-TR/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "Keşfete geri dön"
},
"app.project.install-context.install-content-to-instance": {
"message": "İçeriği kuruluma yükle"
},
"app.settings.developer-mode-enabled": {
"message": "Geliştirici modu açıldı."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/uk-UA/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@
"app.project.install-context.back-to-browse": {
"message": "Повернутися до дослідження"
},
"app.project.install-context.install-content-to-instance": {
"message": "Установити вміст до профілю"
},
"app.settings.developer-mode-enabled": {
"message": "Увімкнено режим розробника."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/vi-VN/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,6 @@
"app.project.install-context.back-to-browse": {
"message": "Quay lại trang Khám Phá"
},
"app.project.install-context.install-content-to-instance": {
"message": "Cài đặt nội dung vào phiên bản"
},
"app.settings.developer-mode-enabled": {
"message": "Chế độ nhà phát triển đã được bật."
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/zh-CN/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "返回发现页"
},
"app.project.install-context.install-content-to-instance": {
"message": "将内容安装到实例中"
},
"app.settings.developer-mode-enabled": {
"message": "开发者模式已启用。"
},
Expand Down
3 changes: 0 additions & 3 deletions apps/app-frontend/src/locales/zh-TW/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -413,9 +413,6 @@
"app.project.install-context.back-to-browse": {
"message": "返回瀏覽"
},
"app.project.install-context.install-content-to-instance": {
"message": "將內容安裝至實例"
},
"app.settings.developer-mode-enabled": {
"message": "開發人員模式已啟用。"
},
Expand Down
10 changes: 9 additions & 1 deletion apps/app-frontend/src/pages/Browse.vue
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const debugLog = useDebugLogger('Browse')
const router = useRouter()
const route = useRoute()
const themeStore = useTheming()
const browseRouteActive = computed(() => route.path.startsWith('/browse/'))
const serverSetupModalRef = ref<InstanceType<typeof CreationFlowModal> | null>(null)
const serverInstallContent = createServerInstallContent({ serverSetupModalRef })
provideServerInstallContent(serverInstallContent)
Expand Down Expand Up @@ -487,6 +488,9 @@ function resetInstanceContext() {
watch(
() => route.params.projectType as ProjectType,
async (newType) => {
if (!browseRouteActive.value) {
return
}
if (isSetupServerContext.value) {
enforceSetupModpackRoute(newType)
if (newType !== 'modpack') return
Expand Down Expand Up @@ -954,6 +958,7 @@ const lockedFilterMessages = computed(() => ({
const searchState = useBrowseSearch({
projectType,
tags,
active: browseRouteActive,
providedFilters: combinedProvidedFilters,
search,
persistentQueryParams: ['i', 'ai', 'shi', 'sid', 'wid', 'from'],
Expand Down Expand Up @@ -1029,6 +1034,9 @@ onUnmounted(() => {
})

function getProjectBrowseQuery() {
if (!browseRouteActive.value) {
return undefined
}
if (!installContext.value) return undefined
return {
...route.query,
Expand Down Expand Up @@ -1119,7 +1127,7 @@ provideBrowseManager({
@browse-modpacks="() => {}"
@create="handleServerModpackFlowCreate"
/>
<Teleport to="#sidebar-teleport-target">
<Teleport v-if="browseRouteActive" to="#sidebar-teleport-target">
<BrowseSidebar />
</Teleport>
</div>
Expand Down
6 changes: 1 addition & 5 deletions apps/app-frontend/src/pages/project/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,6 @@ const messages = defineMessages({
id: 'app.project.install-context.back-to-browse',
defaultMessage: 'Back to discover',
},
installContentToInstance: {
id: 'app.project.install-context.install-content-to-instance',
defaultMessage: 'Install content to instance',
},
alreadyInstalled: {
id: 'app.project.install-button.already-installed',
defaultMessage: 'This project is already installed',
Expand Down Expand Up @@ -358,7 +354,7 @@ const projectInstallContext = computed(() => {
iconSrc: instance.value.icon_path ? convertFileSrc(instance.value.icon_path) : null,
backUrl: projectBrowseBackUrl.value,
backLabel: formatMessage(messages.backToBrowse),
heading: formatMessage(messages.installContentToInstance),
heading: formatMessage(commonMessages.installingContentLabel),
}
}

Expand Down
3 changes: 3 additions & 0 deletions apps/frontend/src/locales/en-US/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -3365,6 +3365,9 @@
"project.gallery.title": {
"message": "Gallery"
},
"project.install-context.back-to-discover": {
"message": "Back to discover"
},
"project.license.error": {
"message": "License text could not be retrieved."
},
Expand Down
Loading
Loading