Updated link to source code to point to gitea

.gitea/workflows/build.yml

@@ -0,0 +1,45 @@
+name: Deploy
+
+on:
+  pull_request:
+    branches:
+      - master
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+      - name: Install dependencies
+        run: echo y | npm exec -- pnpm install
+      - name: Build project
+        run: npm exec -- pnpm build
+      - name: Upload production-ready build files
+        uses: actions/upload-artifact@v3
+        with:
+          name: dist
+          path: ./dist
+
+  deploy:
+    name: Deploy
+    needs: build
+    runs-on: host
+
+    steps:
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: dist
+          path: ./dist
+
+      # Deploy to local repo
+      - name: Move files to server
+        run: |
+          rm -rf /var/www/martials.no/*
+          cp -r dist/* /var/www/martials.no

.github/workflows/build.yml

@@ -1,59 +0,0 @@
-name: Deploy
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8
-
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Build project
-        run: pnpm build
-
-      - name: Upload production-ready build files
-        uses: actions/upload-artifact@v3
-        with:
-          name: production-files
-          path: ./dist
-
-  deploy:
-    name: Deploy
-    needs: build
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
-
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: production-files
-          path: ./dist
-
-      # Deploy to local repo
-      - name: Deploy
-        uses: s0/git-publish-subdir-action@develop
-        env:
-          REPO: self
-          BRANCH: build
-          FOLDER: dist
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -11,22 +11,22 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "autoprefixer": "^10.4.19",
-    "postcss": "^8.4.39",
-    "prettier": "3.3.3",
-    "prettier-plugin-tailwindcss": "^0.6.5",
-    "tailwindcss": "^3.4.6",
-    "typescript": "^5.5.3",
-    "vite": "^5.3.4",
-    "vite-plugin-solid": "^2.10.2"
+    "autoprefixer": "^10.4.17",
+    "postcss": "^8.4.35",
+    "prettier": "3.2.5",
+    "prettier-plugin-tailwindcss": "^0.5.11",
+    "tailwindcss": "^3.4.1",
+    "typescript": "^5.3.3",
+    "vite": "^5.1.4",
+    "vite-plugin-solid": "^2.10.1"
   },
   "dependencies": {
-    "@solidjs/router": "^0.14.1",
-    "@types/diff": "^5.2.1",
+    "@solidjs/router": "^0.12.4",
+    "@types/diff": "^5.0.9",
     "diff": "^5.2.0",
     "solid-headless": "^0.13.1",
     "solid-heroicons": "^3.2.4",
-    "solid-js": "^1.8.18",
+    "solid-js": "^1.8.15",
     "xlsx": "^0.18.5"
   }
 }

src/components/footer.tsx

@@ -5,7 +5,7 @@ import { Link } from "./link"
 const Footer: Component<SimpleProps> = ({ className }) => (
   <footer class={`container absolute bottom-0 py-5 text-center ${className}`}>
     <p>
-      Kildekode på <Link to={"https://github.com/h600878/martials.no"}>GitHub</Link>
+      Kildekode på <Link to={"https://git.martials.no/martials/old.martials.no"}>Gitea</Link>
     </p>
   </footer>
 )

src/components/truth-table.tsx

@@ -3,7 +3,7 @@ import { For } from "solid-js/web"
 import { type Component } from "solid-js"
 
 interface TruthTableProps extends SimpleProps {
-  table?: TruthMatrix
+  table?: Table
   header?: string[]
 }
 
@@ -20,7 +20,8 @@ const TruthTable: Component<TruthTableProps> = ({ table, header, className, styl
             <th
               scope={"col"}
               class={
-                `sticky top-0 bg-default-bg text-center outline outline-2 outline-offset-[-1px] outline-gray-500 [position:-webkit-sticky;]` /*TODO sticky header at the top of the screen */
+                `sticky top-0 bg-default-bg text-center outline
+                             outline-2 outline-offset-[-1px] outline-gray-500 [position:-webkit-sticky;]` /*TODO sticky header at the top of the screen */
               }
             >
               <p class={"w-max px-2"}>{exp}</p>
