Merge pull request #1003 from hypersign-protocol/stage

v5.0.6
hypersign-protocol · Mar 2, 2022 · d7ce32c · d7ce32c
2 parents e9a60c9 + 8f15e3e
commit d7ce32c
Show file tree

Hide file tree

Showing 8 changed files with 189 additions and 137 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -1,26 +1,36 @@
 <template>
   <div id="app">
     <NavBar title="HyperFyre" :show="showUserNav" />
-    <div :class="[
+    <!-- <div :class="[
         showNavbar & !showUserNav
           ? isSidebarCollapsed
             ? 'showNavbar collapsed'
             : 'showNavbar notCollapsed'
           : 'hideNavbar',
+      ]"> -->
+    <div :class="[
+        isSidebarCollapsed 
+            ? 'container-collapsed-not hideNavbar'
+            : 'container-collapsed',
       ]">
       <sidebar-menu class="sidebar-wrapper" @toggle-collapse="onToggleCollapse" :collapsed="isSidebarCollapsed" @item-click="onItemClick" :theme="'white-theme'" width="220px" 
       :menu="isSubscribed? menu : unsubsSubscribedMenu" v-if="showNavbar">
-        <span slot="header" style="background:#363740">
+        <div slot="header" style="background:#363740">
           <div class="ml-1 mt-3 mb-2" style="padding-left:1px; text-align:center; margin-right: 2.25rem !important;" > 
           <a  v-if="!isSidebarCollapsed" href="/admin/dashboard"><img :src="require('./assets/logo.png')" alt="logo" width="175vw" /></a>
           <a v-if="isSidebarCollapsed" href="/admin/dashboard"><img :src="require('./assets/favicon.png')" alt="logo" width="35vw" /></a>
           </div>
           <!-- <p class="header-text">{{ $config.app.name }}</p> -->
           <hr class="rule" />
-        </span>
+        </div>
         <span slot="footer" class="text-center">{{ $config.app.version }}</span>
       </sidebar-menu>
-      <div class="content-wrapper">
+      <!-- <div class="content-wrapper"> -->
+       <div :class="[
+        showNavbar
+            ? 'content-wrapper'
+            : 'content-wrapper-not',
+      ]">
         <router-view />
       </div>
       <div class="footer">Powered By: <a href="https://hypersign.id/" target="_blank"> HyperSign</a></div>
@@ -62,24 +72,35 @@ export default {
           exactPath: true,
         },
         {
-          href: "/admin/subscription",
-          title: "Subscriptions",
-          icon: "fas fa-receipt",
-          exactPath: true,
-        },
-        {
-          href: "/admin/teams",
-          title: "Teams",
-          icon: "fas fa-user-plus",
-          exactPath: true,
-          
-        },
-        {
-          href: "/admin/login",
-          title: "Logout",
-          icon: "fas fa-sign-out-alt",
-          exactPath: true,
-        },
+          title: "Settings",
+          icon: "fas fa-cog",
+          badge: {
+            text: 'new',
+            class: 'vsm--badge_default'
+            // attributes: {}
+            // element: 'span'
+          },
+          child: [
+            {
+              href: "/admin/teams",
+              title: "Teams",
+              icon: "fas fa-user-plus",
+              exactPath: true,
+            },
+            {
+              href: "/admin/subscription",
+              title: "Subscriptions",
+              icon: "fas fa-receipt",
+              exactPath: true,
+            },
+            {
+              href: "/admin/login",
+              title: "Logout",
+              icon: "fas fa-sign-out-alt",
+              exactPath: true,
+            },
+          ]
+        }
       ],
       unsubsSubscribedMenu: [
         {
@@ -237,10 +258,12 @@ export default {
   margin-bottom: 1%;
 }
 
-.showNavbar .content-wrapper {
+.content-wrapper {
   padding: 50px 20px;
 }
-
+.container-collapsed {
+  padding-left: 150px;
+}
 .showNavbar.notCollapsed>.content-wrapper {
   width: calc(100vw - 200px);
   margin-left: auto;

diff --git a/src/components/admin/Profile.vue b/src/components/admin/Profile.vue
@@ -89,11 +89,12 @@
           <div class="card-body">
             <div class="row">
               <div class="col-md-4">
-                <img
+                <!-- <img
                   src="../../assets/avatar.png"
                   alt="John"
                   style="width: 100%;position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);"
-                />
+                /> -->
+                <b-avatar style="position: absolute;top: 50%;left: 50%;transform: translate(-50%, -50%);" square size="8rem" variant="info" :src="getProfileIcon(user.name) "></b-avatar>
               </div>
               <div class="col-md-8" style="flex-wrap: wrap; padding: 20px">
                 <p>DID</p>
@@ -118,10 +119,13 @@
 </template>
 
 <script>
+import profileIconMixins from "../../mixins/profileIconMixins";
+
 export default {
   name: "Profile",
   mounted() {},
   components: {},
+  mixins: [profileIconMixins],
   data() {
     return {
       active: 0,

diff --git a/src/components/admin/createProjectSlider/components/GeneralConfig.vue b/src/components/admin/createProjectSlider/components/GeneralConfig.vue
@@ -203,7 +203,9 @@
           <label for="endDate" class="col-form-label">Notification: </label>
       </div>
       <div class="col-lg-9 col-md-9 px-0"> 
-        <input  class="largerCheckbox" type="checkbox" v-model="project.isNotificaionEnabled" title="Check to notify all platform users about this event" id="">
+        <b-form-checkbox v-model="project.isNotificaionEnabled" name="check-button" switch>
+        </b-form-checkbox>
+        <!-- <input  class="largerCheckbox" type="checkbox" v-model="project.isNotificaionEnabled" title="Check to notify all platform users about this event" id=""> -->
       </div>  
     </div>
 

diff --git a/src/components/participant/Metrics.vue b/src/components/participant/Metrics.vue
@@ -9,7 +9,7 @@
     <b-col cols="4" sm="4" class="border-right" md="4">
       <div class="py-4">
         <div class="number">{{ totalEntries }}</div>
-        <div class="text">Total Entries</div>
+        <div class="text">Total Users</div>
       </div>
     </b-col>
     <b-col cols="4" sm="4" md="4">

diff --git a/src/components/participant/NavBar.vue b/src/components/participant/NavBar.vue
@@ -1,7 +1,7 @@
 <template>
 	<b-navbar class="nav-bar" toggleable="lg" v-if="show">
 		<b-navbar-brand href="https://fyre.hypersign.id/">
-			<img src="../../assets/logo.png" height="50px">
+			<img src="../../assets/logo.png" height="35px">
 		</b-navbar-brand>
 		<a href="#" class="menu ml-auto text-white text-decoration-none" v-if="authToken != '' && authToken != null" @click="logout">
 			<img src="../../assets/box-arrow-right.svg" height="30px">

diff --git a/src/mixins/profileIconMixins.js b/src/mixins/profileIconMixins.js
@@ -0,0 +1,7 @@
+export default {
+    methods: {
+        getProfileIcon(name) {
+            return "https://avatars.dicebear.com/api/identicon/"+name+".svg"
+        },
+    },
+};
diff --git a/src/views/Invitation.vue b/src/views/Invitation.vue
@@ -56,7 +56,7 @@ methods:{
            return this.$swal.fire({
             position: 'center',
             icon: 'warning',
-            title: `${errorMsg}`,
+            title: `${errorMsg.Error}`,
             showConfirmButton: false,
             timer: 5000
             })