From 70706da7fd793585a4279825d0b1be7888bf16d9 Mon Sep 17 00:00:00 2001
From: austin <austin@austinhoover.net>
Date: Sat, 11 May 2024 16:49:21 -0400
Subject: [PATCH] script updates

---
 build.sh |  3 ++-
 test.sh  | 33 ++++++++++++++++++++++++---------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/build.sh b/build.sh
index 8abfd16..a8fca3e 100644
--- a/build.sh
+++ b/build.sh
@@ -35,5 +35,6 @@ echo "config file goes in <docker folder/config/selfsurveybe.db"
 echo "  Format for the config file is"
 echo "  {"
 echo "    \"username\": \"<username here>\","
-echo "    \"password\": \"<password here>\""
+echo "    \"password\": \"<password here>\"",
+echo "    \"domain\":   \"<public domain here>\"",
 echo "  }"
\ No newline at end of file
diff --git a/test.sh b/test.sh
index 74096b4..cb7204e 100644
--- a/test.sh
+++ b/test.sh
@@ -1,16 +1,31 @@
+#local dev folder location of the server source files
+SERVER_DIR=~/p/SelfSurvey-server
+#local dev folder loation of the front end source files
+FE_DIR=~/p/SelfSurvey-FE
+#local folder location of this repo
+CONFIG_DIR=~/p/selfsurvey-config
+#local apache dir
+APACHE_DIR=~/Documents/apache-tomcat-9.0.89
+#the public http address of the build
+SERVER_PUBLIC_ADDR=localhost:8080
 
-
+# setup BE repo stuff
+rm -rf $SERVER_DIR/src/main/resources/static
+mkdir $SERVER_DIR/src/main/resources/static
 # assemble FE
-cd ~/p/SelfSurvey-FE
-npm run build
-cd ~/p/SelfSurvey-server/src/main/resources/static
+cd $FE_DIR
+npx webpack --env apiurl=http://$SERVER_PUBLIC_ADDR
+cd $SERVER_DIR/src/main/resources/static
 rm -rf ./*
-cp -r ~/p/SelfSurvey-FE/dist/* ~/p/SelfSurvey-server/src/main/resources/static/
+cp -r $FE_DIR/dist/* $SERVER_DIR/src/main/resources/static/
 # assemble BE
-cd ~/p/SelfSurvey-server/
+cd $SERVER_DIR
 mvn clean package
-cd ~/Documents/apache-tomcat-9.0.89/webapps/
+# assemble package
+cp $SERVER_DIR/target/self-survey.war $CONFIG_DIR/build/ROOT.war
+cp $CONFIG_DIR/docker-compose.yml $CONFIG_DIR/build/docker-compose.yml
+cd $APACHE_DIR/webapps/
 rm -rf ./ROOT.war ./ROOT
-cp ~/p/SelfSurvey-server/target/self-survey.war ~/Documents/apache-tomcat-9.0.89/webapps/ROOT.war
-cd ~/Documents/apache-tomcat-9.0.89/bin/
+cp $SERVER_DIR/target/self-survey.war $APACHE_DIR/webapps/ROOT.war
+cd $APACHE_DIR/bin/
 ./catalina.sh run
\ No newline at end of file