Merge pull request #318 from SkyCryptWebsite/dev

Author: DarthGigi

.changeset/pre.json

@@ -0,0 +1,10 @@
+{
+  "mode": "pre",
+  "tag": "beta",
+  "initialVersions": {
+    "skycrypt-frontend": "3.5.2"
+  },
+  "changesets": [
+    "wet-apples-sell"
+  ]
+}

.changeset/wet-apples-sell.md

@@ -0,0 +1,5 @@
+---
+"skycrypt-frontend": minor
+---
+
+Remove the official wiki and use the new independent wiki #317. Thanks @DespicableGoose!

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.6.0-beta.0
+
+### Minor Changes
+
+- Remove the official wiki and use the new independent wiki #317. Thanks @DespicableGoose! ([`ac42e56`](https://github.com/SkyCryptWebsite/SkyCrypt-Frontend/commit/ac42e5654b867a6e91e0310ee02e3f90d89313f7))
+
 ## 3.5.2
 
 ### Patch Changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "skycrypt-frontend",
-  "version": "3.5.2",
+  "version": "3.6.0-beta.0",
   "private": true,
   "type": "module",
   "repository": {

pnpm-lock.yaml

@@ -14,7 +14,6 @@ context/
 ├── favorites.svelte.ts        # PersistedState: {uuid, ign, displayName?}[]
 ├── searches.svelte.ts         # PersistedState: recent searches
 ├── packs.svelte.ts            # PersistedState: disabled resource packs
-├── wiki.svelte.ts             # PersistedState: wiki order data
 ├── internal.svelte.ts         # Volatile: tabValue, showItem, itemContent, settingsOpen, openCommand
 ├── utils.ts                   # loadOldStorageKey migration helper
 └── index.ts                   # Barrel export (all get/init/set functions)
@@ -64,7 +63,6 @@ let name = $derived(profile.current?.name);
 | Favorites      | persisted | player favorites list                                                             |
 | RecentSearches | persisted | search history                                                                    |
 | DisabledPacks  | persisted | disabled resource pack IDs                                                        |
-| WikiOrder      | persisted | wiki ordering data                                                                |
 
 ## CONVENTIONS
 

src/context/AGENTS.md

@@ -6,4 +6,3 @@ export * from "./preferences.svelte";
 export * from "./searches.svelte";
 export * from "./themes.svelte";
 export * from "./tooltips.svelte";
-export * from "./wiki.svelte";

src/context/index.ts

@@ -1,37 +1,20 @@
 <script lang="ts">
-  import { getPreferences, getWikiOrder } from "$ctx";
+  import { getPreferences } from "$ctx";
   import { SettingsTab } from "$lib/components/header/types";
-  import { sections } from "$lib/sections/constants";
   import { cn, flyAndScale } from "$lib/shared/utils";
-  import { Feedback } from "@dnd-kit/dom";
-  import { OptimisticSortingPlugin, SortableKeyboardPlugin } from "@dnd-kit/dom/sortable";
-  import { move } from "@dnd-kit/helpers";
-  import type { DragDropEventHandlers } from "@dnd-kit/svelte";
-  import { DragDropProvider } from "@dnd-kit/svelte";
-  import { createSortable } from "@dnd-kit/svelte/sortable";
-  import BookOpenText from "@lucide/svelte/icons/book-open-text";
   import CircleQuestionMark from "@lucide/svelte/icons/circle-question-mark";
   import Fan from "@lucide/svelte/icons/fan";
-  import GripVertical from "@lucide/svelte/icons/grip-vertical";
   import Keyboard from "@lucide/svelte/icons/keyboard";
   import Pickaxe from "@lucide/svelte/icons/pickaxe";
   import Rainbow from "@lucide/svelte/icons/rainbow";
   import Settings2 from "@lucide/svelte/icons/settings-2";
   import Sparkle from "@lucide/svelte/icons/sparkle";
-  import { Button, Separator, Tabs, Tooltip } from "bits-ui";
+  import { Button, Tabs, Tooltip } from "bits-ui";
   import SettingToggleRow from "./SettingToggleRow.svelte";
 
   const preferences = getPreferences();
-  const wikiOrderContext = getWikiOrder();
-  type WikiSource = (typeof wikiOrderContext.current)[number];
-  type SortableItem = ReturnType<typeof createSortable>;
 
   let isListening = $state(false);
-  let wikiOrder = $state([...wikiOrderContext.current]);
-  let providerKey = $state(0);
-
-  const defaultSectionOrder = sections;
-  const differsFromDefault = $derived(JSON.stringify(preferences.sectionOrder) !== JSON.stringify(defaultSectionOrder));
 
   function handleKeybindKeydown(e: KeyboardEvent) {
     if (isListening) {
@@ -56,12 +39,6 @@
       }
     }, 5000);
   }
-
-  function onDragEnd(event: Parameters<NonNullable<DragDropEventHandlers["onDragEnd"]>>[0]) {
-    wikiOrder = move(wikiOrder, event);
-    wikiOrderContext.current = [...wikiOrder];
-    providerKey += 1;
-  }
 </script>
 
 <Tabs.Content value={SettingsTab.Misc} class="space-y-6">
@@ -143,52 +120,5 @@
         </Button.Root>
       </div>
     </div>
