chore: prettier sweep

apply prettier across entire codebase
This commit is contained in:
marshmallow 2024-05-07 11:06:11 +10:00
parent 5ec494391c
commit 610fa12723
20 changed files with 7666 additions and 7664 deletions

View file

@ -1,38 +1,37 @@
name: Check
on:
pull_request:
push:
branches:
- main
pull_request:
push:
branches:
- main
jobs:
prettier:
name: Check Code Format
runs-on: ubuntu-latest
prettier:
name: Check Code Format
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install NPM dependencies
run: npm ci
- name: Install NPM dependencies
run: npm ci
- name: Check Prettier
run: npm run prettier:check:ci
nix:
name: Nix Build
runs-on: ubuntu-latest
- name: Check Prettier
run: npm run prettier:check:ci
nix:
name: Nix Build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: cachix/install-nix-action@v25
- uses: cachix/install-nix-action@v25
- name: Check Nix Build
run: nix build
- name: Check Nix Flake
run: nix flake check
- name: Check Nix Build
run: nix build
- name: Check Nix Flake
run: nix flake check

View file

@ -1,4 +1,4 @@
{
"recommendations": ["astro-build.astro-vscode"],
"unwantedRecommendations": []
"recommendations": ["astro-build.astro-vscode"],
"unwantedRecommendations": []
}

18
.vscode/launch.json vendored
View file

@ -1,11 +1,11 @@
{
"version": "0.2.0",
"configurations": [
{
"command": "./node_modules/.bin/astro dev",
"name": "Development server",
"request": "launch",
"type": "node-terminal"
}
]
"version": "0.2.0",
"configurations": [
{
"command": "./node_modules/.bin/astro dev",
"name": "Development server",
"request": "launch",
"type": "node-terminal"
}
]
}

View file

@ -1,9 +1,9 @@
import { defineConfig } from 'astro/config';
import { defineConfig } from "astro/config";
import tailwind from "@astrojs/tailwind";
import react from "@astrojs/react";
// https://astro.build/config
export default defineConfig({
integrations: [tailwind(), react()]
});
integrations: [tailwind(), react()],
});

View file

@ -1,117 +1,115 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils"
},
"locked": {
"lastModified": 1696331477,
"narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1715023704,
"narHash": "sha256-nf72zOUuXkqN4arcQsngR19KkaQa3cDPtaSJLT8XUWY=",
"owner": "auxolotl",
"repo": "nixpkgs",
"rev": "b0fec4b7a197c6d553d353fbe4a1b6105689187c",
"type": "github"
},
"original": {
"owner": "auxolotl",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"snowfall-lib": "snowfall-lib"
}
},
"snowfall-lib": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils-plus": "flake-utils-plus",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1696432959,
"narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6",
"type": "github"
},
"original": {
"owner": "snowfallorg",
"repo": "lib",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils"
},
"locked": {
"lastModified": 1696331477,
"narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1715023704,
"narHash": "sha256-nf72zOUuXkqN4arcQsngR19KkaQa3cDPtaSJLT8XUWY=",
"owner": "auxolotl",
"repo": "nixpkgs",
"rev": "b0fec4b7a197c6d553d353fbe4a1b6105689187c",
"type": "github"
},
"original": {
"owner": "auxolotl",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs",
"snowfall-lib": "snowfall-lib"
}
},
"snowfall-lib": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils-plus": "flake-utils-plus",
"nixpkgs": ["nixpkgs"]
},
"locked": {
"lastModified": 1696432959,
"narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6",
"type": "github"
},
"original": {
"owner": "snowfallorg",
"repo": "lib",
"type": "github"
}
},
"systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",
"version": 7
}

View file

@ -12,7 +12,7 @@ in
src = lib.snowfall.fs.get-file "/";
npmDepsHash = "sha256-nNeFo6MF1Bn7Lypgtr/hgpm1lEbdmLR+6/krWH+8zCU=";
npmDepsHash = "sha256-aFyw9ySIGQqcJZFuVrFrn7Ntm8nzjTZYnZ5X9d/TiiA=";
npmFlags = ["--ignore-scripts"];

