me
/
ethanreece.com
Archived
1
0
Fork 0
Code Pull Requests Actions Activity

Improve layout

main
Ethan Reece 2023-05-30 16:57:23 -05:00
parent 89c6cd150a
commit 5b62942f44
Signed by: me
GPG Key ID: D3993665FF92E1C3
6 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.prettierrc.cjs
View File

@ -1,6 +1,7 @@
module.exports = { module.exports = {
plugins: [ plugins: [
require.resolve('prettier-plugin-astro'), require.resolve('prettier-plugin-astro'),
require.resolve('prettier-plugin-sort-imports'),
require.resolve('prettier-plugin-tailwindcss'), require.resolve('prettier-plugin-tailwindcss'),
], ],
overrides: [ overrides: [
@ -16,4 +17,8 @@ module.exports = {
tabWidth: 4, tabWidth: 4,
semi: false, semi: false,
singleQuote: true, singleQuote: true,
printWidth: 80,
importOrder: ['^@core/(.*)$', '^@server/(.*)$', '^@ui/(.*)$', '^[./]'],
importOrderSeparation: true,
importOrderSortSpecifiers: true,
} }

3
package.json
View File

@ -26,6 +26,7 @@
"eslint-plugin-tailwindcss": "^3.12.0", "eslint-plugin-tailwindcss": "^3.12.0",
"prettier": "^2.8.8", "prettier": "^2.8.8",
"prettier-plugin-astro": "^0.9.1", "prettier-plugin-astro": "^0.9.1",
"prettier-plugin-tailwindcss": "^0.3.0" "prettier-plugin-tailwindcss": "^0.3.0",
"prettier-plugin-sort-imports": "^1.7.2"
} }
} }

12
pnpm-lock.yaml
View File

@ -49,6 +49,9 @@ devDependencies:
prettier-plugin-astro: prettier-plugin-astro:
specifier: ^0.9.1 specifier: ^0.9.1
version: 0.9.1 version: 0.9.1
prettier-plugin-sort-imports:
specifier: ^1.7.2
version: 1.7.2(typescript@5.0.4)
prettier-plugin-tailwindcss: prettier-plugin-tailwindcss:
specifier: ^0.3.0 specifier: ^0.3.0
version: 0.3.0(prettier-plugin-astro@0.9.1)(prettier@2.8.8) version: 0.3.0(prettier-plugin-astro@0.9.1)(prettier@2.8.8)
@ -4128,6 +4131,15 @@ packages:
sass-formatter: 0.7.6 sass-formatter: 0.7.6
synckit: 0.8.5 synckit: 0.8.5
/prettier-plugin-sort-imports@1.7.2(typescript@5.0.4):
resolution: {integrity: sha512-EUBmaLgQ6GcMcvusMlK/aN4QgPWDmjRjpYjc1htjp1nrbHpA+JA5/nncQJiFAao/mBX2qBninuyasd80x488mQ==}
peerDependencies:
typescript: '>4.0.0'
dependencies:
prettier: 2.8.8
typescript: 5.0.4
dev: true
/prettier-plugin-tailwindcss@0.3.0(prettier-plugin-astro@0.9.1)(prettier@2.8.8): /prettier-plugin-tailwindcss@0.3.0(prettier-plugin-astro@0.9.1)(prettier@2.8.8):
resolution: {integrity: sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==} resolution: {integrity: sha512-009/Xqdy7UmkcTBpwlq7jsViDqXAYSOMLDrHAdTMlVZOrKfM2o9Ci7EMWTMZ7SkKBFTG04UM9F9iM2+4i6boDA==}
engines: {node: '>=12.17.0'} engines: {node: '>=12.17.0'}

3
src/content/global/Font.astro 100644
View File

@ -0,0 +1,3 @@
<div class="font-main text-font">
<slot />
</div>

18
src/content/global/Head.astro 100644
View File

@ -0,0 +1,18 @@
---
export interface Props {
title: string
description: string
}
const { title, description } = Astro.props
---
<head>
<meta charset="UTF-8" />
<meta name="description" content={description} />
<meta name="viewport" content="width=device-width" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="generator" content={Astro.generator} />
<link rel="stylesheet" href="/fonts/fonts.css" />
<title>{title}</title>
</head>

28
src/layouts/Basic.astro
View File

@ -1,4 +1,8 @@
--- ---
import Background from '../content/global/Background.astro'
import Font from '../content/global/Background.astro'
import Head from '../content/global/Head.astro'
export interface Props { export interface Props {
title: string title: string
description: string description: string
@ -9,24 +13,12 @@ const { title, description } = Astro.props
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <Head title={title} description={description} />
<meta charset="UTF-8" /> <body class="relative flex min-h-screen w-screen flex-col">
<meta name="description" content={description} /> <Font>
<meta name="viewport" content="width=device-width" /> <Background>
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="generator" content={Astro.generator} />
<link rel="stylesheet" href="/fonts/fonts.css" />
<title>{title}</title>
</head>
<body>
<div
class="relative flex min-h-screen w-screen flex-col bg-background font-main text-font"
>
<div
class="h-full min-h-screen w-full bg-contain bg-repeat heropattern-circuitboard-pattern"
>
<slot /> <slot />
</div> </Background>
</div> </Font>
</body> </body>
</html> </html>