diff --git a/src/components/Ad.svelte b/src/components/Ad.svelte index e6bc4095..55cfb5e0 100644 --- a/src/components/Ad.svelte +++ b/src/components/Ad.svelte @@ -2,9 +2,10 @@ export let type; export let variant; export let id; + export let style; let _class = ''; export { _class as class }; -
+
diff --git a/src/components/Sidebar/Sidebar.svelte b/src/components/Sidebar/Sidebar.svelte index f57edb9b..017ca9f1 100644 --- a/src/components/Sidebar/Sidebar.svelte +++ b/src/components/Sidebar/Sidebar.svelte @@ -11,11 +11,6 @@ import SidebarMoreItem from './SidebarMoreItem.svelte'; import { showSidebar } from '../../stores/sidebar'; - import Button from '../Button.svelte'; - - import DonateModal from '../DonateModal.svelte'; - - const { open: openModal } = getContext('simple-modal'); export let segment; export let mobile = false; @@ -34,17 +29,6 @@ $: currentLocale = languages.find((e) => e.id === $locale.substring(0, 2)) || { id: 'en', label: 'English' }; $: locales = languages.filter((e) => e.id !== currentLocale.id); - function openDonationModal() { - openModal( - DonateModal, - {}, - { - closeButton: false, - styleWindow: { background: '#25294A', width: '500px' }, - }, - ); - } - function close() { showSidebar.set(false); } @@ -159,10 +143,6 @@ {/each}
- diff --git a/src/routes/_layout.svelte b/src/routes/_layout.svelte index 08ef6ae7..f550eb8a 100644 --- a/src/routes/_layout.svelte +++ b/src/routes/_layout.svelte @@ -32,7 +32,9 @@ await checkLocalSave(); page.subscribe(() => { - if (window.reloadAdSlots) window.reloadAdSlots(); + try { + window.reloadAdSlots(); + } catch (error) {} }); }); @@ -57,7 +59,7 @@ {#if $preloading && $delayedPreloading}
{/if} -
+

{$t('footer.affliate')}
{$t('footer.copyright')} diff --git a/src/routes/achievement/index.svelte b/src/routes/achievement/index.svelte index bad54aa7..a9801560 100644 --- a/src/routes/achievement/index.svelte +++ b/src/routes/achievement/index.svelte @@ -19,6 +19,7 @@ import Icon from '../../components/Icon.svelte'; import Select from '../../components/Select.svelte'; import { pushToast } from '../../stores/toast'; + import Ad from '../../components/Ad.svelte'; export let data; @@ -297,154 +298,165 @@ -

-
-

{$t('achievement.title')}

-
-

- {finishedAchievement} - {$t('achievement.of')} - {totalAchievement} -

-
-

{obtainedPrimogem} {$t('achievement.of')} {totalPrimogem}

- primogem +
+
+
+

{$t('achievement.title')}

+
+

+ {finishedAchievement} + {$t('achievement.of')} + {totalAchievement} +

+
+

{obtainedPrimogem} {$t('achievement.of')} {totalPrimogem}

+ primogem +
+
+
+ +
+ changeSort(!sort)}>{$t('achievement.sort')} +
-
- -
- changeSort(!sort)}>{$t('achievement.sort')} -
-
-
- {#if showFilter} -
-
+
- + +
+
- -
- {/if} -
-
- {#each categories as category, index (category.id)} -
changeCategory(category.id, index)} - > -

{category.name}

-
-

- {category.finished}/{category.total} - ({((category.finished / category.total) * 100).toFixed(0)}%) -

-

- {category.primogem} -

- primogem -
-
- {/each} -
-
- {#each list as el, index} - {#if Array.isArray(el)} -
- {#each el as it, i} -
-
-

- {it.name} - - {it.ver} - - {#if it.commissions} - - {$t('achievement.commissions')} - - {/if} -

-

{it.desc}

-
-
-

{it.reward}

- primogem -
-
- toggle({ index, subindex: i, primogem: it.reward })} - inverted - disabled={i > 0 && !el[i - 1].checked} - /> -
-
- {/each} -
- {:else} -
-
-

- {el.name} - - {el.ver} - - {#if el.commissions} - - {$t('achievement.commissions')} - - {/if} + {/if} +

+
+ {#each categories as category, index (category.id)} +
changeCategory(category.id, index)} + > +

{category.name}

+
+

+ {category.finished}/{category.total} + ({((category.finished / category.total) * 100).toFixed(0)}%)

-

{el.desc}

-
-
-

{el.reward}

- primogem -
-
- toggle({ index, primogem: el.reward })} inverted /> +

+ {category.primogem} +

+ primogem
- {/if} - {/each} + {/each} +
+
+ {#each list as el, index} + {#if Array.isArray(el)} +
+ {#each el as it, i} +
+
+

+ {it.name} + + {it.ver} + + {#if it.commissions} + + {$t('achievement.commissions')} + + {/if} +

+

{it.desc}

+
+
+

{it.reward}

+ primogem +
+
+ toggle({ index, subindex: i, primogem: it.reward })} + inverted + disabled={i > 0 && !el[i - 1].checked} + /> +
+
+ {/each} +
+ {:else} +
+
+

+ {el.name} + + {el.ver} + + {#if el.commissions} + + {$t('achievement.commissions')} + + {/if} +

+

{el.desc}

+
+
+

{el.reward}

+ primogem +
+
+ toggle({ index, primogem: el.reward })} + inverted + /> +
+
+ {/if} + {/each} +
+
+ + diff --git a/src/routes/wish/tally/index.svelte b/src/routes/wish/tally/index.svelte index ff8d2170..3e10da73 100644 --- a/src/routes/wish/tally/index.svelte +++ b/src/routes/wish/tally/index.svelte @@ -1,5 +1,6 @@