-    <Separator.Root class="shrink-0 bg-icon/30 data-[orientation=horizontal]:h-0.5 data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-0.5" />
-    <div class="space-y-4 rounded-lg bg-text/5 p-4">
-      <div class="flex items-start gap-2 rounded-lg p-2 font-semibold">
-        <BookOpenText class="size-5 h-lh shrink-0" />
-        <div class="">
-          <h4>Wiki Order</h4>
-          <div class="space-y-2">
-            <p class="text-text/60">Drag and drop the wiki sources to reorder them as you like.</p>
-            <p class="text-text/60">If the wiki source isn't available, the next one in the list will be used.</p>
-          </div>
-        </div>
-      </div>
-
-      {#key providerKey}
-        <DragDropProvider {onDragEnd}>
-          {#each wikiOrder as wiki, index (wiki.id)}
-            {@const sortable = createSortable({
-              id: wiki.id,
-              get index() {
-                return index;
-              },
-              plugins: [SortableKeyboardPlugin, OptimisticSortingPlugin, Feedback.configure({ feedback: "clone" })]
-            })}
-            {@render wikiRowContent(wiki, sortable, true)}
-          {/each}
-        </DragDropProvider>
-      {/key}
-      {#if differsFromDefault}
-        <Button.Root
-          class="mt-4 w-full rounded-lg bg-text/65 p-1.5 text-sm font-semibold text-background/80 uppercase transition-colors ease-out hover:bg-text/80"
-          onclick={() => {
-            preferences.sectionOrder = defaultSectionOrder;
-          }}>
-          Reset to default
-        </Button.Root>
-      {/if}
-    </div>
   </div>
 </Tabs.Content>
-
-{#snippet wikiRowContent(wiki: WikiSource, sortable: SortableItem | null = null, flipEnabled = false)}
-  <div {@attach sortable?.attach} class="relative flex items-center gap-2 rounded-lg bg-text/5 p-2 font-semibold data-[dragging=true]:animate-pulse data-[dragging=true]:opacity-30 data-[flip=true]:will-change-transform" data-dragging={sortable?.isDropTarget} data-flip={flipEnabled}>
-    <GripVertical class="size-5 shrink-0 text-text/60" />
-    <div class="flex flex-col">
-      {wiki.name.replaceAll("_", " ")}
-      <Button.Root href={wiki.link} target="_blank" class="text-link/60 underline">{new URL(wiki.link).hostname}</Button.Root>
-    </div>
-  </div>
-{/snippet}

src/context/wiki.svelte.ts

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { getPacksContext, getPreferences, getWikiOrder, type WikiOrderData } from "$ctx";
+  import { getPacksContext, getPreferences } from "$ctx";
   import type { ModelsStrippedItem } from "$lib/shared/api/orval-generated";
   import { getRarityClass, removeFormatting, renderLore } from "$lib/shared/helper";
   import { animateObfuscatedText } from "$lib/shared/mc-text/obfuscated";
@@ -18,8 +18,6 @@
   let { piece, isDrawer }: Props = $props();
   const preferences = getPreferences();
 
-  const wikiOrderContext = getWikiOrder();
-
   const skyblockItem = $derived(piece);
   const itemName = $derived(piece?.display_name);
   const itemNameHtml = $derived(itemName ? renderLore(itemName) : "");
@@ -30,31 +28,6 @@
   const hasColor = $derived(skyblockItem?.lore?.some((lore) => lore.includes("Color:")) ?? false);
   const packs = $derived(getPacksContext().packs);
   const packData = $derived(packs?.find((pack) => pack.id === skyblockItem?.texture_pack));
-
-  // Get the wiki link for the item
-  const wikiInfo = $derived.by<Omit<WikiOrderData, "id"> | undefined>(() => {
-    const wiki = skyblockItem?.wiki;
-    if (!wiki) return undefined;
-
-    // Try to get the preferred wiki link first, then fall back to any available link
-    const preference = wikiOrderContext.current[0].name.toLowerCase();
-
-    // Type-safe approach: check if the preference is a valid key
-    if (preference === "fandom" && wiki.fandom) {
-      return { link: wiki.fandom, name: "Fandom" };
-    } else if (preference === "official" && wiki.official) {
-      return { link: wiki.official, name: "Official" };
-    }
-
-    // If no preferred links are available, return any available link or null
-    if (wiki.fandom) {
-      return { link: wiki.fandom, name: "Fandom" };
-    } else if (wiki.official) {
-      return { link: wiki.official, name: "Official" };
-    }
-
-    return undefined;
-  });
 </script>
 
 <div class="group/itemtooltip data-[mctooltip=false]:contents data-[mctooltip=true]:relative data-[mctooltip=true]:rounded-lg data-[mctooltip=true]:bg-mctooltip-bg data-[mctooltip=true]:p-0.5" {@attach animateObfuscatedText} data-mctooltip={preferences.mctooltip}>
@@ -152,8 +125,8 @@
             </Button.Root>
           {/if}
 
-          {#if wikiInfo}
-            <Button.Root href={wikiInfo.link} target="_blank" class="flex shrink items-center justify-center rounded-[0.625rem] bg-text/5 p-2 whitespace-nowrap transition-colors ease-out hover:bg-text/8">
+          {#if piece.wiki}
+            <Button.Root href={piece.wiki} target="_blank" class="flex shrink items-center justify-center rounded-[0.625rem] bg-text/5 p-2 whitespace-nowrap transition-colors ease-out hover:bg-text/8">
               <Info class="mr-2 ml-2 size-6 p-0" />
             </Button.Root>
           {/if}