From b8e956b3398939aae601578357b37d0775bcaad5 Mon Sep 17 00:00:00 2001 From: Cloud Assessment User Date: Mon, 17 Oct 2022 04:43:04 -0400 Subject: [PATCH 1/4] header text change --- views/index.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/index.jade b/views/index.jade index 6e6be7155..2782efd24 100644 --- a/views/index.jade +++ b/views/index.jade @@ -1,7 +1,7 @@ extends layout block content - h1 Find your train! + h1 Find your train!!! p Select your train below to see its current schedule. #wrapper #trainList @@ -10,4 +10,4 @@ block content #trainInfo strong #trainSchedule - strong Select a train to view its current schedule. \ No newline at end of file + strong Select a train to view its current schedule. From feddb0356123b7b6f3f0deb4ce0045a65af0f4ec Mon Sep 17 00:00:00 2001 From: Akash Sood Date: Mon, 17 Oct 2022 04:47:18 -0400 Subject: [PATCH 2/4] header text change 1 --- views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/index.jade b/views/index.jade index 2782efd24..a4525aefe 100644 --- a/views/index.jade +++ b/views/index.jade @@ -1,7 +1,7 @@ extends layout block content - h1 Find your train!!! + h1 Find your train! p Select your train below to see its current schedule. #wrapper #trainList From 69995a02ce8e2c2965d06ec78bb7b36d8fc1993d Mon Sep 17 00:00:00 2001 From: Akash Sood Date: Mon, 17 Oct 2022 07:31:32 -0400 Subject: [PATCH 3/4] add gradle build --- .gitignore | 3 ++- build.gradle | 41 +++++++++++++++++++++++++++++++++++++++++ settings.gradle | 10 ++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 build.gradle create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index dd9a1094d..a572103b1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -.gradle \ No newline at end of file +dist +.gradle diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..ec4bfe20f --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +// This application is built in node.js, and there is a plugin for it in Gradle that does +// a lot of the work for us as far as dealing with node.js builds. We're calling in that +// plugin here +plugins { + id "com.moowork.node" version "1.2.0" +} + +// We've also got to confgure the plugin a little bit. This line will instruct the node plugin +// to download and install node.js and npm locally, for this particular project. It ensures that +// those are installed during the build, but not system-wide, just within this directory. +node { + download = true +} + +// Whenever we call the build task (it's a task called build) which will run any and all +// other tasks that are required to actually call the build "built." +task build + +task zip(type: Zip) { + from ('.') { + include "*" + include "bin/**" + include "data/**" + include "node_modules/**" + include "public/**" + include "routes/**" + include "views/**" + } + destinationDir(file("dist")) + baseName "trainSchedule" + } + + build.dependsOn zip + zip.dependsOn npm_build + + +// All we need to do, in order for this build to actually run, is to call some of the tasks +// built in to the node.js and npm plugins. We're going to call them here. +build.dependsOn npm_build +npm_build.dependsOn npm_test +npm_test.dependsOn npmInstall diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..e080ed02f --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user guide at https://docs.gradle.org/4.6/userguide/multi_project_builds.html + */ + +rootProject.name = 'cicd-pipeline-train-schedule-gradle' From 8a8762edabafa5baf97cbb769d138a72fe659107 Mon Sep 17 00:00:00 2001 From: Akash Sood Date: Mon, 17 Oct 2022 07:33:02 -0400 Subject: [PATCH 4/4] updated gardle build file --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index ec4bfe20f..cabd84dad 100644 --- a/build.gradle +++ b/build.gradle @@ -37,5 +37,6 @@ task zip(type: Zip) { // All we need to do, in order for this build to actually run, is to call some of the tasks // built in to the node.js and npm plugins. We're going to call them here. build.dependsOn npm_build +npm_build.dependsOn npmInstall npm_build.dependsOn npm_test npm_test.dependsOn npmInstall