Merge pull request #12 from ossimlabs/dev

Merging dev into master

.gitignore

@@ -1,4 +1,6 @@
 .gradle
+.idea
 build
-client/yarn.lock
-.idea
+server/build
+client/dist
+client-backup

Jenkinsfile

@@ -0,0 +1,79 @@
+properties([
+    buildDiscarder( logRotator( numToKeepStr: '5' ) ),
+    disableConcurrentBuilds(),
+    parameters([
+        string( name: 'BUILD_NODE', defaultValue: 'omar-build', description: 'The build node to run on' ),
+        booleanParam(name: 'CLEAN_WORKSPACE', defaultValue: true, description: 'Clean the workspace at the end of the run' )
+    ]),
+    pipelineTriggers([
+            [ $class: "GitHubPushTrigger" ]
+    ]),
+    [
+        $class: 'GithubProjectProperty',
+        displayName: '',
+        projectUrlStr: 'https://github.com/ossimlabs/omar-ui-proto'
+    ]
+])
+
+node( "${ BUILD_NODE }" ) {
+
+    stage("Checkout branch $BRANCH_NAME" ) {
+        checkout( scm )
+    }
+
+    stage( "Load Variables" ) {
+        withCredentials([
+            string( credentialsId: 'o2-artifact-project', variable: 'o2ArtifactProject' )
+        ]) {
+            step ([
+                $class: "CopyArtifact",
+                filter: "common-variables.groovy",
+                flatten: true,
+                projectName: o2ArtifactProject
+            ])
+        }
+
+        load "common-variables.groovy"
+    }
+
+    stage ( "Assemble" ) {
+        sh """
+            echo "registry = ${NPM_REGISTRY}" >> .npmrc
+            export CHROMEDRIVER_SKIP_DOWNLOAD=true
+            ./gradlew assembleServerAndClient -PossimMavenProxy=${ OSSIM_MAVEN_PROXY }
+        """
+    }
+
+    stage ( "Publish Docker App" ) {
+        withCredentials([[
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'dockerCredentials',
+            passwordVariable: 'DOCKER_REGISTRY_PASSWORD',
+            usernameVariable: 'DOCKER_REGISTRY_USERNAME'
+        ]]) {
+            // Run all tasks on the app. This includes pushing to OpenShift and S3.
+            sh "./gradlew pushDockerImage -PossimMavenProxy=${ OSSIM_MAVEN_PROXY }"
+        }
+    }
+    try {
+        stage ( "OpenShift Tag Image" ) {
+            withCredentials([[
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: 'openshiftCredentials',
+                usernameVariable: 'OPENSHIFT_USERNAME',
+                passwordVariable: 'OPENSHIFT_PASSWORD'
+            ]]) {
+                // Run all tasks on the app. This includes pushing to OpenShift and S3.
+                sh "./gradlew openshiftTagImage -PossimMavenProxy=${ OSSIM_MAVEN_PROXY }"
+            }
+        }
+
+        stage( "Clean Workspace" ) {
+            if ( "${ CLEAN_WORKSPACE }" == "true" ) {
+                step([ $class: 'WsCleanup' ])
+            }
+        }
+    } catch (e) {
+        echo e.toString()
+    }
+}

build.gradle

@@ -0,0 +1,27 @@
+task copyClientResources( type: Copy, dependsOn: ':client:build' ) {
+	group = 'build'
+	description = 'Copy client resources into server'
+	def srcDir = "${ project( ':client' ).projectDir }/dist"
+	def destDir = "${ project( ':server' ).buildDir }/resources/main/public"
+
+	println "Copying files from ${ srcDir } to ${ destDir }"
+	//	println new File( destDir ).mkdirs()
+
+	from srcDir
+	into destDir
+}
+
+task assembleServerAndClient( dependsOn: [ 'copyClientResources', ':server:shadowJar' ] ) {
+	group = 'build'
+	description = 'Build combined server & client JAR'
+}
+
+task test {
+
+}
+
+task check {
+
+}
+
+tasks.getByPath( ':server:shadowJar' ).mustRunAfter( copyClientResources )

client/.browserslistrc

@@ -0,0 +1,4 @@
+> 1%
+last 2 versions
+
+not ie <= 10

client/.eslintrc.js

