-
{t('Restore password')}
-
- {t(message()) || t('Everything is ok, please give us your email address')}
-
+
{t('Set the new password')}
+
{t(message()) || t('Please give us your email address')}
{
disabled={isSubmitting() || Boolean(message())}
type="submit"
>
- {isSubmitting() ? '...' : t('Restore password')}
+ {isSubmitting() ? '...' : t('Send')}
diff --git a/src/components/Nav/AuthModal/index.tsx b/src/components/Nav/AuthModal/index.tsx
index 94e284d0..e6d3e149 100644
--- a/src/components/Nav/AuthModal/index.tsx
+++ b/src/components/Nav/AuthModal/index.tsx
@@ -11,16 +11,16 @@ import { isMobile } from '../../../utils/media-query'
import { ChangePasswordForm } from './ChangePasswordForm'
import { EmailConfirm } from './EmailConfirm'
-import { ForgotPasswordForm } from './ForgotPasswordForm'
import { LoginForm } from './LoginForm'
import { RegisterForm } from './RegisterForm'
+import { SendResetLinkForm } from './SendResetLinkForm'
import styles from './AuthModal.module.scss'
const AUTH_MODAL_MODES: Record
= {
login: LoginForm,
register: RegisterForm,
- 'forgot-password': ForgotPasswordForm,
+ 'send-reset-link': SendResetLinkForm,
'confirm-email': EmailConfirm,
'change-password': ChangePasswordForm
}
diff --git a/src/components/Nav/AuthModal/types.ts b/src/components/Nav/AuthModal/types.ts
index 92efe4ea..e2db3e78 100644
--- a/src/components/Nav/AuthModal/types.ts
+++ b/src/components/Nav/AuthModal/types.ts
@@ -1,4 +1,4 @@
-export type AuthModalMode = 'login' | 'register' | 'confirm-email' | 'forgot-password' | 'change-password'
+export type AuthModalMode = 'login' | 'register' | 'confirm-email' | 'send-reset-link' | 'change-password'
export type AuthModalSource =
| 'discussions'
| 'vote'
diff --git a/src/components/Nav/HeaderAuth.tsx b/src/components/Nav/HeaderAuth.tsx
index 98dda88e..8aab146b 100644
--- a/src/components/Nav/HeaderAuth.tsx
+++ b/src/components/Nav/HeaderAuth.tsx
@@ -63,11 +63,6 @@ export const HeaderAuth = (props: Props) => {
const handleSaveButtonClick = () => {
saveShout(form)
}
- const { showSnackbar } = useSnackbar()
- const handlePublishButtonClick = () => {
- if (form.mainTopic) publishShout(form)
- else showSnackbar({ body: t('Please, set the main topic first') })
- }
const [width, setWidth] = createSignal(0)
@@ -160,7 +155,7 @@ export const HeaderAuth = (props: Props) => {
{renderIconedButton({
value: t('Publish'),
icon: 'publish',
- action: handlePublishButtonClick
+ action: () => publishShout(form),
})}
diff --git a/src/components/Topic/TopicBadge/TopicBadge.module.scss b/src/components/Topic/TopicBadge/TopicBadge.module.scss
index 3f9d8436..f219910a 100644
--- a/src/components/Topic/TopicBadge/TopicBadge.module.scss
+++ b/src/components/Topic/TopicBadge/TopicBadge.module.scss
@@ -8,6 +8,7 @@
flex-direction: row;
margin-bottom: .8rem;
}
+
.basicInfo {
display: flex;
flex-flow: row nowrap;
diff --git a/src/components/Views/Edit.module.scss b/src/components/Views/EditView/EditView.module.scss
similarity index 98%
rename from src/components/Views/Edit.module.scss
rename to src/components/Views/EditView/EditView.module.scss
index 991c9fc7..15e26228 100644
--- a/src/components/Views/Edit.module.scss
+++ b/src/components/Views/EditView/EditView.module.scss
@@ -189,10 +189,8 @@
flex-flow: column;
.validationError {
- position: absolute;
- z-index: 1;
- top: calc(100% + 4px);
font-size: small;
+ margin-top: -1rem;
color: var(--danger-color);
}
}
diff --git a/src/components/Views/Edit.tsx b/src/components/Views/EditView/EditView.tsx
similarity index 90%
rename from src/components/Views/Edit.tsx
rename to src/components/Views/EditView/EditView.tsx
index 02721720..a85768e1 100644
--- a/src/components/Views/Edit.tsx
+++ b/src/components/Views/EditView/EditView.tsx
@@ -3,33 +3,33 @@ import deepEqual from 'fast-deep-equal'
import { Accessor, Show, createMemo, createSignal, lazy, onCleanup, onMount } from 'solid-js'
import { createStore } from 'solid-js/store'
-import { ShoutForm, useEditorContext } from '../../context/editor'
-import { useLocalize } from '../../context/localize'
-import type { Shout, Topic } from '../../graphql/schema/core.gen'
-import { LayoutType, MediaItem } from '../../pages/types'
-import { useRouter } from '../../stores/router'
-import { clone } from '../../utils/clone'
-import { getImageUrl } from '../../utils/getImageUrl'
-import { isDesktop } from '../../utils/media-query'
-import { slugify } from '../../utils/slugify'
-import { Editor, Panel } from '../Editor'
-import { AudioUploader } from '../Editor/AudioUploader'
-import { AutoSaveNotice } from '../Editor/AutoSaveNotice'
-import { VideoUploader } from '../Editor/VideoUploader'
-import { Modal } from '../Nav/Modal'
-import { TableOfContents } from '../TableOfContents'
-import { DropArea } from '../_shared/DropArea'
-import { Icon } from '../_shared/Icon'
-import { InviteMembers } from '../_shared/InviteMembers'
-import { Popover } from '../_shared/Popover'
-import { EditorSwiper } from '../_shared/SolidSwiper'
+import { ShoutForm, useEditorContext } from '../../../context/editor'
+import { useLocalize } from '../../../context/localize'
+import type { Shout, Topic } from '../../../graphql/schema/core.gen'
+import { LayoutType, MediaItem } from '../../../pages/types'
+import { useRouter } from '../../../stores/router'
+import { clone } from '../../../utils/clone'
+import { getImageUrl } from '../../../utils/getImageUrl'
+import { isDesktop } from '../../../utils/media-query'
+import { slugify } from '../../../utils/slugify'
+import { Editor, Panel } from '../../Editor'
+import { AudioUploader } from '../../Editor/AudioUploader'
+import { AutoSaveNotice } from '../../Editor/AutoSaveNotice'
+import { VideoUploader } from '../../Editor/VideoUploader'
+import { Modal } from '../../Nav/Modal'
+import { TableOfContents } from '../../TableOfContents'
+import { DropArea } from '../../_shared/DropArea'
+import { Icon } from '../../_shared/Icon'
+import { InviteMembers } from '../../_shared/InviteMembers'
+import { Popover } from '../../_shared/Popover'
+import { EditorSwiper } from '../../_shared/SolidSwiper'
-import { PublishSettings } from './PublishSettings'
+import { PublishSettings } from '../PublishSettings'
-import styles from './Edit.module.scss'
+import styles from './EditView.module.scss'
-const SimplifiedEditor = lazy(() => import('../Editor/SimplifiedEditor'))
-const GrowingTextarea = lazy(() => import('../_shared/GrowingTextarea/GrowingTextarea'))
+const SimplifiedEditor = lazy(() => import('../../Editor/SimplifiedEditor'))
+const GrowingTextarea = lazy(() => import('../../_shared/GrowingTextarea/GrowingTextarea'))
type Props = {
shout: Shout
@@ -121,7 +121,7 @@ export const EditView = (props: Props) => {
onCleanup(() => window.removeEventListener('beforeunload', handleBeforeUnload))
})
- const handleTitleInputChange = (value) => {
+ const handleTitleInputChange = (value: string) => {
setForm('title', value)
setForm('slug', slugify(value))
if (value) {
diff --git a/src/components/Views/EditView/index.ts b/src/components/Views/EditView/index.ts
new file mode 100644
index 00000000..8bde254e
--- /dev/null
+++ b/src/components/Views/EditView/index.ts
@@ -0,0 +1 @@
+export { EditView } from './EditView'
diff --git a/src/context/editor.tsx b/src/context/editor.tsx
index 2af3f224..cf899dfc 100644
--- a/src/context/editor.tsx
+++ b/src/context/editor.tsx
@@ -95,7 +95,7 @@ export const EditorProvider = (props: { children: JSX.Element }) => {
const countWords = (value) => setWordCounter(value)
const validate = () => {
if (!form.title) {
- setFormErrors('title', t('Required'))
+ setFormErrors('title', t('Please, set the article title'))
return false
}
diff --git a/src/context/session.tsx b/src/context/session.tsx
index 4583ee66..ecd205c4 100644
--- a/src/context/session.tsx
+++ b/src/context/session.tsx
@@ -11,6 +11,7 @@ import {
ForgotPasswordResponse,
GenericResponse,
LoginInput,
+ ResendVerifyEmailInput,
SignupInput,
VerifyEmailInput
} from '@authorizerdev/authorizer-js'
@@ -68,6 +69,8 @@ export type SessionContextType = {
confirmEmail: (input: VerifyEmailInput) => Promise
// email confirm callback is in auth.discours.io
setIsSessionLoaded: (loaded: boolean) => void
authorizer: () => Authorizer
+ isRegistered: (email: string) => Promise
+ resendVerifyEmail: (params: ResendVerifyEmailInput) => Promise
}
const noop = () => {}
@@ -309,6 +312,31 @@ export const SessionProvider = (props: {
return { data: resp?.data, errors: resp.errors }
}
+ const resendVerifyEmail = async (params: ResendVerifyEmailInput) => {
+ const resp = await authorizer().resendVerifyEmail(params)
+ console.debug('[context.session] resend verify email response:', resp)
+ if (resp.errors) {
+ resp.errors.forEach((error) => {
+ showSnackbar({ type: 'error', body: error.message })
+ })
+ }
+ return resp?.data
+ }
+
+ const isRegistered = async (email: string): Promise => {
+ console.debug('[context.session] calling is_registered for ', email)
+ try {
+ const response = await authorizer().graphqlQuery({
+ query: `query { is_registered(email: "${email}") { message }}`,
+ })
+ // console.log(response)
+ return response?.data?.is_registered?.message
+ } catch (error) {
+ console.warn(error)
+ }
+ return ''
+ }
+
const confirmEmail = async (input: VerifyEmailInput) => {
console.debug(`[context.session] calling authorizer's verify email with`, input)
try {
@@ -347,7 +375,8 @@ export const SessionProvider = (props: {
loadAuthor,
forgotPassword,
changePassword,
- oauth
+ oauth,
+ isRegistered,
}
const value: SessionContextType = {
authError,
@@ -356,7 +385,8 @@ export const SessionProvider = (props: {
isSessionLoaded,
author,
...actions,
- isAuthenticated
+ isAuthenticated,
+ resendVerifyEmail,
}
return {props.children}
diff --git a/src/pages/edit.page.tsx b/src/pages/edit.page.tsx
index 688d2fe4..031eedf4 100644
--- a/src/pages/edit.page.tsx
+++ b/src/pages/edit.page.tsx
@@ -10,7 +10,7 @@ import { useRouter } from '../stores/router'
import { LayoutType } from './types'
-const Edit = lazy(() => import('../components/Views/Edit'))
+const EditView = lazy(() => import('../components/Views/EditView/EditView'))
export const EditPage = () => {
const { page } = useRouter()
@@ -54,7 +54,7 @@ export const EditPage = () => {
}>
-
+
diff --git a/src/stores/emailChecks.ts b/src/stores/emailChecks.ts
deleted file mode 100644
index b8e4875c..00000000
--- a/src/stores/emailChecks.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { createSignal } from 'solid-js'
-
-const [emailChecks, setEmailChecks] = createSignal<{ [email: string]: boolean }>({})
-
-export const checkEmail = async (email: string): Promise => {
- if (emailChecks()[email]) {
- return true
- }
- const checkResult = false // FIXME: secure endpoint for check email
-
- if (checkResult) {
- setEmailChecks((oldEmailChecks) => ({ ...oldEmailChecks, [email]: true }))
- return true
- }
-
- return false
-}
-
-export const useEmailChecks = () => {
- return { emailChecks }
-}
diff --git a/vite.config.ts b/vite.config.ts
index 7291fd35..907f8e24 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -17,7 +17,6 @@ const cssModuleHMR = () => {
module.isSelfAccepting = true
}
})
- }
}
}
@@ -51,7 +50,8 @@ export default defineConfig(({ mode, command }) => {
envPrefix: 'PUBLIC_',
plugins,
server: {
- https: true,
+ cors: isDev,
+ https: {},
port: 3000
},
css: {
@@ -78,6 +78,8 @@ export default defineConfig(({ mode, command }) => {
'wonka',
'solid-popper',
'seroval',
+ 'seroval-plugins',
+ 'seroval-plugins/web',
'@solid-primitives/share',
'i18next',
'js-cookie',