Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

#2567 confirmed before after date wrong way around ui fix #2800

Merged
merged 2 commits into from
Sep 2, 2022
Merged

#2567 confirmed before after date wrong way around ui fix #2800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0a524a
change places between before/after confirmed date filter
Sep 2, 2022
9e5aa95
added secret keys for recaptcha for local development
Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion verification/curator-service/api/src/util/validate-recaptcha-token.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ export const validateRecaptchaToken = async (
): Promise<boolean> => {
const env = validateEnv();
const response = await axios.post(
`https://www.google.com/recaptcha/api/siteverify?secret=${env.RECAPTCHA_SECRET_KEY}&response=${token}`,
`https://www.google.com/recaptcha/api/siteverify?secret=${
env.RECAPTCHA_SECRET_KEY || process.env.RECAPTCHA_SECRET_KEY
}&response=${token}`,
);

return response.data.success;
Expand Down
37 changes: 19 additions & 18 deletions verification/curator-service/ui/src/components/FiltersDialog/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,13 +497,14 @@ export default function FiltersDialog({
formik.touched.variant && formik.errors.variant
}
/>

<TextField
autoFocus={
activeFilterInput === 'dateconfirmedbefore'
activeFilterInput === 'dateconfirmedafter'
}
id="dateconfirmedbefore"
label="Date confirmed before"
name="dateconfirmedbefore"
id="dateconfirmedafter"
label="Date confirmed after"
name="dateconfirmedafter"
type="date"
variant="outlined"
// This makes sure that only 4 digits can be entered as a year
Expand All @@ -512,24 +513,24 @@ export default function FiltersDialog({
}}
size={inputSize}
InputLabelProps={{ shrink: true }}
value={formik.values.dateconfirmedbefore || ''}
value={formik.values.dateconfirmedafter || ''}
onChange={formik.handleChange}
error={
formik.touched.dateconfirmedbefore &&
Boolean(formik.errors.dateconfirmedbefore)
formik.touched.dateconfirmedafter &&
Boolean(formik.errors.dateconfirmedafter)
}
helperText={
formik.touched.dateconfirmedbefore &&
formik.errors.dateconfirmedbefore
formik.touched.dateconfirmedafter &&
formik.errors.dateconfirmedafter
}
/>
<TextField
autoFocus={
activeFilterInput === 'dateconfirmedafter'
activeFilterInput === 'dateconfirmedbefore'
}
id="dateconfirmedafter"
label="Date confirmed after"
name="dateconfirmedafter"
id="dateconfirmedbefore"
label="Date confirmed before"
name="dateconfirmedbefore"
type="date"
variant="outlined"
// This makes sure that only 4 digits can be entered as a year
Expand All @@ -538,15 +539,15 @@ export default function FiltersDialog({
}}
size={inputSize}
InputLabelProps={{ shrink: true }}
value={formik.values.dateconfirmedafter || ''}
value={formik.values.dateconfirmedbefore || ''}
onChange={formik.handleChange}
error={
formik.touched.dateconfirmedafter &&
Boolean(formik.errors.dateconfirmedafter)
formik.touched.dateconfirmedbefore &&
Boolean(formik.errors.dateconfirmedbefore)
}
helperText={
formik.touched.dateconfirmedafter &&
formik.errors.dateconfirmedafter
formik.touched.dateconfirmedbefore &&
formik.errors.dateconfirmedbefore
}
/>
</div>
Expand Down
3 changes: 2 additions & 1 deletion verification/curator-service/ui/src/components/landing-page/SignInForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ interface SignInFormProps {

const RECAPTCHA_SITE_KEY = window.Cypress
? '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
: (process.env.RECAPTCHA_SITE_KEY as string);
: ((process.env.RECAPTCHA_SITE_KEY ||
process.env.REACT_APP_RECAPTCHA_SITE_KEY) as string);

export default function SignInForm({
disabled,
Expand Down
3 changes: 2 additions & 1 deletion verification/curator-service/ui/src/components/landing-page/SignUpForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ interface SignUpFormProps {

const RECAPTCHA_SITE_KEY = window.Cypress
? '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
: (process.env.RECAPTCHA_SITE_KEY as string);
: ((process.env.RECAPTCHA_SITE_KEY ||
process.env.REACT_APP_RECAPTCHA_SITE_KEY) as string);

export default function SignUpForm({
disabled,
Expand Down