Skip to content

Commit

Permalink
feat: Re-work on resource search UX re-design
Browse files Browse the repository at this point in the history
  • Loading branch information
ci010 committed Dec 9, 2023
1 parent 9d68bbc commit 4a1404b
Show file tree
Hide file tree
Showing 28 changed files with 578 additions and 334 deletions.
2 changes: 1 addition & 1 deletion xmcl
4 changes: 4 additions & 0 deletions xmcl-keystone-ui/locales/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,8 @@ modInstall:
upgrade: Upgrade Mods
modSearchType:
all: All
explore: Explore Market
installed: Installed
local: Disk Cache
modified:
reset: Reset
Expand Down Expand Up @@ -1285,9 +1287,11 @@ setup:
shaderPack:
deletion: Delete Shader Pack
deletionHint: This will delete the shader pack file {path} and cannot reverted.
disabled: Disabled Shader Pack
dropHint: Import Shader Pack
empty: No shader pack allocated
enable: Using {name} shader pack
enabled: Enabled Shader Pack
filter: Filter Shader Packs
internal: Internal Shader
internalDescription: >-
Expand Down
2 changes: 2 additions & 0 deletions xmcl-keystone-ui/locales/fr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1350,8 +1350,10 @@ shaderPack:
deletionHint: >-
Cela supprimera le fichier du shaderpack {path} et ne pourra pas être
annulé.
disabled: Pack de shaders désactivé
empty: Vous avez 0 shaderpack
enable: Utilisation du shaderpack {name}
enabled: Pack de shaders activé
filter: Filtrer les Shaderpacks
internal: Shader Interne
internalDescription: >-
Expand Down
2 changes: 2 additions & 0 deletions xmcl-keystone-ui/locales/ru.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1258,8 +1258,10 @@ setup:
shaderPack:
deletion: Удалить шейдер
deletionHint: Это удалит файл шейдера {path} и будет невозможно восстановить его.
disabled: Отключенный пакет шейдеров
empty: Шейдер не выделен
enable: Использование шейдера {name}
enabled: Включенный пакет шейдеров
filter: Фильтр шейдеров
internal: Внутренний шейдер
internalDescription: >-
Expand Down
2 changes: 2 additions & 0 deletions xmcl-keystone-ui/locales/uk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1311,8 +1311,10 @@ setup:
shaderPack:
deletion: Видалити шейдер
deletionHint: Це видалити файл шейдера {path} і неможливо буде відновити його.
disabled: Вимкнений пакет шейдерів
empty: Шейдер не виділено
enable: Використання шейдера {name}
enabled: Увімкнений пакет шейдерів
filter: Фільтр шейдерів
internal: Внутрішній шейдер
internalDescription: >-
Expand Down
4 changes: 4 additions & 0 deletions xmcl-keystone-ui/locales/zh-CN.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ modInstall:
upgrade: 更新 Mods
modSearchType:
all: 所有
explore: 浏览市场
installed: 本地
local: 磁盘缓存
modified:
reset: 重置
Expand Down Expand Up @@ -1248,9 +1250,11 @@ setup:
shaderPack:
deletion: 删除光影包
deletionHint: 这将把光影包文件 {path} 永久删除。
disabled: 未启用的光影
dropHint: 导入光影包
empty: 没有启用光影包
enable: 使用了 {name} 作为光影包
enabled: 已启用的光影
filter: 筛选光影包
internal: 内置
internalDescription: 使用内置 shader,在此模式下你可以编辑 shader 管线选项
Expand Down
71 changes: 3 additions & 68 deletions xmcl-keystone-ui/src/components/MarketExtensions.vue
Original file line number Diff line number Diff line change
@@ -1,72 +1,7 @@
<template>
<v-tabs
:value="tab"
class="mt-3"
centered
background-color="transparent"
@change="$emit('update:tab', $event)"
>
<v-tab>
<v-icon left>
all_inclusive
</v-icon>
{{ t('modSearchType.all') }}
<div
class="v-badge__badge primary static ml-1 w-[unset]"
>
{{ local + modrinth + curseforge }}
</div>
</v-tab>
<v-tab
v-if="local >= 0"
:disabled="local === 0"
>
<v-icon left>
storage
</v-icon>
{{ t('modSearchType.local') }}
<div
class="v-badge__badge primary static ml-1 w-[unset]"
>
{{ local }}
</div>
</v-tab>
<v-tab :disabled="curseforge === 0">
<v-icon
:size="28"
left
>
$vuetify.icons.curseforge
</v-icon>
Curseforge
<div
class="v-badge__badge primary static ml-1 w-[unset]"
>
{{ curseforge }}
</div>
</v-tab>
<v-tab :disabled="modrinth === 0">
<v-icon left>
$vuetify.icons.modrinth
</v-icon>
Modrinth
<div
class="v-badge__badge primary static ml-1 w-[unset]"
>
{{ modrinth }}
</div>
</v-tab>
</v-tabs>
<div
class="flex w-full items-center justify-center gap-4 py-2"
/>
</template>
<script lang="ts" setup>
defineProps<{
tab: number
local: number
modrinth: number
curseforge: number
}>()
defineEmits<{
(event: 'update:tab', tab: number): void
}>()
const { t } = useI18n()
</script>
2 changes: 1 addition & 1 deletion xmcl-keystone-ui/src/components/MarketItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<template v-if="description">
{{ description }}
</template>
<template v-else-if="item.description.includes('§')">
<template v-else-if="typeof item.description === 'string' && item.description?.includes('§')">
<TextComponent :source="item.description" />
</template>
<template v-else>
Expand Down

0 comments on commit 4a1404b

Please sign in to comment.