Merge pull request #1357 from hypersign-protocol/branding

Branding
hypersign-protocol · Jun 23, 2022 · c24ee3e · c24ee3e
2 parents 83af2c3 + 143e35c
commit c24ee3e
Show file tree

Hide file tree

Showing 15 changed files with 117 additions and 161 deletions.
diff --git a/public/index.html b/public/index.html
@@ -1,100 +1,71 @@
 <!DOCTYPE html>
 <html>
-  <head>
 
-   <!-- Google Tag Manager -->
-  <script>(function(w,d,s,l,i){w[l]=w[l]||[];
-  w[l].push({'gtm.start':
-  new Date().getTime(),event:'gtm.js'});
-  var f=d.getElementsByTagName(s)[0],
-  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';
-  j.async=true;
-  j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;
-  f.parentNode.insertBefore(j,f);
-  })(window,document,'script','dataLayer','<%= process.env.VUE_APP_GA_CODE%>');
-  </script>
-  <!-- End Google Tag Manager -->
-
-    <script
-      async
-      src="https://platform.twitter.com/widgets.js"
-      charset="utf-8"
-    ></script>
+<head>
+
+    <!-- Google Tag Manager -->
+    <script>
+        (function(w, d, s, l, i) {
+            w[l] = w[l] || [];
+            w[l].push({
+                'gtm.start': new Date().getTime(),
+                event: 'gtm.js'
+            });
+            var f = d.getElementsByTagName(s)[0],
+                j = d.createElement(s),
+                dl = l != 'dataLayer' ? '&l=' + l : '';
+            j.async = true;
+            j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+            f.parentNode.insertBefore(j, f);
+        })(window, document, 'script', 'dataLayer', '<%= process.env.VUE_APP_GA_CODE%>');
+    </script>
+    <!-- End Google Tag Manager -->
+
+    <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
     <script type="text/javascript">
-      (function() {
-        var script = document.createElement("script");
-        script.type = "text/javascript";
-        script.async = true;
-        script.src = "//telegram.im/widget-button/index.php?id=@hypersignchain";
-        document.getElementsByTagName("head")[0].appendChild(script);
-      })();
+        (function() {
+            var script = document.createElement("script");
+            script.type = "text/javascript";
+            script.async = true;
+            script.src = "//telegram.im/widget-button/index.php?id=@hypersignchain";
+            document.getElementsByTagName("head")[0].appendChild(script);
+        })();
     </script>
 
-    
+
 
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <link 
-    rel="apple-touch-icon" 
-    sizes="180x180" 
-    href="/apple-touch-icon.png"
-    >
-    <link 
-    rel="icon" 
-    type="image/png" 
-    sizes="32x32" 
-    href="/favicon-32x32.png"
-    >
-    <link 
-    rel="icon" 
-    type="image/png" 
-    sizes="16x16" 
-    href="/favicon-16x16.png"
-    >
-    <link 
-    rel="manifest" 
-    href="/site.webmanifest"
-    >
-    <link 
-    rel="mask-icon" 
-    href="/safari-pinned-tab.svg" 
-    color="#5bbad5"
-    >
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
     <meta name="msapplication-TileColor" content="#da532c">
     <meta name="theme-color" content="#ffffff">
 
 
-    <title>HyperFyre</title>
-    <link
-      rel="stylesheet"
-      href="https://unpkg.com/vue-easytable/libs/theme-default/index.css"
-    />
+    <title>Fyre</title>
+    <link rel="stylesheet" href="https://unpkg.com/vue-easytable/libs/theme-default/index.css" />
     <link rel="preconnect" href="https://fonts.gstatic.com" />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;300;500;600&display=swap"
-      rel="stylesheet"
-    />
+    <link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@100;200;300;500;600&display=swap" rel="stylesheet" />
 
-    <link
-      rel="stylesheet"
-      href="https://use.fontawesome.com/releases/v5.7.0/css/all.css"
-      integrity="sha384-lZN37f5QGtY3VHgisS14W3ExzMWZxybE1SJSEsQp9S+oqd12jhcu+A56Ebc1zFSJ"
-      crossorigin="anonymous"
-    />
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css" integrity="sha384-lZN37f5QGtY3VHgisS14W3ExzMWZxybE1SJSEsQp9S+oqd12jhcu+A56Ebc1zFSJ" crossorigin="anonymous" />
 
     <style>
