Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b4fd56a
ci: remove print proxy
steveoh Jul 31, 2024
d71e09e
style: add some bottom margin to the sidebar drawer
steveoh Jul 31, 2024
a6b02af
style: add default link styles
steveoh Jul 31, 2024
27850a0
refactor: make randomize generic
steveoh Aug 1, 2024
047778b
feat: allow map container to accept a click event
steveoh Aug 1, 2024
853e522
feat: enable identify
steveoh Aug 1, 2024
75e3be3
chore: initially hide sidebar on small screens
steveoh Aug 1, 2024
e98d650
refactor: full typescript
steveoh Aug 1, 2024
0bb7fd0
refactor: eslint flat config and package.json config ejection
steveoh Aug 1, 2024
676cd1e
chore: update settings and extensions
steveoh Aug 1, 2024
55aa9b4
refactor: update identify text
steveoh Aug 1, 2024
891a25f
feat: open popup after geocode
steveoh Aug 2, 2024
f3dad6e
chore: fix type clash
steveoh Aug 2, 2024
6d539db
chore: update comments
steveoh Aug 2, 2024
9c0c6e4
ci: add lint/type checking to pull requests
stdavis Aug 2, 2024
63912cc
chore: remove some extensions
steveoh Aug 5, 2024
3c2b6be
feat: add about details for page components
steveoh Aug 5, 2024
a02f363
refactor: use aria-hidden
steveoh Aug 5, 2024
5136991
refactor: migrate to design system link components
steveoh Aug 14, 2024
037f1fb
deps: update packages
steveoh Aug 14, 2024
72e7f02
style: update focus outline on summaries
steveoh Aug 14, 2024
fbdf965
refactor: update layer name and metadata
steveoh Aug 14, 2024
e055c53
chore: remove log
steveoh Aug 14, 2024
a3b601c
chore: add and remove graphic on identify
steveoh Aug 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .eslintignore

This file was deleted.

28 changes: 26 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,31 @@ concurrency:
cancel-in-progress: true

jobs:
test-check:
name: Lint and check types
runs-on: ubuntu-latest

steps:
- name: ⬇️ Set up code
uses: actions/checkout@v4
with:
show-progress: false

- name: ⎔ Setup Node.js
uses: actions/setup-node@v4
with:
node-version: lts/*
cache: npm

- name: 📥 Download dependencies
run: npm ci

- name: 🧶 Lint
run: npm run lint

- name: 🧪 Check types
run: npm run check

test-unit:
name: Unit tests
runs-on: ubuntu-latest
Expand All @@ -37,7 +62,7 @@ jobs:
deploy-preview:
name: Firebase preview
runs-on: ubuntu-latest
needs: test-unit
needs: [test-unit, test-check]
if: ${{ github.event.sender.type == 'User' }}
environment:
name: preview
Expand All @@ -55,5 +80,4 @@ jobs:
env:
VITE_DISCOVER: ${{ secrets.VITE_DISCOVER }}
VITE_WEB_API: ${{ secrets.VITE_WEB_API }}
VITE_PRINT_PROXY: ${{ secrets.VITE_PRINT_PROXY }}
VITE_FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }}
1 change: 0 additions & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,4 @@ jobs:
env:
VITE_DISCOVER: ${{ secrets.VITE_DISCOVER }}
VITE_WEB_API: ${{ secrets.VITE_WEB_API }}
VITE_PRINT_PROXY: ${{ secrets.VITE_PRINT_PROXY }}
VITE_FIREBASE_CONFIG: ${{ secrets.FIREBASE_CONFIG }}
5 changes: 5 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"plugins": ["prettier-plugin-organize-imports", "prettier-plugin-packagejson", "prettier-plugin-tailwindcss"],
"printWidth": 120,
"singleQuote": true
}
8 changes: 8 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"recommendations": [
"streetsidesoftware.code-spell-checker",
"esbenp.prettier-vscode",
"bradlc.vscode-tailwindcss",
"dbaeumer.vscode-eslint",
]
}
19 changes: 9 additions & 10 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,38 @@
{
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cSpell.words": [
"agrc",
"apos",
"arcgis",
"basemap",
"browserslist",
"cadastre",
"cbll",
"chuhlomin",
"escaperegexp",
"esrijs",
"firebaserc",
"geocode",
"Geospatial",
"gnis",
"hostingchannels",
"lods",
"noopener",
"noreferrer",
"packagejson",
"padder",
"sgid",
"sitla",
"sortby",
"srid",
"tagname",
"tailwindcss",
"tibdex",
"topo",
"ugrc",
"uniqwith",
"usgs",
"vite",
"wkid",
"wonkavision",
"wwwroot"
"wkid"
],
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
}
54 changes: 54 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import js from '@eslint/js';
import eslintConfigPrettier from 'eslint-config-prettier';
import prettier from 'eslint-plugin-prettier';
import reactPlugin from 'eslint-plugin-react';
import reactHooks from 'eslint-plugin-react-hooks';
import globals from 'globals';
import tseslint from 'typescript-eslint';

// eslint.config.js
export default tseslint.config(
js.configs.recommended,
...tseslint.configs.recommended,
{
...reactPlugin.configs.flat.recommended,
languageOptions: {
ecmaVersion: 2022,
sourceType: 'module',
...reactPlugin.configs.flat.recommended.languageOptions,
globals: {
...globals.browser,
...globals.node,
...globals.es2022,
},
},
settings: { react: { version: 'detect' } },
plugins: {
react: reactPlugin,
prettier,
'react-hooks': reactHooks,
},
files: ['**/*.{js,mjs,cjs,jsx,mjsx,ts,tsx,mtsx}'],
rules: {
...eslintConfigPrettier.rules,
...reactHooks.configs.recommended.rules,
...reactPlugin.configs['jsx-runtime'].rules,
},
},
{
ignores: [
'.firebase',
'.github/*',
'.vscode/*',
'data/*',
'dist/*',
'forklift/*',
'maps/*',
'mockups/*',
'node_modules/*',
'package-lock.json',
'public/*',
'scripts/*',
],
},
);
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no" />
<meta
name="description"
content="This web mapping application will show you Discover base maps, kitchen sink react components, and the esri javascript api. It is a GitHub template that you can use to create your own."
Expand All @@ -17,6 +17,6 @@
<body class="size-full bg-white text-zinc-700 subpixel-antialiased dark:bg-zinc-800 dark:text-zinc-50">
<noscript> You need to enable JavaScript to run this app. </noscript>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
Loading