Merge pull request #1 from edmcouncil/master

Merge changes from edmcouncil/html-pages

auto/src/components/Footer.vue

@@ -10,6 +10,9 @@
                 <li>
                   <router-link :to="{ path: router() }">About AUTO</router-link>
                 </li>
+                <li>
+                  <a href="https://spec.edmcouncil.org" v-on:click="outboundLinkClick('https://spec.edmcouncil.org')">OKG</a>
+                </li>                  
                 <li>
                   <router-link :to="{ path: router('ontology') }">AUTO Viewer</router-link>
                 </li>

auto/src/components/Header.vue

@@ -49,13 +49,16 @@
         <ul class="navbar-nav ml-auto">
 
           <li class="nav-item">
-            <router-link class="nav-link" :to="{ path: router() }">About</router-link>
+            <router-link class="nav-link" :to="{ path: router() }">About AUTO</router-link>
           </li>
+          <li class="nav-item">
+            <a href="https://spec.edmcouncil.org" class="nav-link" v-on:click="outboundLinkClick('https://spec.edmcouncil.org')">OKG</a>
+          </li>            
           <li class="nav-item">
             <router-link class="nav-link" :to="{ path: router('ontology') }">AUTO Viewer</router-link>
           </li>
           <li class="nav-item">
-            <router-link class="nav-link" :to="{ path: router('documentation') }">Documentation</router-link>
+            <router-link class="nav-link" :to="{ path: router('documentation') }">Docs</router-link>
           </li>
 <!--          <li class="nav-item dropdown">
             <a

fibo/src/components/Footer.vue

@@ -8,8 +8,11 @@
             <div class="col-md-6">
               <ul>
                 <li>
-                  <router-link :to="{ path: router() }">About</router-link>
+                  <router-link :to="{ path: router() }">About FIBO</router-link>
                 </li>
+                <li>
+                  <a href="https://spec.edmcouncil.org" v-on:click="outboundLinkClick('https://spec.edmcouncil.org')">OKG</a>
+                </li>                
                 <li>
                   <router-link :to="{ path: router('ontology') }">FIBO Viewer</router-link>
                 </li>
@@ -36,7 +39,7 @@
                   <router-link :to="{ path: router('data-dictionary') }">FIBO data dict.</router-link>
                 </li>
                 <li>
-                  <router-link :to="{ path: router('courses') }">FIBO courses</router-link>
+                  <a href="https://spec.edmcouncil.org/courses" v-on:click="outboundLinkClick('https://spec.edmcouncil.org/courses')">FIBO courses</a>
                 </li>
                 <li>
                   <router-link :to="{ path: router('use-cases') }">FIBO use cases</router-link>

fibo/src/components/Header.vue

@@ -48,8 +48,11 @@
       <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav ml-auto">
           <li class="nav-item">
-            <router-link class="nav-link" :to="{ path: router() }">About</router-link>
+            <router-link class="nav-link" :to="{ path: router() }">About FIBO</router-link>
           </li>
+          <li class="nav-item">
+            <a href="https://spec.edmcouncil.org" class="nav-link" v-on:click="outboundLinkClick('https://spec.edmcouncil.org')">OKG</a>
+          </li>          
           <li class="nav-item">
             <router-link class="nav-link" :to="{ path: router('ontology') }">FIBO VIEWER</router-link>
           </li>
@@ -62,7 +65,7 @@
               data-toggle="dropdown"
               aria-haspopup="true"
               aria-expanded="false"
-            >Documentation</a>
+            >Docs</a>
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
               <router-link class="dropdown-item" :to="{ path: router('FIBO-Groups') }">FIBO Groups</router-link>
               <!-- <router-link class="dropdown-item" :to="{ path: router('development-process') }">Development process</router-link>
@@ -99,7 +102,7 @@
               aria-expanded="false"
             >TRAINING</a>
             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-              <router-link class="dropdown-item" :to="{ path: router('courses') }">Courses</router-link>
+              <a href="https://spec.edmcouncil.org/courses" class="dropdown-item" v-on:click="outboundLinkClick('https://spec.edmcouncil.org/courses')">OKG Courses</a>
               <router-link class="dropdown-item" :to="{ path: router('use-cases') }">Use cases</router-link>
             </div>
           </li>

fibo/src/views/Home.vue

@@ -8,7 +8,7 @@
 
                 <h3>What is FIBO</h3>
 
