The_Bois/MigratorProject-frontend
Archived
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

committing random clean ups + build script - Ben why use scp :P

Browse Source
This commit is contained in:
pepper 2021-01-22 01:02:00 -05:00
parent 146391ffdd
commit fef14103a9
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
01-build.sh
View File

@ -3,6 +3,7 @@
# Date: 21/01/2021 # Date: 21/01/2021
PROJ_DIR="/home/dev/MigratorProject-frontend" PROJ_DIR="/home/dev/MigratorProject-frontend"
DEPLOY_PATH="/home/mxpoopzxzx"
echo "Removing old build files" echo "Removing old build files"
# Remove old build files # Remove old build files
@ -10,4 +11,8 @@ rm -rf $PROJ_DIR/build*
echo "Building site and creating zip" echo "Building site and creating zip"
# Build the site and zip it with the .htaccess # 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" 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"

2
src/components/root/Home.js
View File

@ -65,6 +65,7 @@ export class Home extends Component {
<UList listItems={builfArrayFromObject(this.state.timeslots)} /> */} <UList listItems={builfArrayFromObject(this.state.timeslots)} /> */}
<TimeSlotHelper /> <TimeSlotHelper />
</div> </div>
<div className="container">
<div className="row"> <div className="row">
<div className="col s12"> <div className="col s12">
<GenericList APILINK="/pending/" /> <GenericList APILINK="/pending/" />
@ -72,6 +73,7 @@ export class Home extends Component {
</div> </div>
</div> </div>
</div> </div>
</div>
); );
} }
} }

8
src/components/root/Pages/Cards.js
View File

@ -28,7 +28,7 @@ class Cards extends Component {
return ( return (
<div className="row"> <div className="row">
<div className="col s6 m4"> <div className="col s6 m6 card-size">
<div className="card grey darken-1"> <div className="card grey darken-1">
<div className="card-content white-text"> <div className="card-content white-text">
<span className="card-title"></span> <span className="card-title"></span>
@ -39,7 +39,7 @@ class Cards extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className="col s6 m4"> <div className="col s6 m6 card-size">
<div className="card grey darken-1"> <div className="card grey darken-1">
<div className="card-content white-text"> <div className="card-content white-text">
<span className="card-title"></span> <span className="card-title"></span>
@ -50,7 +50,7 @@ class Cards extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className="col s6 m3"> <div className="col s6 m6 card-size">
<div className="card grey darken-1 "> <div className="card grey darken-1 ">
<div className="card-content white-text "> <div className="card-content white-text ">
<span className="card-title"></span> <span className="card-title"></span>
@ -61,7 +61,7 @@ class Cards extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className="col s6 m4"> <div className="col s6 m6 card-size">
<div className="card grey darken-1"> <div className="card grey darken-1">
<div className="card-content white-text"> <div className="card-content white-text">
<span className="card-title"></span> <span className="card-title"></span>

2
src/components/root/common/Forms/ReportSingleMigration.js
View File

@ -62,7 +62,7 @@ const ReportSingleMigration = ({ item }) => {
<option>Status</option> <option>Status</option>
<option>Booked</option> <option>Booked</option>
<option>Waiting Termination</option> <option>Waiting Termination</option>
<option>Complete</option> <option>Completed</option>
<option>Cancelled</option> <option>Cancelled</option>
</Input> </Input>
</FormGroup> </FormGroup>

2
src/components/root/common/Functionality/InlineSearchBar.js
View File

@ -17,7 +17,7 @@ class InLineSearch extends React.Component {
// This is so we can access the state within the function // This is so we can access the state within the function
if (e.keyCode === 13) { if (e.keyCode === 13) {
window.location.href = window.location.href =
"https://devui.benjamyn.love/migrations/" + this.state.data; process.env.REACT_APP_SITE_URL + '/migrations/' + this.state.data;
} }
}; };
render() { render() {

6
src/components/root/common/Tables/TimeSlots.js
View File

@ -19,7 +19,7 @@ const TimeSlots = (props) => {
const columns = [ const columns = [
{ {
dataField: "timeslot", dataField: "timeslot",
text: "timeslot/date", text: "Timeslot/Date",
}, },
{ {
dataField: "yesterday", dataField: "yesterday",
@ -52,10 +52,10 @@ const TimeSlots = (props) => {
columns={columns} columns={columns}
> >
{(props) => ( {(props) => (
<div className="py-4"> <div >
<div <div
id="datatable-basic_filter" id="datatable-basic_filter"
className="dataTables_filter px-4 pb-1" className="dataTables_filter pb-1"
></div> ></div>
<BootstrapTable <BootstrapTable
{...props.baseProps} {...props.baseProps}