diff --git a/.storybook/main.js b/.storybook/main.js index 61249f4f..1f950e07 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -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: {}, diff --git a/.storybook/preview-head.html b/.storybook/preview-head.html index 05da1e9d..e5510401 100644 --- a/.storybook/preview-head.html +++ b/.storybook/preview-head.html @@ -1,3 +1,3 @@ \ No newline at end of file + diff --git a/commitlint.config.js b/commitlint.config.js index 91272ddd..b2727de7 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -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']], }, }; diff --git a/firebase.json b/firebase.json index 156921c2..a2ed94db 100644 --- a/firebase.json +++ b/firebase.json @@ -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": { diff --git a/functions/database/submissions/onCreateMonument.js b/functions/database/submissions/onCreateMonument.js index a505d9ad..1a36c8e9 100644 --- a/functions/database/submissions/onCreateMonument.js +++ b/functions/database/submissions/onCreateMonument.js @@ -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, @@ -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, }); } diff --git a/functions/emailHelpers.js b/functions/emailHelpers.js index f0c67fad..8e34b19a 100644 --- a/functions/emailHelpers.js +++ b/functions/emailHelpers.js @@ -9,7 +9,7 @@ export const notify = (key, template) => { { nodeEnv: process.env.NODE_ENV }, { structuredData: true, - } + }, ); return Promise.resolve([ diff --git a/functions/https/postGeneratePreview.js b/functions/https/postGeneratePreview.js index cbf22cf8..c7d3a184 100644 --- a/functions/https/postGeneratePreview.js +++ b/functions/https/postGeneratePreview.js @@ -53,6 +53,7 @@ export const generatePreview = async (data, auth) => { logger.error( 'error fetching surveyor license. using empty string', auth.uid, + error, { structuredData: true, }, diff --git a/functions/pdfHelpers.js b/functions/pdfHelpers.js index fc2b7cea..73573827 100644 --- a/functions/pdfHelpers.js +++ b/functions/pdfHelpers.js @@ -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 }; diff --git a/index.html b/index.html index 0d65156c..1fb55a01 100644 --- a/index.html +++ b/index.html @@ -1,21 +1,21 @@ - + + + + + + Utah PLSS Corner Points: Provided by the UGRC + + + + + - - - - - Utah PLSS Corner Points: Provided by the UGRC - - - - - - - -
- - - + +
+ + diff --git a/src/components/app/App.jsx b/src/components/app/App.jsx index 166a1300..5c8b5dc2 100644 --- a/src/components/app/App.jsx +++ b/src/components/app/App.jsx @@ -1,20 +1,14 @@ -import { useImmerReducer } from 'use-immer'; -import { - AnalyticsProvider, - AuthProvider, - useFirebaseApp, - FunctionsProvider, - StorageProvider, -} from 'reactfire'; import { getAnalytics } from 'firebase/analytics'; -import { getAuth, connectAuthEmulator } from 'firebase/auth'; -import { getFunctions, connectFunctionsEmulator } from 'firebase/functions'; -import { getStorage, connectStorageEmulator } from 'firebase/storage'; -import { getFirestore, connectFirestoreEmulator } from 'firebase/firestore'; -import reduce, { defaults } from '../reducers/AppReducer'; +import { connectAuthEmulator, getAuth } from 'firebase/auth'; +import { connectFirestoreEmulator, getFirestore } from 'firebase/firestore'; +import { connectFunctionsEmulator, getFunctions } from 'firebase/functions'; +import { connectStorageEmulator, getStorage } from 'firebase/storage'; +import { AnalyticsProvider, AuthProvider, FunctionsProvider, StorageProvider, useFirebaseApp } from 'reactfire'; +import { useImmerReducer } from 'use-immer'; import Drawer from '../layoutElements/Drawer.jsx'; import Menu from '../layoutElements/Menu.jsx'; import Map from '../pageElements/Map.jsx'; +import reduce, { defaults } from '../reducers/AppReducer'; export default function App() { const [state, dispatch] = useImmerReducer(reduce, defaults); @@ -38,10 +32,7 @@ export default function App() { } } - if ( - typeof window === 'undefined' || - !window['_firebase_functions_emulator'] - ) { + if (typeof window === 'undefined' || !window['_firebase_functions_emulator']) { try { connectFunctionsEmulator(functions, 'localhost', 5001); } catch { @@ -52,10 +43,7 @@ export default function App() { } } - if ( - typeof window === 'undefined' || - !window['_firebase_storage_emulator'] - ) { + if (typeof window === 'undefined' || !window['_firebase_storage_emulator']) { try { connectStorageEmulator(storage, 'localhost', 9199); } catch { @@ -66,10 +54,7 @@ export default function App() { } } - if ( - typeof window === 'undefined' || - !window['_firebase_firestore_emulator'] - ) { + if (typeof window === 'undefined' || !window['_firebase_firestore_emulator']) { try { connectFirestoreEmulator(firestore, 'localhost', 8080); } catch { @@ -87,12 +72,7 @@ export default function App() {
- + menu diff --git a/src/components/contexts/SubmissionContext.jsx b/src/components/contexts/SubmissionContext.jsx index 367c8a70..cef59073 100644 --- a/src/components/contexts/SubmissionContext.jsx +++ b/src/components/contexts/SubmissionContext.jsx @@ -1,6 +1,6 @@ -import { createContext } from 'react'; -import PropTypes from 'prop-types'; import { useMachine } from '@xstate/react'; +import PropTypes from 'prop-types'; +import { createContext } from 'react'; import { submissionMachine } from '../machines'; export const SubmissionContext = createContext({}); @@ -10,11 +10,7 @@ export const SubmissionProvider = ({ children, context }) => { input: { ...context }, }); - return ( - - {children} - - ); + return {children}; }; SubmissionProvider.propTypes = { diff --git a/src/components/formElements/Buttons.jsx b/src/components/formElements/Buttons.jsx index 31230c39..5d0a0645 100644 --- a/src/components/formElements/Buttons.jsx +++ b/src/components/formElements/Buttons.jsx @@ -1,8 +1,8 @@ +import { ExclamationCircleIcon } from '@heroicons/react/20/solid'; import clsx from 'clsx'; -import PropTypes from 'prop-types'; import { OAuthProvider, signInWithPopup } from 'firebase/auth'; +import PropTypes from 'prop-types'; import { useAuth } from 'reactfire'; -import { ExclamationCircleIcon } from '@heroicons/react/20/solid'; export const LogInButton = () => { const auth = useAuth(); @@ -154,14 +154,7 @@ export const Button = ({ fill="none" viewBox="0 0 24 24" > - + )} - {state === 'error' && ( - - )} + {state === 'error' && } {children} ); @@ -210,14 +201,7 @@ Button.propTypes = { buttonGroup: PropTypes.object, }; -export const Link = ({ - href, - children, - target, - rel, - buttonGroup, - style = 'link', -}) => { +export const Link = ({ href, children, target, rel, buttonGroup, style = 'link' }) => { const attributes = { target, rel, diff --git a/src/components/formElements/FileUpload.jsx b/src/components/formElements/FileUpload.jsx index ed4188ec..4012ea47 100644 --- a/src/components/formElements/FileUpload.jsx +++ b/src/components/formElements/FileUpload.jsx @@ -1,19 +1,12 @@ -import { useEffect, useRef, useState } from 'react'; +import clsx from 'clsx'; +import { deleteObject, getDownloadURL, ref, uploadBytesResumable } from 'firebase/storage'; import PropTypes from 'prop-types'; +import { useEffect, useRef, useState } from 'react'; import { useStorage } from 'reactfire'; -import { - deleteObject, - getDownloadURL, - ref, - uploadBytesResumable, -} from 'firebase/storage'; -import clsx from 'clsx'; import { Button } from './Buttons.jsx'; const validateContentTypes = (contentType, contentTypes) => { - const found = contentTypes.find( - (meta) => contentType === meta.value.toLowerCase(), - ); + const found = contentTypes.find((meta) => contentType === meta.value.toLowerCase()); if (found) { return [true, '']; @@ -28,14 +21,7 @@ const validateSize = (actualSize, megabytes) => { return actualSize > megabytes * 1024 * 1024; }; -const FileUpload = ({ - defaultFileName, - path, - contentTypes, - maxFileSize, - value, - onChange, -}) => { +const FileUpload = ({ defaultFileName, path, contentTypes, maxFileSize, value, onChange }) => { const storage = useStorage(); const uploadReference = useRef(); const [fileUrl, setFileUrl] = useState(''); @@ -54,10 +40,7 @@ const FileUpload = ({ const fileToUpload = fileList[0]; let fileName = fileToUpload.name; - let [hasValidType, errorMessage] = validateContentTypes( - fileToUpload.type, - contentTypes, - ); + let [hasValidType, errorMessage] = validateContentTypes(fileToUpload.type, contentTypes); if (!hasValidType) { setUploadError(errorMessage); return; @@ -70,10 +53,7 @@ const FileUpload = ({ uploadReference.current = ref(storage, `${path}/${fileName}`); - const uploadTask = uploadBytesResumable( - uploadReference.current, - fileToUpload, - ); + const uploadTask = uploadBytesResumable(uploadReference.current, fileToUpload); uploadTask?.on( 'state_changed', @@ -97,14 +77,10 @@ const FileUpload = ({ ).toFixed(2)}MB.`, ); } else { - setUploadError( - 'Permission denied. Check your login status and try again.', - ); + setUploadError('Permission denied. Check your login status and try again.'); } } catch { - setUploadError( - 'Permission denied. Check your login status and try again.', - ); + setUploadError('Permission denied. Check your login status and try again.'); } }, async () => { @@ -135,11 +111,7 @@ const FileUpload = ({ name={defaultFileName} id={defaultFileName} onChange={uploadFile} - className="w-max text-center text-sm text-slate-400 file:flex file:min-h-[2rem] file:cursor-pointer file:rounded-full file:border-2 - file:border-solid file:border-sky-600 file:bg-sky-500 file:px-7 file:py-1 file:text-sm - file:font-semibold file:text-white file:transition-all file:duration-200 file:ease-in-out hover:file:bg-sky-600 - file:focus:border-sky-500 file:focus:outline-none file:focus:ring-2 file:focus:ring-sky-600 file:focus:ring-opacity-50 - file:active:bg-sky-700 file:disabled:cursor-not-allowed file:disabled:opacity-50" + className="w-max text-center text-sm text-slate-400 file:flex file:min-h-[2rem] file:cursor-pointer file:rounded-full file:border-2 file:border-solid file:border-sky-600 file:bg-sky-500 file:px-7 file:py-1 file:text-sm file:font-semibold file:text-white file:transition-all file:duration-200 file:ease-in-out hover:file:bg-sky-600 file:focus:border-sky-500 file:focus:outline-none file:focus:ring-2 file:focus:ring-sky-600 file:focus:ring-opacity-50 file:active:bg-sky-700 file:disabled:cursor-not-allowed file:disabled:opacity-50" /> {uploadPercent !== undefined && ( { return (
{url.search(/\.pdf\?/i) > -1 ? ( - + PDF preview ) : ( - upload preview + upload preview )} diff --git a/src/components/formElements/Form.jsx b/src/components/formElements/Form.jsx index aeb304ae..2ecd59b6 100644 --- a/src/components/formElements/Form.jsx +++ b/src/components/formElements/Form.jsx @@ -2,10 +2,7 @@ import PropTypes from 'prop-types'; export function NumberedForm({ children, onSubmit }) { return ( -
+
{children}
@@ -26,7 +23,7 @@ export function NumberedFormSection({ children, number, title }) {
{title ? title : children}
- {title &&
{children}
} + {title &&
{children}
} ); } diff --git a/src/components/formElements/Inputs.jsx b/src/components/formElements/Inputs.jsx index cb851fd3..220a2967 100644 --- a/src/components/formElements/Inputs.jsx +++ b/src/components/formElements/Inputs.jsx @@ -22,7 +22,7 @@ export const Input = forwardRef( ref, ) => { const classes = clsx( - 'border border-slate-400 bg-white py-2 px-3 text-slate-800 placeholder:text-slate-400 shadow-sm transition-all duration-200 ease-in-out focus:border-sky-500 focus:outline-none focus:ring focus:ring-sky-600 focus:ring-opacity-50 disabled:cursor-not-allowed disabled:opacity-50 sm:text-sm', + 'border border-slate-400 bg-white px-3 py-2 text-slate-800 shadow-sm transition-all duration-200 ease-in-out placeholder:text-slate-400 focus:border-sky-500 focus:outline-none focus:ring focus:ring-sky-600 focus:ring-opacity-50 disabled:cursor-not-allowed disabled:opacity-50 sm:text-sm', { 'rounded-md': !left, 'rounded-l-md': left, @@ -90,10 +90,7 @@ Input.propTypes = { /** * Custom css class names to append to the defaults */ - className: PropTypes.oneOfType([ - PropTypes.string, - PropTypes.arrayOf(PropTypes.string), - ]), + className: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.string)]), touched: PropTypes.bool, step: PropTypes.string, min: PropTypes.string, diff --git a/src/components/formElements/LimitedTextarea.jsx b/src/components/formElements/LimitedTextarea.jsx index 20bdd2d5..902631c3 100644 --- a/src/components/formElements/LimitedTextarea.jsx +++ b/src/components/formElements/LimitedTextarea.jsx @@ -1,6 +1,6 @@ +import { ErrorMessage } from '@hookform/error-message'; import clsx from 'clsx'; import PropTypes from 'prop-types'; -import { ErrorMessage } from '@hookform/error-message'; import ErrorMessageTag from '../pageElements/ErrorMessage.jsx'; export const LimitedTextarea = ({ @@ -95,8 +95,7 @@ export const CharactersRemaining = ({ remaining, limit }) => { className={clsx('absolute bottom-0 right-3', { 'text-xs text-slate-500': percentage >= 0 && percentage < 0.8, 'text-xs text-amber-600': percentage >= 0.8 && percentage < 0.9, - 'border border-red-600 bg-white p-2 text-lg font-black text-red-600': - percentage >= 0.9, + 'border border-red-600 bg-white p-2 text-lg font-black text-red-600': percentage >= 0.9, })} > {remaining} characters left diff --git a/src/components/formElements/Note.jsx b/src/components/formElements/Note.jsx index ba4560bd..6eb9e5c2 100644 --- a/src/components/formElements/Note.jsx +++ b/src/components/formElements/Note.jsx @@ -1,11 +1,7 @@ import PropTypes from 'prop-types'; export default function Note({ children }) { - return ( -

- {children} -

- ); + return

{children}

; } Note.propTypes = { children: PropTypes.node.isRequired, diff --git a/src/components/formElements/Select.jsx b/src/components/formElements/Select.jsx index af399ebf..87372c82 100644 --- a/src/components/formElements/Select.jsx +++ b/src/components/formElements/Select.jsx @@ -1,15 +1,8 @@ -import { forwardRef, Fragment } from 'react'; -import PropTypes from 'prop-types'; -import { - Listbox, - ListboxButton, - Label, - ListboxOption, - ListboxOptions, - Transition, -} from '@headlessui/react'; +import { Label, Listbox, ListboxButton, ListboxOption, ListboxOptions, Transition } from '@headlessui/react'; import { CheckIcon, ChevronUpDownIcon } from '@heroicons/react/20/solid'; import clsx from 'clsx'; +import PropTypes from 'prop-types'; +import { forwardRef, Fragment } from 'react'; const getDefaultValue = (value, placeholder, options) => { if ((value?.length ?? 0) < 1) { @@ -21,9 +14,7 @@ const getDefaultValue = (value, placeholder, options) => { } if (Object.keys(options[0]).includes('value')) { - const label = options.find( - (option) => option.value === (value?.value ?? value), - )?.label; + const label = options.find((option) => option.value === (value?.value ?? value))?.label; if (!label) { return placeholder; @@ -41,106 +32,85 @@ const getDefaultValue = (value, placeholder, options) => { return option; }; -export const Select = forwardRef( - ( - { disabled, label, name, required, options, value, onChange, placeholder }, - ref, - ) => { - return ( - { - if (onChange) { - onChange(newValue?.value ?? newValue); - } - }} - > - {label !== false && ( - - )} -
- - - {getDefaultValue(value, placeholder, options)} - - - - - - - {(options?.length ?? 0) > 0 ? ( - options?.map((option, id) => ( - - clsx( - 'relative cursor-default select-none py-2 pl-10 pr-4', - { - 'bg-sky-100 text-sky-900': focus, - 'text-sky-900': !focus && !option?.disabled, - 'cursor-not-allowed text-slate-400': - option?.disabled ?? false, - }, - ) - } - value={option} - disabled={option?.disabled ?? false} - > - {({ selected }) => ( - <> - - {option?.label ?? option} +export const Select = forwardRef(({ disabled, label, name, required, options, value, onChange, placeholder }, ref) => { + return ( + { + if (onChange) { + onChange(newValue?.value ?? newValue); + } + }} + > + {label !== false && ( + + )} +
+ + {getDefaultValue(value, placeholder, options)} + + + + + + {(options?.length ?? 0) > 0 ? ( + options?.map((option, id) => ( + + clsx('relative cursor-default select-none py-2 pl-10 pr-4', { + 'bg-sky-100 text-sky-900': focus, + 'text-sky-900': !focus && !option?.disabled, + 'cursor-not-allowed text-slate-400': option?.disabled ?? false, + }) + } + value={option} + disabled={option?.disabled ?? false} + > + {({ selected }) => ( + <> + + {option?.label ?? option} + + {selected ? ( + + - {selected ? ( - - - ) : null} - - )} - - )) - ) : ( -
- This list is empty 😶 -
- )} - - -
- - ); - }, -); + ) : null} + + )} + + )) + ) : ( +
+ This list is empty 😶 +
+ )} + + +
+ + ); +}); Select.displayName = 'Select'; Select.propTypes = { /** @@ -167,14 +137,8 @@ Select.propTypes = { * The options to place inside the select */ options: PropTypes.arrayOf( - PropTypes.oneOfType([ - PropTypes.string, - PropTypes.shape({ label: PropTypes.string, value: PropTypes.string }), - ]), + PropTypes.oneOfType([PropTypes.string, PropTypes.shape({ label: PropTypes.string, value: PropTypes.string })]), ), - value: PropTypes.oneOfType([ - PropTypes.string, - PropTypes.shape({ label: PropTypes.string, value: PropTypes.string }), - ]), + value: PropTypes.oneOfType([PropTypes.string, PropTypes.shape({ label: PropTypes.string, value: PropTypes.string })]), onChange: PropTypes.func, }; diff --git a/src/components/formElements/Select.stories.jsx b/src/components/formElements/Select.stories.jsx index 33ee4207..52ce80f6 100644 --- a/src/components/formElements/Select.stories.jsx +++ b/src/components/formElements/Select.stories.jsx @@ -96,10 +96,7 @@ export const ResetInForm = () => { /> )} /> - diff --git a/src/components/formElements/Switch.jsx b/src/components/formElements/Switch.jsx index e136b60c..414e80c5 100644 --- a/src/components/formElements/Switch.jsx +++ b/src/components/formElements/Switch.jsx @@ -1,19 +1,11 @@ -import { forwardRef } from 'react'; -import PropTypes from 'prop-types'; import { Switch } from '@headlessui/react'; import clsx from 'clsx'; +import PropTypes from 'prop-types'; +import { forwardRef } from 'react'; const Toggle = forwardRef( ( - { - name, - value = false, - onChange, - screenReader = 'Toggle', - hideLabel = false, - yesValue = 'Yes', - noValue = 'No', - }, + { name, value = false, onChange, screenReader = 'Toggle', hideLabel = false, yesValue = 'Yes', noValue = 'No' }, ref, ) => { return ( @@ -33,17 +25,14 @@ const Toggle = forwardRef( className={clsx( { 'translate-x-8 border-sky-800 from-sky-300 to-sky-800': value, - 'translate-x-0 border-slate-500 from-white to-slate-300': - !value, + 'translate-x-0 border-slate-500 from-white to-slate-300': !value, }, 'pointer-events-none inline-block h-6 w-6 transform rounded-full border-2 bg-gradient-to-br shadow-lg ring-0 transition duration-200 ease-in-out', )} /> {!hideLabel && ( - - {value ? yesValue : noValue} - + {value ? yesValue : noValue} )} ); diff --git a/src/components/hooks/usePageView.jsx b/src/components/hooks/usePageView.jsx index 29b1e07f..e0b15dee 100644 --- a/src/components/hooks/usePageView.jsx +++ b/src/components/hooks/usePageView.jsx @@ -1,6 +1,6 @@ -import { useAnalytics } from 'reactfire'; import { logEvent } from 'firebase/analytics'; import { useEffect } from 'react'; +import { useAnalytics } from 'reactfire'; export default function usePageView(page, data) { const analytics = useAnalytics(); diff --git a/src/components/layoutElements/Drawer.jsx b/src/components/layoutElements/Drawer.jsx index 61b4e133..e9678456 100644 --- a/src/components/layoutElements/Drawer.jsx +++ b/src/components/layoutElements/Drawer.jsx @@ -14,9 +14,7 @@ const SubmissionProvider = lazy(() => default: module.SubmissionProvider, })), ); -const CornerSubmission = lazy( - () => import('../pageElements/CornerSubmission/CornerSubmission.jsx'), -); +const CornerSubmission = lazy(() => import('../pageElements/CornerSubmission/CornerSubmission.jsx')); const MyContent = lazy(() => import('../pageElements/MyContent.jsx')); const AddPoint = lazy(() => import('../pageElements/AddPoint.jsx')); const Identify = lazy(() => import('../pageElements/Identify.jsx')); @@ -25,15 +23,7 @@ const Profile = lazy(() => import('../pageElements/Profile.jsx')); const Welcome = lazy(() => import('../pageElements/Welcome.jsx')); const Legend = lazy(() => import('../pageElements/Legend.jsx')); -export default function Drawer({ - dispatch, - authenticated, - map, - addPoint, - activeComponent, - drawerOpen, - submission, -}) { +export default function Drawer({ dispatch, authenticated, map, addPoint, activeComponent, drawerOpen, submission }) { const { data: signInCheckResult } = useSigninCheck(); const scrollContainer = useRef(); @@ -76,11 +66,7 @@ export default function Drawer({ } case 'points': { return signInCheckResult?.signedIn ? ( - + ) : ( ); @@ -99,13 +85,7 @@ export default function Drawer({ return ; } case 'identify': { - return ( - - ); + return ; } case 'submission': { return ( @@ -121,16 +101,14 @@ export default function Drawer({ ); diff --git a/src/components/layoutElements/Menu.jsx b/src/components/layoutElements/Menu.jsx index 73aca83f..c2d2f703 100644 --- a/src/components/layoutElements/Menu.jsx +++ b/src/components/layoutElements/Menu.jsx @@ -1,29 +1,13 @@ -import PropTypes from 'prop-types'; +import { FolderIcon, HomeModernIcon, PlusCircleIcon, SwatchIcon, UserCircleIcon } from '@heroicons/react/24/outline'; import clsx from 'clsx'; -import { - FolderIcon, - PlusCircleIcon, - UserCircleIcon, - SwatchIcon, - HomeModernIcon, -} from '@heroicons/react/24/outline'; +import PropTypes from 'prop-types'; import { useUser } from 'reactfire'; export default function Menu({ dispatch, drawerOpen }) { const { data: user } = useUser(); const classes = clsx( - [ - 'menu', - 'z-20', - 'flex', - 'py-4', - 'bg-slate-800/95', - 'shadow', - 'menu', - 'md:justify-between', - 'justify-evenly', - ], + ['menu', 'z-20', 'flex', 'py-4', 'bg-slate-800/95', 'shadow', 'menu', 'md:justify-between', 'justify-evenly'], { 'menu--open': drawerOpen, }, @@ -31,40 +15,23 @@ export default function Menu({ dispatch, drawerOpen }) { return ( diff --git a/src/components/machines/geolocation.js b/src/components/machines/geolocation.js index 94e5f011..bb60b7fb 100644 --- a/src/components/machines/geolocation.js +++ b/src/components/machines/geolocation.js @@ -1,5 +1,5 @@ -import { assign, fromCallback, setup } from 'xstate'; import Graphic from '@arcgis/core/Graphic'; +import { assign, fromCallback, setup } from 'xstate'; const updatePosition = assign({ position: ({ event }) => { diff --git a/src/components/machines/index.js b/src/components/machines/index.js index dcdf0316..70337651 100644 --- a/src/components/machines/index.js +++ b/src/components/machines/index.js @@ -1,8 +1,8 @@ // @ts-check -import { assign, fromPromise, setup } from 'xstate'; -import ky from 'ky'; import DmsCoordinates, { parseDms } from 'dms-conversion'; +import ky from 'ky'; +import { assign, fromPromise, setup } from 'xstate'; import { countiesInZone, createProjectFormData, @@ -47,18 +47,14 @@ const project = (grid) => { return ky .post('project', { body: formData, - prefixUrl: - 'https://mapserv.utah.gov/arcgis/rest/services/Geometry/GeometryServer', + prefixUrl: 'https://mapserv.utah.gov/arcgis/rest/services/Geometry/GeometryServer', }) .json(); }; const coordinateToDecimalDegrees = (geographic) => { return new Promise((resolve) => { - const dms = [ - `${formatDegrees(geographic.northing)} N`, - `${formatDegrees(geographic.easting)} W`, - ]; + const dms = [`${formatDegrees(geographic.northing)} N`, `${formatDegrees(geographic.easting)} W`]; const [y, x] = dms.map(parseDms); @@ -104,8 +100,7 @@ const projectToStatePlane = (coordinates) => { return ky .post('project', { body: formData, - prefixUrl: - 'https://mapserv.utah.gov/arcgis/rest/services/Geometry/GeometryServer', + prefixUrl: 'https://mapserv.utah.gov/arcgis/rest/services/Geometry/GeometryServer', }) .json(); }; @@ -132,14 +127,11 @@ export const submissionMachine = setup({ 'is new submission': ({ context }) => context.type === 'new', 'is existing submission': ({ context }) => context.type === 'existing', 'is grid datum': ({ context }) => context.datum.split('-')[0] === 'grid', - 'is geographic datum': ({ context }) => - context.datum.split('-')[0] === 'geographic', + 'is geographic datum': ({ context }) => context.datum.split('-')[0] === 'geographic', }, actors: { project: fromPromise(({ input }) => project(input)), - coordinateToDecimalDegrees: fromPromise(({ input }) => - coordinateToDecimalDegrees(input), - ), + coordinateToDecimalDegrees: fromPromise(({ input }) => coordinateToDecimalDegrees(input)), queryForCounty: fromPromise(({ input }) => queryForCounty(input)), projectToStatePlane: fromPromise(({ input }) => projectToStatePlane({ @@ -471,10 +463,7 @@ export const submissionMachine = setup({ return ''; } - const county = - event.output.features[0].attributes[ - 'NAME' - ]?.toLowerCase(); + const county = event.output.features[0].attributes['NAME']?.toLowerCase(); let zone; @@ -534,10 +523,7 @@ export const submissionMachine = setup({ src: fromPromise( ({ input: { decimalDegrees } }) => new Promise((resolve) => { - const dmsCoords = new DmsCoordinates( - decimalDegrees.y, - decimalDegrees.x, - ); + const dmsCoords = new DmsCoordinates(decimalDegrees.y, decimalDegrees.x); resolve(dmsCoords.dmsArrays); }), diff --git a/src/components/machines/index.test.js b/src/components/machines/index.test.js index 3d44e482..ce41e2a7 100644 --- a/src/components/machines/index.test.js +++ b/src/components/machines/index.test.js @@ -15,9 +15,7 @@ describe('updateContext', () => { }); test('it can update an existing property on an existing object', () => { - expect( - updateContext({ property: 'value' }, 'property', 'new value'), - ).toEqual({ + expect(updateContext({ property: 'value' }, 'property', 'new value')).toEqual({ property: 'new value', }); }); @@ -30,11 +28,9 @@ describe('updateContext', () => { test('it can merge a property within an object', () => { expect( - updateContext( - { geography: { northing: { degrees: 1, minutes: 1, seconds: 1 } } }, - 'geography', - { elevation: 100 }, - ), + updateContext({ geography: { northing: { degrees: 1, minutes: 1, seconds: 1 } } }, 'geography', { + elevation: 100, + }), ).toEqual({ geography: { northing: { diff --git a/src/components/pageElements/AddPoint.jsx b/src/components/pageElements/AddPoint.jsx index 778ca430..c681f60a 100644 --- a/src/components/pageElements/AddPoint.jsx +++ b/src/components/pageElements/AddPoint.jsx @@ -1,26 +1,26 @@ -import { Fragment, useEffect, useRef, useState } from 'react'; -import PropTypes from 'prop-types'; +import { QuestionMarkCircleIcon } from '@heroicons/react/24/outline'; +import { ErrorMessage } from '@hookform/error-message'; +import { yupResolver } from '@hookform/resolvers/yup'; +import { useMutation, useQueryClient } from '@tanstack/react-query'; import { contrastColor } from 'contrast-color'; +import { httpsCallable } from 'firebase/functions'; +import PropTypes from 'prop-types'; +import { Fragment, useEffect, useRef, useState } from 'react'; import { CirclePicker } from 'react-color'; import { Controller, useForm, useWatch } from 'react-hook-form'; -import { useUser, useFunctions } from 'reactfire'; -import { httpsCallable } from 'firebase/functions'; -import { useMutation, useQueryClient } from '@tanstack/react-query'; -import { LimitedTextarea } from '../formElements/LimitedTextarea.jsx'; -import { Input } from '../formElements/Inputs.jsx'; -import { Switch } from '../formElements/Switch.jsx'; -import Spacer from '../formElements/Spacer.jsx'; -import { NumberedForm, NumberedFormSection } from '../formElements/Form.jsx'; -import Card from '../formElements/Card.jsx'; +import { useFunctions, useUser } from 'reactfire'; import { addPointSchema as schema } from '../../../functions/shared/cornerSubmission/Schema.js'; -import { yupResolver } from '@hookform/resolvers/yup'; -import { ErrorMessage } from '@hookform/error-message'; -import ErrorMessageTag from './ErrorMessage.jsx'; -import Wizard from './CornerSubmission/Wizard.jsx'; -import { QuestionMarkCircleIcon } from '@heroicons/react/24/outline'; -import FileUpload from '../formElements/FileUpload.jsx'; import { Button } from '../formElements/Buttons.jsx'; +import Card from '../formElements/Card.jsx'; +import FileUpload from '../formElements/FileUpload.jsx'; +import { NumberedForm, NumberedFormSection } from '../formElements/Form.jsx'; +import { Input } from '../formElements/Inputs.jsx'; +import { LimitedTextarea } from '../formElements/LimitedTextarea.jsx'; +import Spacer from '../formElements/Spacer.jsx'; +import { Switch } from '../formElements/Switch.jsx'; import usePageView from '../hooks/usePageView.jsx'; +import Wizard from './CornerSubmission/Wizard.jsx'; +import ErrorMessageTag from './ErrorMessage.jsx'; const numberFormatter = new Intl.NumberFormat('en-US'); const dateFormatter = new Intl.DateTimeFormat('en-US', { @@ -29,13 +29,7 @@ const dateFormatter = new Intl.DateTimeFormat('en-US', { }); const limit = 3; -export default function AddPoint({ - active, - color, - geometry, - dispatch, - notes = '', -}) { +export default function AddPoint({ active, color, geometry, dispatch, notes = '' }) { const functions = useFunctions(); const addPoint = httpsCallable(functions, 'postPoint'); const { data: user } = useUser(); @@ -54,11 +48,10 @@ export default function AddPoint({ [`photo-3-${uniqueId.current}`]: '', }; - const { control, formState, handleSubmit, register, reset, setValue, watch } = - useForm({ - resolver: yupResolver(schema), - defaultValues, - }); + const { control, formState, handleSubmit, register, reset, setValue, watch } = useForm({ + resolver: yupResolver(schema), + defaultValues, + }); const fields = useWatch({ control }); @@ -67,11 +60,7 @@ export default function AddPoint({ useEffect(() => { if (geometry?.x && geometry?.y) { - setValue( - 'location', - { x: geometry.x, y: geometry.y }, - { shouldValidate: true }, - ); + setValue('location', { x: geometry.x, y: geometry.y }, { shouldValidate: true }); } }, [geometry, setValue]); @@ -140,25 +129,15 @@ export default function AddPoint({ Add Reference Point

- Use reference points to help you remember points of interest or other - identifying features when out in the field collecting information. + Use reference points to help you remember points of interest or other identifying features when out in the field + collecting information.

- - + +
@@ -177,11 +156,7 @@ export default function AddPoint({ /> )} /> - + {new Array(imageCount).fill().map((_, i) => ( @@ -250,9 +225,7 @@ export default function AddPoint({ <>
- - selected color - + selected color
@@ -262,12 +235,8 @@ export default function AddPoint({ > {geometry?.x && ( <> -
- {numberFormatter.format(geometry?.x || 0)} -
-
- {numberFormatter.format(geometry?.y || 0)} -
+
{numberFormatter.format(geometry?.x || 0)}
+
{numberFormatter.format(geometry?.y || 0)}
)}
@@ -275,11 +244,7 @@ export default function AddPoint({ )} - + @@ -301,20 +266,11 @@ export default function AddPoint({

- + - mutate} - clear={onReset} - status={status} - back={false} - /> + mutate} clear={onReset} status={status} back={false} /> diff --git a/src/components/pageElements/AddPoint.stories.jsx b/src/components/pageElements/AddPoint.stories.jsx index ae9eb177..e28c14e1 100644 --- a/src/components/pageElements/AddPoint.stories.jsx +++ b/src/components/pageElements/AddPoint.stories.jsx @@ -3,12 +3,7 @@ import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; import { getFunctions } from 'firebase/functions'; import { getStorage } from 'firebase/storage'; -import { - AuthProvider, - FirebaseAppProvider, - FunctionsProvider, - StorageProvider, -} from 'reactfire'; +import { AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire'; import { useImmerReducer } from 'use-immer'; import reduce, { defaults } from '../reducers/AppReducer'; import './../../index.css'; diff --git a/src/components/pageElements/CornerSubmission/0-CornerSubmission.stories.jsx b/src/components/pageElements/CornerSubmission/0-CornerSubmission.stories.jsx index 58ba0d6f..b8da037f 100644 --- a/src/components/pageElements/CornerSubmission/0-CornerSubmission.stories.jsx +++ b/src/components/pageElements/CornerSubmission/0-CornerSubmission.stories.jsx @@ -1,18 +1,12 @@ -import CornerSubmission from './CornerSubmission.jsx'; -import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; -import { getAnalytics } from 'firebase/analytics'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; +import { getAnalytics } from 'firebase/analytics'; import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; import { getFunctions } from 'firebase/functions'; import { getStorage } from 'firebase/storage'; -import { - AnalyticsProvider, - AuthProvider, - FirebaseAppProvider, - FunctionsProvider, - StorageProvider, -} from 'reactfire'; +import { AnalyticsProvider, AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire'; +import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import CornerSubmission from './CornerSubmission.jsx'; let config = { apiKey: '', @@ -96,10 +90,7 @@ const Template = (args) => { }; return ( -
+
); diff --git a/src/components/pageElements/CornerSubmission/1-Metadata.stories.jsx b/src/components/pageElements/CornerSubmission/1-Metadata.stories.jsx index d221e213..31c0b026 100644 --- a/src/components/pageElements/CornerSubmission/1-Metadata.stories.jsx +++ b/src/components/pageElements/CornerSubmission/1-Metadata.stories.jsx @@ -1,16 +1,11 @@ -import Metadata from './Metadata.jsx'; -import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; import { getFunctions } from 'firebase/functions'; import { getStorage } from 'firebase/storage'; -import { - AuthProvider, - FirebaseAppProvider, - FunctionsProvider, - StorageProvider, -} from 'reactfire'; +import { AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire'; +import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import Metadata from './Metadata.jsx'; let config = { apiKey: '', @@ -42,9 +37,7 @@ export default { - - {Story()} - + {Story()} @@ -78,10 +71,7 @@ export default { const Template = (args) => { const data = { ...args }; return ( -
+
); diff --git a/src/components/pageElements/CornerSubmission/1b-Existing.stories.jsx b/src/components/pageElements/CornerSubmission/1b-Existing.stories.jsx index 18590dbd..3ffdb4cd 100644 --- a/src/components/pageElements/CornerSubmission/1b-Existing.stories.jsx +++ b/src/components/pageElements/CornerSubmission/1b-Existing.stories.jsx @@ -1,19 +1,15 @@ -import { StorageProvider, FirebaseAppProvider, AuthProvider } from 'reactfire'; -import { getStorage } from 'firebase/storage'; import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; -import Pdf from './Pdf.jsx'; +import { getStorage } from 'firebase/storage'; +import { AuthProvider, FirebaseAppProvider, StorageProvider } from 'reactfire'; import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import Pdf from './Pdf.jsx'; export default { title: 'Corner/Submission/Parts', component: Pdf, decorators: [ - (Story) => ( - - {Story()} - - ), + (Story) => {Story()}, ], parameters: { backgrounds: { @@ -61,10 +57,7 @@ const Template = (args) => { -
+
diff --git a/src/components/pageElements/CornerSubmission/2-Datum.stories.jsx b/src/components/pageElements/CornerSubmission/2-Datum.stories.jsx index 13c91d06..b37c1fbb 100644 --- a/src/components/pageElements/CornerSubmission/2-Datum.stories.jsx +++ b/src/components/pageElements/CornerSubmission/2-Datum.stories.jsx @@ -4,13 +4,7 @@ import CoordinatePicker from './Datum.jsx'; export default { title: 'Corner/Submission/Parts', component: CoordinatePicker, - decorators: [ - (Story) => ( - - {Story()} - - ), - ], + decorators: [(Story) => {Story()}], parameters: { backgrounds: { default: 'drawer', @@ -37,10 +31,7 @@ const Template = (args) => { const data = { ...args }; return ( -
+
); diff --git a/src/components/pageElements/CornerSubmission/3-Grid.stories.jsx b/src/components/pageElements/CornerSubmission/3-Grid.stories.jsx index eb617448..cda3be1a 100644 --- a/src/components/pageElements/CornerSubmission/3-Grid.stories.jsx +++ b/src/components/pageElements/CornerSubmission/3-Grid.stories.jsx @@ -1,16 +1,10 @@ -import GridCoordinates from './GridCoordinates.jsx'; import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import GridCoordinates from './GridCoordinates.jsx'; export default { title: 'Corner/Submission/Parts', component: GridCoordinates, - decorators: [ - (Story) => ( - - {Story()} - - ), - ], + decorators: [(Story) => {Story()}], parameters: { backgrounds: { default: 'drawer', @@ -37,10 +31,7 @@ const Template = (args) => { const data = { ...args }; return ( -
+
); diff --git a/src/components/pageElements/CornerSubmission/3a-Latitude.stories.jsx b/src/components/pageElements/CornerSubmission/3a-Latitude.stories.jsx index b5e78680..a2799b40 100644 --- a/src/components/pageElements/CornerSubmission/3a-Latitude.stories.jsx +++ b/src/components/pageElements/CornerSubmission/3a-Latitude.stories.jsx @@ -1,5 +1,5 @@ -import { Latitude } from './GeographicCoordinates.jsx'; import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import { Latitude } from './GeographicCoordinates.jsx'; export default { title: 'Corner/Submission/Parts', @@ -35,12 +35,7 @@ export default { }, xstate: { submission: { - events: [ - { type: 'start submission' }, - { type: 'NEXT' }, - { type: 'NEXT' }, - { type: 'NEXT' }, - ], + events: [{ type: 'start submission' }, { type: 'NEXT' }, { type: 'NEXT' }, { type: 'NEXT' }], }, project: { events: { type: 'SET_COORDINATES' }, @@ -57,10 +52,7 @@ const Template = (args) => { const data = { ...args }; return ( -
+
); diff --git a/src/components/pageElements/CornerSubmission/3b-Longitude.stories.jsx b/src/components/pageElements/CornerSubmission/3b-Longitude.stories.jsx index 7a2f9dda..3f0d6716 100644 --- a/src/components/pageElements/CornerSubmission/3b-Longitude.stories.jsx +++ b/src/components/pageElements/CornerSubmission/3b-Longitude.stories.jsx @@ -1,14 +1,12 @@ -import { Longitude } from './GeographicCoordinates.jsx'; import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import { Longitude } from './GeographicCoordinates.jsx'; export default { title: 'Corner/Submission/Parts', component: Longitude, decorators: [ (Story) => ( - + {Story()} ), @@ -39,10 +37,7 @@ const Template = (args) => { const data = { ...args }; return ( -
+
); diff --git a/src/components/pageElements/CornerSubmission/3c-Height.stories.jsx b/src/components/pageElements/CornerSubmission/3c-Height.stories.jsx index 31fb8096..e3ed537a 100644 --- a/src/components/pageElements/CornerSubmission/3c-Height.stories.jsx +++ b/src/components/pageElements/CornerSubmission/3c-Height.stories.jsx @@ -1,18 +1,12 @@ -import { GeographicHeight } from './GeographicCoordinates.jsx'; -import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; -import { getAnalytics } from 'firebase/analytics'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; +import { getAnalytics } from 'firebase/analytics'; import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; import { getFunctions } from 'firebase/functions'; import { getStorage } from 'firebase/storage'; -import { - AnalyticsProvider, - AuthProvider, - FirebaseAppProvider, - FunctionsProvider, - StorageProvider, -} from 'reactfire'; +import { AnalyticsProvider, AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire'; +import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import { GeographicHeight } from './GeographicCoordinates.jsx'; let config = { apiKey: '', @@ -90,10 +84,7 @@ const Template = (args) => { const data = { ...args }; return ( -
+
); diff --git a/src/components/pageElements/CornerSubmission/4-Images.stories.jsx b/src/components/pageElements/CornerSubmission/4-Images.stories.jsx index cf30e24d..29bd35e0 100644 --- a/src/components/pageElements/CornerSubmission/4-Images.stories.jsx +++ b/src/components/pageElements/CornerSubmission/4-Images.stories.jsx @@ -1,9 +1,9 @@ -import { StorageProvider, FirebaseAppProvider, AuthProvider } from 'reactfire'; -import { getStorage } from 'firebase/storage'; import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; -import Images from './Images.jsx'; +import { getStorage } from 'firebase/storage'; +import { AuthProvider, FirebaseAppProvider, StorageProvider } from 'reactfire'; import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import Images from './Images.jsx'; export default { title: 'Corner/Submission/Parts', @@ -55,10 +55,7 @@ const Template = (args) => { -
+
diff --git a/src/components/pageElements/CornerSubmission/CornerSubmission.jsx b/src/components/pageElements/CornerSubmission/CornerSubmission.jsx index a768ee82..ef5f7414 100644 --- a/src/components/pageElements/CornerSubmission/CornerSubmission.jsx +++ b/src/components/pageElements/CornerSubmission/CornerSubmission.jsx @@ -1,13 +1,13 @@ -import { lazy, useContext, useEffect, useRef } from 'react'; -import PropTypes from 'prop-types'; -import { ErrorBoundary } from 'react-error-boundary'; -import clsx from 'clsx'; import { MinusCircleIcon, PlusCircleIcon } from '@heroicons/react/24/outline'; import { useLocalStorage } from '@ugrc/utilities/hooks'; +import clsx from 'clsx'; +import PropTypes from 'prop-types'; +import { lazy, useContext, useEffect, useRef } from 'react'; +import { ErrorBoundary } from 'react-error-boundary'; import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; import { Button } from '../../formElements/Buttons.jsx'; -import DefaultFallback from '../ErrorBoundary.jsx'; import usePageView from '../../hooks/usePageView.jsx'; +import DefaultFallback from '../ErrorBoundary.jsx'; const SubmissionNotice = lazy(() => import('./SubmissionNotice.jsx')); const MonumentPdf = lazy(() => import('./Pdf.jsx')); const Metadata = lazy(() => import('./Metadata.jsx')); @@ -33,11 +33,7 @@ const Longitude = lazy(() => ); export default function CornerSubmission({ submission, dispatch }) { - const [hide, setHide] = useLocalStorage( - 'plssSubmissionNoteVisible', - false, - true, - ); + const [hide, setHide] = useLocalStorage('plssSubmissionNoteVisible', false, true); const scrollContainer = useRef(null); const [state, send] = useContext(SubmissionContext); const { analytics, logEvent } = usePageView('screen-submission-start'); @@ -89,8 +85,7 @@ export default function CornerSubmission({ submission, dispatch }) {

Something went wrong

- No matching component for {JSON.stringify(state.value, null, 2)}{' '} - state. + No matching component for {JSON.stringify(state.value, null, 2)} state.

diff --git a/src/components/pageElements/CornerSubmission/Datum.jsx b/src/components/pageElements/CornerSubmission/Datum.jsx index 534af014..675e76f2 100644 --- a/src/components/pageElements/CornerSubmission/Datum.jsx +++ b/src/components/pageElements/CornerSubmission/Datum.jsx @@ -1,22 +1,19 @@ -import { useContext, useState, useEffect } from 'react'; -import clsx from 'clsx'; -import { Controller, useForm } from 'react-hook-form'; +import { Tab, TabGroup, TabList, TabPanel, TabPanels } from '@headlessui/react'; import { ErrorMessage } from '@hookform/error-message'; import { yupResolver } from '@hookform/resolvers/yup'; -import { Tab, TabGroup, TabList, TabPanel, TabPanels } from '@headlessui/react'; -import Spacer from '../../formElements/Spacer.jsx'; -import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; +import clsx from 'clsx'; +import { useContext, useEffect, useState } from 'react'; +import { Controller, useForm } from 'react-hook-form'; +import { geographic, grid } from '../../../../functions/shared/cornerSubmission/Options.js'; +import { coordinatePickerSchema } from '../../../../functions/shared/cornerSubmission/Schema.js'; +import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; import { Button } from '../../formElements/Buttons.jsx'; +import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; import { Select } from '../../formElements/Select.jsx'; +import Spacer from '../../formElements/Spacer.jsx'; +import usePageView from '../../hooks/usePageView.jsx'; import ErrorMessageTag from '../ErrorMessage.jsx'; -import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; -import { - geographic, - grid, -} from '../../../../functions/shared/cornerSubmission/Options.js'; -import { coordinatePickerSchema } from '../../../../functions/shared/cornerSubmission/Schema.js'; import Wizard from './Wizard.jsx'; -import usePageView from '../../hooks/usePageView.jsx'; const formats = { Geographic: geographic, Grid: grid }; @@ -80,9 +77,7 @@ const CoordinatePicker = () => { {state.context.type === 'existing' && ( <>
-

- Coordinates are optional for existing monument uploads -

+

Coordinates are optional for existing monument uploads

@@ -127,22 +122,14 @@ const CoordinatePicker = () => { /> )} /> - + ))} - send({ type: 'BACK' })} - next={true} - clear={onReset} - /> + send({ type: 'BACK' })} next={true} clear={onReset} /> diff --git a/src/components/pageElements/CornerSubmission/GeographicCoordinates.jsx b/src/components/pageElements/CornerSubmission/GeographicCoordinates.jsx index 1c45c0ae..504753fe 100644 --- a/src/components/pageElements/CornerSubmission/GeographicCoordinates.jsx +++ b/src/components/pageElements/CornerSubmission/GeographicCoordinates.jsx @@ -1,23 +1,23 @@ -import { useContext, useEffect, useState } from 'react'; +import { Label, Radio, RadioGroup } from '@headlessui/react'; import { ErrorMessage } from '@hookform/error-message'; import { yupResolver } from '@hookform/resolvers/yup'; import clsx from 'clsx'; +import { useContext, useEffect, useState } from 'react'; import { Controller, useForm } from 'react-hook-form'; -import { RadioGroup, Label, Radio } from '@headlessui/react'; -import { Input } from '../../formElements/Inputs.jsx'; -import Spacer from '../../formElements/Spacer.jsx'; -import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; -import ErrorMessageTag from '../ErrorMessage.jsx'; -import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; import { units } from '../../../../functions/shared/cornerSubmission/Options.js'; import { + geographicHeightSchema, latitudeSchema, longitudeSchema, - geographicHeightSchema, } from '../../../../functions/shared/cornerSubmission/Schema.js'; -import Wizard from './Wizard.jsx'; import { formatDatum } from '../../../../functions/shared/index.js'; +import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; +import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; +import { Input } from '../../formElements/Inputs.jsx'; +import Spacer from '../../formElements/Spacer.jsx'; import usePageView from '../../hooks/usePageView.jsx'; +import ErrorMessageTag from '../ErrorMessage.jsx'; +import Wizard from './Wizard.jsx'; const defaults = { seconds: '', @@ -51,10 +51,7 @@ export const Latitude = () => { }, []); useEffect(() => { - if ( - state.matches('form.entering alternate latitude') && - state.matches('projecting.done') - ) { + if (state.matches('form.entering alternate latitude') && state.matches('projecting.done')) { reset({ northing: state.context?.geographic?.northing }); } }, [state, reset]); @@ -71,12 +68,9 @@ export const Latitude = () => { return ( <>

Location Information

-

- Geographic Northing for {formatDatum(state.context.datum)} -

+

Geographic Northing for {formatDatum(state.context.datum)}

- {state.matches('form.entering alternate latitude') && - !state.matches('projecting.done') ? ( + {state.matches('form.entering alternate latitude') && !state.matches('projecting.done') ? (
Projecting Grid Coordinates...
) : ( @@ -91,11 +85,7 @@ export const Latitude = () => { required={true} {...register('northing.degrees')} /> - +
{ required={true} {...register('northing.minutes')} /> - +
{ {...register('northing.seconds')} />

5 Decimals ##.#####

- +
@@ -178,9 +160,7 @@ export const Longitude = () => { return ( <>

Location Information

-

- Geographic Easting for {formatDatum(state.context.datum)} -

+

Geographic Easting for {formatDatum(state.context.datum)}

@@ -194,11 +174,7 @@ export const Longitude = () => { required={true} {...register('easting.degrees')} /> - +
{ required={true} {...register('easting.minutes')} /> - +
{ {...register('easting.seconds')} />

5 Decimals ##.#####

- +
- send({ type: 'BACK' })} - next={true} - clear={onReset} - /> + send({ type: 'BACK' })} next={true} clear={onReset} /> @@ -273,11 +237,10 @@ export const GeographicHeight = () => { const selectedUnit = units.find((x) => x.value === defaultValues.unit); - const { control, formState, handleSubmit, register, reset, setFocus } = - useForm({ - resolver: yupResolver(geographicHeightSchema), - defaultValues, - }); + const { control, formState, handleSubmit, register, reset, setFocus } = useForm({ + resolver: yupResolver(geographicHeightSchema), + defaultValues, + }); useEffect(() => { setFocus('elevation'); @@ -297,9 +260,7 @@ export const GeographicHeight = () => { return ( <>

Location Information

-

- Geographic height for {formatDatum(state.context.datum)} -

+

Geographic height for {formatDatum(state.context.datum)}

@@ -333,12 +294,7 @@ export const GeographicHeight = () => { > {({ checked }) => (
-
@@ -348,23 +304,11 @@ export const GeographicHeight = () => { )} /> - - + + - send({ type: 'BACK' })} - next={true} - clear={onReset} - /> + send({ type: 'BACK' })} next={true} clear={onReset} /> diff --git a/src/components/pageElements/CornerSubmission/GridCoordinates.jsx b/src/components/pageElements/CornerSubmission/GridCoordinates.jsx index 46d388b0..93991856 100644 --- a/src/components/pageElements/CornerSubmission/GridCoordinates.jsx +++ b/src/components/pageElements/CornerSubmission/GridCoordinates.jsx @@ -1,23 +1,19 @@ -import { useContext, useEffect } from 'react'; import { ErrorMessage } from '@hookform/error-message'; import { yupResolver } from '@hookform/resolvers/yup'; +import { useContext, useEffect } from 'react'; import { Controller, useForm } from 'react-hook-form'; +import { statePlaneZones, units, verticalDatums } from '../../../../functions/shared/cornerSubmission/Options.js'; +import { gridCoordinatesSchema } from '../../../../functions/shared/cornerSubmission/Schema.js'; +import { formatDatum } from '../../../../functions/shared/index.js'; +import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; +import { Button } from '../../formElements/Buttons.jsx'; +import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; import { Input } from '../../formElements/Inputs.jsx'; import { Select } from '../../formElements/Select.jsx'; import Spacer from '../../formElements/Spacer.jsx'; -import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; +import usePageView from '../../hooks/usePageView.jsx'; import ErrorMessageTag from '../../pageElements/ErrorMessage.jsx'; -import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; -import { - units, - statePlaneZones, - verticalDatums, -} from '../../../../functions/shared/cornerSubmission/Options.js'; -import { gridCoordinatesSchema } from '../../../../functions/shared/cornerSubmission/Schema.js'; import Wizard from './Wizard.jsx'; -import { formatDatum } from '../../../../functions/shared/index.js'; -import usePageView from '../../hooks/usePageView.jsx'; -import { Button } from '../../formElements/Buttons.jsx'; const defaults = { zone: '', @@ -38,11 +34,10 @@ const GridCoordinates = () => { defaultValues = defaults; } - const { control, formState, handleSubmit, register, reset, setFocus } = - useForm({ - resolver: yupResolver(gridCoordinatesSchema), - defaultValues, - }); + const { control, formState, handleSubmit, register, reset, setFocus } = useForm({ + resolver: yupResolver(gridCoordinatesSchema), + defaultValues, + }); useEffect(() => { setFocus('zone'); @@ -56,10 +51,7 @@ const GridCoordinates = () => { }, []); useEffect(() => { - if ( - state.matches('form.entering alternate grid coordinates') && - state.matches('projecting.done') - ) { + if (state.matches('form.entering alternate grid coordinates') && state.matches('projecting.done')) { reset({ ...state.context?.grid }); } }, [state, reset]); @@ -76,9 +68,7 @@ const GridCoordinates = () => { return ( <>

Location Information

-

- Grid coordinates for {formatDatum(state.context.datum)} -

+

Grid coordinates for {formatDatum(state.context.datum)}

{state.matches('projecting.rejected') && ( <> @@ -86,8 +76,7 @@ const GridCoordinates = () => { )} - {state.matches('form.entering alternate grid coordinates') && - !state.matches('projecting.done') ? ( + {state.matches('form.entering alternate grid coordinates') && !state.matches('projecting.done') ? (
Projecting Grid Coordinates...
) : ( @@ -106,61 +95,27 @@ const GridCoordinates = () => { /> )} /> - +
( - )} /> - +
- - + +
- - + +
@@ -178,33 +133,15 @@ const GridCoordinates = () => { /> )} /> - +
- - + +
- send({ type: 'BACK' })} - next={true} - clear={onReset} - /> + send({ type: 'BACK' })} next={true} clear={onReset} /> )} diff --git a/src/components/pageElements/CornerSubmission/Images.jsx b/src/components/pageElements/CornerSubmission/Images.jsx index 9a3af208..160a49e1 100644 --- a/src/components/pageElements/CornerSubmission/Images.jsx +++ b/src/components/pageElements/CornerSubmission/Images.jsx @@ -1,17 +1,17 @@ -import { Fragment, useContext, useState } from 'react'; -import { useUser } from 'reactfire'; -import { useForm, useWatch, Controller } from 'react-hook-form'; import { ErrorMessage } from '@hookform/error-message'; import { yupResolver } from '@hookform/resolvers/yup'; +import { Fragment, useContext, useState } from 'react'; +import { Controller, useForm, useWatch } from 'react-hook-form'; +import { useUser } from 'reactfire'; import { imagesSchema as schema } from '../../../../functions/shared/cornerSubmission/Schema.js'; import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; +import { Button } from '../../formElements/Buttons.jsx'; +import FileUpload from '../../formElements/FileUpload.jsx'; import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; import Spacer from '../../formElements/Spacer.jsx'; +import usePageView from '../../hooks/usePageView.jsx'; import ErrorMessageTag from '../../pageElements/ErrorMessage.jsx'; -import { Button } from '../../formElements/Buttons.jsx'; -import FileUpload from '../../formElements/FileUpload.jsx'; import Wizard from './Wizard.jsx'; -import usePageView from '../../hooks/usePageView.jsx'; const limit = 10; const defaults = { @@ -90,11 +90,7 @@ export default function MonumentImages() { /> )} /> - + )} /> - + )} /> - + {new Array(extraPageCount).fill().map((_, i) => ( @@ -165,11 +153,7 @@ export default function MonumentImages() { /> )} /> - + ))} {limit - extraPageCount} extra pages are allowed diff --git a/src/components/pageElements/CornerSubmission/Metadata.jsx b/src/components/pageElements/CornerSubmission/Metadata.jsx index c646b89b..dbbb2cf7 100644 --- a/src/components/pageElements/CornerSubmission/Metadata.jsx +++ b/src/components/pageElements/CornerSubmission/Metadata.jsx @@ -1,26 +1,22 @@ -import { useContext, useEffect } from 'react'; -import PropTypes from 'prop-types'; +import { ArrowTopRightOnSquareIcon } from '@heroicons/react/20/solid'; import { ErrorMessage } from '@hookform/error-message'; import { yupResolver } from '@hookform/resolvers/yup'; +import PropTypes from 'prop-types'; +import { useContext, useEffect } from 'react'; import { Controller, useForm } from 'react-hook-form'; -import { ArrowTopRightOnSquareIcon } from '@heroicons/react/20/solid'; +import { accuracy, corner, status } from '../../../../functions/shared/cornerSubmission/Options.js'; +import { metadataSchema as schema } from '../../../../functions/shared/cornerSubmission/Schema.js'; import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; +import { Link } from '../../formElements/Buttons.jsx'; +import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; +import { Input, Label } from '../../formElements/Inputs.jsx'; import { LimitedTextarea } from '../../formElements/LimitedTextarea.jsx'; import { Select } from '../../formElements/Select.jsx'; -import { Switch } from '../../formElements/Switch.jsx'; import Spacer from '../../formElements/Spacer.jsx'; -import { Input, Label } from '../../formElements/Inputs.jsx'; -import { Link } from '../../formElements/Buttons.jsx'; -import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; +import { Switch } from '../../formElements/Switch.jsx'; +import usePageView from '../../hooks/usePageView.jsx'; import ErrorMessageTag from '../../pageElements/ErrorMessage.jsx'; -import { - accuracy, - status, - corner, -} from '../../../../functions/shared/cornerSubmission/Options.js'; -import { metadataSchema as schema } from '../../../../functions/shared/cornerSubmission/Schema.js'; import Wizard from './Wizard.jsx'; -import usePageView from '../../hooks/usePageView.jsx'; const defaults = { section: '', @@ -49,11 +45,10 @@ const Metadata = ({ dispatch }) => { defaultValues.mrrc = false; } - const { control, formState, handleSubmit, register, reset, setFocus } = - useForm({ - resolver: yupResolver(schema), - defaultValues, - }); + const { control, formState, handleSubmit, register, reset, setFocus } = useForm({ + resolver: yupResolver(schema), + defaultValues, + }); const onSubmit = (payload) => { payload.collected = dateFormatter.format(payload.collected); @@ -86,11 +81,7 @@ const Metadata = ({ dispatch }) => { required={true} {...register('section')} /> - +
{ /> )} /> - +
@@ -128,11 +115,7 @@ const Metadata = ({ dispatch }) => { /> )} /> - +
@@ -144,11 +127,7 @@ const Metadata = ({ dispatch }) => { required={true} {...register('collected')} > - +
{ /> )} /> - +
- +
-
- dispatch({ type: 'menu/toggle', payload: 'identify' })} - clear={onReset} - /> + dispatch({ type: 'menu/toggle', payload: 'identify' })} clear={onReset} /> diff --git a/src/components/pageElements/CornerSubmission/Pdf.jsx b/src/components/pageElements/CornerSubmission/Pdf.jsx index 6bba04ee..920cdefa 100644 --- a/src/components/pageElements/CornerSubmission/Pdf.jsx +++ b/src/components/pageElements/CornerSubmission/Pdf.jsx @@ -1,17 +1,17 @@ -import { useContext } from 'react'; +import { ErrorMessage } from '@hookform/error-message'; +import { yupResolver } from '@hookform/resolvers/yup'; import PropTypes from 'prop-types'; +import { useContext } from 'react'; +import { Controller, useForm, useWatch } from 'react-hook-form'; import { useUser } from 'reactfire'; -import { useForm, useWatch, Controller } from 'react-hook-form'; -import { yupResolver } from '@hookform/resolvers/yup'; -import { ErrorMessage } from '@hookform/error-message'; +import { existingSheetSchema } from '../../../../functions/shared/cornerSubmission/Schema.js'; import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; import FileUpload from '../../formElements/FileUpload.jsx'; import { NumberedForm, NumberedFormSection } from '../../formElements/Form.jsx'; import Spacer from '../../formElements/Spacer.jsx'; +import usePageView from '../../hooks/usePageView.jsx'; import ErrorMessageTag from '../../pageElements/ErrorMessage.jsx'; import Wizard from './Wizard.jsx'; -import { existingSheetSchema } from '../../../../functions/shared/cornerSubmission/Schema.js'; -import usePageView from '../../hooks/usePageView.jsx'; export default function MonumentPdf({ dispatch }) { const { data: user } = useUser(); @@ -51,17 +51,10 @@ export default function MonumentPdf({ dispatch }) { /> )} /> - + - dispatch({ type: 'menu/toggle', payload: 'identify' })} - /> + dispatch({ type: 'menu/toggle', payload: 'identify' })} /> diff --git a/src/components/pageElements/CornerSubmission/SubmissionNotice.jsx b/src/components/pageElements/CornerSubmission/SubmissionNotice.jsx index 6e8cbbaf..4c6676be 100644 --- a/src/components/pageElements/CornerSubmission/SubmissionNotice.jsx +++ b/src/components/pageElements/CornerSubmission/SubmissionNotice.jsx @@ -1,20 +1,17 @@ -import Card from '../../formElements/Card.jsx'; -import Note from '../../formElements/Note.jsx'; -import { Button } from '../../formElements/Buttons.jsx'; -import extractTownshipInformation from '../../../../functions/shared/cornerSubmission/blmPointId.js'; +import { useQuery } from '@tanstack/react-query'; import { httpsCallable } from 'firebase/functions'; -import { useUser, useFunctions } from 'reactfire'; import PropTypes from 'prop-types'; import { useMemo } from 'react'; -import { useQuery } from '@tanstack/react-query'; +import { useFunctions, useUser } from 'reactfire'; +import extractTownshipInformation from '../../../../functions/shared/cornerSubmission/blmPointId.js'; +import { Button } from '../../formElements/Buttons.jsx'; +import Card from '../../formElements/Card.jsx'; +import Note from '../../formElements/Note.jsx'; export default function SubmissionNotice({ pointId, county, toggle }) { const { data: user } = useUser(); - const townshipInformation = useMemo( - () => extractTownshipInformation(pointId), - [pointId], - ); + const townshipInformation = useMemo(() => extractTownshipInformation(pointId), [pointId]); const functions = useFunctions(); const getProfile = httpsCallable(functions, 'getProfile'); @@ -44,9 +41,8 @@ export default function SubmissionNotice({ pointId, county, toggle }) {
- This monument record information will be reviewed by the county - surveyor under stewardship of this corner to satisfy the requirements - of state code 17-23-17-7a. + This monument record information will be reviewed by the county surveyor under stewardship of this corner to + satisfy the requirements of state code 17-23-17-7a.
Submitted By diff --git a/src/components/pageElements/CornerSubmission/SubmissionReview.jsx b/src/components/pageElements/CornerSubmission/SubmissionReview.jsx index 922d8f58..a41ba0ed 100644 --- a/src/components/pageElements/CornerSubmission/SubmissionReview.jsx +++ b/src/components/pageElements/CornerSubmission/SubmissionReview.jsx @@ -1,21 +1,21 @@ -import { useContext, useState } from 'react'; -import PropTypes from 'prop-types'; -import { ErrorBoundary } from 'react-error-boundary'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { httpsCallable } from 'firebase/functions'; +import { getDownloadURL, ref } from 'firebase/storage'; +import PropTypes from 'prop-types'; +import { useContext, useState } from 'react'; +import { ErrorBoundary } from 'react-error-boundary'; import { useFunctions, useStorage } from 'reactfire'; -import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; -import Wizard from './Wizard.jsx'; -import { keyMap, formatDatum } from '../../../../functions/shared/index.js'; -import Card from '../../formElements/Card.jsx'; import { geographic as geographicOptions, grid as gridOptions, } from '../../../../functions/shared/cornerSubmission/Options.js'; -import { ObjectPreview } from '../../formElements/FileUpload.jsx'; +import { formatDatum, keyMap } from '../../../../functions/shared/index.js'; +import { SubmissionContext } from '../../contexts/SubmissionContext.jsx'; import { Link } from '../../formElements/Buttons.jsx'; -import { getDownloadURL, ref } from 'firebase/storage'; +import Card from '../../formElements/Card.jsx'; +import { ObjectPreview } from '../../formElements/FileUpload.jsx'; import usePageView from '../../hooks/usePageView.jsx'; +import Wizard from './Wizard.jsx'; const Review = () => { const [state, send] = useContext(SubmissionContext); @@ -29,11 +29,7 @@ const Review = () => { const { data, status } = useQuery({ enabled: state.context.type === 'new', - queryKey: [ - 'monument record sheet', - state.context.blmPointId, - { preview: true }, - ], + queryKey: ['monument record sheet', state.context.blmPointId, { preview: true }], queryFn: () => generatePreview(state.context), staleTime: 5000, // 5 seconds, }); @@ -60,21 +56,11 @@ const Review = () => { <>
-

- Corner Submission Review -

-

- {state.context.blmPointId} -

+

Corner Submission Review

+

{state.context.blmPointId}

- {state.context.type !== 'existing' && ( - - )} - + {state.context.type !== 'existing' && } + {state.context.type === 'existing' ? ( ) : ( @@ -87,32 +73,19 @@ const Review = () => { )}
- send({ type: 'BACK' })} - status={mutationStatus} - finish={() => mutate(state.context)} - /> + send({ type: 'BACK' })} status={mutationStatus} finish={() => mutate(state.context)} />
); }; -const MetadataReview = ({ - accuracy, - collected, - corner, - description, - mrrc, - notes, - section, - status, -}) => { +const MetadataReview = ({ accuracy, collected, corner, description, mrrc, notes, section, status }) => { return (

Metadata {mrrc && ( -
+
MRRC
)} @@ -190,9 +163,7 @@ const CoordinateReview = ({ datum, grid, geographic }) => { {formatDatum(datum)}
{coordinates[0]} -

- Calculated Coordinates -

+

Calculated Coordinates

Datum {calculated} @@ -337,18 +308,12 @@ const AttachmentReview = ({ path }) => { return ( -

- Existing Monument Record Sheet -

+

Existing Monument Record Sheet

Uploaded Tiesheet - {data ? ( - preview - ) : ( - 'loading...' - )} + {data ? preview : 'loading...'}
); @@ -364,11 +329,7 @@ const MonumentPreview = ({ status, children }) => { {status === 'pending' && 'generating preview...'} {status === 'success' && (
- The preview could not be accessed.
} - > - {children} - + The preview could not be accessed.
}>{children}
)} {status === 'error' && 'error generating preview'} @@ -389,11 +350,7 @@ const PdfPreview = ({ path }) => { return
Loading...
; } - return ( -
- {data && preview} -
- ); + return
{data && preview}
; }; PdfPreview.propTypes = { path: PropTypes.string, diff --git a/src/components/pageElements/CornerSubmission/SubmissionReview.stories.jsx b/src/components/pageElements/CornerSubmission/SubmissionReview.stories.jsx index 54fc1247..7531dab9 100644 --- a/src/components/pageElements/CornerSubmission/SubmissionReview.stories.jsx +++ b/src/components/pageElements/CornerSubmission/SubmissionReview.stories.jsx @@ -1,14 +1,10 @@ -import Review from './SubmissionReview.jsx'; -import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; -import { - FirebaseAppProvider, - FunctionsProvider, - StorageProvider, -} from 'reactfire'; +import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { initializeApp } from 'firebase/app'; import { getFunctions } from 'firebase/functions'; import { getStorage } from 'firebase/storage'; -import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; +import { FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire'; +import { SubmissionProvider } from '../../contexts/SubmissionContext.jsx'; +import Review from './SubmissionReview.jsx'; let config = { apiKey: '', @@ -34,7 +30,7 @@ export default { const storage = getStorage(app); return ( -

- The PLSS team at UGRC has been notified of your submission. They will - review the submission and approve the sheet if there are no errors. + The PLSS team at UGRC has been notified of your submission. They will review the submission and approve the + sheet if there are no errors.

- Next, UGRC will share the approved sheet with the representative from - the county the monument is located in. The county representative will - then review the submission and approve the sheet if there are no errors. - They are provided 10 days to comment and after that time period they - implicitly approve the sheet. + Next, UGRC will share the approved sheet with the representative from the county the monument is located in. The + county representative will then review the submission and approve the sheet if there are no errors. They are + provided 10 days to comment and after that time period they implicitly approve the sheet.

- Once the sheet is approved, the monument record sheet pdf will be - accessible through this PLSS website. UGRC will then use the submitted - coordinates to improve the PLSS point dataset and fabric. + Once the sheet is approved, the monument record sheet pdf will be accessible through this PLSS website. UGRC + will then use the submitted coordinates to improve the PLSS point dataset and fabric.

Tracking progress

- You can track the progress of this submission and all of your prior - submissions by clicking on the{' '} - {' '} menu link. diff --git a/src/components/pageElements/CornerSubmission/Wizard.jsx b/src/components/pageElements/CornerSubmission/Wizard.jsx index 8cf71f2c..e05c94ce 100644 --- a/src/components/pageElements/CornerSubmission/Wizard.jsx +++ b/src/components/pageElements/CornerSubmission/Wizard.jsx @@ -1,13 +1,7 @@ -import { Button } from '../../formElements/Buttons.jsx'; import PropTypes from 'prop-types'; +import { Button } from '../../formElements/Buttons.jsx'; -export default function Wizard({ - back = false, - next = false, - finish, - clear, - status, -}) { +export default function Wizard({ back = false, next = false, finish, clear, status }) { return (

{back && ( @@ -33,12 +27,7 @@ export default function Wizard({ )} {finish && ( - )} diff --git a/src/components/pageElements/ErrorBoundary.jsx b/src/components/pageElements/ErrorBoundary.jsx index cccbec22..460640e7 100644 --- a/src/components/pageElements/ErrorBoundary.jsx +++ b/src/components/pageElements/ErrorBoundary.jsx @@ -1,7 +1,7 @@ +import { logEvent } from 'firebase/analytics'; import PropTypes from 'prop-types'; -import { Button } from '../formElements/Buttons.jsx'; import { useAnalytics } from 'reactfire'; -import { logEvent } from 'firebase/analytics'; +import { Button } from '../formElements/Buttons.jsx'; export default function DefaultFallback({ error, resetErrorBoundary }) { const analytics = useAnalytics(); diff --git a/src/components/pageElements/Identify.jsx b/src/components/pageElements/Identify.jsx index a9d635de..24a0c4b9 100644 --- a/src/components/pageElements/Identify.jsx +++ b/src/components/pageElements/Identify.jsx @@ -1,20 +1,15 @@ import { ArrowDownCircleIcon } from '@heroicons/react/20/solid'; -import { - CheckIcon, - ExclamationCircleIcon, - XMarkIcon, -} from '@heroicons/react/24/outline'; +import { CheckIcon, ExclamationCircleIcon, XMarkIcon } from '@heroicons/react/24/outline'; import PropTypes from 'prop-types'; +import { getDefault } from '../../../functions/shared/index.js'; import { Button, Link } from '../formElements/Buttons.jsx'; import Card from '../formElements/Card.jsx'; import Spacer from '../formElements/Spacer.jsx'; -import { getDefault } from '../../../functions/shared/index.js'; import TieSheetList from './TieSheetList.jsx'; const managed_counties = { UTAH: 'https://maps.utahcounty.gov/TieSheets/TieSheet.htm', - WASATCH: - 'https://wasatch.maps.arcgis.com/apps/webappviewer/index.html?id=103db0251a5342f7bbd1462eb7a47440', + WASATCH: 'https://wasatch.maps.arcgis.com/apps/webappviewer/index.html?id=103db0251a5342f7bbd1462eb7a47440', DAVIS: 'http://www.co.davis.ut.us/surveyor/default.cfm', 'SALT LAKE': 'https://slco.org/surveyor/apps/surveymonument/map.html', WEBER: 'https://www3.co.weber.ut.us/gis/maps/survey/index.html', @@ -31,9 +26,7 @@ export default function Identify({ authenticated, graphic, dispatch }) { return ( <>

PLSS Point Information

-

- {graphic.attributes.point_id} -

+

{graphic.attributes.point_id}

{graphic?.attributes?.point_id && ( @@ -59,9 +52,7 @@ export default function Identify({ authenticated, graphic, dispatch }) {
Elevation - - {getDefault(graphic.attributes.elevation, 'unknown', ' ft')} - + {getDefault(graphic.attributes.elevation, 'unknown', ' ft')}
County @@ -114,9 +105,7 @@ export default function Identify({ authenticated, graphic, dispatch }) {
Category - - {getDefault(graphic.attributes.point_category)} - + {getDefault(graphic.attributes.point_category)}
@@ -135,13 +124,8 @@ export default function Identify({ authenticated, graphic, dispatch }) {
County managed - - {getDefault(graphic.attributes.managed_by)} county surveyor - website + + {getDefault(graphic.attributes.managed_by)} county surveyor website
@@ -179,8 +163,8 @@ const EmptyIdentify = ({ dispatch }) => {

No corner point was found at this location.

- If you do not see any points, try zooming in and click on the point - again. Otherwise try clicking on the corner point again. + If you do not see any points, try zooming in and click on the point again. Otherwise try clicking on the + corner point again.

); }} @@ -78,8 +65,7 @@ const layers = [ { name: 'County Managed', color: '#7BE144', - about: - 'PLSS points whose monument record sheets and information are managed on a county website.', + about: 'PLSS points whose monument record sheets and information are managed on a county website.', }, { name: 'Monument Record', @@ -89,8 +75,7 @@ const layers = [ { name: 'Control', color: '#1A1A1A', - about: - 'PLSS points that have been incorporated into the PLSS Fabric as control points.', + about: 'PLSS points that have been incorporated into the PLSS Fabric as control points.', }, { name: 'Calculated', diff --git a/src/components/pageElements/Login.jsx b/src/components/pageElements/Login.jsx index 9d806fe4..dead3bd9 100644 --- a/src/components/pageElements/Login.jsx +++ b/src/components/pageElements/Login.jsx @@ -1,11 +1,11 @@ -import PropTypes from 'prop-types'; -import { httpsCallable } from 'firebase/functions'; -import { useFunctions, useSigninCheck, useUser } from 'reactfire'; import { useQuery, useQueryClient } from '@tanstack/react-query'; -import { LogInButton, LogOutButton, Button } from '../formElements/Buttons.jsx'; -import Card from '../formElements/Card.jsx'; +import { httpsCallable } from 'firebase/functions'; import md5 from 'md5'; +import PropTypes from 'prop-types'; import { useEffect } from 'react'; +import { useFunctions, useSigninCheck, useUser } from 'reactfire'; +import { Button, LogInButton, LogOutButton } from '../formElements/Buttons.jsx'; +import Card from '../formElements/Card.jsx'; import usePageView from '../hooks/usePageView.jsx'; const size = 160; @@ -28,9 +28,7 @@ export default function Login({ dispatch }) { }); } }, [signedIn, queryClient]); - return ( - {data?.signedIn ? : } - ); + return {data?.signedIn ? : }; } Login.propTypes = { dispatch: PropTypes.func, @@ -43,19 +41,16 @@ const SignIn = () => {

Sign in to your account

- This app requires a UtahId account to submit monument record sheets. - Your name and email address will be shared with this application. + This app requires a UtahId account to submit monument record sheets. Your name and email address will be shared + with this application.

- A surveyor license and seal will be displayed publicly on monument - record sheets if you choose to add them on your profile. Otherwise, no - other personal information will be shared or made public. + A surveyor license and seal will be displayed publicly on monument record sheets if you choose to add them on + your profile. Otherwise, no other personal information will be shared or made public.

- - continue with - + continue with
@@ -87,9 +82,7 @@ const Profile = ({ dispatch }) => { return (
-

- Welcome back, {response.data.displayName} -

+

Welcome back, {response.data.displayName}

{status === 'success' && } @@ -106,11 +99,7 @@ const Profile = ({ dispatch }) => {
- +
); @@ -120,9 +109,7 @@ Profile.propTypes = { }; const Gravatar = ({ email }) => { - const gravatar = `https://www.gravatar.com/avatar/${md5( - email.toLowerCase(), - )}?s=${size}&default=${fallback}`; + const gravatar = `https://www.gravatar.com/avatar/${md5(email.toLowerCase())}?s=${size}&default=${fallback}`; return Gravatar; }; diff --git a/src/components/pageElements/Logo.jsx b/src/components/pageElements/Logo.jsx index ab6ae71d..05b22132 100644 --- a/src/components/pageElements/Logo.jsx +++ b/src/components/pageElements/Logo.jsx @@ -3,11 +3,7 @@ import PropTypes from 'prop-types'; export default function Logo({ version }) { return (
- + result.layer?.id === 'PLSS Points', - ); + const hits = response?.results?.filter((result) => result.layer?.id === 'PLSS Points'); let payload = null; if (hits.length > 0) { @@ -501,13 +492,7 @@ export default function PlssMap({ color, dispatch, drawerOpen, state }) { setUserGraphics(); dispatch({ type: 'map/userPoints', payload: [] }); } - }, [ - dispatch, - setUserGraphics, - content?.data?.points, - status, - signInCheckResult?.signedIn, - ]); + }, [dispatch, setUserGraphics, content?.data?.points, status, signInCheckResult?.signedIn]); // add and zoom to gps location useEffect(() => { @@ -567,23 +552,12 @@ export default function PlssMap({ color, dispatch, drawerOpen, state }) { <>
-
+
- {selectorOptions ? ( - - ) : null} + {selectorOptions ? : null} - +

Quick finder tools

@@ -608,10 +582,7 @@ export default function PlssMap({ color, dispatch, drawerOpen, state }) { - + diff --git a/src/components/pageElements/MyContent.jsx b/src/components/pageElements/MyContent.jsx index 15a3b1aa..15df4c32 100644 --- a/src/components/pageElements/MyContent.jsx +++ b/src/components/pageElements/MyContent.jsx @@ -2,11 +2,12 @@ import { Tab, TabGroup, TabList, TabPanel, TabPanels } from '@headlessui/react'; import { ChevronRightIcon } from '@heroicons/react/20/solid'; import { ArrowLeftCircleIcon } from '@heroicons/react/24/outline'; import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; +import { useOpenClosed } from '@ugrc/utilities/hooks'; import clsx from 'clsx'; +import { logEvent } from 'firebase/analytics'; +import { deleteDoc, doc, getFirestore } from 'firebase/firestore'; import { httpsCallable } from 'firebase/functions'; import { getDownloadURL, ref } from 'firebase/storage'; -import { deleteDoc, doc, getFirestore } from 'firebase/firestore'; -import { logEvent } from 'firebase/analytics'; import PropTypes from 'prop-types'; import { useState } from 'react'; import { @@ -19,12 +20,11 @@ import { useStorage, useUser, } from 'reactfire'; -import { useOpenClosed } from '@ugrc/utilities/hooks'; +import { timeSince } from '../../../functions/shared/index.js'; import { Button, Link } from '../formElements/Buttons.jsx'; import Card from '../formElements/Card.jsx'; import { ObjectPreview } from '../formElements/FileUpload.jsx'; import { Select } from '../formElements/Select.jsx'; -import { timeSince } from '../../../functions/shared/index.js'; import Spacer from '../formElements/Spacer.jsx'; import usePageView from '../hooks/usePageView.jsx'; @@ -124,16 +124,10 @@ const MyContent = ({ dispatch }) => { )} {status === 'success' && name === 'Submissions' && ( - + )} {status === 'success' && name === 'Reference Points' && ( - + )} ))} @@ -158,10 +152,7 @@ const ReferencePoints = ({ items, dispatch }) => {

Your reference point list is empty

You can create reference points in the{' '} - {' '} section @@ -174,19 +165,10 @@ const ReferencePoints = ({ items, dispatch }) => {

- + - +
@@ -203,8 +185,8 @@ const Submissions = ({ items, dispatch }) => {

Your submission list is empty

- You haven't submitted any monument record sheets yet. Start a - submission by clicking on the corner points. Get out and survey! + You haven't submitted any monument record sheets yet. Start a submission by clicking on the corner + points. Get out and survey!

); @@ -261,7 +243,7 @@ const Submission = ({ item, dispatch }) => { try { getDownloadURL(ref(storage, attributes.ref)).then(setUrl); - } catch (e) { + } catch { logEvent(analytics, 'download-submission-error', { document: item.key, }); @@ -271,10 +253,7 @@ const Submission = ({ item, dispatch }) => {
{id}
- + submitted {timeSince(submission)} @@ -282,13 +261,7 @@ const Submission = ({ item, dispatch }) => {
{(url?.length ?? 0) > 0 ? ( - + Download ) : ( @@ -299,9 +272,7 @@ const Submission = ({ item, dispatch }) => { @@ -356,9 +327,7 @@ const SubmissionStatus = ({ status, label }) => (
Received - - {getReviewStatus(status.reviewed)} - + {getReviewStatus(status.reviewed)} Published
@@ -371,10 +340,7 @@ SubmissionStatus.propTypes = { const SelectedItem = ({ item, dispatch }) => ( <> - dispatch({ type: 'set_selection', payload: null })} - /> + dispatch({ type: 'set_selection', payload: null })} />

{item.name}

{dateFormatter.format(item.when)}
@@ -405,12 +371,7 @@ SelectedItem.propTypes = { dispatch: PropTypes.func, }; -const sortOrders = [ - 'New to Old', - 'Old to New', - 'Ascending (0-9 A-Z)', - 'Descending (Z-A 0-9)', -]; +const sortOrders = ['New to Old', 'Old to New', 'Ascending (0-9 A-Z)', 'Descending (Z-A 0-9)']; const sortFunction = (sortOrder, transform) => { return (one, two) => { @@ -438,10 +399,7 @@ const ItemList = ({ items, dispatch, sortOrder }) => { {clone .sort( sortFunction(sortOrder, (x, y) => { - if ( - sortOrder === 'Ascending (0-9 A-Z)' || - sortOrder === 'Descending (Z-A 0-9)' - ) { + if (sortOrder === 'Ascending (0-9 A-Z)' || sortOrder === 'Descending (Z-A 0-9)') { return { a: x.attributes.name, b: y.attributes.name }; } @@ -482,10 +440,7 @@ const Item = ({ item, dispatch }) => { {item.attributes.name}

- + created {timeSince(date)} @@ -507,9 +462,7 @@ const Item = ({ item, dispatch }) => {
{item.photos.length === 0 && ( -

- No photos are attached to this point. -

+

No photos are attached to this point.

 )} {item.photos.map((path) => ( @@ -525,9 +478,7 @@ const Item = ({ item, dispatch }) => { @@ -538,9 +489,7 @@ const Item = ({ item, dispatch }) => { onClick={async () => { try { setStatus('loading'); - await deleteDoc( - doc(db, 'submitters', user.uid, 'points', item.attributes.id), - ); + await deleteDoc(doc(db, 'submitters', user.uid, 'points', item.attributes.id)); queryClient.invalidateQueries(['my content']); setStatus('success'); } catch (error) { diff --git a/src/components/pageElements/MyContent.stories.jsx b/src/components/pageElements/MyContent.stories.jsx index 2d5b3571..9c09aa77 100644 --- a/src/components/pageElements/MyContent.stories.jsx +++ b/src/components/pageElements/MyContent.stories.jsx @@ -3,12 +3,7 @@ import { initializeApp } from 'firebase/app'; import { getAuth } from 'firebase/auth'; import { getFunctions } from 'firebase/functions'; import { getStorage } from 'firebase/storage'; -import { - AuthProvider, - FirebaseAppProvider, - FunctionsProvider, - StorageProvider, -} from 'reactfire'; +import { AuthProvider, FirebaseAppProvider, FunctionsProvider, StorageProvider } from 'reactfire'; import './../../index.css'; import MyContent from './MyContent.jsx'; diff --git a/src/components/pageElements/Profile.jsx b/src/components/pageElements/Profile.jsx index 5d6a726d..3c36c873 100644 --- a/src/components/pageElements/Profile.jsx +++ b/src/components/pageElements/Profile.jsx @@ -1,19 +1,19 @@ +import { ErrorMessage } from '@hookform/error-message'; +import { yupResolver } from '@hookform/resolvers/yup'; +import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; +import { httpsCallable } from 'firebase/functions'; import PropTypes from 'prop-types'; import { useEffect } from 'react'; -import { httpsCallable } from 'firebase/functions'; -import { useUser, useFunctions } from 'reactfire'; -import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; import { Controller, useForm, useWatch } from 'react-hook-form'; -import { yupResolver } from '@hookform/resolvers/yup'; -import { ErrorMessage } from '@hookform/error-message'; -import ErrorMessageTag from './ErrorMessage.jsx'; +import { useFunctions, useUser } from 'reactfire'; import { profileSchema as schema } from '../../../functions/shared/cornerSubmission/Schema.js'; -import { Input, Label } from '../formElements/Inputs.jsx'; -import Card from '../formElements/Card.jsx'; import { Button } from '../formElements/Buttons.jsx'; +import Card from '../formElements/Card.jsx'; import FileUpload from '../formElements/FileUpload.jsx'; +import { Input, Label } from '../formElements/Inputs.jsx'; import Note from '../formElements/Note.jsx'; import usePageView from '../hooks/usePageView.jsx'; +import ErrorMessageTag from './ErrorMessage.jsx'; const defaultValues = { displayName: '', @@ -46,11 +46,10 @@ export default function Profile({ dispatch }) { staleTime: Infinity, }); - const { control, formState, handleSubmit, register, reset, setFocus } = - useForm({ - resolver: yupResolver(schema), - defaultValues, - }); + const { control, formState, handleSubmit, register, reset, setFocus } = useForm({ + resolver: yupResolver(schema), + defaultValues, + }); const fields = useWatch({ control }); useEffect(() => { @@ -89,32 +88,12 @@ export default function Profile({ dispatch }) {

Loading...

) : ( <> - - + + - - - + + + @@ -135,23 +114,16 @@ export default function Profile({ dispatch }) { /> )} /> - + - Your surveyor license and seal will be displayed publicly on - monument record sheets. No other personal information will be - shared or made public. + Your surveyor license and seal will be displayed publicly on monument record sheets. No other personal + information will be shared or made public.
diff --git a/src/components/pageElements/TieSheetList.jsx b/src/components/pageElements/TieSheetList.jsx index 6e077b32..9f51d873 100644 --- a/src/components/pageElements/TieSheetList.jsx +++ b/src/components/pageElements/TieSheetList.jsx @@ -42,19 +42,12 @@ const TieSheetList = ({ blmPointId, children }) => {

Monument Records

{status === 'pending' &&
Loading...
} - {status === 'error' && ( -
The monument records are currently not available
- )} - {status === 'success' && (data?.length ?? 0) === 0 && ( -
This point has no monument records
- )} + {status === 'error' &&
The monument records are currently not available
} + {status === 'success' && (data?.length ?? 0) === 0 &&
This point has no monument records
} {status === 'success' && data.length > 0 && (
diff --git a/src/components/pageElements/mapElements/Township.stories.jsx b/src/components/pageElements/mapElements/Township.stories.jsx index 0783d25f..8dbddbf7 100644 --- a/src/components/pageElements/mapElements/Township.stories.jsx +++ b/src/components/pageElements/mapElements/Township.stories.jsx @@ -1,6 +1,6 @@ -import Township from './Township.jsx'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; +import Township from './Township.jsx'; // More on default export: https://storybook.js.org/docs/react/writing-stories/introduction#default-export export default { diff --git a/src/components/pageElements/mapElements/townships.js b/src/components/pageElements/mapElements/townships.js index b5a2d4bd..ef416cb4 100644 --- a/src/components/pageElements/mapElements/townships.js +++ b/src/components/pageElements/mapElements/townships.js @@ -1,17 +1,4 @@ -export const ub = [ - '1N', - '2N', - '3N', - '4N', - '5N', - '1S', - '2S', - '3S', - '4S', - '5S', - '6S', - '7S', -]; +export const ub = ['1N', '2N', '3N', '4N', '5N', '1S', '2S', '3S', '4S', '5S', '6S', '7S']; export const sl = [ '1N', '2N', diff --git a/src/components/reducers/AppReducer.js b/src/components/reducers/AppReducer.js index 2b34ccca..72cbc37e 100644 --- a/src/components/reducers/AppReducer.js +++ b/src/components/reducers/AppReducer.js @@ -3,10 +3,7 @@ const toggleDrawer = (draft, action) => { if (action.payload === '') { draft.drawerOpen = false; draft.activeComponent = action.payload; - } else if ( - draft.activeComponent === action.payload && - action.payload !== 'identify' - ) { + } else if (draft.activeComponent === action.payload && action.payload !== 'identify') { draft.drawerOpen = !draft.drawerOpen; draft.activeComponent = null; } else { @@ -71,8 +68,7 @@ expected break; } case 'add-point/activate': { - draft.map.activeTool = - draft.map.activeTool !== 'add-point' ? 'add-point' : null; + draft.map.activeTool = draft.map.activeTool !== 'add-point' ? 'add-point' : null; if (draft.map.activeTool === null) { draft.addPoint.geometry = null; } @@ -80,7 +76,7 @@ expected break; } case 'add-point/reset': { - draft.map.activeTool === null; + draft.map.activeTool = null; draft.addPoint = { color: '', geometry: null, diff --git a/src/emails/cancelled_submission.html b/src/emails/cancelled_submission.html index 0b77c45a..1aa64cb7 100644 --- a/src/emails/cancelled_submission.html +++ b/src/emails/cancelled_submission.html @@ -1,18 +1,15 @@ - + - - - - - - - - - PLSS Corner Management - A monument submission was cancelled 😥️ - + PLSS Corner Management - A monument submission was cancelled 😥️ + - -
- 🍃️ Just like that {{blmPointId}} is gone͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ‌ -  ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ‌ -  ͏ ͏ ͏ ͏ ͏ -
-
-
+ +
+ 🍃️ Just like that {{blmPointId}} is gone͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ‌ +  ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ‌  ͏ ͏ ͏ ͏ + ͏ +
+
-
- -
-
Monument Record Cancellation
-
Utah PLSS + role="article" + aria-roledescription="email" + aria-label="PLSS Corner Management - A monument submission was cancelled 😥" + lang="en" + style=" + margin-left: auto; + margin-right: auto; + max-width: 65ch; + font-family: + ui-sans-serif, + system-ui, + -apple-system, + BlinkMacSystemFont, + Segoe UI, + Roboto, + Helvetica Neue, + Arial, + Noto Sans, + sans-serif, + Apple Color Emoji, + Segoe UI Emoji, + Segoe UI Symbol, + Noto Color Emoji; + " + > +
+
+ +
+
Monument Record Cancellation
+
+ Utah PLSS +
-
-

{{blmPointId}}

-
-

- A monument record ({{type}}) was cancelled by {{surveyor}}. -

+

{{blmPointId}}

+
+

A monument record ({{type}}) was cancelled by {{surveyor}}.

+
-
-
- - +
+ diff --git a/src/emails/new_submission.html b/src/emails/new_submission.html index c8a9881e..be062177 100644 --- a/src/emails/new_submission.html +++ b/src/emails/new_submission.html @@ -1,18 +1,15 @@ - + - - - - - - - - - PLSS Corner Management - A monument record was created 🙌 - + PLSS Corner Management - A monument record was created 🙌 + - -
- 🏆 for {{surveyor}} submitting a record for {{blmPointId}}͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ‌ -  ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ - ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ‌ -  ͏ ͏ ͏ ͏ ͏ -
-
-
+ +
+ 🏆 for {{surveyor}} submitting a record for {{blmPointId}}͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ‌  ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ + ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ͏ ‌  ͏ ͏ ͏ + ͏ ͏ +
+
-
- -
-
Monument Record Submission
-
Utah PLSS + role="article" + aria-roledescription="email" + aria-label="PLSS Corner Management - A monument record was created 🙌" + lang="en" + style=" + margin-left: auto; + margin-right: auto; + max-width: 65ch; + font-family: + ui-sans-serif, + system-ui, + -apple-system, + BlinkMacSystemFont, + Segoe UI, + Roboto, + Helvetica Neue, + Arial, + Noto Sans, + sans-serif, + Apple Color Emoji, + Segoe UI Emoji, + Segoe UI Symbol, + Noto Color Emoji; + " + > +
+
+ +
+
Monument Record Submission
+
+ Utah PLSS +
-
-

{{blmPointId}}

-
-

- A monument record ({{type}}) was submitted in {{county}} by {{surveyor}}. The submission PDF is attached to - this - email. -

+

{{blmPointId}}

+
+

+ A monument record ({{type}}) was submitted in {{county}} by {{surveyor}}. The submission PDF is attached to + this email. +

+
-
-
- - +
+ diff --git a/src/main.jsx b/src/main.jsx index a0eee1fc..23cb061c 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -1,10 +1,10 @@ -import { StrictMode } from 'react'; -import { createRoot } from 'react-dom/client'; +import '@arcgis/core/assets/esri/themes/light/main.css'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; +import { StrictMode } from 'react'; +import { createRoot } from 'react-dom/client'; import { FirebaseAppProvider } from 'reactfire'; import App from './components/app/App.jsx'; -import '@arcgis/core/assets/esri/themes/light/main.css'; import './index.css'; let firebaseConfig = { diff --git a/storage.rules.test.mjs b/storage.rules.test.mjs index ac2cf9d0..c05e133a 100644 --- a/storage.rules.test.mjs +++ b/storage.rules.test.mjs @@ -1,11 +1,7 @@ -import { - assertFails, - assertSucceeds, - initializeTestEnvironment, -} from '@firebase/rules-unit-testing'; -import { afterAll, beforeAll, beforeEach, describe, it } from 'vitest'; -import { readFileSync } from 'fs'; +import { assertFails, assertSucceeds, initializeTestEnvironment } from '@firebase/rules-unit-testing'; import { Buffer } from 'buffer'; +import { readFileSync } from 'fs'; +import { afterAll, beforeAll, beforeEach, describe, it } from 'vitest'; let testEnv; const userId = 'user_abc'; @@ -20,9 +16,7 @@ const getPaths = (storage) => { submitter: storage.ref(`submitters/new`), userImage: storage.ref(`submitters/${userId}/new`).child('userFolder.png'), user: storage.ref(`submitters/${userId}/new`), - pointImage: storage - .ref(`submitters/${userId}/new/${blmPoint}`) - .child('pointFolder.png'), + pointImage: storage.ref(`submitters/${userId}/new/${blmPoint}`).child('pointFolder.png'), point: storage.ref(`submitters/${userId}/new/${blmPoint}`), }; }; @@ -67,13 +61,9 @@ describe('storage', () => { const storage = testEnv.unauthenticatedContext().storage(); const { submitter, user, point } = getPaths(storage); - await assertFails( - submitter.child('test.png').put(loadImage(), { contentType }) - ); + await assertFails(submitter.child('test.png').put(loadImage(), { contentType })); await assertFails(user.child('test.png').put(loadImage(), { contentType })); - await assertFails( - point.child('test.png').put(loadImage(), { contentType }) - ); + await assertFails(point.child('test.png').put(loadImage(), { contentType })); }); it('disallows metadata access for unauthorized users', async () => { @@ -98,42 +88,29 @@ describe('storage', () => { const storage = testEnv.authenticatedContext(userId).storage(); const { submitter, user, point } = getPaths(storage); - await assertFails( - submitter - .child('test.doc') - .put(loadImage(), { contentType: 'text/plain' }) - ); - await assertFails( - user.child('test.doc').put(loadImage(), { contentType: 'text/plain' }) - ); - await assertFails( - point.child('test.doc').put(loadImage(), { contentType: 'text/plain' }) - ); + await assertFails(submitter.child('test.doc').put(loadImage(), { contentType: 'text/plain' })); + await assertFails(user.child('test.doc').put(loadImage(), { contentType: 'text/plain' })); + await assertFails(point.child('test.doc').put(loadImage(), { contentType: 'text/plain' })); }); it('allows write access for authorized users to their folder when uploading image files', async () => { const storage = testEnv.authenticatedContext(userId).storage(); const { submitter, user, point } = getPaths(storage); - await assertFails( - submitter.child('test.png').put(loadImage(), { contentType }) - ); + await assertFails(submitter.child('test.png').put(loadImage(), { contentType })); await assertFails(user.child('test.png').put(loadImage(), { contentType })); - await assertSucceeds( - point.child('test.png').put(loadImage(), { contentType }) - ); + await assertSucceeds(point.child('test.png').put(loadImage(), { contentType })); }); it('disallows files greater than 5MB', async () => { const storage = testEnv.authenticatedContext(userId).storage(); - const getRef = (submitter, imageName) => - storage.ref(`submitters/${submitter}`).child(imageName); + const getRef = (submitter, imageName) => storage.ref(`submitters/${submitter}`).child(imageName); await assertFails( getRef(userId, 'big.png').put(createMBImage(5.1), { contentType, - }) + }), ); }); }); diff --git a/vite.config.js b/vite.config.js index 14771710..fb960a72 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,5 +1,5 @@ -import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react-swc'; +import { defineConfig } from 'vite'; import eslintPlugin from 'vite-plugin-eslint'; import loadVersion from 'vite-plugin-package-version';