Merge branch 'main' into nate/actionsToTop

flamingchickens1540 · Nov 5, 2024 · fe733b7 · fe733b7
2 parents bbda020 + aff12db
commit fe733b7
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 58 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -0,0 +1,22 @@
+name: Format
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    name: Format Files
+    steps:
+      - uses: actions/checkout@v3
+      - uses: oven-sh/setup-bun@v2
+      - run: bun install
+      - name: Prettier
+        run: bun run format ./src
+        env:
+          GITHUB_TOKEN: ${{ secrets.WORKFLOW_TOKEN }}
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        if: ${{ github.event_name == 'push' || github.event_name == 'workflow_dispatch' }}
+        with:
+          commit_message: 'style: format files'
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # inflatedchickens
 
 ## usage
+
 ```bash
 # install dependencies
 bun i

diff --git a/bun.lockb b/bun.lockb
diff --git a/postcss.config.js b/postcss.config.js
@@ -1,6 +1,6 @@
 export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}
+	plugins: {
+		tailwindcss: {},
+		autoprefixer: {}
+	}
+};
diff --git a/src/app.html b/src/app.html
@@ -1,12 +1,12 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <link rel="icon" href="flamingChicken.png" />
-        <meta name="viewport" content="width=device-width" />
-        %sveltekit.head%
-    </head>
-    <body data-sveltekit-preload-data="hover">
-        <div style="display: contents">%sveltekit.body%</div>
-    </body>
+	<head>
+		<meta charset="utf-8" />
+		<link rel="icon" href="flamingChicken.png" />
+		<meta name="viewport" content="width=device-width" />
+		%sveltekit.head%
+	</head>
+	<body data-sveltekit-preload-data="hover">
+		<div style="display: contents">%sveltekit.body%</div>
+	</body>
 </html>
diff --git a/src/lib/components/Action.svelte b/src/lib/components/Action.svelte
@@ -1,11 +1,17 @@
 <script lang="ts">
 	import type { ActionData } from '$lib/types';
 
-	let { action = $bindable(), deleteself }: { action: ActionData; deleteself: () => void } = $props()
+	let { action = $bindable(), deleteself }: { action: ActionData; deleteself: () => void } =
+		$props();
 
-	let actionBackgroundColor = $derived(action.result === 'success' ? 'bg-cresc_green' : 'bg-fail_red');
+	let actionBackgroundColor = $derived(
+		action.result === 'success' ? 'bg-cresc_green' : 'bg-fail_red'
+	);
 </script>
 
-<button class="{actionBackgroundColor} w-full p-1 rounded border-2 border-outline_gray text-text_white" onclick={deleteself}>
+<button
+	class="{actionBackgroundColor} w-full p-1 rounded border-2 border-outline_gray text-text_white"
+	onclick={deleteself}
+>
 	{action.type}
 </button>
diff --git a/src/lib/types.ts b/src/lib/types.ts
@@ -1,19 +1,19 @@
 export enum actionType {
-    IntakeTote = 'Intake Tote',
-    EjectTote = 'Eject Tote',
-    IntakeBalloon = 'Intake Balloon',
-    ScoreLow = 'Score Low',
-    ScoreExternalTote = 'Score External Tote',
-    ScoreInternalTote = 'Score Internal Tote',
-    ScoreAnotherRobotsTote = 'Score Another Robots Tote'
+	IntakeTote = 'Intake Tote',
+	EjectTote = 'Eject Tote',
+	IntakeBalloon = 'Intake Balloon',
+	ScoreLow = 'Score Low',
+	ScoreExternalTote = 'Score External Tote',
+	ScoreInternalTote = 'Score Internal Tote',
+	ScoreAnotherRobotsTote = 'Score Another Robots Tote'
 }
 
 export enum actionResult {
-    success = 'success',
-    fail = 'fail'
+	success = 'success',
+	fail = 'fail'
 }
 
 export type ActionData = {
-    type: actionType;
-    result: actionResult;
-}
+	type: actionType;
+	result: actionResult;
+};
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -1,12 +1,12 @@
 <script>
 	let { children } = $props();
-    import "../app.css";
+	import '../app.css';
 </script>
 
+{@render children()}
+
 <style lang="postcss">
 	:global(body) {
-        @apply bg-bg_gray;
+		@apply bg-bg_gray;
 	}
 </style>
-
-{@render children()}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -1,8 +1,4 @@
 <div class="flex flex-col items-center justify-evenly h-dvh text-text_white">
-    <h1 class="text-center text-5xl font-bold">
-        hiiii :3
-    </h1>
-    <a class="text-center text-2xl rounded bg-btn_grey px-4 py-2 font-bold" href="/scout">
-        scout
-    </a>
+	<h1 class="text-center text-5xl font-bold">hiiii :3</h1>
+	<a class="text-center text-2xl rounded bg-btn_grey px-4 py-2 font-bold" href="/scout"> scout </a>
 </div>
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,20 +1,20 @@
 /** @type {import('tailwindcss').Config} */
 export default {
-    content: ['./src/**/*.{html,js,svelte,ts}'],
-    theme: {
-        colors: {
-            "navbar_black": "#1c1c1c",
-            "outline_gray": "#c2c2c2",
-            "cresc_green": "#00d586",
-            "bg_gray": "#2c2c2c",
-            "slack_purple": "#4A154B",
-            "robot_blue": "#0083E6",
-            "robot_red": "#ED1C24",
-            "fail_red": "#EE3C42",
-            "btn_grey": "#5C5C5C",
-            "text_white": "#ffffff"
-        },
-        extend: {},
-    },
-    plugins: [],
-}
+	content: ['./src/**/*.{html,js,svelte,ts}'],
+	theme: {
+		colors: {
+			navbar_black: '#1c1c1c',
+			outline_gray: '#c2c2c2',
+			cresc_green: '#00d586',
+			bg_gray: '#2c2c2c',
+			slack_purple: '#4A154B',
+			robot_blue: '#0083E6',
+			robot_red: '#ED1C24',
+			fail_red: '#EE3C42',
+			btn_grey: '#5C5C5C',
+			text_white: '#ffffff'
+		},
+		extend: {}
+	},
+	plugins: []
+};