Added version to fetch props. Renamed interfaces to a declaration file

emberal · Apr 8, 2023 · 292da46 · 292da46
1 parent 3245769
commit 292da46
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 27 deletions.
diff --git a/src/components/button.tsx b/src/components/button.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { type Component, createSignal } from "solid-js";
-import type { ButtonProps, TitleProps } from "../types/interfaces";
+import type { ButtonProps, TitleProps } from "../types/types";
 
 interface SwitchProps extends TitleProps {
     defaultValue?: boolean,

diff --git a/src/components/card.tsx b/src/components/card.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { type Component } from "solid-js";
-import type { CardProps } from "../types/interfaces";
+import type { CardProps } from "../types/types";
 import { Link } from "./link";
 
 const Card: Component<CardProps> = ({ children, className, title, to, newTab = false }) => {

diff --git a/src/components/dialog.tsx b/src/components/dialog.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { Dialog, DialogDescription, DialogPanel, DialogTitle } from "solid-headless";
-import type { TitleProps } from "../types/interfaces";
+import type { TitleProps } from "../types/types";
 import { createEffect, createSignal, JSX } from "solid-js";
 import { Button } from "./button";
 import { Portal } from "solid-js/web";

diff --git a/src/components/footer.tsx b/src/components/footer.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { type Component } from "solid-js";
-import type { SimpleProps } from "../types/interfaces";
+import type { SimpleProps } from "../types/types";
 import { Link } from "./link";
 
 const Footer: Component<SimpleProps> = ({ className }) => {

diff --git a/src/components/header.tsx b/src/components/header.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { type Component, Show } from "solid-js";
-import type { TitleProps } from "../types/interfaces";
+import type { TitleProps } from "../types/types";
 import { Icon } from "solid-heroicons";
 import { chevronLeft } from "solid-heroicons/solid";
 import { Link } from "./link";

diff --git a/src/components/input.tsx b/src/components/input.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { type Component, createSignal, JSX, Setter } from "solid-js";
-import type { InputProps } from "../types/interfaces";
+import type { InputProps } from "../types/types";
 import Row from "./row";
 
 function setupEventListener(id: string, setIsHover: Setter<boolean>): () => void {

diff --git a/src/components/layout.tsx b/src/components/layout.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { type Component } from "solid-js";
-import type { TitleProps } from "../types/interfaces";
+import type { TitleProps } from "../types/types";
 import Header from "./header";
 import Footer from "./footer";
 

diff --git a/src/components/link.tsx b/src/components/link.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { type Component } from "solid-js";
-import type { LinkProps } from "../types/interfaces";
+import type { LinkProps } from "../types/types";
 
 export const Link: Component<LinkProps> = (
     {

diff --git a/src/components/menu.tsx b/src/components/menu.tsx
@@ -1,5 +1,5 @@
 /* @refresh reload */
-import type { TitleProps } from "../types/interfaces";
+import type { TitleProps } from "../types/types";
 import { type Component, createEffect, createSignal, JSX, Show } from "solid-js";
 import { Button } from "./button";
 

diff --git a/src/components/output.tsx b/src/components/output.tsx
@@ -1,6 +1,6 @@
 import { Disclosure, DisclosureButton, DisclosurePanel, Transition } from "solid-headless";
 import { Icon } from "solid-heroicons";
-import type { ChildProps, TitleProps } from "../types/interfaces";
+import type { ChildProps, TitleProps } from "../types/types";
 import { Component, JSX } from "solid-js";
 import { chevronUp } from "solid-heroicons/solid";
 

diff --git a/src/components/row.tsx b/src/components/row.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
 import { type Component } from "solid-js";
-import type { ChildProps } from "../types/interfaces";
+import type { ChildProps } from "../types/types";
 
 const Row: Component<ChildProps> = ({ children, className }) => {
     return <div class={ `flex-row-center ${ className }` }>{ children }</div>

diff --git a/src/components/truth-table.tsx b/src/components/truth-table.tsx
@@ -1,6 +1,6 @@
 /* @refresh reload */
-import type { SimpleProps } from "../types/interfaces";
-import type { Table } from "../types/interfaces";
+import type { SimpleProps } from "../types/types";
+import type { Table } from "../types/types";
 import { For } from "solid-js/web";
 import { type Component } from "solid-js";
 

diff --git a/src/index.tsx b/src/index.tsx
@@ -5,7 +5,7 @@ import "./index.css";
 import { type Component } from "solid-js";
 import Layout from "./components/layout";
 import Card from "./components/card";
-import type { CardProps } from "./types/interfaces";
+import type { CardProps } from "./types/types";
 import { Link } from "./components/link";
 
 const apiRoot = "https://api.martials.no";

diff --git a/src/truth-table.tsx b/src/truth-table.tsx
@@ -6,7 +6,7 @@ import TruthTable from "./components/truth-table";
 import { InfoBox, MyDisclosure, MyDisclosureContainer } from "./components/output";
 import { diffChars } from "diff";
 import MyMenu from "./components/menu";
-import type { FetchResult } from "./types/interfaces";
+import type { FetchResult } from "./types/types";
 import { type Accessor, type Component, createSignal, JSX, onMount, Show } from "solid-js";
 import { For, render } from "solid-js/web";
 import Row from "./components/row";

diff --git a/env.d.ts → src/types/env.d.ts b/env.d.ts → src/types/env.d.ts
diff --git a/src/types/interfaces.ts → src/types/types.d.ts b/src/types/interfaces.ts → src/types/types.d.ts
@@ -1,44 +1,44 @@
 import { JSX } from "solid-js";
 
-export interface SimpleProps {
+interface SimpleProps {
     name?: string;
     className?: string,
     style?: JSX.CSSProperties,
     id?: string,
     title?: string,
 }
 
-export interface ChildProps extends SimpleProps {
+interface ChildProps extends SimpleProps {
     children?: JSX.Element,
 }
 
-export interface LinkProps extends ChildProps {
+interface LinkProps extends ChildProps {
     to?: string,
     rel?: string,
     newTab?: boolean,
 }
 
-export interface TitleProps extends ChildProps {
+interface TitleProps extends ChildProps {
     title?: string,
 }
 
-export interface ButtonProps extends TitleProps {
+interface ButtonProps extends TitleProps {
     onClick?: JSX.EventHandlerUnion<HTMLButtonElement, MouseEvent>,
     type?: "button" | "submit" | "reset",
 }
 
-export interface InputProps<T> extends TitleProps {
+interface InputProps<T> extends TitleProps {
     onInput?: JSX.EventHandlerUnion<T, Event>,
     placeholder?: string | null,
     required?: boolean,
     type?: string,
 }
 
-export interface CardProps extends LinkProps {
+interface CardProps extends LinkProps {
     title?: string;
 }
 
-export type Expression = {
+type Expression = {
     leading: string,
     left: Expression | null,
     operator: Operator | null,
@@ -47,18 +47,19 @@ export type Expression = {
     atomic: string | null,
 };
 
-export type Operator = "AND" | "OR" | "NOT" | "IMPLICATION";
+type Operator = "AND" | "OR" | "NOT" | "IMPLICATION";
 
-export type Table = boolean[][];
+type Table = boolean[][];
 
-export type OrderOfOperations = {
+type OrderOfOperations = {
     before: string,
     after: string,
     law: string,
 }[];
 
-export type FetchResult = {
+type FetchResult = {
     status: string,
+    version: string | null,
     before: string,
     after: string,
     orderOperations: OrderOfOperations | null,