-                <img src="../assets/img/FIBO_logo.jpg" class="fibo-logo img-fluid" />
+                <img src="../assets/img/FIBO with tagline.png" width="25%" class="fibo-logo img-fluid" />
 
                 <p>
                     The Financial Industry Business Ontology (FIBO) defines the sets of things that are of interest in financial business applications and the ways that those things can relate to one another. In this way, FIBO can give meaning to any data (e.g., spreadsheets, relational databases, XML documents) that describe the business of finance.

home/.browserslistrc

@@ -0,0 +1,2 @@
+> 1%
+last 2 versions

home/.editorconfig

@@ -0,0 +1,7 @@
+[*.{js,jsx,ts,tsx,vue}]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 100

home/.eslintrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+  },
+  extends: [
+    'plugin:vue/essential',
+    '@vue/airbnb',
+  ],
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+  },
+  parserOptions: {
+    parser: 'babel-eslint',
+  },
+};

home/.gitignore

@@ -0,0 +1,21 @@
+.DS_Store
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

home/Jenkinsfile

@@ -0,0 +1,100 @@
+#!/usr/bin/env groovy
+//
+// The main Jenkinsfile for html-pages
+//
+// Note that this file is in the so called "Declarative Pipeline" syntax
+//
+// See https://jenkins.io/doc/book/pipeline/jenkinsfile/
+//
+//
+// Jenkins requirements:
+//	* "pipeline-npm" plugin + "home" Npm config file
+
+env.ONTPUB_FAMILY=''
+env.ONTPUB_SPEC_HOST='spec.edmcouncil.org'
+env.ONTPUB_IS_DARK_MODE='1'
+env.LC_ALL='en_US.UTF-8'
+env.LANG='en_US.UTF-8'
+env.LANGUAGE='en_US.UTF-8'
+env.NGINX_SPEC_ROOT='/opt/html-pages'
+
+properties([
+  buildDiscarder(
+          logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '30')
+  ),
+  //
+  // We let each stage running on each jenkins slave / agent decide what to check out or not
+  //
+//  skipDefaultCheckout(),
+  //
+  // Skip stages once the build status has gone to UNSTABLE.
+  //
+//  skipStagesAfterUnstable(),
+  //
+  // There must be SOME limit, if it hangs or whatever then that's a bug and therefore cancel the job.
+  //
+//  timeout(time: 23, unit: 'HOURS'),
+  //
+  // Prepend all console output generated by the Pipeline run with the time at which the line was emitted
+  //
+  //timestamps()
+//  ansiColor('xterm')
+])
+
+node {
+  ansiColor('xterm') {
+    stage('Build') {
+      node('master') {
+        try {
+          echo "Branch is ${env.BRANCH_NAME}..."
+          checkout scm
+          dir('home') {
+            withNPM(npmrcConfig:'home') {
+              sh "set &>${env.BUILD_TAG}.log"
+              echo "Performing npm install..."
+              sh "npm --no-progress --no-color install &>>${env.BUILD_TAG}.log"
+              echo "Performing npm build..."
+              sh "npm --no-progress --no-color run build &>>${env.BUILD_TAG}.log"
+              sh "mv -vf ${env.BUILD_TAG}.log dist/"
+              echo 'Stashing dist/**'
+              dir('dist') {
+                stash name: "home", includes: "htmlpages/**,*.log"
+              }
+            }
+          }
+        } catch (e) {
+          currentBuild.result = "FAILURE"
+          echo "Failed the \"${STAGE_NAME}\" stage: ${e}"
+          throw e
+        } finally {
+          deleteDir()
+          dir("${workspace}@tmp") {
+            deleteDir()
+          }
+          // slackScript.notifyStage()
+        }
+      } // end of node('master')
+    } // end of stage "Publish"
+    stage('Publish') {
+      node('master') {
+        try {
+          dir("${NGINX_SPEC_ROOT}") {
+            echo 'Unstashing the output of the publish stage'
+            unstash 'home'
+            archiveArtifacts artifacts: '*.log', allowEmptyArchive: true
+          }
+        } catch (e) {
+          currentBuild.result = "FAILURE"
+          echo "Failed the \"${STAGE_NAME}\" stage: ${e}"
+          throw e
+        } finally {
+          deleteDir()
+          dir("${workspace}@tmp") {
+            deleteDir()
+          }
+          // slackScript.notifyStage()
+        }
+      } // end of node('master')
+    } // end of stage "Publish"
+  } // end of ansiColor('xterm')
+}

home/README.md

@@ -0,0 +1,3 @@
+<img src="https://vuejs.org/images/logo.png" width="50" align="right"/>
+
+# OKG Home Vue

home/babel.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/app',
+  ],
+};