Skip to content

feat: mods counter in results #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ZeKap wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: mods counter in results #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion web/messages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,17 @@
"error_while_calculating": "Error while processing",
"remaining_results": "{nb_remaining} other possibilities",
"results": {
"compatible_mods": "Compatible mods",
"best_config": "Best Minecraft configuration",
"mod": [
{
"declarations": ["input count", "local countPlural = count: plural"],
"selectors": ["countPlural"],
"match": {
"countPlural=one": "Mod",
"countPlural=other": "Mods"
}
}
],
"mc_version": [
{
"declarations": ["input count", "local countPlural = count: plural"],
Expand Down
11 changes: 10 additions & 1 deletion web/messages/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,17 @@
"error_while_calculating": "Erreur pendant processus",
"remaining_results": "{nb_remaining} autres possibilités",
"results": {
"compatible_mods": "Mods compatibles",
"best_config": "Meilleure configuration Minecraft",
"mod": [
{
"declarations": ["input count", "local countPlural = count: plural"],
"selectors": ["countPlural"],
"match": {
"countPlural=one": "Mod",
"countPlural=other": "Mods"
}
}
],
"mc_version": [
{
"declarations": ["input count", "local countPlural = count: plural"],
Expand Down
40 changes: 30 additions & 10 deletions web/src/components/ReleaseResultCarousel.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<script lang="ts">
import type { Solution } from 'mclib';
import type { ModRepoMetadata, Solution } from 'mclib';
import { ModResultsList } from '$cmpts';
import { m } from '$msg';
import { fly } from 'svelte/transition';

let { results }: { results: Solution[] } = $props();
let { results, selected_mods }: { results: Solution[]; selected_mods: ModRepoMetadata[] } =
$props();
let [is_left_button_visible, is_right_button_visible]: [
is_left_button_visible: boolean,
is_right_button_visible: boolean
Expand Down Expand Up @@ -70,14 +71,22 @@
>
{#each results as result, _id (result)}
<li id={'page_' + _id.toString()}>
<p>
{m['runner.results.mc_version']({ count: 1 })}:
<b>{result.mcConfig.mcVersion}</b>
</p>
<p>
{m['runner.results.loader']({ count: 1 })}:
<b>{result.mcConfig.loader}</b>
</p>
<div class="infos">
<div class="config">
<p>
{m['runner.results.mc_version']({ count: 1 })}:
<b>{result.mcConfig.mcVersion}</b>
</p>
<p>
{m['runner.results.loader']({ count: 1 })}:
<b>{result.mcConfig.loader}</b>
</p>
</div>
<p>
<b>{result.mods.length}</b>/{selected_mods.length}
{m['runner.results.mod']({ count: selected_mods.length })}
</p>
</div>

<ModResultsList mod_list={result.mods} />
</li>
Expand Down Expand Up @@ -196,6 +205,17 @@
display: flex;
flex-direction: column;
gap: 0.8rem;
& .infos {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: end;
& .config {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
}
}
}
& ul.pagination {
Expand Down
43 changes: 31 additions & 12 deletions web/src/components/ReleasesResult.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
<script lang="ts">
import type { Solution } from 'mclib';
import type { ModRepoMetadata, Solution } from 'mclib';
import { ModResultsList } from '$cmpts';
import { m } from '$msg';
import ReleaseResultCarousel from './ReleaseResultCarousel.svelte';

let { results }: { results: Solution[] } = $props();
let { results, selected_mods }: { results: Solution[]; selected_mods: ModRepoMetadata[] } =
$props();
let remaining_results: Solution[] = $derived(results.slice(1));
</script>

<h2>{m['runner.results.best_config']()}:</h2>
<p>
{m['runner.results.mc_version']({ count: results[0].mcConfig.mcVersion.length })}:
<b>{results[0].mcConfig.mcVersion}</b>
</p>
<p>
{m['runner.results.loader']({ count: results[0].mcConfig.loader.length })}:
<b>{results[0].mcConfig.loader}</b>
</p>
<div class="infos">
<div class="config">
<p>
{m['runner.results.mc_version']({ count: 1 })}:
<b>{results[0].mcConfig.mcVersion}</b>
</p>
<p>
{m['runner.results.loader']({ count: 1 })}:
<b>{results[0].mcConfig.loader}</b>
</p>
</div>
<p>
<b>{results[0].mods.length}</b>/{selected_mods.length}
{m['runner.results.mod']({ count: selected_mods.length })}
</p>
</div>

<h3>{m['runner.results.compatible_mods']()}:</h3>
<ModResultsList mod_list={results[0].mods} />
{#if remaining_results.length > 0}
<ReleaseResultCarousel results={remaining_results} />
<ReleaseResultCarousel results={remaining_results} {selected_mods} />
{/if}

<button
Expand All @@ -38,4 +46,15 @@
background: none;
color: var(--grey-light-2);
}
.infos {
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: end;
& .config {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
}
</style>
2 changes: 1 addition & 1 deletion web/src/routes/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
{:else if is_loading_mccreator}
<p>{m['runner.processing_modpack_creator']()}</p>
{:else if mc_results}
<ReleasesResult results={mc_results} />
<ReleasesResult results={mc_results} selected_mods={mod_list_added} />
{/if}
</section>
{/if}
Expand Down