-      body {
-        overflow-x: hidden;
-      }
+        body {
+            overflow-x: hidden;
+        }
     </style>
-  </head>
-  <body>
+</head>
+
+<body>
 
-  <!-- Google Tag Manager (noscript) -->
-  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= process.env.VUE_APP_GA_CODE %>"
+    <!-- Google Tag Manager (noscript) -->
+    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= process.env.VUE_APP_GA_CODE %>"
   height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-  <!-- End Google Tag Manager (noscript) -->
+    <!-- End Google Tag Manager (noscript) -->
 
 
     <noscript>
@@ -106,5 +77,6 @@
     <div id="app"></div>
     <script src="https://telegram.org/js/telegram-widget.js"></script>
     <!-- built files will be auto injected -->
-  </body>
-</html>
+</body>
+
+</html>
diff --git a/public/site.webmanifest b/public/site.webmanifest
@@ -1,14 +1,12 @@
 {
-    "name": "Hyperfyre",
-    "short_name": "Hyperfyre",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        }
-    ],
+    "name": "Fyre",
+    "short_name": "Fyre",
+    "icons": [{
+        "src": "/android-chrome-192x192.png",
+        "sizes": "192x192",
+        "type": "image/png"
+    }],
     "theme_color": "#ffffff",
     "background_color": "#ffffff",
     "display": "standalone"
-}
+}
diff --git a/src/App.vue b/src/App.vue
@@ -9,26 +9,30 @@
           : '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">
+      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">
         <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 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/Fyre_Small.png')" alt="logo" width="130vw" /></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" />
         </div>
         <span slot="footer" class="text-center" style="font-size:14px; padding: 7px; border: 1px solid #80808014;">
-        <a href="https://docs.fyre.hypersign.id/" target="_blank" style="text-decoration: none; background-color: transparent;color: #8B8B8B;">Docs</a></span>
+          <a href="https://docs.fyre.hypersign.id/" target="_blank"
+            style="text-decoration: none; background-color: transparent;color: #8B8B8B;">Docs</a></span>
         <span slot="footer" class="text-center" style="font-size: 12px; padding: 7px;">{{ $config.app.version }}</span>
       </sidebar-menu>
       <!-- <div class="content-wrapper"> -->
-       <div :class="[
+      <div :class="[
         showNavbar
             ? 'content-wrapper'
             : 'content-wrapper-not',
@@ -38,7 +42,7 @@
       <div class="footer">Powered By: <a href="https://hypersign.id/" target="_blank"> HyperSign</a></div>
     </div>
     <notifications group="foo" />
-    <KommunicateChat v-if="showChat"/>
+    <KommunicateChat v-if="showChat" />
   </div>
 </template>
 <script>

diff --git a/src/assets/Fyre_Gold_Black.png b/src/assets/Fyre_Gold_Black.png
diff --git a/src/assets/Fyre_Small.png b/src/assets/Fyre_Small.png
diff --git a/src/components/admin/createProjectSlider/components/EventActionConfig.vue b/src/components/admin/createProjectSlider/components/EventActionConfig.vue
@@ -602,7 +602,7 @@
             <a
               target="_blank"
               :href="`https://telegram.me/hyperfyre_stage_bot?startgroup=any`"
-              >Hyperfyre Telegram Bot</a
+              >Fyre Telegram Bot</a
             >
             in your public group, for this functionality to work properly.</span
           >

diff --git a/src/components/admin/selectPlanSlider/components/EventActionConfig.vue b/src/components/admin/selectPlanSlider/components/EventActionConfig.vue
@@ -246,7 +246,7 @@
             <a
               target="_blank"
               :href="`https://telegram.me/${hfTgBotId}?startgroup=any`"
-              >Hyperfyre Telegram Bot</a
+              >Fyre Telegram Bot</a
             >
             in your public group, for this functionality to work properly.</span
           >

diff --git a/src/components/participant/NavBar.vue b/src/components/participant/NavBar.vue
@@ -14,17 +14,18 @@ color: white !important;
 <template>
 	<b-navbar class="nav-bar" toggleable="lg" v-if="show">
 		<b-navbar-brand href="https://fyre.hypersign.id/" target="blank">