14780
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,32 +1,32 @@
{
"name": "website",
"type": "module",
"version": "0.0.1",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"build": "astro check && astro build",
"preview": "astro preview",
"astro": "astro",
"prettier:check:ci": "prettier . --check",
"prettier:format": "prettier . --write"
},
"dependencies": {
"@astrojs/check": "^0.5.10",
"@astrojs/react": "^3.3.1",
"@astrojs/tailwind": "^5.1.0",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"astro": "^4.7.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5"
},
"license": "GPL-3.0-or-later",
"devDependencies": {
"@tailwindcss/typography": "^0.5.13",
"prettier": "^3.2.5",
"prettier-plugin-astro": "^0.13.0"
}
"name": "website",
"type": "module",
"version": "0.0.1",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
"build": "astro check && astro build",
"preview": "astro preview",
"astro": "astro",
"prettier:check:ci": "prettier . --check",
"prettier:format": "prettier . --write"
},
"dependencies": {
"@astrojs/check": "^0.5.10",
"@astrojs/react": "^3.3.1",
"@astrojs/tailwind": "^5.1.0",
"@types/react": "^18.3.1",
"@types/react-dom": "^18.3.0",
"astro": "^4.7.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.5"
},
"license": "GPL-3.0-or-later",
"devDependencies": {
"@tailwindcss/typography": "^0.5.13",
"prettier": "^3.2.5",
"prettier-plugin-astro": "^0.13.0"
}
}

View file

@ -1,15 +1,17 @@
---
interface Props {}
import { useTranslations } from '../i18n/utils';
import { Image } from 'astro:assets';
import aux from '../../public/aux.svg';
import { useTranslations } from "../i18n/utils";
import { Image } from "astro:assets";
import aux from "../../public/aux.svg";
const { lang } = Astro.params;
const translation = useTranslations(lang);
---
<header class="sticky flex justify-between top-0 bg-[rgb(var(--background))] z-10 max-w-4xl mx-auto p-4 text-lg">
<header
class="sticky flex justify-between top-0 bg-[rgb(var(--background))] z-10 max-w-4xl mx-auto p-4 text-lg"
>
<div class="flex items-center">
<a href="https://auxolotl.org" class="flex items-center text-lg gap-4">
<Image class="w-12 h-12" src={aux} alt="auxolotl.org logo" />
@ -19,12 +21,16 @@ const translation = useTranslations(lang);
<nav>
<ul class="flex gap-4 items-center h-full">
<!--
<!--
<li><a href="https://auxolotl.org/contribute">Contribute</a></li>
-->
<li><a href="https://wiki.auxolotl.org">Wiki</a></li>
<li><a href="https://forum.aux.computer">{translation("header.community")}</a></li>
<li>
<a href="https://forum.aux.computer"
>{translation("header.community")}</a
>
</li>
<li><a href="https://github.com/auxolotl">GitHub</a></li>
</ul>
</nav>

View file

@ -1,5 +1,5 @@
---
import { useTranslations } from '../../i18n/utils';
import { useTranslations } from "../../i18n/utils";
const { lang } = Astro.params;
const translation = useTranslations(lang);
@ -43,5 +43,4 @@ const translation = useTranslations(lang);
</div>
</section>
<style>
</style>
<style></style>

View file

@ -1,7 +1,7 @@
---
import { useTranslations } from '../../i18n/utils';
import { Image } from 'astro:assets';
import aux from '../../../public/aux.svg';
import { useTranslations } from "../../i18n/utils";
import { Image } from "astro:assets";
import aux from "../../../public/aux.svg";
const { lang } = Astro.params;
const translation = useTranslations(lang);

View file