@@ -1,29 +1,22 @@
-// https://eslint.org/docs/user-guide/configuring
-
 module.exports = {
   root: true,
-  parserOptions: {
-    parser: 'babel-eslint'
-  },
   env: {
-    browser: true,
+    node: true
   },
-  extends: [
-    // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
-    // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
-    'plugin:vue/essential', 
-    // https://github.com/standard/standard/blob/master/docs/RULES-en.md
-    'standard'
+  'extends': [
+    'plugin:vue/essential',
+    'eslint:recommended'
   ],
   // required to lint *.vue files
   plugins: [
     'vue'
   ],
-  // add your custom rules here
   rules: {
-    // allow async-await
-    'generator-star-spacing': 'off',
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+    'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    "quotes": [2, "single", { "avoidEscape": true }]
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
   }
 }

client/.gitignore

@@ -1,12 +1,15 @@
 .DS_Store
-node_modules/
-/dist/
+node_modules
+/dist
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-/test/unit/coverage/
-/test/e2e/reports/
-selenium-debug.log
 
 # Editor directories and files
 .idea
@@ -15,3 +18,4 @@ selenium-debug.log
 *.ntvs*
 *.njsproj
 *.sln
+*.sw?

client/README.md

@@ -1,30 +1,29 @@
 # client
 
-> A Vue.js project
-
-## Build Setup
-
-``` bash
-# install dependencies
-npm install
-
-# serve with hot reload at localhost:3000
-npm run dev
-
-# build for production with minification
-npm run build
+## Project setup
+```
+yarn install
+```
 
-# build for production and view the bundle analyzer report
-npm run build --report
+### Compiles and hot-reloads for development
+```
+yarn run serve
+```
 
-# run unit tests
-npm run unit
+### Compiles and minifies for production
+```
+yarn run build
+```
 
-# run e2e tests
-npm run e2e
+### Run your tests
+```
+yarn run test
+```
 
-# run all tests
-npm test
+### Lints and fixes files
+```
+yarn run lint
 ```
 
-For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).

client/babel.config.js

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

client/build.gradle

@@ -1,49 +1,33 @@
 plugins {
-    id "com.moowork.node" version "1.2.0"
+	id "com.github.node-gradle.node" version "1.3.0"
 }
 
 node {
-    version = '8.7.0'
-    yarnVersion = '1.3.2'
-    download = true
+	version = '10.15.0' // https://nodejs.org/en/
+	yarnVersion = '1.13.0' // https://yarnpkg.com/en/
+	download = true
 }
 
-task bootRun(dependsOn: 'start') {
-    group = 'application'
-    description = 'Run the client app (for use with gradle bootRun -parallel'
+task run( type: YarnTask, dependsOn: 'yarn' ) {
+	group = 'application'
+	description = 'Run the client app'
+	args = [ 'run', 'serve' ]
 }
 
-task start(type: YarnTask, dependsOn: 'yarn') {
-    group = 'application'
-    description = 'Run the client app'
-    args = ['run', 'start']
+task build( type: YarnTask, dependsOn: 'yarn' ) {
+	group = 'build'
+	description = 'Build the client bundle'
+	args = [ 'run', 'build' ]
 }
 
-task build(type: YarnTask, dependsOn: 'yarn') {
-    group = 'build'
-    description = 'Build the client bundle'
-    args = ['run', 'build']
-}
-task lint(type: YarnTask, dependsOn: 'yarn') {
-    group = 'build'
-    description = 'Run eslint'
-    args = ['run', 'lint']
-}
-
-task test(type: YarnTask, dependsOn: 'yarn') {
-    group = 'verification'
-    description = 'Run the unit & e2e tests'
-    args = ['run', 'test']
-}
-
-task unit(type: YarnTask, dependsOn: 'yarn') {
-    group = 'verification'
-    description = 'Run the unit tests'
-    args = ['run', 'unit']
+task test( type: YarnTask, dependsOn: 'yarn' ) {
+	group = 'verification'
+	description = 'Run the client tests'
+	args = [ 'run', 'test' ]
 }
 
-task e2e(type: YarnTask, dependsOn: 'yarn') {
-    group = 'verification'
-    description = 'Run the e2e tests'
-    args = ['run', 'e2e']
+task eject( type: YarnTask, dependsOn: 'yarn' ) {
+	group = 'other'
+	description = 'Eject from the create-react-app scripts'
+	args = [ 'run', 'eject' ]
 }