From 905ef95d559eed3c01b50d3af1ceb04b67373c12 Mon Sep 17 00:00:00 2001
From: Annika Merris <me@annikamerris.com>
Date: Sun, 4 Feb 2024 17:46:02 -0500
Subject: [PATCH] Dependencies, Actions, and a Code Fix?

---
 .forgejo/build_configs/buildkitd.toml |   2 +
 .forgejo/workflows/build.yml          |  77 ++++++++++++++++++++++++++
 bun.lockb                             | Bin 180269 -> 180269 bytes
 src/components/SpecialItemsCard.vue   |   4 +-
 4 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 .forgejo/build_configs/buildkitd.toml
 create mode 100644 .forgejo/workflows/build.yml

diff --git a/.forgejo/build_configs/buildkitd.toml b/.forgejo/build_configs/buildkitd.toml
new file mode 100644
index 0000000..b13cd40
--- /dev/null
+++ b/.forgejo/build_configs/buildkitd.toml
@@ -0,0 +1,2 @@
+[dns]
+  nameservers=["10.42.10.1","10.42.10.54"]
diff --git a/.forgejo/workflows/build.yml b/.forgejo/workflows/build.yml
new file mode 100644
index 0000000..75e7024
--- /dev/null
+++ b/.forgejo/workflows/build.yml
@@ -0,0 +1,77 @@
+---
+name: release
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'main'
+
+env:
+  DOCKER_HOST: tcp://docker-in-docker:2375
+
+jobs:
+  build:
+    name: Build and push docker image
+    runs-on: docker
+    container:
+      image: node:21-alpine
+    steps:
+      - name: Install docker
+        shell: /bin/ash -e {0}
+        run: apk add --update docker git bash
+      - name: Check out the repo
+        uses: https://github.com/actions/checkout@v4
+      - name: Get Metadata For Docker
+        id: meta
+        uses: https://github.com/docker/metadata-action@v5
+        with:
+          images: forgejo.merr.is/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+          labels: |
+            org.opencontainers.image.licenses=MIT
+          annotations: |
+            manifest:org.opencontainers.image.licenses=MIT
+      - name: Set up Docker Buildx
+        uses: https://github.com/docker/setup-buildx-action@v3
+        with:
+          driver-opts: |
+            network=host
+          config: .forgejo/build_configs/buildkitd.toml
+      - name: Login to docker repo
+        uses: docker/login-action@v3
+        with:
+          registry: "forgejo.merr.is"
+          username: ${{ github.actor }}
+          password: ${{ secrets.actions_token }}
+      - name: Build and push the image
+        uses: https://github.com/docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+      - name: Extract Binary For Release
+        uses: https://github.com/moosetheory/actions-docker-extract@v3.1
+        id: extract
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          shell_command: /bin/ash -c
+          image: ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
+          path: isl-api
+          destination: dist
+      - name: Create a Release
+        uses: https://forgejo.merr.is/actions/forgejo-release@alpinev1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          direction: upload
+          release-dir: dist
+          token: ${{ secrets.ADMIN_TOKEN }}
+
diff --git a/bun.lockb b/bun.lockb
index 4053ca7945bade5c06c2fbaedd016bdd5438d80f..6e01c21303de51437b0f8cab0452c6982a1c0ee4 100755
GIT binary patch
delta 40
ucmZ46z`eGCyI~9C@+TaOafT*(26_h5*FRxg2jc0OS?ZZ@PkqXG;uZiZP7crj

delta 40
lcmZ46z`eGCyI~9C@+TZj3=lAV{S(G@aNhRRr;I0V0RZ*W3&H>Z

diff --git a/src/components/SpecialItemsCard.vue b/src/components/SpecialItemsCard.vue
index cf588f4..7677514 100644
--- a/src/components/SpecialItemsCard.vue
+++ b/src/components/SpecialItemsCard.vue
@@ -4,6 +4,8 @@ import type { PowerItem } from '@/types/PowerItem';
 import type { Ref } from 'vue'
 import { computed, ref } from 'vue'
 
+type SortItem = { key: string, order?: boolean | 'asc' | 'desc' }
+
 export interface Props {
     items: Map<string, PowerItem>
     minimumTotal: number
@@ -65,7 +67,7 @@ const headers = ref([
     key: `1.aveTotalPower`
   }
 ])
-const sortBy = ref([
+const sortBy: Ref<SortItem[]> = ref([
   {
     key: '1.minItemPower',
     order: 'asc'