From 49bfb86ff4e2116eeee1994860ed85d07908f3b3 Mon Sep 17 00:00:00 2001
From: Gux <varshney.nikunj@gmail.com>
Date: Wed, 29 May 2019 06:04:25 -0400
Subject: [PATCH 1/2] (FEAT) Show active link on side bar and image in editor

---
 src/components/RichTextEditor.vue | 13 ++++++++++-
 src/components/section/Layout.vue | 39 ++++++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/components/RichTextEditor.vue b/src/components/RichTextEditor.vue
index e01f193..d26cc63 100644
--- a/src/components/RichTextEditor.vue
+++ b/src/components/RichTextEditor.vue
@@ -62,6 +62,7 @@
     History,
     HorizontalRule,
     Mention,
+    Image,
   } from 'tiptap-extensions'
 
   export default {
@@ -94,6 +95,7 @@
             new ListItem(),
             new TodoItem(),
             new TodoList(),
+            new Image(),
             new Bold(),
             new Code(),
             new Italic(),
@@ -186,6 +188,7 @@
           {name: 'underline', icon: 'underline'},
           {name: 'strike', icon: 'strikethrough'},
           {name: 'link', icon: 'link'},
+          {name: 'image', icon: 'image'},
           {name: 'heading', icon: 'heading'},
           {name: 'horizontal_rule', icon: 'minus'},
         ],
@@ -219,6 +222,9 @@
           case 'heading':
             this.editor.commands.heading({level: 1});
             break;
+          case 'image':
+            this.showImagePrompt();
+            break;
           case 'link':
             const {empty} = this.editor.state.tr.selection;
             if (empty) {
@@ -266,11 +272,16 @@
           return link;
         }
       },
+      showImagePrompt() {
+        const src = prompt('Enter the url of your image here')
+        if (src !== null) {
+          this.editor.commands.image({ src })
+        }
+      },
       setLinkUrl(url) {
         this.editor.commands.link({href: url});
         this.editor.focus()
       },
-
       // navigate to the previous item
       // if it's the first item, navigate to the last one
       upHandler() {
diff --git a/src/components/section/Layout.vue b/src/components/section/Layout.vue
index b02c8d7..437fc6a 100644
--- a/src/components/section/Layout.vue
+++ b/src/components/section/Layout.vue
@@ -56,9 +56,9 @@
         <div class="navbar">
           <div class="brand">
             <div>
-              <router-link :to="{ name: 'Index' }">
+              <span class="pointer" @click="$router.push({name: 'Index'})">
                 <img :src="brand_logo" style="height: 38px;">
-              </router-link>
+              </span>
             </div>
 
             <div class="flex">
@@ -183,16 +183,25 @@
         <div class="row">
           <div v-if="$root.mode === 'normal'" class="col-0 col-lg-3 col-xl-3 sidebarblock">
             <div class="desktop block">
-              <router-link class="dropdown-item"
-                :to="{name: 'Index' }">
+              <router-link
+                class="dropdown-item sidebar-nav-item"
+                :to="{name: 'Index' }"
+                :exact="true">
+                <font-awesome-icon :icon="['fas', 'home']" />
                 home
               </router-link>
-              <router-link class="dropdown-item"
-                :to="{name: 'Feed' }">
+              <router-link
+                class="dropdown-item sidebar-nav-item"
+                :to="{name: 'Feed' }"
+                 :exact="true">
+                <font-awesome-icon :icon="['fas', 'newspaper']" />
                 feed
               </router-link>
-              <router-link class="dropdown-item"
-                :to="{name: 'Sub', params: { sub: 'all' } }">
+              <router-link
+                class="dropdown-item sidebar-nav-item"
+                :to="{name: 'Sub', params: { sub: 'all' } }"
+                 :exact="true">
+                <font-awesome-icon :icon="['fas', 'globe']" />
                 all
               </router-link>
               <router-link v-if="eos_referendum"
@@ -633,4 +642,18 @@ export default {
 .buy-banner-modal .footer button {
   margin-left: 10px;
 }
+.pointer {
+  cursor: pointer;
+}
+.router-link-active {
+  background: #e0e1e2;
+}
+.sidebar-nav-item {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.sidebar-nav-item svg {
+  margin-right: 5px;
+}
 </style>

From 922859250542d50d37c87db4e725b6711fc4efce Mon Sep 17 00:00:00 2001
From: Gux <varshney.nikunj@gmail.com>
Date: Wed, 29 May 2019 06:08:34 -0400
Subject: [PATCH 2/2] (FEAT) Show icon for referendume

---
 src/components/section/Layout.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/section/Layout.vue b/src/components/section/Layout.vue
index 437fc6a..281d92c 100644
--- a/src/components/section/Layout.vue
+++ b/src/components/section/Layout.vue
@@ -187,26 +187,27 @@
                 class="dropdown-item sidebar-nav-item"
                 :to="{name: 'Index' }"
                 :exact="true">
-                <font-awesome-icon :icon="['fas', 'home']" />
+                <font-awesome-icon class="fas sidebar-nav-icon" :icon="['fas', 'home']" />
                 home
               </router-link>
               <router-link
                 class="dropdown-item sidebar-nav-item"
                 :to="{name: 'Feed' }"
                  :exact="true">
-                <font-awesome-icon :icon="['fas', 'newspaper']" />
+                <font-awesome-icon class="fas sidebar-nav-icon" :icon="['fas', 'newspaper']" />
                 feed
               </router-link>
               <router-link
                 class="dropdown-item sidebar-nav-item"
                 :to="{name: 'Sub', params: { sub: 'all' } }"
                  :exact="true">
-                <font-awesome-icon :icon="['fas', 'globe']" />
+                <font-awesome-icon class="fas sidebar-nav-icon" :icon="['fas', 'globe']" />
                 all
               </router-link>
               <router-link v-if="eos_referendum"
-                class="dropdown-item"
+                class="dropdown-item sidebar-nav-item"
                 :to="{name: 'Sub', params: { sub: 'referendum' } }">
+                <font-awesome-icon class="fas sidebar-nav-icon" :icon="['fas', 'poll']" />
                   referendum
               </router-link>
               <div class="divline" />
@@ -215,7 +216,7 @@
                   :key="`userSub-${i}`"
                   class="dropdown-item"
                   :to="{ name: 'UserProfile', params: { account: user } }">
-                  <font-awesome-icon class="fas follow-user-icon" :icon="['fas', 'user-circle']" />
+                  <font-awesome-icon class="fas sidebar-nav-icon" :icon="['fas', 'user-circle']" />
                   <div>
                     {{ user }}
                   </div>
@@ -566,7 +567,7 @@ export default {
 }
 </style>
 <style scoped>
-.follow-user-icon {
+.sidebar-nav-icon {
   width: 20px;
   height: 20px;
   margin-right: 5px;