Merge from test

Client/src/app/components/home/home.component.html

@@ -68,7 +68,7 @@
                     Here at Old Fashion Baptist Church we love the Word of God!
                     <p class="verse">
                     But he answered and said, <span class="red">It is written, Man shall not live by bread alone, but by every word that proceedeth out of the mouth of God.</span> - Matthew 4:4</p>
-                    We encourage you to come and join as as we study, teach and preach Gods Word!-
+                    We encourage you to come and join as as we study, teach and preach Gods Word!!!!!
                     <br><br>
                     <p class="action">
                         <i ofbicon>directions</i> <a target="_blank" class="align-top" href="https://www.google.com/maps/place/Old+Fashion+Baptist+Church/@45.9814004,-112.5320574,11.87z/data=!4m12!1m6!3m5!1s0x535b078c3c74ea33:0xac299097142c5894!2sOld+Fashion+Baptist+Church!8m2!3d45.951287!4d-112.511978!3m4!1s0x535b078c3c74ea33:0xac299097142c5894!8m2!3d45.951287!4d-112.511978">Get Directions</a>

Server/bin/start

@@ -1,5 +1,5 @@
 #!/bin/sh
 /sbin/pidof /home/ofbbutte/webapps/ofb_angular/bin/node > /dev/null 2>&1 && exit 0
 mkdir -p /home/ofbbutte/webapps/ofb_angular/run
-nohup /home/ofbbutte/webapps/ofb_angular/bin/node /home/ofbbutte/webapps/ofb_angular/src/app.js > /dev/null 2>&1 &
+nohup /home/ofbbutte/webapps/ofb_angular/bin/node /home/ofbbutte/webapps/ofb_angular/src/app.js 25776 > /dev/null 2>&1 &
 /sbin/pidof /home/ofbbutte/webapps/ofb_angular/bin/node > /home/ofbbutte/webapps/ofb_angular/run/node.pid

Server/bin/start_test

@@ -0,0 +1,5 @@
+#!/bin/sh
+/sbin/pidof /home/ofbbutte/webapps/ofb_angular_test/bin/node > /dev/null 2>&1 && exit 0
+mkdir -p /home/ofbbutte/webapps/ofb_angular_test/run
+nohup /home/ofbbutte/webapps/ofb_angular_test/bin/node /home/ofbbutte/webapps/ofb_angular_test/src/app.js 27606 > /dev/null 2>&1 &
+/sbin/pidof /home/ofbbutte/webapps/ofb_angular_test/bin/node > /home/ofbbutte/webapps/ofb_angular_test/run/node.pid

Server/bin/stop_test

@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/pkill -f /home/ofbbutte/webapps/ofb_angular_test/bin/node && rm -f /home/ofbbutte/webapps/ofb_angular_test/run/node.pid

Server/src/app.js

@@ -1,3 +1,7 @@
+var port = 25776;
+if (process.argv.length >= 3){
+  port = process.argv[2];
+}
 const express = require('express');
 const app = express();
 var bodyParser = require("body-parser");
@@ -27,7 +31,7 @@ app.get('/*', function (req, res) {
   res.sendFile(path.join(__dirname, '../www', 'index.html'));
 })
 
-app.listen(25776, function () {
+app.listen(port, function () {
-  console.log('listening on port 25776!');
+  console.log('listening on port '+ port +'!');
 })
 

git-post-receive

@@ -1,27 +1,33 @@
 #!/bin/sh
 
-BUILD_ANGULAR_ARG=$1
+BRANCH=$1
+BUILD_ANGULAR_ARG=$2
 BUILD_ANGULAR=true
 if [ "$BUILD_ANGULAR_ARG" = -ng ]; then
 	BUILD_ANGULAR=true
 fi
 
 echo "Build Angular = $BUILD_ANGULAR"
+echo "Branch Name = $BRANCH"
+
+if [ "$BRANCH" = test ]; then
+	cd /home/ofbbutte/webapps/ofb_angular_test/
+fi
+if [ "$BRANCH" = master ]; then
+	cd /home/ofbbutte/webapps/ofb_angular/
+fi
 
-cd /home/ofbbutte/webapps/ofb_angular/
 echo "Node Version"
 bin/node --version
 echo "NPM Version"
-bin/node bin/npm --version
+bin/node bin/npm --version --scripts-prepend-node-path
-echo "Angular CLI Version"
-bin/node tempcheckout/Client/node_modules/@angular/cli/bin/ng --version
 
 if [ "$BUILD_ANGULAR" = true ]; then
 	cd tempcheckout/Client
 	echo "Pruning Client Node Modules"
-	../../bin/node ../../bin/npm prune --silent
+	../../bin/node ../../bin/npm prune --silent --scripts-prepend-node-path
 	echo "Installing Client Node Modules"
-	../../bin/node ../../bin/npm install --silent
+	../../bin/node ../../bin/npm install --silent --scripts-prepend-node-path
 	echo "Building Angular Application"
 	../../bin/node node_modules/@angular/cli/bin/ng build --prod
 	cd ../../
@@ -31,11 +37,15 @@ else
 	echo "Skipping Building Angular Application"
 fi
 
+
+echo "Angular CLI Version"
+bin/node tempcheckout/Client/node_modules/@angular/cli/bin/ng --version
+
 cd tempcheckout/Server/src
 echo "Pruning Server Node Modules"
-../../../bin/node ../../../bin/npm prune --silent
+../../../bin/node ../../../bin/npm prune --silent --scripts-prepend-node-path
 echo "Installing Server Node Modules"
-../../../bin/node ../../../bin/npm install --silent
+../../../bin/node ../../../bin/npm install --silent --scripts-prepend-node-path
 cd ../../../
 rm -r -f src/
 mv tempcheckout/Server/src/ src/
@@ -43,8 +53,14 @@ echo "Remove start and stop script files"
 rm -f bin/start
 rm -f bin/stop
 echo "Copying start and stop script files"
-mv tempcheckout/Server/bin/start bin/start
+if [ "$BRANCH" = master ]; then
-mv tempcheckout/Server/bin/stop bin/stop
+	mv tempcheckout/Server/bin/start bin/start
+	mv tempcheckout/Server/bin/stop bin/stop
+fi
+if [ "$BRANCH" = test ]; then
+	mv tempcheckout/Server/bin/start_test bin/start
+	mv tempcheckout/Server/bin/stop_test bin/stop
+fi
 ls
 echo "Modifying permissions on start and stop script files to be executable"
 chmod +x bin/start