Skip to content

Commit e5886e2

Browse files
willwadewillwade
committed
fix gh actions
1 parent 59371f6 commit e5886e2

37 files changed

Lines changed: 544 additions & 276 deletions

‎.eslintrc.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ export default [
1515
},
1616
},
1717
{
18-
ignores: [
19-
'dist',
20-
'node_modules',
21-
'.astro',
22-
'public/legacy',
23-
'*.config.js',
24-
],
18+
ignores: ['dist', 'node_modules', '.astro', 'public/legacy', '*.config.js'],
2519
},
2620
];

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Build & Lint
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [astro-build]
66
pull_request:
7-
branches: [master]
7+
branches: [astro-build]
88

99
jobs:
1010
lint:

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [astro-build]
66
workflow_dispatch:
77

88
permissions:

‎.prettierignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
dist
2+
.astro
3+
4+
# Legacy mirrored site content (invalid/legacy HTML not suitable for Prettier)
5+
public/download/**
6+
public/videos/*.html
7+
static/dasher/**
8+
static/images/favicon.ico

‎README.md‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ To add a page to the documentation sidebar, edit `src/utils/nav.ts`:
118118
### Downloadable Resources
119119

120120
Alphabet XML files and training texts are stored in `public/download/`:
121+
121122
- `/public/download/alphabets/` - 144 alphabet XML files
122123
- `/public/download/training.html` - Training text downloads
123124

@@ -129,20 +130,21 @@ Alphabet XML files and training texts are stored in `public/download/`:
129130

130131
## Scripts
131132

132-
| Command | Description |
133-
|---------|-------------|
134-
| `npm run dev` | Start development server |
135-
| `npm run build` | Build for production |
136-
| `npm run preview` | Preview production build |
137-
| `npm run lint` | Run ESLint |
138-
| `npm run format` | Format code with Prettier |
139-
| `npm run format:check` | Check formatting |
133+
| Command | Description |
134+
| ---------------------- | ------------------------- |
135+
| `npm run dev` | Start development server |
136+
| `npm run build` | Build for production |
137+
| `npm run preview` | Preview production build |
138+
| `npm run lint` | Run ESLint |
139+
| `npm run format` | Format code with Prettier |
140+
| `npm run format:check` | Check formatting |
140141

141142
## Deployment
142143

143144
The site is automatically deployed to GitHub Pages on push to the `master` branch via GitHub Actions.
144145

145146
**Deployment workflow:**
147+
146148
1. Push to `master` branch
147149
2. GitHub Actions runs `build.yml` (lint + build)
148150
3. If successful, `deploy.yml` publishes to GitHub Pages
@@ -153,13 +155,15 @@ The site is automatically deployed to GitHub Pages on push to the `master` branc
153155
The site uses a custom design system with CSS custom properties:
154156

155157
**Colors:**
158+
156159
- `--color-deep-ink: #27537B` - Primary text and headings
157160
- `--color-horizon-mint: #A8D0CB` - Accents and highlights
158161
- `--color-focus-yellow: #F4E47E` - Callouts and emphasis
159162
- `--color-target-coral: #D96A6A` - CTAs and hover states
160163
- `--color-canvas-white: #F8F9FA` - Backgrounds
161164

162165
**Typography:**
166+
163167
- `--font-ui: 'Inter'` - UI text
164168
- `--font-display: 'Outfit'` - Headings
165169

‎assets/scss/_variables_project.scss‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
Add styles or override variables from the theme here.
44
55
*/
6-