@@ -36,7 +37,8 @@ const TruthTable: Component<TruthTableProps> = ({ table, header, className, styl
             <For each={row}>
               {(value) => (
                 <td
-                  class={`border border-gray-500 text-center last:underline ${value ? "bg-green-700" : "bg-red-700"}`}
+                  class={`border border-gray-500 text-center last:underline
+                                            ${value ? "bg-green-700" : "bg-red-700"}`}
                 >
                   <p>{value ? "T" : "F"}</p>
                 </td>

src/pages/truth-table.tsx

@@ -25,20 +25,18 @@ type Option = {
 }
 
 const fetchUrls = [
-  "http://localhost:8000/simplify/table/",
-  "https://api.martials.no/simplify-truths/v2/simplify/table/"
+  "http://localhost:8080/simplify/table/",
+  "https://api.martials.no/simplify-truths/simplify/table/"
 ]
 
 // TODO move some code to new components
-// TODO option to ignore case
-// TODO more user friendly options
 const TruthTablePage: Component = () => {
   const [searchParams, setSearchParams] = useSearchParams()
-  let inputElement!: HTMLInputElement
+  let inputElement: HTMLInputElement | undefined = undefined
 
   let simplifyDefault = searchParams.simplify === undefined || searchParams.simplify === "true",
     inputContent = !!searchParams.exp,
-    hideIntermediate = searchParams.hideIntermediateSteps === "true"
+    hideIntermediate = searchParams.hideIntermediate === "true"
 
   const [simplifyEnabled, setSimplifyEnabled] = createSignal(simplifyDefault)
   const [fetchResult, setFetchResult] = createSignal<FetchResult | null>(null)
@@ -77,14 +75,14 @@ const TruthTablePage: Component = () => {
         simplify: simplifyEnabled(),
         hide: hideValues().value,
         sort: sortValues().value,
-        hideIntermediateSteps: hideIntermediates()
+        hideIntermediate: hideIntermediates()
       })
 
-      void getFetchResult(exp)
+      getFetchResult(exp)
     }
   }
 
-  async function getFetchResult(exp: string | null): Promise<void> {
+  function getFetchResult(exp: string | null): void {
     setFetchResult(null)
 
     if (exp && exp !== "") {
@@ -92,30 +90,18 @@ const TruthTablePage: Component = () => {
       setError(null)
       setIsLoaded(false)
 
-      try {
-        const response =
-          await fetch(`${fetchUrls[useLocalhost() ? 0 : 1]}${encodeURIComponent(exp)}?
-simplify=${simplifyEnabled()}&hide=${hideValues().value}&sort=${sortValues().value}&ignoreCase=false&
-hideIntermediateSteps=${hideIntermediates()}`)
-
-        const body = await response.json()
-        if (!response.ok) {
-          setError({
-            title: "Input error",
-            message: body.message
-          })
-        } else {
-          const fetchResult: FetchResult = body
-          setFetchResult(fetchResult)
-        }
-      } catch (e: any) {
-        setError({
-          title: "Error",
-          message: e.message
+      fetch(`${fetchUrls[useLocalhost() ? 0 : 1]}${encodeURIComponent(exp)}?
+simplify=${simplifyEnabled()}&hide=${hideValues().value}&sort=${sortValues().value}&caseSensitive=false&
+hideIntermediate=${hideIntermediates()}`)
+        .then((res) => res.json())
+        .then((res) => {
+          if (res.status !== "OK" && !res.ok) {
+            return setError({ title: "Input error", message: res.message })
+          }
+          return setFetchResult(res)
         })
-      } finally {
-        setIsLoaded(true)
-      }
+        .catch((err) => setError({ title: "Fetch error", message: err.toString() }))
+        .finally(() => setIsLoaded(true))
     }
   }
 
@@ -134,7 +120,7 @@ hideIntermediateSteps=${hideIntermediates()}`)
         setSortValues(sortOptions.find((o) => o.value === sort) ?? sortOptions[0])
       }
 
-      void getFetchResult(exp)
+      getFetchResult(exp)
     }
 
     // Focuses searchbar on load
@@ -300,12 +286,12 @@ hideIntermediateSteps=${hideIntermediates()}`)
             />
           </Show>
 
-          <Show when={simplifyEnabled() && (fetchResult()?.operations?.length ?? 0) > 0} keyed>
+          <Show when={simplifyEnabled() && (fetchResult()?.orderOperations?.length ?? 0) > 0} keyed>
             <ShowMeHow fetchResult={fetchResult} />
           </Show>
         </div>
 
-        <Show when={isLoaded() && error() === null && fetchResult()?.truthTable} keyed>
+        <Show when={isLoaded() && error() === null} keyed>
           <Show when={simplifyEnabled()} keyed>
             <InfoBox
               className={"mx-auto w-fit pb-1 text-center text-lg"}
@@ -319,8 +305,8 @@ hideIntermediateSteps=${hideIntermediates()}`)
           <div class={"m-2 flex justify-center"}>
             <div id={"table"} class={"h-[45rem] overflow-auto"}>
               <TruthTable
-                header={fetchResult()!.truthTable!.header}
-                table={fetchResult()!.truthTable!.truthMatrix}
+                header={fetchResult()?.header ?? undefined}
+                table={fetchResult()?.table?.truthMatrix}
                 id={tableId}
               />
             </div>
@@ -368,7 +354,7 @@ const ShowMeHow: Component<ShowMeHowProps> = ({ fetchResult }) => (
     <MyDisclosure title={"Show me how it's done"}>
       <table class={"table"}>
         <tbody>
-          <For each={fetchResult()?.operations}>{operationRow()}</For>
+          <For each={fetchResult()?.orderOperations}>{orderOperationRow()}</For>
         </tbody>
       </table>
     </MyDisclosure>
@@ -386,8 +372,7 @@ const HowTo: Component = () => (
         Parentheses is also allowed.
       </p>
       <p>
-        API docs can be found{" "}
-        <Link to={"https://api.martials.no/simplify-truths/v2/openapi"}>here</Link>.
+        API docs can be found <Link to={"https://api.martials.no/simplify-truths"}>here</Link>.
       </p>
     </MyDisclosure>
 
@@ -395,7 +380,7 @@ const HowTo: Component = () => (
   </MyDisclosureContainer>
 )
 
-const operationRow = () => (operation: Operation, index: Accessor<number>) => (
+const orderOperationRow = () => (operation: OrderOfOperation, index: Accessor<number>) => (
   <tr class={"border-b border-dotted border-gray-500"}>
     <td>{index() + 1}:</td>
     <td class={"px-2"}>
@@ -452,7 +437,7 @@ const KeywordsDisclosure: Component = () => (
         </tr>
         <tr>
           <td class={"pr-2"}>Implication:</td>
-          <td>{"=>"}</td>
+          <td>{"->"}</td>
           <td class={"px-2"}>IMPLICATION</td>
           <td>IMP</td>
         </tr>

src/types/types.d.ts

@@ -37,51 +37,34 @@ interface CardProps extends LinkProps {
   title?: string
 }
 
-type AtomicExpression = {
-  atomic: string
+type Expression = {
+  leading: string
+  left: Expression | null
+  operator: Operator | null
+  right: Expression | null
+  trailing: string
+  atomic: string | null
 }
 
-type NotExpression = {
-  not: Expression
-}
+type Operator = "AND" | "OR" | "NOT" | "IMPLICATION"
 
-type BinaryExpression = {
-  left: Expression
-  operator: BinaryOperator
-  right: Expression
-}
+type Table = boolean[][]
 
-type Expression = AtomicExpression | NotExpression | BinaryExpression
-
-type BinaryOperator = "AND" | "OR" | "IMPLICATION"
-
-type Law =
-  | "ELIMINATION_OF_IMPLICATION"
-  | "DE_MORGANS_LAWS"
-  | "ABSORPTION_LAW"
-  | "ASSOCIATIVE_LAW"
-  | "DISTRIBUTIVE_LAW"
-  | "DOUBLE_NEGATION_ELIMINATION"
-  | "COMMUTATIVE_LAW"
-
-type TruthMatrix = boolean[][]
-
-type Operation = {
+type OrderOfOperation = {
   before: string
   after: string
-  law: Law
-}
-
-type Table = {
-  header: string[]
-  truthMatrix: TruthMatrix
+  law: string
 }
 
 type FetchResult = {
-  version: string
+  status: string
+  version: string | null
   before: string
   after: string
-  operations: Operation[]
+  orderOperations: OrderOfOperation[] | null
   expression: Expression | null
-  truthTable?: Table | null
+  header: string[] | null
+  table: {
+    truthMatrix: Table
+  } | null
 }

src/utils/expressionUtils.ts

@@ -7,8 +7,8 @@ export function replaceOperators(expression: string): string {
   return expression
     .replaceAll(/\//g, "|")
     .replaceAll(/¬/g, "!")
-    .replaceAll(/\s(OR|⋁)\s/gi, " | ")
-    .replaceAll(/\s(AND|⋀)\s/gi, " & ")
-    .replaceAll(/\s(IMPLICATION|IMP|->)\s/gi, " => ")
+    .replaceAll(/\sOR\s/gi, " | ")
+    .replaceAll(/\sAND\s/gi, " & ")
+    .replaceAll(/\s(IMPLICATION|IMP)\s/gi, " -> ")
     .replaceAll(/\sNOT\s/gi, " !")
 }