diff --git a/app/frontend/components/HelpTooltip.tsx b/app/frontend/components/HelpTooltip.tsx index 9efdec68..ab030c0e 100644 --- a/app/frontend/components/HelpTooltip.tsx +++ b/app/frontend/components/HelpTooltip.tsx @@ -12,19 +12,11 @@ interface IProps { className?: string; } -const HelpTooltip: React.FC = ({ - message, - tooltipId, - title, - size, - hideLabel, - placement, - className, -}) => { +const HelpTooltip: React.FC = ({ message, tooltipId, title, size, hideLabel, placement, className }) => { return (
{!title && ( -
+
= ({ } > - +
)} {title && (
{!hideLabel && {title}} -
+
= ({ } > - +
diff --git a/app/frontend/components/forms/SwayFormCheckbox.tsx b/app/frontend/components/forms/SwayFormCheckbox.tsx index 55d71d7f..e84465ed 100644 --- a/app/frontend/components/forms/SwayFormCheckbox.tsx +++ b/app/frontend/components/forms/SwayFormCheckbox.tsx @@ -14,14 +14,9 @@ const SwayFormCheckbox: React.FC = ({ field, value }) => { const { handleChange } = useFormikContext(); return ( <> - {`${field.label} - ${value}`} + {`${field.label} - ${value}`}   - + ); }; diff --git a/app/frontend/components/user/AddressAutocomplete.tsx b/app/frontend/components/user/AddressAutocomplete.tsx index e8d46850..0c4ce310 100644 --- a/app/frontend/components/user/AddressAutocomplete.tsx +++ b/app/frontend/components/user/AddressAutocomplete.tsx @@ -135,7 +135,7 @@ const Autocomplete: React.FC = ({ field, error, setLoading }) => { } = suggestion; return ( - + {main_text} {secondary_text} ); @@ -165,6 +165,7 @@ const Autocomplete: React.FC = ({ field, error, setLoading }) => { }; const AddressAutocomplete: React.FC = (props) => { + logDev("AddressAutocomplete.googleMapsApiKey -", import.meta.env.VITE_GOOGLE_MAPS_API_KEY); const { isLoaded } = useJsApiLoader({ googleMapsApiKey: import.meta.env.VITE_GOOGLE_MAPS_API_KEY as string, libraries: GOOGLE_MAPS_LIBRARIES, diff --git a/app/frontend/hooks/authentication/useWebAuthnAuthentication.ts b/app/frontend/hooks/authentication/useWebAuthnAuthentication.ts index 13aa4fc0..7691473e 100644 --- a/app/frontend/hooks/authentication/useWebAuthnAuthentication.ts +++ b/app/frontend/hooks/authentication/useWebAuthnAuthentication.ts @@ -1,7 +1,7 @@ import * as webauthnJson from "@github/webauthn-json"; import { useAxios_NOT_Authenticated_POST_PUT } from "app/frontend/hooks/useAxios"; -import { handleError } from "app/frontend/sway_utils"; +import { handleError, logDev } from "app/frontend/sway_utils"; import { PublicKeyCredentialRequestOptionsJSON } from "node_modules/@github/webauthn-json/dist/types/basic/json"; import { useCallback, useState } from "react"; import { sway } from "sway"; @@ -62,6 +62,10 @@ export const useWebAuthnAuthentication = (onAuthenticated: (user: sway.IUser) => .then((result) => { setLoading(false); if (result) { + logDev( + "useWebAuthnAuthentication.verifyAuthentication.verify - Verified Auth. Calling onAuthenticated with result -", + result, + ); onAuthenticated(result as sway.IUser); } return result; diff --git a/app/frontend/pages/Passkey.tsx b/app/frontend/pages/Passkey.tsx index 159830e6..b00e6e81 100644 --- a/app/frontend/pages/Passkey.tsx +++ b/app/frontend/pages/Passkey.tsx @@ -39,7 +39,10 @@ const Passkey: React.FC = () => { logDev("Passkey.tsx"); const onAuthenticated = useCallback((user: sway.IUser) => { - if (!user) return; + if (!user) { + logDev("Passkey.onAuthenticated - No user returned."); + return; + } if (user.isRegistrationComplete) { router.visit(ROUTES.legislators); diff --git a/docker/dockerfiles/production.alpine.dockerfile b/docker/dockerfiles/production.alpine.dockerfile index 9de71661..cbb7e153 100644 --- a/docker/dockerfiles/production.alpine.dockerfile +++ b/docker/dockerfiles/production.alpine.dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.3.2 +ARG RUBY_VERSION=3.3.5 FROM registry.docker.com/library/ruby:$RUBY_VERSION-alpine AS base LABEL fly_launch_runtime="rails" diff --git a/docker/dockerfiles/production.dockerfile b/docker/dockerfiles/production.dockerfile index e3a5e62b..b53e6558 100644 --- a/docker/dockerfiles/production.dockerfile +++ b/docker/dockerfiles/production.dockerfile @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.3.2 +ARG RUBY_VERSION=3.3.5 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base LABEL fly_launch_runtime="rails" @@ -21,13 +21,14 @@ RUN apt-get update -qq && \ apt-get install --no-install-recommends -y \ build-essential \ libsqlite3-0 \ - pkg-config \ nodejs \ - npm && \ + npm \ + pkg-config && \ apt-get clean # Install application gems COPY Gemfile Gemfile.lock package.json package-lock.json ./ +COPY gemfiles/rubocop.gemfile gemfiles/rubocop.gemfile RUN bundle config set build.sqlite3 "--with-sqlite-cflags='-DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_PAGE_SIZE=16384 -DSQLITE_DQS=0 -DSQLITE_ENABLE_FTS5 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_USE_ALLOCA'" && \ bundle install && \ rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \