From 4c7839aaffb6187fe1256f17d9e3d557060eb342 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Tue, 25 Jun 2024 22:56:42 +0300
Subject: [PATCH] apiurl-fix+modal-fmt

---
 src/components/Nav/AuthModal/index.tsx |   4 +-
 src/components/Views/ConnectView.tsx   | 128 +++++++++++++------------
 src/config/config.ts                   |   2 +-
 src/context/ui.tsx                     |   8 +-
 src/utils/config.ts                    |   8 --
 5 files changed, 75 insertions(+), 75 deletions(-)
 delete mode 100644 src/utils/config.ts

diff --git a/src/components/Nav/AuthModal/index.tsx b/src/components/Nav/AuthModal/index.tsx
index 71079db2..64fdc5d3 100644
--- a/src/components/Nav/AuthModal/index.tsx
+++ b/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,
diff --git a/src/components/Views/ConnectView.tsx b/src/components/Views/ConnectView.tsx
index 42bebf2b..066fc8a5 100644
--- a/src/components/Views/ConnectView.tsx
+++ b/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,17 +11,19 @@ export const ConnectView = () => {
     e.preventDefault()
     setState('loading')
 
-    const postData = formRef? Array.from(formRef.elements).reduce(
-      (acc, element) => {
-        const formField = element as unknown as { name: string; value: string }
-        if (formField.name) {
-          acc[formField.name] = formField.value
-        }
+    const postData = formRef
+      ? Array.from(formRef.elements).reduce(
+          (acc, element) => {
+            const formField = element as unknown as { name: string; value: string }
+            if (formField.name) {
+              acc[formField.name] = formField.value
+            }
 
-        return acc
-      },
-      {} as Record<string, string>,
-    ) : {}
+            return acc
+          },
+          {} as Record<string, string>,
+        )
+      : {}
 
     const requestOptions = {
       method: 'POST',
@@ -45,53 +47,59 @@ export const ConnectView = () => {
     })
   }
 
-  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'}>
-        <h1>
-          <span class="wrapped">{t('Suggest an idea')}</span>
-        </h1>
+  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'}>
+            <h1>
+              <span class="wrapped">{t('Suggest an idea')}</span>
+            </h1>
 
-        <p>
-          {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>
+            <p>
+              {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('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>
-              <option value={t('Anything else')}>{t('Anything else')}</option>
-            </select>
-          </div>
-          <div class="pretty-form__item">
-            <input
-              type="email"
-              name="contact"
-              placeholder={t('Your contact for answer')}
-              disabled={state() === 'loading'}
-            />
-            <label for="contact-email">{t('Your contact for answer')}</label>
-          </div>
-          <div class="pretty-form__item">
-            <textarea name="message" placeholder={t('Message text')} disabled={state() === 'loading'} />
-            <label for="message">{t('Message text')}</label>
-          </div>
-          <button class="button" disabled={state() === 'loading'} type="submit">
-          {t('Send')}
-          </button>
-        </form>
-      </Show>
-      <Show when={state() === 'error'}>
-        <br />
-        {t('Something went wrong, please try again')}
-      </Show>
-      <Show when={state() === 'success'}>{t('Thank you for reaching us')}!</Show>
-    </div>
-  </div>
-</article>)
+            <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('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>
+                  <option value={t('Anything else')}>{t('Anything else')}</option>
+                </select>
+              </div>
+              <div class="pretty-form__item">
+                <input
+                  type="email"
+                  name="contact"
+                  placeholder={t('Your contact for answer')}
+                  disabled={state() === 'loading'}
+                />
+                <label for="contact-email">{t('Your contact for answer')}</label>
+              </div>
+              <div class="pretty-form__item">
+                <textarea name="message" placeholder={t('Message text')} disabled={state() === 'loading'} />
+                <label for="message">{t('Message text')}</label>
+              </div>
+              <button class="button" disabled={state() === 'loading'} type="submit">
+                {t('Send')}
+              </button>
+            </form>
+          </Show>
+          <Show when={state() === 'error'}>
+            <br />
+            {t('Something went wrong, please try again')}
+          </Show>
+          <Show when={state() === 'success'}>{t('Thank you for reaching us')}!</Show>
+        </div>
+      </div>
+    </article>
+  )
 }
diff --git a/src/config/config.ts b/src/config/config.ts
index fde915c7..7842ada7 100644
--- a/src/config/config.ts
+++ b/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'
diff --git a/src/context/ui.tsx b/src/context/ui.tsx
index b756d7c6..bc72d5d0 100644
--- a/src/context/ui.tsx
+++ b/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
@@ -173,8 +173,8 @@ 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})
+    setTimeout(() => setModal(null), 1) // NOTE: modal rerender fix
+    setSearchParams({ source: undefined, m: undefined, mode: undefined })
   }
 
   const [searchParams] = useSearchParams()
diff --git a/src/utils/config.ts b/src/utils/config.ts
deleted file mode 100644
index c81a546e..00000000
--- a/src/utils/config.ts
+++ /dev/null
@@ -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'