From 0952ffc3e7c0811c0ca326ef0f5b64c3cd361386 Mon Sep 17 00:00:00 2001
From: Gavin Suntop <206379+gvn@users.noreply.github.com>
Date: Tue, 10 Oct 2023 09:05:32 -0700
Subject: [PATCH] Adding Post button and snackbar UI

---
 components/nav/NavSide.vue                    |  4 +-
 components/nav/NavSideItem.vue                | 36 +++++++++++-
 components/publish/PublishSnackbar.vue        | 57 +++++++++++++++++++
 components/publish/PublishWidget.vue          | 11 +++-
 .../publish/PublishWidgetFull.client.vue      | 11 +++-
 locales/en.json                               |  4 +-
 pages/compose.vue                             | 11 +++-
 styles/vars.css                               |  6 +-
 8 files changed, 129 insertions(+), 11 deletions(-)
 create mode 100644 components/publish/PublishSnackbar.vue

diff --git a/components/nav/NavSide.vue b/components/nav/NavSide.vue
index 0724a44baa..96eace195a 100644
--- a/components/nav/NavSide.vue
+++ b/components/nav/NavSide.vue
@@ -28,7 +28,6 @@ const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
     <NavSideItem :text="$t('nav.bookmarks')" to="/bookmarks" icon="i-ri:bookmark-line" user-only :command="command" />
 
     <div class="spacer" shrink hidden sm:block />
-    <NavSideItem :text="$t('action.compose')" to="/compose" icon="i-ri:quill-pen-line" user-only :command="command" />
 
     <div class="spacer" shrink hidden sm:block />
     <NavSideItem :text="$t('nav.explore')" :to="isHydrated ? `/${currentServer}/explore` : '/explore'" icon="i-ri:hashtag" :command="command" />
@@ -38,6 +37,9 @@ const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
 
     <div class="spacer" shrink hidden sm:block />
     <NavSideItem :text="$t('nav.settings')" to="/settings" icon="i-ri:settings-3-line" :command="command" />
+
+    <div class="spacer" shrink hidden sm:block />
+    <NavSideItem lozenge :text="$t('action.compose')" to="/compose" icon="i-ri:add-fill" user-only :command="command" />
   </nav>
 </template>
 