@ -1,5 +1,5 @@
---
import { useTranslations } from '../../i18n/utils';
import { useTranslations } from "../../i18n/utils";
const { lang } = Astro.params;
const translation = useTranslations(lang);
@ -13,57 +13,57 @@ const translation = useTranslations(lang);
<h3>{translation("roadmap.soft_fork.title")}</h3>
<p>
{translation("roadmap.soft_fork.1")}
<p>
{translation("roadmap.soft_fork.2")}
</p>
</li>
<li>
<h3>{translation("roadmap.hard_fork.title")}</h3>
<p>
{translation("roadmap.hard_fork.1")}
</p>
<p>
{translation("roadmap.hard_fork.2")}
</p>
<p>
{translation("roadmap.hard_fork.3")}
</p>
</li>
<li>
<h3>{translation("roadmap.organization.title")}</h3>
<p>
{translation("roadmap.organization.1")}
</p>
<p>
{translation("roadmap.organization.2")}
</p>
<p>
{translation("roadmap.organization.3")}
</p>
</li>
<li>
<h3>{translation("roadmap.infra.title")}</h3>
<p>
{translation("roadmap.infra.1")}
</p>
<p>
{translation("roadmap.infra.2")}
</p>
<p>
{translation("roadmap.infra.3")}
</p>
</li>
<li>
<h3>{translation("roadmap.alignment.title")}</h3>
<p>
{translation("roadmap.alignment.1")}
</p>
<p>
{translation("roadmap.alignment.2")}
<p>
{translation("roadmap.soft_fork.2")}
</p>
</p>
<li>
<h3>{translation("roadmap.hard_fork.title")}</h3>
<p>
{translation("roadmap.hard_fork.1")}
</p>
<p>
{translation("roadmap.hard_fork.2")}
</p>
<p>
{translation("roadmap.hard_fork.3")}
</p>
</li>
<li>
<h3>{translation("roadmap.organization.title")}</h3>
<p>
{translation("roadmap.organization.1")}
</p>
<p>
{translation("roadmap.organization.2")}
</p>
<p>
{translation("roadmap.organization.3")}
</p>
</li>
<li>
<h3>{translation("roadmap.infra.title")}</h3>
<p>
{translation("roadmap.infra.1")}
</p>
<p>
{translation("roadmap.infra.2")}
</p>
<p>
{translation("roadmap.infra.3")}
</p>
</li>
<li>
<h3>{translation("roadmap.alignment.title")}</h3>
<p>
{translation("roadmap.alignment.1")}
</p>
<p>
{translation("roadmap.alignment.2")}
</p>
</li>
</li>
</ol>
</section>
<style>
</style>
<style></style>
</section>

View file

@ -1,5 +1,5 @@
---
import { useTranslations } from '../../i18n/utils';
import { useTranslations } from "../../i18n/utils";
const { lang } = Astro.params;
const translation = useTranslations(lang);
@ -29,5 +29,4 @@ const translation = useTranslations(lang);
</p>
</section>
<style>
</style>
<style></style>

View file

@ -1,10 +1,10 @@
import en from "../../public/locales/en/translations.json"
import en from "../../public/locales/en/translations.json";
export const languages = {
en: 'English'
en: "English",
};
export const defaultLang = 'en';
export const defaultLang = "en";
export const ui = {
en,

View file

@ -1,7 +1,7 @@
import { ui, defaultLang } from './ui';
import { ui, defaultLang } from "./ui";
export function useTranslations(lang: keyof typeof ui) {
return function t(key: keyof typeof ui[typeof defaultLang]) {
return function t(key: keyof (typeof ui)[typeof defaultLang]) {
return ui[lang][key] || ui[defaultLang][key];
}
};
}

View file

@ -13,7 +13,10 @@ const { lang } = Astro.params;
<html lang={lang}>
<head>
<meta charset="UTF-8" />
<meta name="description" content="An alternative to the Nix ecosystem." />
<meta
name="description"
content="An alternative to the Nix ecosystem."
/>
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="generator" content={Astro.generator} />

View file

@ -4,9 +4,7 @@ import Layout from "../../layouts/Layout.astro";
import Home from "../../components/home/Home.astro";
export async function getStaticPaths() {
return Object.keys(languages).map((name) => (
{ params: { lang: name } }
))
return Object.keys(languages).map((name) => ({ params: { lang: name } }));
}
---

View file

@ -1,5 +1,5 @@
---
import { defaultLang } from '../i18n/ui';
import { defaultLang } from "../i18n/ui";
---
<meta http-equiv="refresh" content=`0;url=/${defaultLang}/` />

View file

@ -1,8 +1,8 @@
/** @type {import('tailwindcss').Config} */
export default {
content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
theme: {
extend: {},
},
plugins: [require("@tailwindcss/typography")],
content: ["./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}"],
theme: {
extend: {},
},
plugins: [require("@tailwindcss/typography")],
};

View file

@ -1,7 +1,7 @@
{
"extends": "astro/tsconfigs/strict",
"compilerOptions": {
"jsx": "react-jsx",
"jsxImportSource": "react"
}
}
"extends": "astro/tsconfigs/strict",
"compilerOptions": {
"jsx": "react-jsx",
"jsxImportSource": "react"
}
}