Skip to content

Commit a14227e

Browse files
aaronxsuaaronxsu
authored
Merge pull request #667 from azavea/feature/asu/frontend-themes
Add custom Tailwind themes and a styled Button component
2 parents b868308 + f22ba16 commit a14227e

22 files changed

Lines changed: 617 additions & 25 deletions

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,7 @@ src/backend/static
8181
src/backend/assets
8282
src/frontend/build
8383
src/frontend/node_modules
84-
src/frontend/public/neighborhoods
84+
src/frontend/public/neighborhoods
85+
86+
.vscode/*
87+
!.vscode/settings.json

‎.vscode/settings.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
// 1. Set Tailwind CSS as the language mode for CSS files
3+
"files.associations": {
4+
"*.css": "tailwindcss"
5+
},
6+
7+
// 2. Configure Prettier as the default formatter for all relevant files
8+
"editor.defaultFormatter": "esbenp.prettier-vscode",
9+
"editor.formatOnSave": true,
10+
11+
// 3. Enable ESLint to auto-fix issues on save
12+
"editor.codeActionsOnSave": {
13+
"source.fixAll.eslint": "explicit"
14+
},
15+
16+
// 4. Silence the default VS Code CSS validator
17+
"css.validate": false,
18+
"less.validate": false,
19+
"scss.validate": false
20+
}

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
1111
- Add frontend component library ADR [#614](https://github.com/azavea/echo-locator/pull/614)
1212
- Add `./scripts/ecs-shell <env>` script [#626](https://github.com/azavea/echo-locator/pull/626)
1313
- Bootstrap new frontend and remove old frontend [#666](https://github.com/azavea/echo-locator/pull/666)
14+
- Add Tailwind CSS theme [#667](https://github.com/azavea/echo-locator/pull/667)
15+
- Add a styled Button component [#667](https://github.com/azavea/echo-locator/pull/667)
1416

1517
### Changed
1618

‎docker-compose.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ services:
88
volumes:
99
- ./src/frontend:/usr/local/src
1010
- $HOME/.aws:/root/.aws:ro
11-
- node-modules-volume:/usr/local/src/node_modules
1211
ports:
1312
- "9966:9966"
1413
command: yarn dev
@@ -58,6 +57,3 @@ services:
5857
retries: 3
5958
start_period: 5s
6059
command: postgres -c log_statement=all
61-
62-
volumes:
63-
node-modules-volume:

‎src/frontend/index.html‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
5+
<link rel="icon" type="image/svg+xml" href="/logo.svg" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<link rel="preconnect" href="https://fonts.googleapis.com" />
8+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
9+
<link
10+
href="https://fonts.googleapis.com/css2?family=Mulish:ital,wght@0,400;0,500;0,700;1,400&display=swap"
11+
rel="stylesheet"
12+
/>
713
<title>BHA ECHO Locator</title>
814
</head>
915
<body>

‎src/frontend/package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
"react-aria-components": "^1.10.1",
2727
"react-dom": "^19.1.0",
2828
"react-router": "^7.6.2",
29+
"tailwind-variants": "^1.0.0",
2930
"tailwindcss": "^4.1.10",
30-
"tailwindcss-react-aria-components": "^2.0.0"
31+
"tailwindcss-react-aria-components": "^2.0.0",
32+
"vite-plugin-svgr": "^4.3.0"
3133
},
3234
"devDependencies": {
3335
"@eslint/js": "^9.25.0",

‎src/frontend/public/logo.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎src/frontend/public/vite.svg‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/frontend/src/assets/icons/arrow-left.svg‎

Lines changed: 1 addition & 0 deletions
Loading

‎src/frontend/src/assets/icons/arrow-right.svg‎

Lines changed: 6 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)