diff --git a/components/nav/NavSideItem.vue b/components/nav/NavSideItem.vue
index 8c5858e8c3..488dea29ee 100644
--- a/components/nav/NavSideItem.vue
+++ b/components/nav/NavSideItem.vue
@@ -5,8 +5,10 @@ const props = withDefaults(defineProps<{
   to: string | Record<string, string>
   userOnly?: boolean
   command?: boolean
+  lozenge?: boolean
 }>(), {
   userOnly: false,
+  lozenge: false,
 })
 
 defineSlots<{
@@ -56,12 +58,14 @@ const noUserVisual = computed(() => isHydrated.value && props.userOnly && !curre
     <CommonTooltip :disabled="!isMediumOrLargeScreen" :content="text" placement="right">
       <div
         class="item"
+        :class="lozenge ? 'lozenge' : ''"
         flex items-center gap4
         w-fit rounded-3
         px2 mx3 sm:mxa
         xl="ml0 mr5 px5 w-auto"
         transition-100
-        elk-group-hover="bg-active" group-focus-visible:ring="2 current"
+        :elk-group-hover="lozenge ? '' : 'bg-active'"
+        group-focus-visible:ring="2 current"
       >
         <slot name="icon">
           <div :class="icon" text-xl />
@@ -75,6 +79,36 @@ const noUserVisual = computed(() => isHydrated.value && props.userOnly && !curre
 </template>
 
 <style scoped>
+  .lozenge {
+    color: var(--c-text-base-light);
+    font-size: 15px;
+    line-height: 20px;
+    max-width: 160px;
+    border-radius: 360px;
+    align-items: center;
+    background: var(--c-primary);
+    display: flex;
+    justify-content: center;
+    padding-right: 50px;
+
+    &:hover {
+      background: var(--c-primary-active);
+    }
+  }
+
+  @media screen and ( min-width: 640px ) {
+    .lozenge.item {
+      padding: 0.2rem;
+    }
+  }
+
+  @media screen and ( min-width: 1280px ) {
+    .lozenge.item {
+      padding-top: 12px;
+      padding-bottom: 12px;
+    }
+  }
+
   .item {
     padding-top: 0.5rem;
     padding-bottom: 0.5rem;
diff --git a/components/publish/PublishSnackbar.vue b/components/publish/PublishSnackbar.vue
new file mode 100644
index 0000000000..8eea5c8bd5
--- /dev/null
+++ b/components/publish/PublishSnackbar.vue
@@ -0,0 +1,57 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+const isVisible = ref(false)
+
+function show() {
+  isVisible.value = true
+
+  setTimeout(() => {
+    hide()
+  }, 10000)
+}
+
+function hide() {
+  isVisible.value = false
+}
+
+defineExpose({
+  show,
+  hide,
+})
+</script>
+
+<template>
+  <div class="snackbar-wrapper">
+    <div
+      :class="{ active: isVisible }"
+      class="snackbar"
+    >
+      Your post was published
+    </div>
+  </div>
+</template>
+
+<style scoped>
+  .snackbar-wrapper {
+    display: flex;
+    justify-content: center;
+  }
+  .snackbar {
+    background: var(--c-primary);
+    border-radius: 8px;
+    border: 1px solid var(--c-primary-light);
+    color: var(--c-text-base-light);
+    font-size: 12px;
+    font-weight: 600;
+    line-height: 16px;
+    min-width: 280px;
+    opacity: 0;
+    padding: 8px 16px;
+    text-align: center;
+    transition: opacity 800ms ease-in-out;
+  }
+  .snackbar.active {
+    opacity: 1;
+  }
+</style>
diff --git a/components/publish/PublishWidget.vue b/components/publish/PublishWidget.vue
index 36bb4eabb4..cc56b9b053 100644
--- a/components/publish/PublishWidget.vue
+++ b/components/publish/PublishWidget.vue
@@ -494,7 +494,7 @@ onDeactivated(() => {
               </span>
               <span v-if="draft.editingStatus">{{ $t('action.save_changes') }}</span>
               <span v-else-if="draft.params.inReplyToId">{{ $t('action.reply') }}</span>
-              <span v-else>{{ !isSending ? $t('action.publish') : $t('state.publishing') }}</span>
+              <span v-else>{{ !isSending ? $t('action.post') : $t('state.publishing') }}</span>
             </button>
           </CommonTooltip>
         </div>
@@ -504,6 +504,15 @@ onDeactivated(() => {
 </template>
 
 <style scoped>
+  .publish-button {
+    background: var(--c-primary);
+    border-radius: 360px;
+
+    &:hover {
+      background: var(--c-primary-active);
+    }
+  }
+
   .publish-button[aria-disabled=true] {
     cursor: not-allowed;
     background-color: var(--c-bg-btn-disabled);
diff --git a/components/publish/PublishWidgetFull.client.vue b/components/publish/PublishWidgetFull.client.vue
index f2de2fbe87..f70198c12d 100644
--- a/components/publish/PublishWidgetFull.client.vue
+++ b/components/publish/PublishWidgetFull.client.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import { formatTimeAgo } from '@vueuse/core'
 
+const emit = defineEmits<{
+  (evt: 'published'): void
+}>()
 const route = useRoute()
 const { formatNumber } = useHumanReadableNumber()
 const timeAgoOptions = useTimeAgoOptions()
@@ -13,6 +16,10 @@ const nonEmptyDrafts = $computed(() => draftKeys
   .map(i => [i, currentUserDrafts.value[i]] as const),
 )
 
+async function onPublish() {
+  emit('published')
+}
+
 watchEffect(() => {
   draftKey = route.query.draft?.toString() || 'home'
 })
@@ -23,7 +30,7 @@ onDeactivated(() => {
 </script>
 
 <template>
-  <div flex="~ col" pt-6 h-screen>
+  <div flex="~ col" pt-6 mb-6>
     <div inline-flex justify-end h-8>
       <VDropdown v-if="nonEmptyDrafts.length" placement="bottom-end">
         <button btn-text flex="inline center">
@@ -57,7 +64,7 @@ onDeactivated(() => {
       </VDropdown>
     </div>
     <div>
-      <PublishWidget :key="draftKey" expanded class="min-h-100!" :draft-key="draftKey" />
+      <PublishWidget :key="draftKey" expanded class="min-h-100!" :draft-key="draftKey" @published="onPublish" />
     </div>
   </div>
 </template>
diff --git a/locales/en.json b/locales/en.json
index fcfd55c5cf..44baa7eb5e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -53,7 +53,7 @@
     "clear_publish_failed": "Clear publish errors",
     "clear_upload_failed": "Clear file upload errors",
     "close": "Close",
-    "compose": "Compose",
+    "compose": "Post",
     "confirm": "Confirm",
     "create_account": "Create account",
     "done": "Done",
@@ -64,8 +64,8 @@
     "favourited": "Favorited",
     "more": "More",
     "next": "Next",
+    "post": "Post",
     "prev": "Prev",
-    "publish": "Publish",
     "reply": "Reply",
     "reply_count": "{0}",
     "reset": "Reset",
diff --git a/pages/compose.vue b/pages/compose.vue
index 4b2e59ef0c..a0a4d8cd81 100644
--- a/pages/compose.vue
+++ b/pages/compose.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { ref } from 'vue'
+
 definePageMeta({
   middleware: 'auth',
 })
@@ -8,8 +10,15 @@ const { t } = useI18n()
 useHydratedHead({
   title: () => t('nav.compose'),
 })
+
+const publishSnackbar = ref(null)
+
+function onPublish() {
+  publishSnackbar.value.show()
+}
 </script>
 
 <template>
-  <PublishWidgetFull />
+  <PublishWidgetFull @published="onPublish" />
+  <PublishSnackbar ref="publishSnackbar" />
 </template>
diff --git a/styles/vars.css b/styles/vars.css
index 5bd3dc571d..432c378b25 100644
--- a/styles/vars.css
+++ b/styles/vars.css
@@ -53,14 +53,14 @@
   --c-bg-code: #ffffff06;
   --c-bg-dm: #0a2f35;
 
-  --c-text-base: #f3f3f3;
+  --c-text-base: #FBFBFE;
   --c-text-base-light: #232323;
   --c-text-code: #ecd88e;
   --c-text-secondary: #888;
   --c-text-secondary-light: #686868;
 
-  --c-bg-btn-disabled: #2a2a2a;
-  --c-text-btn-disabled: #919191;
+  --c-bg-btn-disabled: #9F9FAD;
+  --c-text-btn-disabled: #15141A;
 
   --c-moz-logo-background: white;
   --c-moz-logo-text: black;