Skip to content

Commit

Permalink
style: format files
Browse files Browse the repository at this point in the history
  • Loading branch information
awwpotato committed Nov 5, 2024
1 parent a39d199 commit 7640acc
Show file tree
Hide file tree
Showing 12 changed files with 84 additions and 79 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
name: Format

on:
push:
pull_request:
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'
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'
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# inflatedchickens

## usage

```bash
# install dependencies
bun i
Expand Down
Binary file modified bun.lockb
Binary file not shown.
10 changes: 5 additions & 5 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
plugins: {
tailwindcss: {},
autoprefixer: {}
}
};
20 changes: 10 additions & 10 deletions src/app.html
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 9 additions & 3 deletions src/lib/components/Action.svelte
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion src/lib/components/Timeline.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import type { ActionData } from '$lib/types';
import Action from './Action.svelte';
let { actions = $bindable() }: { actions: ActionData[] } = $props()
let { actions = $bindable() }: { actions: ActionData[] } = $props();
</script>

<div class="flex flex-col items-center h-[80vh] bg-btn_grey text-text_white p-1 rounded gap-2 w-80">
Expand Down
24 changes: 12 additions & 12 deletions src/lib/types.ts
Original file line number Diff line number Diff line change
@@ -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;
};
8 changes: 4 additions & 4 deletions src/routes/+layout.svelte
Original file line number Diff line number Diff line change
@@ -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()}
8 changes: 2 additions & 6 deletions src/routes/+page.svelte
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 5 additions & 3 deletions src/routes/scout/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
</script>

<main class="flex flex-col items-center gap-2 p-2 justify-center h-screen">
<Timeline bind:actions={latestActions} />
<Timeline bind:actions={latestActions} />

<!--to be changed in the future-->
<button class="bg-btn_grey w-80 p-1 rounded border-2 border-outline_gray" onclick={addAction}>Add Action</button>
<!--to be changed in the future-->
<button class="bg-btn_grey w-80 p-1 rounded border-2 border-outline_gray" onclick={addAction}
>Add Action</button
>
</main>
36 changes: 18 additions & 18 deletions tailwind.config.js
Original file line number Diff line number Diff line change
@@ -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: []
};

0 comments on commit 7640acc

Please sign in to comment.