‎astro.config.mjs‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ import react from '@astrojs/react';
55
// https://astro.build/config
66
export default defineConfig({
77
site: 'https://dasher.at',
8-
integrations: [
9-
mdx(),
10-
react(),
11-
],
8+
integrations: [mdx(), react()],
129
output: 'static',
1310
image: {
1411
serviceEntry: true,
@@ -18,7 +15,23 @@ export default defineConfig({
1815
},
1916
i18n: {
2017
defaultLocale: 'en',
21-
locales: ['en', 'zh', 'da', 'de', 'nl', 'fa', 'fr', 'it', 'ja', 'no', 'pl', 'pt', 'ru', 'es', 'sv'],
18+
locales: [
19+
'en',
20+
'zh',
21+
'da',
22+
'de',
23+
'nl',
24+
'fa',
25+
'fr',
26+
'it',
27+
'ja',
28+
'no',
29+
'pl',
30+
'pt',
31+
'ru',
32+
'es',
33+
'sv',
34+
],
2235
},
2336
vite: {
2437
build: {

‎eslint.config.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ export default [
77
...tseslint.configs.recommended,
88
...astroPlugin.configs.recommended,
99
{
10-
ignores: [
11-
'dist',
12-
'node_modules',
13-
'.astro',
14-
'public/legacy',
15-
'astro.config.mjs',
16-
],
10+
ignores: ['dist', 'node_modules', '.astro', 'public/legacy', 'astro.config.mjs'],
1711
},
1812
];

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"astro": "astro",
1111
"lint": "eslint .",
1212
"lint:fix": "eslint . --fix",
13-
"format": "prettier --write .",
14-
"format:check": "prettier --check .",
13+
"format": "prettier --write \"src/**/*.{astro,md,css,ts,js,mjs,json}\" \"assets/**/*.scss\" \".github/**/*.{yml,yaml}\" \"README.md\" \"astro.config.mjs\" \"eslint.config.js\" \".eslintrc.js\" \"tsconfig.json\" \"package.json\"",
14+
"format:check": "prettier --check \"src/**/*.{astro,md,css,ts,js,mjs,json}\" \"assets/**/*.scss\" \".github/**/*.{yml,yaml}\" \"README.md\" \"astro.config.mjs\" \"eslint.config.js\" \".eslintrc.js\" \"tsconfig.json\" \"package.json\"",
1515
"typecheck": "astro check"
1616
},
1717
"repository": {

‎src/layouts/BaseLayout.astro‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
2-
const {
3-
title = 'Dasher',
4-
description = 'An information-efficient text-entry interface',
5-
} = Astro.props;
2+
const { title = 'Dasher', description = 'An information-efficient text-entry interface' } =
3+
Astro.props;
64
75
const currentPath = Astro.url.pathname;
86
const navItems = [
@@ -36,16 +34,19 @@ const navItems = [
3634
<a class="site-brand" href="/">Dasher</a>
3735
<nav aria-label="Primary">
3836
<ul class="site-nav-list">
39-
{navItems.map((item) => {
40-
const active = item.href === '/'
41-
? currentPath === '/'
42-
: currentPath.startsWith(item.href);
43-
return (
44-
<li>
45-
<a class={active ? 'active' : undefined} href={item.href}>{item.label}</a>
46-
</li>
47-
);
48-
})}
37+
{
38+
navItems.map((item) => {
39+
const active =
40+
item.href === '/' ? currentPath === '/' : currentPath.startsWith(item.href);
41+
return (
42+
<li>
43+
<a class={active ? 'active' : undefined} href={item.href}>
44+
{item.label}
45+
</a>
46+
</li>
47+
);
48+
})
49+
}
4950
</ul>
5051
</nav>
5152
</div>
@@ -58,7 +59,11 @@ const navItems = [
5859
<footer class="site-footer">
5960
<div class="container site-footer-inner">
6061
<p>Dasher Project</p>
61-
<p><a href="https://github.com/dasher-project" target="_blank" rel="noopener noreferrer">GitHub</a></p>
62+
<p>
63+
<a href="https://github.com/dasher-project" target="_blank" rel="noopener noreferrer"
64+
>GitHub</a
65+
>
66+
</p>
6267
</div>
6368
</footer>
6469
</body>

0 commit comments

Comments
 (0)