Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: display interior points as white #410

Draft
wants to merge 5 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
11 changes: 0 additions & 11 deletions .eslintignore

This file was deleted.

2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ updates:
major-app-dependencies:
update-types: ['major']
exclude-patterns:
- firebase
- firebase
commit-message:
prefix: deps
prefix-development: deps(dev)
Expand Down
9 changes: 9 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.vscode
/data
/forklift
/maps
/mockups
/scripts
/dist
/public/assets
CHANGELOG.md
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"plugins": ["prettier-plugin-organize-imports", "prettier-plugin-packagejson", "prettier-plugin-tailwindcss"],
"printWidth": 120,
"singleQuote": true,
"tailwindFunctions": ["clsx", "tv", "twMerge", "twJoin"]
}
6 changes: 1 addition & 5 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
export default {
stories: ['../src/**/*.stories.@(js|jsx|ts|tsx)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
],
addons: ['@storybook/addon-links', '@storybook/addon-essentials', '@storybook/addon-interactions'],
framework: {
name: '@storybook/react-vite',
options: {},
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview-head.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<script>
window.global = window;
</script>
</script>
17 changes: 1 addition & 16 deletions commitlint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,6 @@ export default {
extends: ['@commitlint/config-conventional'],
rules: {
'scope-enum': [2, 'always', ['api', 'app']],
'type-enum': [
2,
'always',
[
'build',
'chore',
'ci',
'docs',
'feat',
'fix',
'refactor',
'deps',
'style',
'test',
],
],
'type-enum': [2, 'always', ['build', 'chore', 'ci', 'docs', 'feat', 'fix', 'refactor', 'deps', 'style', 'test']],
},
};
61 changes: 61 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
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 storybook from 'eslint-plugin-storybook';
import globals from 'globals';
import tseslint from 'typescript-eslint';

// eslint.config.js
export default tseslint.config(
js.configs.recommended,
...tseslint.configs.recommended,
...storybook.configs['flat/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',
'scripts/*',
'.github/*',
'.emulator-data/*',
'.husky/*',
'**/coverage/*',
'firebase-export-*/',
'public/assets/*',
],
},
);
7 changes: 1 addition & 6 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
"source": "functions",
"runtime": "nodejs20",
"codebase": "default",
"ignore": [
"node_modules",
".git",
"firebase-debug.log",
"firebase-debug.*.log"
]
"ignore": ["node_modules", ".git", "firebase-debug.log", "firebase-debug.*.log"]
}
],
"firestore": {
Expand Down
3 changes: 2 additions & 1 deletion functions/database/submissions/onCreateMonument.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ export const createMonumentRecord = async (record, id) => {
} catch (error) {
logger.error(
'error fetching surveyor license. using empty string',
error,
record.submitted_by,
{
structuredData: true,
Expand Down Expand Up @@ -92,7 +93,7 @@ export const createMonumentRecord = async (record, id) => {

await doc.update({ monument: fileName });
} catch (error) {
logger.error('error updating monument record sheet', fileName, {
logger.error('error updating monument record sheet', fileName, error, {
structuredData: true,
});
}
Expand Down
2 changes: 1 addition & 1 deletion functions/emailHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const notify = (key, template) => {
{ nodeEnv: process.env.NODE_ENV },
{
structuredData: true,
}
},
);

return Promise.resolve([
Expand Down
1 change: 1 addition & 0 deletions functions/https/postGeneratePreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export const generatePreview = async (data, auth) => {
logger.error(
'error fetching surveyor license. using empty string',
auth.uid,
error,
{
structuredData: true,
},
Expand Down
8 changes: 6 additions & 2 deletions functions/pdfHelpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,16 @@ export const getPdfAssets = async (bucket, metadata, seal) => {
try {
images = await getBase64Images(bucket, imagePaths);
} catch (error) {
logger.error('could not get binary images');
logger.error('could not get binary images', error, {
structuredData: true,
});
}
try {
pdfs = await getBinaryPdfs(bucket, pdfPaths);
} catch (error) {
logger.error('could not get binary pdfs');
logger.error('could not get binary pdfs', error, {
structuredData: true,
});
}

return { images, pdfs };
Expand Down
36 changes: 18 additions & 18 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="https://gis.utah.gov/images/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Utah PLSS Corner Points: Provided by the UGRC</title>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta
name="description"
content="View and submit corner monument information for the Utah Public Lands Survey System."
/>
</head>

<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="https://gis.utah.gov/images/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Utah PLSS Corner Points: Provided by the UGRC</title>
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta name="description"
content="View and submit corner monument information for the Utah Public Lands Survey System." />
</head>

<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>

<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
Loading
Loading