From 500e8132dd5fabaab69aaf0d23de0d0fbd924889 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Mon, 6 May 2024 18:39:01 +0300
Subject: [PATCH 1/2] fix nav header

---
 src/components/Nav/HeaderAuth.tsx | 59 ++++++++++---------------------
 1 file changed, 19 insertions(+), 40 deletions(-)

diff --git a/src/components/Nav/HeaderAuth.tsx b/src/components/Nav/HeaderAuth.tsx
index a0c273fc..8556c77f 100644
--- a/src/components/Nav/HeaderAuth.tsx
+++ b/src/components/Nav/HeaderAuth.tsx
@@ -34,12 +34,12 @@ export const HeaderAuth = (props: Props) => {
   const { page } = useRouter()
   const { session, author, isSessionLoaded } = useSession()
   const { unreadNotificationsCount, showNotificationsPanel } = useNotifications()
-  const { form, toggleEditorPanel, saveShout, saveDraft, publishShout } = useEditorContext()
+  const { form, toggleEditorPanel, saveShout, publishShout } = useEditorContext()
 
   const handleBellIconClick = (event: Event) => {
     event.preventDefault()
 
-    if (!author()?.id) {
+    if (!session()?.access_token) {
       showModal('auth')
       return
     }
@@ -48,23 +48,19 @@ export const HeaderAuth = (props: Props) => {
   }
 
   const isEditorPage = createMemo(() => page().route === 'edit' || page().route === 'editSettings')
-  const isNotificationsVisible = createMemo(() => author()?.id && !isEditorPage())
-  const isSaveButtonVisible = createMemo(() => author()?.id && isEditorPage())
+  const isNotificationsVisible = createMemo(() => session()?.access_token && !isEditorPage())
+  const isSaveButtonVisible = createMemo(() => session()?.access_token && isEditorPage())
   const isCreatePostButtonVisible = createMemo(() => !isEditorPage())
-  const isAuthenticatedControlsVisible = createMemo(() => author()?.id && session()?.user?.email_verified)
+  const isAuthenticatedControlsVisible = createMemo(
+    () => session()?.access_token && session()?.user?.email_verified,
+  )
 
   const handleBurgerButtonClick = () => {
     toggleEditorPanel()
   }
 
-  // FIXME: use or remove
-  const handleSaveClick = () => {
-    const hasTopics = form.selectedTopics?.length > 0
-    if (hasTopics) {
-      saveShout(form)
-    } else {
-      saveDraft(form)
-    }
+  const handleSaveButtonClick = () => {
+    saveShout(form)
   }
 
   const [width, setWidth] = createSignal(0)
@@ -110,14 +106,8 @@ export const HeaderAuth = (props: Props) => {
       <Show when={isSessionLoaded()} keyed={true}>
         <div class={clsx('col-auto col-lg-7', styles.usernav)}>
           <div class={styles.userControl}>
-            <Show when={isCreatePostButtonVisible() && author()?.id}>
-              <div
-                class={clsx(
-                  styles.userControlItem,
-                  styles.userControlItemVerbose,
-                  // styles.userControlItemCreate,
-                )}
-              >
+            <Show when={isCreatePostButtonVisible() && session()?.access_token}>
+              <div class={clsx(styles.userControlItem, styles.userControlItemVerbose)}>
                 <a href={getPagePath(router, 'create')}>
                   <span class={styles.textLabel}>{t('Create post')}</span>
                   <Icon name="pencil-outline" class={styles.icon} />
@@ -224,18 +214,12 @@ export const HeaderAuth = (props: Props) => {
               </div>
             </Show>
 
-            <Show when={isCreatePostButtonVisible() && !!author()?.id}>
-              <div
-                class={clsx(
-                  styles.userControlItem,
-                  styles.userControlItemVerbose,
-                  // styles.userControlItemCreate,
-                )}
-              >
+            <Show when={isCreatePostButtonVisible() && !session()?.access_token}>
+              <div class={clsx(styles.userControlItem, styles.userControlItemVerbose)}>
                 <a href={getPagePath(router, 'create')}>
                   <span class={styles.textLabel}>{t('Create post')}</span>
-                  <Icon name="pencil-outline" class={styles.icon} />
-                  <Icon name="pencil-outline-hover" class={clsx(styles.icon, styles.iconHover)} />
+                  <Icon name="pencil" class={styles.icon} />
+                  <Icon name="pencil" class={clsx(styles.icon, styles.iconHover)} />
                 </a>
               </div>
             </Show>
@@ -243,24 +227,19 @@ export const HeaderAuth = (props: Props) => {
             <Show
               when={isAuthenticatedControlsVisible()}
               fallback={
-                <Show when={!author()?.id}>
+                <Show when={!session()?.access_token}>
                   <div class={clsx(styles.userControlItem, styles.userControlItemVerbose, 'loginbtn')}>
                     <a href="?m=auth&mode=login">
                       <span class={styles.textLabel}>{t('Enter')}</span>
                       <Icon name="key" class={styles.icon} />
-                      <Icon name="key" class={clsx(styles.icon, styles.iconHover)} />
+                      {/*<Icon name="user-default" class={clsx(styles.icon, styles.iconHover)} />*/}
                     </a>
                   </div>
                 </Show>
               }
             >
               <Show when={!isSaveButtonVisible()}>
-                <div
-                  class={clsx(
-                    styles.userControlItem,
-                    // styles.userControlItemInbox
-                  )}
-                >
+                <div class={clsx(styles.userControlItem, styles.userControlItemInbox)}>
                   <a href={getPagePath(router, 'inbox')}>
                     <div classList={{ entered: page().path === '/inbox' }}>
                       <Icon name="inbox-white" class={styles.icon} />
@@ -272,7 +251,7 @@ export const HeaderAuth = (props: Props) => {
             </Show>
           </div>
 
-          <Show when={author()?.id}>
+          <Show when={session()?.access_token}>
             <ProfilePopup
               onVisibilityChange={(isVisible) => {
                 props.setIsProfilePopupVisible(isVisible)

From d8f61e5b6671e0450b2ca9a6188870b1cbee65c2 Mon Sep 17 00:00:00 2001
From: Untone <anton.rewin@gmail.com>
Date: Mon, 6 May 2024 18:43:10 +0300
Subject: [PATCH 2/2] styles-fixme

---
 src/components/Nav/Header/Header.tsx | 2 +-
 vite.config.ts                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx
index f1342f1d..c5d3da0e 100644
--- a/src/components/Nav/Header/Header.tsx
+++ b/src/components/Nav/Header/Header.tsx
@@ -335,7 +335,7 @@ export const Header = (props: Props) => {
           <Show when={props.title}>
             <div
               class={clsx(styles.articleControls, 'col-auto', {
-                [styles.articleControlsAuthorized]: session()?.user?.id,
+                // FIXME: use or remove [styles.articleControlsAuthorized]: session()?.user?.id,
               })}
             >
               <SharePopup
diff --git a/vite.config.ts b/vite.config.ts
index 6f1389bc..324e5161 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -69,6 +69,7 @@ export default defineConfig(({ mode, command }) => {
       https: {},
       port: 3000,
     },
+    sourcemap: isDev,
     css: {
       devSourcemap: isDev,
       preprocessorOptions: {