Merge pull request #7 from dhealthproject/next

v1.2.0: dHealth Branding & Jenkins

CHANGELOG.md

@@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.
 
 The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.2.0][1.2.0] - 29-Mar-2022
+
+#### Added
+
+- Adds Jenkinsfile for automatic builds targetting next
+
+#### Changed
+
+- Changes theme colors to dHealth branding
+- Changes logos and links for dHealth Network
+- Adds link to dHealth Developer Hub
+- Fixes vulnerabilities as reported by dependabot
+
 ## [1.0.0][1.0.0] - 20-May-2021
 
 #### Changed
@@ -13,4 +26,5 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
 
 - Some missing re-branding items for dHealth logos.
 
+[1.2.0]: https://github.com/dhealthproject/dhealth-explorer/releases/tag/v1.2.0
 [1.0.0]: https://github.com/dhealthproject/dhealth-explorer/releases/tag/v1.0.0

Jenkinsfile

@@ -0,0 +1,32 @@
+pipeline {
+    agent any
+    stages {
+        stage('Download dependencies') {
+            steps {
+                echo 'Downloading dependencies...'
+                sh 'npm install'
+            }
+        }
+
+        stage('Run linter checks') {
+            steps {
+                echo 'Running linter checks...'
+                sh 'npm run lint'
+            }
+        }
+
+        stage('Build software') {
+            steps {
+                echo 'Running compiler...'
+                sh 'npm run build'
+            }
+        }
+
+        stage('Run unit tests') {
+            steps {
+                echo 'Running unit tests...'
+                sh 'npm run test'
+            }
+        }
+    }
+}

package.json

@@ -2,7 +2,7 @@
     "name": "dhealth-explorer",
     "description": "dHealth Explorer: Public Blockchain Infrastructure for Healthcare",
     "homepage": "https://github.com/dhealthproject/dhealth-explorer",
