Fixed bug where the user poposer only showed in mobile

elsiehupp · May 30, 2021 · a53b3a1 · a53b3a1
1 parent 62aba9d
commit a53b3a1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/website/macos-big-sur-icons/src/components/Header.vue b/website/macos-big-sur-icons/src/components/Header.vue
@@ -7,7 +7,7 @@
         <!-- <div v-if="true">
             {{ toggleOverflow() }}
         </div> -->
-
+        <OptionsMenu :optionsList="optionsList"/>
         <Dialog/>
         <SubmissionDialog/>
         <LoginDialog/>
@@ -56,12 +56,15 @@
                         <!-- Account Profile -->
                         <div v-if="getUser.isAuth" class="profile-nav">
                             <img 
-                                id="profilePicNav" 
-                                @click="showEl('profileNavPopover')" 
+                                id="profilePicNav-mobile" 
+                                @click="showEl({
+                                    elId: 'profileNavPopover', 
+                                    targetId: 'profilePicNav-mobile'
+                                })"
                                 class="profile-pic-nav m-l-5" 
                                 :src="icons.profilePic" alt=""
                             >
-                            <OptionsMenu :optionsList="optionsList"/>
+                            <!-- <OptionsMenu :optionsList="optionsList"/> -->
                         </div>
 
                         <!-- Back to all icons -->
@@ -218,12 +221,14 @@
                         </button>
 
                         <img 
-                            id="profilePicNav" 
-                            @click="showEl('profileNavPopover')" 
+                            id="profilePicNav-desktop" 
+                            @click="showEl({
+                                elId: 'profileNavPopover',
+                                targetId: 'profilePicNav-desktop'
+                                })" 
                             class="profile-pic-nav m-l-5" 
                             :src="icons.profilePic" alt=""
                         >
-                        <OptionsMenu :optionsList="optionsList"/>
                     </div>
 
                     <!-- Submit icons -->

diff --git a/website/macos-big-sur-icons/src/components/Home.vue b/website/macos-big-sur-icons/src/components/Home.vue
@@ -215,7 +215,6 @@ import dotenv from 'dotenv'; // Used to access env varaibles
 dotenv.config()
 
 // TODO: remove credentials
-
 const VUE_APP_PARSE_APP_ID = process.env.VUE_APP_PARSE_APP_ID
 const VUE_APP_PARSE_JAVASCRIPT_KEY = process.env.VUE_APP_PARSE_JAVASCRIPT_KEY
 
@@ -226,7 +225,6 @@ var Icons = Parse.Object.extend("Icons2");
 
 let algolia = {
     // TODO: remove credentials
-
     appid: process.env.VUE_APP_ALGOLIA_APPID,
     apikey: process.env.VUE_APP_ALGOLIA_KEY
 }

diff --git a/website/macos-big-sur-icons/src/components/SubmissionDialog.vue b/website/macos-big-sur-icons/src/components/SubmissionDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <coral-dialog id="submissionDialog" focusOnShow="off">
+  <coral-dialog id="submissionDialog">
 
     <coral-dialog-header>
       Submit an icon

diff --git a/website/macos-big-sur-icons/src/store/store.js b/website/macos-big-sur-icons/src/store/store.js
@@ -208,7 +208,15 @@ export default new Vuex.Store({
     },
 
     showEl(store, id){
-      document.getElementById(id).show()
+      console.log(id);
+      if(id.elId != undefined){
+        console.log(document.getElementById(id.elId));
+        document.getElementById(id.elId).target = "#"+id.targetId
+        document.getElementById(id.elId).show()
+        console.log("Hoiii");
+      } else{
+        document.getElementById(id).show()
+      }
     },
 
     setUser(store, user){