CoastalCommits/CoastalCommitsPastes
CoastalCommits/CoastalCommitsPastes
2
1
Fork 0
forked from CoastalCommitsArchival/github.com-MaxLeiter-drift
Code Pull requests Activity Actions

client: don't require confirming password accessing protected page

Browse source
This commit is contained in:
Max Leiter 2022-03-21 18:59:50 -07:00
parent ecd06a2258
commit c1dcfb6a58
No known key found for this signature in database
GPG key ID: A3512F2F2F17EBDA
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/components/new-post/password/index.tsx
View file

@ -2,24 +2,24 @@ import { Input, Modal, Note, Spacer } from "@geist-ui/core"
import { useState } from "react" import { useState } from "react"
type Props = { type Props = {
warning?: boolean creating?: boolean
isOpen: boolean isOpen: boolean
onClose: () => void onClose: () => void
onSubmit: (password: string) => void onSubmit: (password: string) => void
} }
const PasswordModal = ({ isOpen, onClose, onSubmit: onSubmitAfterVerify, warning }: Props) => { const PasswordModal = ({ isOpen, onClose, onSubmit: onSubmitAfterVerify, creating }: Props) => {
const [password, setPassword] = useState<string>() const [password, setPassword] = useState<string>()
const [confirmPassword, setConfirmPassword] = useState<string>() const [confirmPassword, setConfirmPassword] = useState<string>()
const [error, setError] = useState<string>() const [error, setError] = useState<string>()
const onSubmit = () => { const onSubmit = () => {
if (!password || !confirmPassword) { if (!password || (creating && !confirmPassword)) {
setError('Please enter a password') setError('Please enter a password')
return return
} }
if (password !== confirmPassword) { if (password !== confirmPassword && creating) {
setError("Passwords do not match") setError("Passwords do not match")
return return
} }
@ -31,7 +31,7 @@ const PasswordModal = ({ isOpen, onClose, onSubmit: onSubmitAfterVerify, warning
{<Modal visible={isOpen} > {<Modal visible={isOpen} >
<Modal.Title>Enter a password</Modal.Title> <Modal.Title>Enter a password</Modal.Title>
<Modal.Content> <Modal.Content>
{!error && warning && <Note type="warning" label='Warning'> {!error && creating && <Note type="warning" label='Warning'>
This doesn&apos;t protect your post from the server administrator. This doesn&apos;t protect your post from the server administrator.
</Note>} </Note>}
{error && <Note type="error" label='Error'> {error && <Note type="error" label='Error'>
@ -39,7 +39,7 @@ const PasswordModal = ({ isOpen, onClose, onSubmit: onSubmitAfterVerify, warning
</Note>} </Note>}
<Spacer /> <Spacer />
<Input width={"100%"} label="Password" marginBottom={1} htmlType="password" placeholder="Password" onChange={(e) => setPassword(e.target.value)} /> <Input width={"100%"} label="Password" marginBottom={1} htmlType="password" placeholder="Password" onChange={(e) => setPassword(e.target.value)} />
<Input width={"100%"} label="Confirm" htmlType="password" placeholder="Confirm Password" onChange={(e) => setConfirmPassword(e.target.value)} /> {creating && <Input width={"100%"} label="Confirm" htmlType="password" placeholder="Confirm Password" onChange={(e) => setConfirmPassword(e.target.value)} />}
</Modal.Content> </Modal.Content>
<Modal.Action passive onClick={onClose}>Cancel</Modal.Action> <Modal.Action passive onClick={onClose}>Cancel</Modal.Action>
<Modal.Action onClick={onSubmit}>Submit</Modal.Action> <Modal.Action onClick={onSubmit}>Submit</Modal.Action>

2
client/pages/post/protected/[id].tsx
View file

@ -91,7 +91,7 @@ const Post = ({ theme, changeTheme }: ThemeProps) => {
} }
if (!post) { if (!post) {
return <Page><PasswordModal warning={false} onClose={onClose} onSubmit={onSubmit} isOpen={isPasswordModalOpen} /></Page> return <Page><PasswordModal creating={false} onClose={onClose} onSubmit={onSubmit} isOpen={isPasswordModalOpen} /></Page>
} }
return ( return (