-    "version": "1.0.0",
+    "version": "1.2.0",
     "author": {
         "name": "Using Blockchain Ltd",
         "email": "[email protected]",

src/components/NemDescription.vue

@@ -19,8 +19,8 @@
 <template>
 	<b-col sm="12" lg="4">
 		<div class="ft-logo">
-			<a href="https://dhealth.network/" target="_blank" style="height: 60px;">
-				<img src="../styles/img/logo-f-w.dhealth.png" />
+			<a href="https://dhealth.network/" target="_blank" style="height: 30px;">
+				<img src="../styles/img/dhealth_logo_white.png" />
 			</a>
 		</div>
 		<div class="ft-desc mt-3">

src/components/containers/Card.vue

@@ -45,7 +45,7 @@ export default {
 <style lang="scss" scoped>
 .ex-card {
     //padding: 20px;
-    box-shadow: 0 1px 15px 1px #da50da2c;
+    box-shadow: 0 1px 15px 1px $sand-color;
     background: #fff;
     border-radius: 4px;
     border: none;

src/components/layout/Footer.vue

@@ -59,6 +59,7 @@ import IconReddit from 'vue-material-design-icons/Reddit.vue';
 import IconForum from 'vue-material-design-icons/Forum.vue';
 import IconTelegram from 'vue-material-design-icons/Telegram.vue';
 import IconHomeCurrencyUsd from 'vue-material-design-icons/HomeCurrencyUsd.vue';
+import IconBookOpenPageVariant from 'vue-material-design-icons/BookOpenPageVariant.vue';
 import globalConfig from '../../config/globalConfig';
 
 export default {
@@ -72,7 +73,8 @@ export default {
 		IconReddit,
 		IconForum,
 		IconTelegram,
-		IconHomeCurrencyUsd
+		IconHomeCurrencyUsd,
+		IconBookOpenPageVariant
 	},
 
 	data() {
@@ -90,7 +92,7 @@ export default {
 }
 
 .footer {
-    background: #410078;
+    background: linear-gradient(315.55deg, $primary-color -1.68%, $secondary-color 110.7%);
     padding: 50px 0 0;
     width: 100%;
     position: relative;
@@ -108,7 +110,7 @@ export default {
 
 .footer::before {
     content: '';
-    background-image: url(../../styles/img/symbol_connector_crop2.jpg);
+    // background-image: url(../../styles/img/symbol_connector_crop2.jpg);
     position: absolute;
     z-index: 0;
     bottom: 0;

src/components/layout/Header.vue

@@ -5,8 +5,8 @@
 				<b-row>
 					<b-col md="3" class="header-left">
 						<router-link to="/" class="d-none d-md-block">
-							<img v-if="isTestnet" src="../../styles/img/symbol_logo_white_testnet.png" class="header-logo"/>
-							<img v-else src="../../styles/img/symbol_logo_white_aw.png" class="header-logo"/>
+							<img v-if="isTestnet" src="../../styles/img/dhealth_logo_white.png" class="header-logo"/>
+							<img v-else src="../../styles/img/dhealth_logo_white.png" class="header-logo"/>
 						</router-link>
 					</b-col>
 					<b-col md="6" class="header-center">
@@ -71,11 +71,11 @@ export default {
 
 <style lang="scss" scoped>
 .mainnet-gradient {
-    background: linear-gradient(120deg, var(--primary) 0%, var(--secondary) 100%);
+    background: linear-gradient(315.55deg, $primary-color -1.68%, $secondary-color 110.7%);
 }
 
 .testnet-gradient {
-    background: linear-gradient(120deg, rgb(43, 1, 102) 0%, rgb(67, 0, 78) 80%);
+    background: linear-gradient(315.55deg, $primary-color -1.68%, $secondary-color 110.7%);
 }
 
 .header-gradinet {
@@ -140,7 +140,7 @@ export default {
 
         .header-logo {
             width: 100%;
-            max-width: 193px;
+            max-width: 277px;
         }
     }
 
@@ -151,7 +151,6 @@ export default {
         .header-title {
             color: #fff;
             font-weight: 500;
-            text-transform: capitalize;
             font-size: 18px;
             margin-top: 14px;
             margin-bottom: 0.5rem;

src/components/menu/MobileMenu.vue

@@ -206,7 +206,7 @@ export default {
     }
 
     .mobile-panel {
-        background: linear-gradient(120deg, var(--primary) 0%, var(--secondary) 100%);
+        background: linear-gradient(315.55deg, $primary-color -1.68%, $secondary-color 110.7%);
         box-shadow: 0 2px 10px 2px rgba(0, 0, 0, 0.2);
         padding: 0 15px;
         display: flex;

src/components/menu/NavigationMenu.vue

@@ -82,11 +82,11 @@ export default {
 
 <style lang="scss" scoped>
 .testnet-gradient {
-    background: linear-gradient(120deg, rgb(43, 1, 102) 0%, rgb(67, 0, 78) 80%);
+    background: linear-gradient(315.55deg, $primary-color -1.68%, $secondary-color 110.7%);
 }
 
 .mainnet-gradient {
-    background: linear-gradient(120deg, var(--primary) 0%, var(--secondary) 100%);
+    background: linear-gradient(315.55deg, $primary-color -1.68%, $secondary-color 110.7%);
 }
 
 .header-gradinet {

src/components/widgets/BaseInfoWidget.vue

@@ -118,7 +118,7 @@ export default {
 
 <style lang="scss" scoped>
 .ex-item {
-    border-left: 4px solid #904d9c;
+    border-left: 4px solid $navy-color;
     padding: 1px 10px;
     margin-bottom: 15px;
 

src/components/widgets/NetworkFeesWidget.vue

@@ -72,7 +72,7 @@ export default {
 
 <style lang="scss" scoped>
 .ex-item {
-    border-left: 4px solid #904d9c;
+    border-left: 4px solid $navy-color;
     padding: 1px 10px;
     margin-bottom: 15px;
 

src/components/widgets/NetworkRentalFeesWidget.vue

@@ -64,7 +64,7 @@ export default {
 
 <style lang="scss" scoped>
 .ex-item {
-    border-left: 4px solid #904d9c;
+    border-left: 4px solid $navy-color;
     padding: 1px 10px;
     margin-bottom: 15px;
 

src/components/widgets/NodeStatsWidget.vue

@@ -160,15 +160,15 @@ export default {
 
 @media (max-width: 760px) {
     .ex-item {
-        border-left: 4px solid #904d9c;
+        border-left: 4px solid $navy-color;
         padding: 1px 10px;
         margin-bottom: 15px;
         max-width: 150px;
     }
 }
 
 .ex-item {
-    border-left: 4px solid #904d9c;
+    border-left: 4px solid $navy-color;
     padding: 1px 10px;
     margin-bottom: 15px;
 }

src/components/widgets/RecentBlocksWidget.vue

@@ -104,7 +104,7 @@ export default {
     padding: 0;
     left: 0;
     top: 0;
-    background: #763f80;
+    background: $navy-color;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
 }

src/components/widgets/RecentTransactionsWidget.vue

@@ -104,7 +104,7 @@ export default {
     padding: 0;
     left: 0;
     top: 0;
-    background: #ab5cb9;
+    background: $navy-color;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
 }

src/config/default.json

@@ -41,6 +41,11 @@
 				"href": "https://github.com/UsingBlockchain",
 				"text": "Github",
 				"icon": "IconGithub"
+			},
+			{
+				"href": "http://docs.dhealth.com",
+				"text": "Developer Hub",
+				"icon": "IconBookOpenPageVariant"
 			}
 		]
 	}

src/styles/variables.scss

@@ -1,18 +1,20 @@
 // --- Symbol color palette ---
 
-$primary-color: #5200c6;
-$secondary-color: #44004e;
+$primary-color: #150867;
+$secondary-color: #2970ff;
 $red-color: red;
 $pink-color: #f0f;
 $accent-color: #f0f;
 $blue-color: #00c8ff;
 $green-color: #33dd50;
 $orange-color: #ff9600;
 $dark-white-color: #f3f4f8;
+$navy-color: #150867;
+$sand-color: #f0efec;
 
 // --- General colors --- 
 
-$title-text-color: $pink-color;
+$title-text-color: $navy-color;
 $link-text-color: $primary-color;
 $card-error-text-color: #98a8b4;
 $clickable-item: #fffc;