-			<img src="../../assets/logo.png"  height="35px">
+			<img src="../../assets/Fyre_Small.png" height="50px">
 		</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">
 		</a> -->
-		<b-nav-item-dropdown size="sm" right  class="btn-secondary m-2 menu ml-auto text-white text-decoration-none" v-if="authToken != '' && authToken != null">
+		<b-nav-item-dropdown size="sm" right class="btn-secondary m-2 menu ml-auto text-white text-decoration-none"
+			v-if="authToken != '' && authToken != null">
 			<template #button-content>
 				<b-icon style="color:white" icon="menu-button-wide"></b-icon>
 			</template>
 			<b-dropdown-item to="/user/home/">
-				Home</b-dropdown-item> 
+				Home</b-dropdown-item>
 			<b-dropdown-item @click="logout">Logout</b-dropdown-item>
 		</b-nav-item-dropdown>
 	</b-navbar>

diff --git a/src/router.js b/src/router.js
@@ -18,7 +18,7 @@ const router = new Router({
                 ),
             meta: (route) => ({
                 requiresAuth: false,
-                title: "Hyperfyre - " + route.params.slug,
+                title: "Fyre - " + route.params.slug,
                 tabbar: false,
             }),
         },
@@ -30,7 +30,7 @@ const router = new Router({
                     /* webpackChunkName: "investorLogin" */
                     "./views/participant/Home.vue"
                 ),
-            meta: () => ({ requiresAuth: true, title: 'Hyperfyre - User Home' })
+            meta: () => ({ requiresAuth: true, title: 'Fyre - User Home' })
         },
         {
             path: "/",
@@ -56,7 +56,7 @@ const router = new Router({
 
             component: () =>
                 import ( /* webpackChunkName: "adminLogin" */ './views/admin/AdminLogin.vue'),
-            meta: () => ({ requiresAuth: true, title: 'Hyperfyre - Admin Login', tabbar: false })
+            meta: () => ({ requiresAuth: true, title: 'Fyre - Admin Login', tabbar: false })
 
         },
         {
@@ -65,7 +65,9 @@ const router = new Router({
 
             component: () =>
                 import ( /* webpackChunkName: "adminLogin" */ './views/404.vue'),
-
+            meta: {
+                title: 'Fyre - 404'
+            }
         },
         {
             path: "/admin/dashboard",
@@ -78,7 +80,7 @@ const router = new Router({
             meta: {
                 requiresAuth: true,
                 admin: true,
-                title: 'Hyperfyre - Admin Dashboard'
+                title: 'Fyre - Admin Dashboard'
             },
         },
         {
@@ -92,7 +94,7 @@ const router = new Router({
             meta: {
                 requiresAuth: true,
                 admin: true,
-                title: 'Hyperfyre - Teams'
+                title: 'Fyre - Teams'
             },
         },
         {
@@ -106,7 +108,7 @@ const router = new Router({
             meta: {
                 requiresAuth: true,
                 admin: true,
-                title: 'Hyperfyre - CreateApp'
+                title: 'Fyre - CreateApp'
             },
         },
         {
@@ -120,7 +122,7 @@ const router = new Router({
             meta: {
                 requiresAuth: true,
                 admin: true,
-                title: 'Hyperfyre - Participants',
+                title: 'Fyre - Participants',
             },
         },
         {
@@ -131,7 +133,7 @@ const router = new Router({
             meta: {
                 requiresAuth: true,
                 admin: true,
-                title: 'Hyperfyre - Events'
+                title: 'Fyre - Events'
             },
         },
         {
@@ -145,7 +147,7 @@ const router = new Router({
             meta: {
                 requiresAuth: true,
                 admin: true,
-                title: 'Hyperfyre - Subscription'
+                title: 'Fyre - Subscription'
             },
         },
         {
@@ -156,7 +158,7 @@ const router = new Router({
             meta: {
                 requiresAuth: false,
                 admin: false,
-                title: 'Hyperfyre - SuperAdmin Home'
+                title: 'Fyre - SuperAdmin Home'
             },
         },
     ],