Merge pull request #1 from MadeBaruna/main

sync

src/components/Sidebar/Sidebar.svelte

@@ -22,6 +22,7 @@
   const languages = [
     { id: 'en', label: 'English' },
     { id: 'id', label: 'Indonesia' },
+    { id: 'ru', label: 'Русский' },
   ];
   $: currentLocale = languages.find((e) => e.id === $locale.substring(0, 2)) || { id: 'en', label: 'English' };
   $: locales = languages.filter((e) => e.id !== currentLocale.id);

src/i18n.js

@@ -2,6 +2,7 @@ import { addMessages, init, getLocaleFromNavigator, locale as $locale } from 'sv
 
 import en from './locales/en.json';
 import id from './locales/id.json';
+import ru from './locales/ru.json';
 
 const INIT_OPTIONS = {
   fallbackLocale: 'en',
@@ -23,6 +24,7 @@ $locale.subscribe((value) => {
 addMessages('en', en);
 addMessages('en-US', en);
 addMessages('id', id);
+addMessages('ru', ru);
 
 export function startClient() {
   const savedLocale = localStorage.getItem('locale');

src/locales/en.json

@@ -35,7 +35,8 @@
     },
     "items": {
       "title": "Farmable Today",
-      "detail": "Items"
+      "detail": "Items",
+      "sunday": "Sunday can farm all items 😁"
     },
     "calculator": {
       "title": "🧮 Calculate Character and Weapons ascension material and talent book! All the calculations can be added to the Todo list, it will show you how much resin you need too!",
@@ -455,5 +456,10 @@
     ],
     "kofi": "Support me on Ko-fi",
     "trakteer": "Support me on Trakteer"
+  },
+  "reminder": {
+    "title": "Reminder Notification",
+    "notSupported": "Your browser does not support push notification, please try other browser!",
+    "blocked": "Notification is blocked, the reminder notification will not work! Please enable it on your browser."
   }
 }

src/locales/ru.json

@@ -126,7 +126,7 @@
           "для доп. информации). Вы можете отключить отправку ваших молитв, тогда вся ваша история молитв будет сохраняться на вашем устройстве (или на вашем Google Drive, если вы включили синхронизацию)."
         ],
         "q6": "Я выполнил все шаги, но у меня ошибка API!",
-        "a6": "Убедитесь, что вы скопировлись весь текст (удерживайте и нажмите «Выбрать все» для мобильных устройств); возможно, вы пропустили часть ссылки которая нужна для работы импорта",
+        "a6": "Убедитесь, что вы скопировлись весь текст (удерживайте и нажмите «Выбрать все» для мобильных устройств); возможно, вы пропустили часть ссылки которая нужна для работы импорта"
       },
       "guide": {
         "pc": [

src/routes/_index/item.svelte

@@ -56,34 +56,38 @@
 
 <div class="bg-item rounded-xl p-4 flex flex-col">
   <p class="text-white mb-2">{$t('home.items.title')}</p>
-  <table>
-    {#each Object.entries(characterItems) as [id, characters]}
+  {#if today === 'sunday'}
+    <div class="text-white">{$t('home.items.sunday')}</div>
+  {:else}
+    <table>
+      {#each Object.entries(characterItems) as [id, characters]}
+        <tr>
+          <td class="border-b border-gray-700 h-14 w-14 pr-2 py-2 align-middle">
+            <img class="h-full" src="/images/items/{id}.png" alt={id} title={id} />
+          </td>
+          <td class="border-b border-gray-700 pt-2 align-middle">
+            {#each characters as char}
+              <img
+                class="h-10 w-auto mb-2 mr-2 inline rounded-full"
+                src="/images/characters/{char}.png"
+                alt={char}
+                title={char}
+              />
+            {/each}
+          </td>
+        </tr>
+      {/each}
       <tr>
-        <td class="border-b border-gray-700 h-14 w-14 pr-2 py-2 align-middle">
-          <img class="h-full" src="/images/items/{id}.png" alt={id} title={id} />
-        </td>
-        <td class="border-b border-gray-700 pt-2 align-middle">
-          {#each characters as char}
-            <img
-              class="h-10 w-auto mb-2 mr-2 inline rounded-full"
-              src="/images/characters/{char}.png"
-              alt={char}
-              title={char}
-            />
+        <td colspan="2" class="py-2 align-middle">
+          {#each Object.entries(weaponItems) as [id, _]}
+            <div class="h-10 w-10 mr-4 inline-block">
+              <img class="h-full" src="/images/items/{id}.png" alt={id} title={id} />
+            </div>
           {/each}
         </td>
       </tr>
-    {/each}
-    <tr>
-      <td colspan="2" class="py-2 align-middle">
-        {#each Object.entries(weaponItems) as [id, _]}
-          <div class="h-10 w-10 mr-4 inline-block">
-            <img class="h-full" src="/images/items/{id}.png" alt={id} title={id} />
-          </div>
-        {/each}
-      </td>
-    </tr>
-  </table>
+    </table>
+  {/if}
   <a
     href="/items"
     class="flex justify-end items-center self-end lg:self-start text-white mt-4 bg-background-secondary rounded-xl py-2 px-4

src/routes/_index/wish.svelte

@@ -58,7 +58,7 @@
   {:else}
     <p class="text-white mb-2">{$t('home.wish.latest')}</p>
     <div class="flex">
-      <div class="h-16 w-16" style="min-width: 4rem;">
+      <div class="h-16 w-16 mr-1" style="min-width: 4rem;">
         <img
           class="h-full w-auto"
           src={latestPull.type === 'character'

static/images/locales/ru.svg

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+<svg id="svg378" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="512" width="512" version="1" y="0" x="0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata4346">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="flag" fill-rule="evenodd" stroke-width="1pt" transform="matrix(.48166 0 0 .72249 0 .0000024116)">
+  <rect id="rect171" height="708.66" width="1063" y="0" x="0" fill="#fff"/>
+  <rect id="rect403" height="472.44" width="1063" y="236.22" x="0" fill="#01017e"/>
+  <rect id="rect135" height="236.22" width="1063" y="472.44" x="0" fill="#fe0101"/>
+ </g>
+</svg>