WIP(profile): close icon moved to profile.vue

website/client/src/components/userMenu/profile.vue

@@ -1,5 +1,8 @@
 <template>
   <div>
+    <close-x
+      @click="close()"
+    />
     <div
       v-if="!user && userLoaded"
     >
@@ -956,6 +959,7 @@ import markdown from '@/directives/markdown';
 import achievementsLib from '@/../../common/script/libs/achievements';
 import Content from '@/../../common/script/content';
 import profileStats from './profileStats';
+import closeX from '../ui/closeX';
 
 import message from '@/assets/svg/message.svg';
 import gift from '@/assets/svg/gift.svg';
@@ -986,6 +990,7 @@ export default {
     profileStats,
     error404,
     toggle,
+    closeX,
   },
   mixins: [externalLinks, userCustomStateMixin('userLoggedIn')],
   props: ['userId', 'startingPage'],
@@ -1317,6 +1322,9 @@ export default {
       this.isOpened = true;
       this.$emit('toggled', this.isOpened);
     },
+    close () {
+      this.$root.$emit('bv::hide::modal', 'profile');
+    },
   },
 };
 </script>

website/client/src/components/userMenu/profileModal.vue

@@ -6,9 +6,6 @@
     @hide="beforeHide"
     @shown="onShown()"
   >
-    <close-x
-      @click="close()"
-    />
     <profile
       :user-id="userId"
       :starting-page="startingPage"
@@ -47,12 +44,10 @@
 
 <script>
 import profile from './profile';
-import closeX from '../ui/closeX';
 
 export default {
   components: {
     profile,
-    closeX,
   },
   data () {
     return {
@@ -82,9 +77,6 @@ export default {
       }
     },
   },
-  close () {
-    this.$root.$emit('bv::hide::modal', 'profile');
-  },
 };