apiurl-fix+modal-fmt

src/components/Nav/AuthModal/index.tsx

@@ -30,8 +30,8 @@ export type AuthModalSearchParams = {
 }
 
 const AUTH_MODAL_MODES: Record<AuthModalMode, Component> = {
-  'login': LoginForm,
-  'register': RegisterForm,
+  login: LoginForm,
+  register: RegisterForm,
   'send-reset-link': SendResetLinkForm,
   'confirm-email': EmailConfirm,
   'send-confirm-email': SendEmailConfirm,

src/components/Views/ConnectView.tsx

@@ -1,6 +1,6 @@
-import { createSignal } from "solid-js"
-import { Show } from "solid-js/web"
-import { useLocalize } from "~/context/localize"
+import { createSignal } from 'solid-js'
+import { Show } from 'solid-js/web'
+import { useLocalize } from '~/context/localize'
 
 export const ConnectView = () => {
   const { t } = useLocalize()
@@ -11,7 +11,8 @@ export const ConnectView = () => {
     e.preventDefault()
     setState('loading')
 
-    const postData = formRef? Array.from(formRef.elements).reduce(
+    const postData = formRef
+      ? Array.from(formRef.elements).reduce(
           (acc, element) => {
             const formField = element as unknown as { name: string; value: string }
             if (formField.name) {
@@ -21,7 +22,8 @@ export const ConnectView = () => {
             return acc
           },
           {} as Record<string, string>,
-    ) : {}
+        )
+      : {}
 
     const requestOptions = {
       method: 'POST',
@@ -45,7 +47,8 @@ export const ConnectView = () => {
     })
   }
 
-  return (<article class="wide-container container--static-page">
+  return (
+    <article class="wide-container container--static-page">
       <div class="row">
         <div class="col-sm-20 col-md-16 col-lg-14 col-xl-12 offset-md-5">
           <Show when={state() === 'loading' || state() === 'initial' || state() === 'error'}>
@@ -54,14 +57,18 @@ export const ConnectView = () => {
             </h1>
 
             <p>
-          {t('Want to suggest, discuss or advise something? Share a topic or an idea?  Please send us a message!')}
+              {t(
+                'Want to suggest, discuss or advise something? Share a topic or an idea?  Please send us a message!',
+              )}
               {t('Specify your e-mail and we will reply.')}
             </p>
 
             <form onSubmit={handleFormSubmit} ref={(el) => (formRef = el)}>
               <div class="pretty-form__item">
                 <select name="subject" disabled={state() === 'loading'}>
-              <option value={t('Collaborate')} selected>{t('Collaborate')}</option>
+                  <option value={t('Collaborate')} selected>
+                    {t('Collaborate')}
+                  </option>
                   <option value={t('Recommend some new topic')}>{t('Recommend some new topic')}</option>
                   <option value={t('Report an error')}>{t('Report an error')}</option>
                   <option value={t('Volounteering')}>{t('Volounteering')}</option>
@@ -93,5 +100,6 @@ export const ConnectView = () => {
           <Show when={state() === 'success'}>{t('Thank you for reaching us')}!</Show>
         </div>
       </div>
-</article>)
+    </article>
+  )
 }

src/config/config.ts

@@ -2,7 +2,7 @@ export const isDev = import.meta.env.MODE === 'development'
 export const cdnUrl = 'https://cdn.discours.io'
 export const thumborUrl = import.meta.env.PUBLIC_THUMBOR_URL || 'https://images.discours.io'
 export const reportDsn = import.meta.env.PUBLIC_GLITCHTIP_DSN || import.meta.env.PUBLIC_SENTRY_DSN || ''
-export const coreApiUrl = import.meta.env.PUBLIC_API_BASE || 'https://core.discours.io'
+export const coreApiUrl = import.meta.env.PUBLIC_CORE_API || 'https://core.discours.io'
 export const chatApiUrl = import.meta.env.PUBLIC_CHAT_API || 'https://inbox.discours.io'
 export const authApiUrl = import.meta.env.PUBLIC_AUTH_API || 'https://auth.discours.io/graphql'
 export const sseUrl = import.meta.env.PUBLIC_REALTIME_EVENTS || 'https://connect.discours.io'

src/context/ui.tsx

@@ -127,7 +127,7 @@ type ConfirmMessage = {
 }
 
 type UIContextType = {
-  modal: Accessor<ModalType|null>
+  modal: Accessor<ModalType | null>
   showModal: (m: ModalType, source?: AuthModalSource) => void
   hideModal: () => void
   confirmMessage: Accessor<ConfirmMessage>
@@ -143,7 +143,7 @@ export function useUI() {
 
 export const UIProvider = (props: { children: JSX.Element }) => {
   const [, setSearchParams] = useSearchParams<Record<string, string>>()
-  const [modal, setModal] = createSignal<ModalType|null>(null)
+  const [modal, setModal] = createSignal<ModalType | null>(null)
   const [confirmMessage, setConfirmMessage] = createSignal<ConfirmMessage>({} as ConfirmMessage)
 
   let resolveFn: (value: boolean) => void
@@ -174,7 +174,7 @@ export const UIProvider = (props: { children: JSX.Element }) => {
   const hideModal = () => {
     console.log('[context.ui] hideModal()', modal())
     setTimeout(() => setModal(null), 1) // NOTE: modal rerender fix
-    setSearchParams({source: undefined, m: undefined, mode: undefined})
+    setSearchParams({ source: undefined, m: undefined, mode: undefined })
   }
 
   const [searchParams] = useSearchParams()

src/utils/config.ts

@@ -1,8 +0,0 @@
-export const isDev = import.meta.env.MODE === 'development'
-export const cdnUrl = 'https://cdn.discours.io'
-export const thumborUrl = import.meta.env.PUBLIC_THUMBOR_URL || 'https://images.discours.io'
-export const reportDsn = import.meta.env.PUBLIC_GLITCHTIP_DSN || import.meta.env.PUBLIC_SENTRY_DSN || ''
-export const coreApiUrl = import.meta.env.PUBLIC_API_BASE || 'https://core.discours.io'
-export const chatApiUrl = import.meta.env.PUBLIC_CHAT_API || 'https://inbox.discours.io'
-export const authApiUrl = import.meta.env.PUBLIC_AUTH_API || 'https://auth.discours.io/graphql'
-export const sseUrl = import.meta.env.PUBLIC_REALTIME_EVENTS || 'https://connect.discours.io'