From fef14103a91b0afa86f6c1ba4a02d5c75c866284 Mon Sep 17 00:00:00 2001
From: pepper <git@pooper.net.au>
Date: Fri, 22 Jan 2021 01:02:00 -0500
Subject: [PATCH] committing random clean ups + build script - Ben why use scp
 :P

---
 01-build.sh                                          |  7 ++++++-
 src/components/root/Home.js                          |  8 +++++---
 src/components/root/Pages/Cards.js                   | 12 ++++++------
 .../root/common/Forms/ReportSingleMigration.js       |  2 +-
 .../root/common/Functionality/InlineSearchBar.js     |  2 +-
 src/components/root/common/Tables/TimeSlots.js       |  6 +++---
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/01-build.sh b/01-build.sh
index 40bc56e..52d7515 100644
--- a/01-build.sh
+++ b/01-build.sh
@@ -3,6 +3,7 @@
 # Date: 21/01/2021
 
 PROJ_DIR="/home/dev/MigratorProject-frontend"
+DEPLOY_PATH="/home/mxpoopzxzx"
 
 echo "Removing old build files"
 # Remove old build files
@@ -10,4 +11,8 @@ rm -rf $PROJ_DIR/build*
 
 echo "Building site and creating zip"
 # Build the site and zip it with the .htaccess
-npm run-script build && cd build && zip -r $PROJ_DIR/build.zip $PROJ_DIR/build/* && zip -r $PROJ_DIR/build.zip $PROJ_DIR/build/.htaccess* && echo "Successfully built" || echo "Build Failed"
\ No newline at end of file
+npm run-script build && cd build && zip -r $PROJ_DIR/build.zip * && \
+ zip -r $PROJ_DIR/build.zip .htaccess* && echo "Successfully built" || echo "Build Failed"
+
+scp -P 2683 $PROJ_DIR/build.zip mxpoopzxzx@s02cd.syd6.hostingplatform.net.au:$DEPLOY_PATH
+ssh -p 2683 mxpoopzxzx@s02cd.syd6.hostingplatform.net.au "bash $DEPLOY_PATH/deploy-tracker.sh"
\ No newline at end of file
diff --git a/src/components/root/Home.js b/src/components/root/Home.js
index c4fee83..31b0663 100644
--- a/src/components/root/Home.js
+++ b/src/components/root/Home.js
@@ -65,9 +65,11 @@ export class Home extends Component {
             <UList listItems={builfArrayFromObject(this.state.timeslots)} /> */}
             <TimeSlotHelper />
           </div>
-          <div className="row">
-            <div className="col s12">
-              <GenericList APILINK="/pending/" />
+          <div className="container">
+            <div className="row">
+              <div className="col s12">
+                <GenericList APILINK="/pending/" />
+              </div>
             </div>
           </div>
         </div>
diff --git a/src/components/root/Pages/Cards.js b/src/components/root/Pages/Cards.js
index 042f49e..abce9af 100644
--- a/src/components/root/Pages/Cards.js
+++ b/src/components/root/Pages/Cards.js
@@ -28,7 +28,7 @@ class Cards extends Component {
 
     return (
       <div className="row">
-        <div className="col s6 m4">
+        <div className="col s6 m6 card-size">
           <div className="card grey darken-1">
             <div className="card-content white-text">
               <span className="card-title"></span>
@@ -39,7 +39,7 @@ class Cards extends Component {
             </div>
           </div>
         </div>
-        <div className="col s6 m4">
+        <div className="col s6 m6 card-size">
           <div className="card grey darken-1">
             <div className="card-content white-text">
               <span className="card-title"></span>
@@ -50,9 +50,9 @@ class Cards extends Component {
             </div>
           </div>
         </div>
-        <div className="col s6 m3">
-          <div className="card grey darken-1">
-            <div className="card-content white-text">
+        <div className="col s6 m6 card-size">
+          <div className="card grey darken-1 ">
+            <div className="card-content white-text ">
               <span className="card-title"></span>
               {this.missedMig()}
             </div>
@@ -61,7 +61,7 @@ class Cards extends Component {
             </div>
           </div>
         </div>
-        <div className="col s6 m4">
+        <div className="col s6 m6 card-size">
           <div className="card grey darken-1">
             <div className="card-content white-text">
               <span className="card-title"></span>
diff --git a/src/components/root/common/Forms/ReportSingleMigration.js b/src/components/root/common/Forms/ReportSingleMigration.js
index 56db012..f9472de 100644
--- a/src/components/root/common/Forms/ReportSingleMigration.js
+++ b/src/components/root/common/Forms/ReportSingleMigration.js
@@ -62,7 +62,7 @@ const ReportSingleMigration = ({ item }) => {
                   <option>Status</option>
                   <option>Booked</option>
                   <option>Waiting Termination</option>
-                  <option>Complete</option>
+                  <option>Completed</option>
                   <option>Cancelled</option>
                 </Input>
               </FormGroup>
diff --git a/src/components/root/common/Functionality/InlineSearchBar.js b/src/components/root/common/Functionality/InlineSearchBar.js
index c89d39b..aedbe89 100644
--- a/src/components/root/common/Functionality/InlineSearchBar.js
+++ b/src/components/root/common/Functionality/InlineSearchBar.js
@@ -17,7 +17,7 @@ class InLineSearch extends React.Component {
     // This is so we can access the state within the function
     if (e.keyCode === 13) {
       window.location.href =
-        "https://devui.benjamyn.love/migrations/" + this.state.data;
+        process.env.REACT_APP_SITE_URL + '/migrations/' + this.state.data;
     }
   };
   render() {
diff --git a/src/components/root/common/Tables/TimeSlots.js b/src/components/root/common/Tables/TimeSlots.js
index 1d2bf5a..a5e1719 100644
--- a/src/components/root/common/Tables/TimeSlots.js
+++ b/src/components/root/common/Tables/TimeSlots.js
@@ -19,7 +19,7 @@ const TimeSlots = (props) => {
   const columns = [
     {
       dataField: "timeslot",
-      text: "timeslot/date",
+      text: "Timeslot/Date",
     },
     {
       dataField: "yesterday",
@@ -52,10 +52,10 @@ const TimeSlots = (props) => {
       columns={columns}
     >
       {(props) => (
-        <div className="py-4">
+        <div >
           <div
             id="datatable-basic_filter"
-            className="dataTables_filter px-4 pb-1"
+            className="dataTables_filter  pb-1"
           ></div>
           <BootstrapTable
             {...props.baseProps}