chore: prettier

agrc · Feb 4, 2025 · 912d646 · 912d646
1 parent de46427
commit 912d646
Show file tree

Hide file tree

Showing 76 changed files with 784 additions and 1,622 deletions.
diff --git 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
@@ -1,3 +1,3 @@
 <script>
   window.global = window;
-</script>
+</script>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,21 +1,21 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="https://gis.utah.gov/images/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Utah PLSS Corner Points: Provided by the UGRC</title>
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta
+      name="description"
+      content="View and submit corner monument information for the Utah Public Lands Survey System."
+    />
+  </head>
 
-<head>
-  <meta charset="UTF-8" />
-  <link rel="icon" type="image/svg+xml" href="https://gis.utah.gov/images/favicon.ico" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>Utah PLSS Corner Points: Provided by the UGRC</title>
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="description"
-    content="View and submit corner monument information for the Utah Public Lands Survey System." />
-</head>
-
-<body>
-  <div id="root"></div>
-  <script type="module" src="/src/main.jsx"></script>
-</body>
-
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
 </html>
diff --git 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() {
         <FunctionsProvider sdk={functions}>
           <StorageProvider sdk={storage}>
             <main className="app grid h-full w-screen">
-              <Map
-                state={state.map}
-                color={state.addPoint.color}
-                drawerOpen={state.drawerOpen}
-                dispatch={dispatch}
-              />
+              <Map state={state.map} color={state.addPoint.color} drawerOpen={state.drawerOpen} dispatch={dispatch} />
               <Menu drawerOpen={state.drawerOpen} dispatch={dispatch}>
                 menu
               </Menu>

diff --git 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 (
-    <SubmissionContext.Provider value={[state, send]}>
-      {children}
-    </SubmissionContext.Provider>
-  );
+  return <SubmissionContext.Provider value={[state, send]}>{children}</SubmissionContext.Provider>;
 };
 
 SubmissionProvider.propTypes = {

diff --git 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,24 +154,15 @@ export const Button = ({
           fill="none"
           viewBox="0 0 24 24"
         >
-          <circle
-            className="opacity-25"
-            cx="12"
-            cy="12"
-            r="10"
-            stroke="currentColor"
-            strokeWidth="4"
-          ></circle>
+          <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
           <path
             className="opacity-75"
             fill="currentColor"
             d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
           ></path>
         </svg>
       )}
-      {state === 'error' && (
-        <ExclamationCircleIcon className="-ml-1 mr-2 h-5 w-5 text-red-500" />
-      )}
+      {state === 'error' && <ExclamationCircleIcon className="-ml-1 mr-2 h-5 w-5 text-red-500" />}
       {children}
     </button>
   );
@@ -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,
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ export const notify = (key, template) => { @@
           { nodeEnv: process.env.NODE_ENV },
           {
             structuredData: true,
-          }
+          },
         );
         return Promise.resolve([
@@ Expand Down @@