diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dc4c33d --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +public/wrenchboard/images_folder +public/LIVE/images_folder + +apache_log +apache_log/ +apache_log/* \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 94595a2..5e8dcec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,12 @@ services: volumes: - ./:/var/www/html - ./apache_log:/var/log/apache2 + extra_hosts: + - backend.wrenchboard.api.live:10.10.33.15 + - backend.wrenchboard.api.test:10.10.33.15 + - apigate.lotus.g1.wrenchboard.com:10.10.33.15 + - apigate.orion.g1.wrenchboard.com:10.10.33.15 + - apigate.nebula.g1.wrenchboard.com:10.10.33.15 ports: - 9999:80 volumes: diff --git a/public/.well-known/pki-validation/A0FDFE6A8A13212C8A7860C26BF656EA.txt b/public/.well-known/pki-validation/A0FDFE6A8A13212C8A7860C26BF656EA.txt new file mode 100644 index 0000000..87fccdd --- /dev/null +++ b/public/.well-known/pki-validation/A0FDFE6A8A13212C8A7860C26BF656EA.txt @@ -0,0 +1 @@ +177DCE1C8C5C1B6CC1E72EA9F01013B705164058083610C11032AB6898B6FA36 comodoca.com 64dedb737b099 \ No newline at end of file diff --git a/public/LIVE/def.php b/public/LIVE/def.php new file mode 100644 index 0000000..4098ebf --- /dev/null +++ b/public/LIVE/def.php @@ -0,0 +1,425 @@ +wrenchboard_api($data,$out); + echo "
INPUT "; + var_dump($data); + echo "
OUTPUT "; + var_dump($out); + echo highlight_string(file_get_contents(__FILE__)); + +?> diff --git a/public/LIVE/wrenchboard_class.php b/public/LIVE/wrenchboard_class.php new file mode 100644 index 0000000..5f848dc --- /dev/null +++ b/public/LIVE/wrenchboard_class.php @@ -0,0 +1,244 @@ + array('POST'), + 'generics' => array('POST'), + 'createuser' => array('POST'), + 'createmobileuser' => array('POST'), + 'completemobileuser' => array('POST'), + 'startresetpasword' => array('POST'), + 'userlogin' => array('POST'), + 'startjoblist' => array('POST'), + 'dashdata' => array('POST'), + 'getjobsdata' => array('POST'), + 'offerslist' => array('POST'), + 'activejoblist' => array('POST'), + 'loadprofile' => array('POST'), + 'account' => array('POST'), + 'message' => array('POST'), + 'pendingjob' => array('POST'), + 'paymenthx' => array('POST'), + 'getjob' => array('POST'), + 'mybanklist' => array('POST'), + 'sendmoney' => array('POST'), + 'sendinterest' => array('POST'), + 'sendmoneyfee' => array('POST'), + 'getpendingjobs' => array('POST'), + 'taskmessage' => array('POST'), + 'sendtaskmessage' => array('POST'), + 'getwallets' => array('POST'), + 'sitecontact' => array('POST'), + 'signupcountry' => array('POST'), + 'userscards' => array('POST'), + 'blogdata' => array('POST'), + 'blogitem' => array('POST'), + 'couponhx' => array('POST'), + 'couponpending' => array('POST'), + 'couponredeem' => array('POST'), + 'sendinterestmessage' => array('POST'), + 'replyinterestmessage' => array('POST') +); + +*/ + +private function baseUrlPath($in) +{ +$pathName = ''; + switch ($in['action']) { + case WRENCHBOARD_ACCOUNT_LOGIN: + $pathName = 'userlogin'; + break; + case WRENCHBOARD_ACCOUNT_PENDING: + $pathName = 'createuser'; + break; + + case WRENCHBOARD_CARDS_GETCARDLIST: + $pathName = 'userscards'; + break; + + case WRENCHBOARD_CARDS_GETCARDLIST: + $pathName = 'startjoblist'; + break; + + case WRENCHBOARD_MOBILE_ACTIVEJOB: + $pathName = 'activejoblist'; + break; + case WRENCHBOARD_ACCOUNT_WALLETS: + $pathName ='getwallets'; + break; + + case WRENCHBOARD_START_JOBLIST: + $pathName="startjoblist"; + break; + + case WRENCHBOARD_MOBILE_PAYMENTHX: + $pathName="paymenthx"; + break; + + case WRENCHBOARD_COUPON_MEMLIST: + $pathName= 'couponhx'; + break; + + case WRENCHBOARD_MOBILE_PURCHASEHX: + $pathName= 'purchasehx'; + break; + + case WRENCHBOARD_ACCOUNT_USER_RECIPEINT: + $pathName= 'recipients'; + break; + + case WRENCHBOARD_SMONEY_PROCFEE: + $pathName= 'sendmoneyfee'; + break; + + case WRENCHBOARD_MOBILE_UPDATEPROFILE: + $pathName= 'updateprofile'; + break; + + case WRENCHBOARD_ACCOUNT_SENDREFER: + $pathName= 'sendreferral'; + break; + + case WRENCHBOARD_ACCOUNT_REFFERHX: + $pathName= 'refferhx'; + break; + + case WRENCHBOARD_ACCOUNT_COUNTRY_BANKS: + $pathName= 'countrybanks'; + break; + + case WRENCHBOARD_ACCOUNT_PENDJOB: + $pathName = 'getpendingjobs'; + break; + case WRENCHBOARD_MOBILE_OFFERSLIST: + $pathName = 'offerslist'; + break; + + case WRENCHBOARD_RESET_PASSWORD: + $pathName = 'startresetpasword'; + break; + + case WRENCHBOARD_ACCOUNT_ACCOUNT_TYPES: + $pathName = 'accounttypes'; + break; + //loadprofile + case WRENCHBOARD_MOBILE_LOADPROFILE: + $pathName = 'loadprofile'; + break; + + case WRENCHBOARD_VERIFY_PENDING_LINK: + $pathName = 'verifysignuplink'; + break; + + case WRENCHBOARD_JOB_LISTJOBS: + $pathName = 'jobmanagerlist'; + break; + + case WRENCHBOARD_ACCOUNT_ADD_RECIPEINT: + $pathName = 'addrecipient'; + break; + + + + case 1200021: + $pathName="signupcountry"; + break; + + } +return $pathName; +} + public function wrenchboard_api($in, &$out = array(),$pathWay='') { + $ret = 0; + + $urlPath = ($pathWay!='')? $pathWay :$this->baseUrlPath($in); + $local_url = $this->REACT_APP_USERS_ENDPOINT; + $url = $local_url ."/".$urlPath; //"/generics"; + $data = $in; + + $content = json_encode($data); + + $curl = curl_init($url); + curl_setopt($curl, CURLOPT_HEADER, false); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-type" => "application/json")); + curl_setopt($curl, CURLOPT_POST, true); + curl_setopt($curl, CURLOPT_POSTFIELDS, $content); + + $json_response = curl_exec($curl); + $status = curl_getinfo($curl, CURLINFO_HTTP_CODE); + + if ($status != 200) { + echo ("Error: call to URL $url failed with status $status, response $json_response, | curl_error " . curl_error($curl) . ", | curl_errno " . curl_errno($curl)); + } + + curl_close($curl); + $response = json_decode($json_response, true); + $this->showResult($url, $in, $response); + $out = $response; + return $response["internal_return"]; + } + + private function showResult($url, $in,$out){ + + echo " + + + + + + +
TARGET ENDPOINT[POST]".$url."
".var_dump($in)."".var_dump($out)."
"; + //$response['result_list'] + if ( isset($out['result_list']) && is_array($out['result_list']) && count($out['result_list']) > 0 ){ + $arr = $out['result_list']; + $myHeaders = array_keys($arr[0]); + +var_dump( $myHeaders); + $tableHead = ''; + foreach ($myHeaders as $hd){ + $tableHead .= "".$hd.""; + } + $tableHead .= ''; + + $tableBody = ''; + foreach ($arr as $item) { + $tableBody .= ''; + $backColor ='white'; + foreach ($myHeaders as $hd){ + $backColor = ($backColor=='aliceblue')?'white': 'aliceblue'; + $tableBody .= "".$item[$hd].""; + } + $tableBody .= ''; + } + + echo "".$tableHead.$tableBody."
"; + } + } + +} + +?> \ No newline at end of file diff --git a/public/signup.php b/public/signup.php index d2218c5..0c4df22 100644 --- a/public/signup.php +++ b/public/signup.php @@ -4,8 +4,11 @@ include('def.php'); include('wrenchboard_class.php'); $wrenchboard = new wrenchboard_class(); - $data['firstname'] = 'Olu'; - $data['lastname'] = 'Amey'; + $cnt = ['US'.'NG']; + $country = $cnt[rand(0,1)]; + + $data['firstname'] = 'Olu'. $country; + $data['lastname'] = 'Amey'. $country; // $email = 'ses66181+'.rand(1000,9999).'@gmail.com'; $email = 'ameye+aug'.rand(1000,9999).'@chiefsoft.com'; @@ -15,6 +18,7 @@ $wrenchboard = new wrenchboard_class(); $data['terms'] = 1; // $terms; $data['news'] = 1; //$news; $data['loc'] = "38.101.241.200"; + $data['country'] = $country; $data['action'] = WRENCHBOARD_ACCOUNT_PENDING; diff --git a/public/wrenchboard/addrecipient.php b/public/wrenchboard/addrecipient.php index 405de00..8bd4cfd 100644 --- a/public/wrenchboard/addrecipient.php +++ b/public/wrenchboard/addrecipient.php @@ -16,7 +16,7 @@ $data = array( "country" => 'NG', "state" => 'Lagos', "city" => 'Lagos', - 'accitytion'=>WRENCHBOARD_ACCOUNT_ADD_RECIPEINT + 'action'=>WRENCHBOARD_ACCOUNT_ADD_RECIPEINT ); $out = array(); diff --git a/public/wrenchboard/def.php b/public/wrenchboard/def.php index d40a4dc..c4f4aef 100644 --- a/public/wrenchboard/def.php +++ b/public/wrenchboard/def.php @@ -1,10 +1,72 @@ [ + + ['login','This is the username password login call','https://docs.google.com/document/d/16wQi3vK2sEPexIU-MVLL_tbqiLn0brUfErdKMO26D9A/edit',''], + ['qrlogin','This is the QR login call','https://docs.google.com/document/d/16wQi3vK2sEPexIU-MVLL_tbqiLn0brUfErdKMO26D9A/edit',''], + ['login-google','This is the username password login call','https://docs.google.com/document/d/16wQi3vK2sEPexIU-MVLL_tbqiLn0brUfErdKMO26D9A/edit',''], + ['signup','This is the sign up endpoint for manual account creation , we will have modified version for OAuth latter','',''], + ['signup2','Country Removed This is the sign up endpoint for manual account creation , we will have modified version for OAuth latter','',''], + ], + 'My Page' =>[ + ['mypageload', 'Load My page data','','style="background-color:#D1F2EB" '], + ['mypageintro', 'updates my page intro','','style="background-color:#D1F2EB" '], + ['mypagedetail', 'updates my page detail','','style="background-color:#D1F2EB" '], + ], + 'Family Functions' =>[ + ['familyrelinvite', 'Relative Invite','','style="background-color:#D1F2EB" '], + ['familyreljoin', 'Relative Join','','style="background-color:#D1F2EB" '], + ['familylist', 'Get list of Family Accounts','','style="background-color:aliceblue" '], + + ['familywallet', 'Get Family Member Wallet','','style="background-color:aliceblue" '], + + ['familytransferstart', 'Start family transfer','','style="background-color:aliceblue" '], + ['familytransfer', 'Complete family transfer','','style="background-color:aliceblue" '], + ['familyrewardhx', 'Reward History','','style="background-color:aliceblue" '], + + + ['familyadd', 'Add Family Account','','style="background-color:aliceblue" '], + ['familyupdate', 'Update Family Account','','style="background-color:aliceblue" '], + ['familymanage', 'Manage A Family Account','','style="background-color:aliceblue" '], + ['familylogin', 'LoginA Family Account','','style="background-color:aliceblue" '], + ['familytasks', 'All or Family Member Tasks','','style="background-color:aliceblue" '], + + ['familysuggesttasks', 'The action of suggestiing a task to parent','','style="background-color:cyan" '], + ['familysuggestlist', 'The list of What is already suggested','','style="background-color:cyan" '], + ['familysampletasks', 'Possible Tasks List A Kids can Select From','','style="background-color:cyan" '], + + ['familywaitingtasks', 'This is the Parent View of all waiting list','','style="background-color:cyan" '], + + ], + 'Job Owner'=>[ + ['jobmanagerlist', 'Job owner job list', '','style="background-color:Orange" '], + ['jobmanageroffers', 'Job owner job open offers list', '','style="background-color:Orange" '], + ['jobmanageractive','Job Beign Worked On OWNER of Job','','style="background-color:red" '], + + + ['jobmanageragree', 'Job Agree','','style="background-color:Orange" '], + ['jobmanagerlist', 'Job owner job list', '','style="background-color:Orange" '], + + ['jobmanagerlist_family', 'Job owner job FAMILY list', '','style="background-color:Orange" '], + ['jobmanagercreatejob', 'Create a new Job - general job mode', '','style="background-color:Orange"'], + ['jobmanagerupdatejob', 'Update a Job - general job mode','','style="background-color:Orange" '], + ['jobmanagerdeletejob', 'Delete a Job - general job mode','','style="background-color:Orange" '], + + ['pendingjobextend',' - Extend offers expiration','','style="background-color:#FFEBCD" '], + ['pendingjobsendtome',' - Re-Send Offer Message','','style="background-color:#FFEBCD" '], + ['pendingjobcancel',' - Cancel Pending Offer','','style="background-color:#FFEBCD" '], + + ], + 'Files Mamager'=>[ + ['getmedia','Read Files from server','',''], + ], +'Ungrouped' => [ ['cronjobs','Cron Jobs layers','',''], ['dashrecent','Dash Recent layer','',''], ['playground','Playground layer','',''], - ['getmedia','Read Files from server','',''], + ['getaccsettings','Get Account Settings','',''], ['setaccsettings','Set Account Settings','',''], ['startcredit','Start Credit','',''], @@ -14,11 +76,6 @@ $tArr =[ ['blogdata','Blog Data','',''], ['mynotifications','Notifications hx','',''], ['faq','Faq page *******','',''], - ['login','This is the username password login call','https://docs.google.com/document/d/16wQi3vK2sEPexIU-MVLL_tbqiLn0brUfErdKMO26D9A/edit',''], - ['qrlogin','This is the QR login call','https://docs.google.com/document/d/16wQi3vK2sEPexIU-MVLL_tbqiLn0brUfErdKMO26D9A/edit',''], - ['login-google','This is the username password login call','https://docs.google.com/document/d/16wQi3vK2sEPexIU-MVLL_tbqiLn0brUfErdKMO26D9A/edit',''], - ['signup','This is the sign up endpoint for manual account creation , we will have modified version for OAuth latter','',''], - ['signup2','Country Removed This is the sign up endpoint for manual account creation , we will have modified version for OAuth latter','',''], ['profilepasschange','Reset Pass from Profile','',''], ['userscards','What are you for really *******','',''], @@ -58,36 +115,11 @@ $tArr =[ ['sendtaskmessage','activejobmsgadd - Adding message to active job','','style="background-color:#A9DDE2" '], ['activejobmessage','Adding message to active job','','style="background-color:#A9DDE2" '], - ['jobmanagerlist', 'Job owner job list', '','style="background-color:Orange" '], - ['jobmanageroffers', 'Job owner job open offers list', '','style="background-color:Orange" '], - ['jobmanageractive','Job Beign Worked On OWNER of Job','','style="background-color:red" '], - ['jobmanageragree', 'Job Agree','','style="background-color:Orange" '], - ['jobmanagerlist', 'Job owner job list', '','style="background-color:Orange" '], - ['jobmanagerlist_family', 'Job owner job FAMILY list', '','style="background-color:Orange" '], - ['jobmanagercreatejob', 'Create a new Job - general job mode', '','style="background-color:Orange"'], - ['jobmanagerupdatejob', 'Update a Job - general job mode','','style="background-color:Orange" '], - ['jobmanagerdeletejob', 'Delete a Job - general job mode','','style="background-color:Orange" '], - - ['pendingjobextend',' - Extend offers expiration','','style="background-color:#FFEBCD" '], - ['pendingjobsendtome',' - Re-Send Offer Message','','style="background-color:#FFEBCD" '], - ['pendingjobcancel',' - Cancel Pending Offer','','style="background-color:#FFEBCD" '], - ['starttopup', 'Retired USE *** startcredit *** Instead Start naira top up','',''], ['topupresult', 'Use this for status of the Flutterwave based credit result','',''], - ['familylist', 'Get list of Family Accounts','','style="background-color:aliceblue" '], - ['familyadd', 'Add Family Account','','style="background-color:aliceblue" '], - ['familyupdate', 'Update Family Account','','style="background-color:aliceblue" '], - ['familymanage', 'Manage A Family Account','','style="background-color:aliceblue" '], - ['familylogin', 'LoginA Family Account','','style="background-color:aliceblue" '], - ['familytasks', 'All or Family Member Tasks','','style="background-color:aliceblue" '], - ['familysuggesttasks', 'The action of suggestiing a task to parent','','style="background-color:cyan" '], - ['familysuggestlist', 'The list of What is already suggested','','style="background-color:cyan" '], - ['familysampletasks', 'Possible Tasks List A Kids can Select From','','style="background-color:cyan" '], - - ['familywaitingtasks', 'This is the Parent View of all waiting list','','style="background-color:cyan" '], ['assigntask', 'Assign a task to a user. Note different call method','','style="background-color:#E4EBD2" '], @@ -111,12 +143,19 @@ $tArr =[ ['payprevcard','Pay with previous card','','style="background-color:violet" '], ['payremcard','Removed Previously added card','','style="background-color:violet" '], ['LINE','?? confirm','',''], +] + ]; // +// const WRENCHBOARD_PICTURE_PROFILE = 11300; +// const WRENCHBOARD_PICTURE_FAMMEMBER = 11305; +// const WRENCHBOARD_RESOURCE_MYFILES = 11307; +// const WRENCHBOARD_MYFILES_LIST = 11309; + define('LOGIN_GOOGLE', 990010); define('LOGIN_FACEBOOK', 990011); define('LOGIN_APPLE', 990012); @@ -176,6 +215,8 @@ define('WRENCHBOARD_USER_ADNEWCC', 11054); define('WRENCHBOARD_USER_CARDLIST', 11055); define('WRENCHBOARD_USER_USESAVEDCC', 11056); +define('WRENCHBOARD_SIGNUP_COUNTRY' , 648); + define('WRENCH_EXISTING_ACCOUNT', 100); define('WRENCH_NEWBANK_ACCOUNT', 500); @@ -262,6 +303,7 @@ define('WRENCHBOARD_ACCOUNT_RECENTS', 11202); define('WRENCHBOARD_ACCOUNT_NOTIFICATIONS',11205); define('WRENCHBOARD_PICTURE_PROFILE', 11300); +define('WRENCHBOARD_PICTURE_JOB', 11303); define('WRENCHBOARD_PICTURE_FAMMEMBER',11305); define('WRENCHBOARD_RESOURCE_MYFILES', 11307); @@ -303,6 +345,7 @@ define('WRENCHBOARD_JOB_CANCEL_OFFER' ,13043); define('WRENCHBOARD_GROUP_START', 12000); + define('WRENCHBOARD_GROUP_CREATEGROUP', 12010); define('WRENCHBOARD_GROUP_INVITEGROUP', 12015); define('WRENCHBOARD_GROUP_ACCEPTGROUP', 12020); @@ -310,8 +353,16 @@ define('WRENCHBOARD_GROUP_ACCEPTGROUP', 12020); define('WRENCHBOARD_GROUP_END', 12999); //************************************************************** define('WRENCHBOARD_FAMILY_LIST', 22010); +define('WRENCHBOARD_FAMILY_WALLET', 22012); + +define('WRENCHBOARD_FAMILY_TRANSFERHX', 22011); +define('WRENCHBOARD_FAMILY_TRANSFERSTART', 22013); +define('WRENCHBOARD_FAMILY_TRANSFER', 22014); + +define('FAMILY_TRANSFER_DIRECT' , 100); + define('WRENCHBOARD_FAMILY_ADD', 22015); -define('WRENCHBOARD_FAMILY_UPDATE', 22020); +define('WRENCHBOARD_FAMILY_UPDATE', 22020); define('WRENCHBOARD_FAMILY_MANAGE', 22025); define('WRENCHBOARD_FAMILY_SAMPLETASKS', 22027); define('WRENCHBOARD_FAMILY_SGGESTTASKS', 22028); diff --git a/public/wrenchboard/familymanage.php b/public/wrenchboard/familymanage.php index 0d3e1fb..945a55c 100644 --- a/public/wrenchboard/familymanage.php +++ b/public/wrenchboard/familymanage.php @@ -8,7 +8,7 @@ $data = array( "member_id" => $member_id , "sessionid" => $session_id , "uid" => $uid, - "family_uid" => 'a24f1193-7885-4c26-afac-3e5ad744ef40', + "family_uid" => '349c419a-2ad9-40b1-b747-37b710f62a8d', 'action'=>WRENCHBOARD_FAMILY_MANAGE ); diff --git a/public/wrenchboard/familyrelinvite.php b/public/wrenchboard/familyrelinvite.php new file mode 100644 index 0000000..e69de29 diff --git a/public/wrenchboard/familyrewardhx.php b/public/wrenchboard/familyrewardhx.php new file mode 100644 index 0000000..6795cfc --- /dev/null +++ b/public/wrenchboard/familyrewardhx.php @@ -0,0 +1,19 @@ + $member_id , + "sessionid" => $session_id , + "uid" => $uid, + "limit" => 20, + "offset" => 1, + 'action'=>WRENCHBOARD_FAMILY_TRANSFERHX +); + +$out = array(); +$ret = $wrenchboard->wrenchboard_api($data,$out,'familyrewardhx'); +//define('WRENCHBOARD_FAMILY_TRANSFERHX', 22011); +?> \ No newline at end of file diff --git a/public/wrenchboard/familytransfer.php b/public/wrenchboard/familytransfer.php new file mode 100644 index 0000000..017bcee --- /dev/null +++ b/public/wrenchboard/familytransfer.php @@ -0,0 +1,26 @@ + $member_id , + "sessionid" => $session_id , + "uid" => $uid, + "family_uid" => "1f385837-b5e6-420e-a17a-488c4b8ef015", + "wallet_uid" => "aa6e6488-2e71-4f83-b265-27c3c4339f73", + 'origing_wallet_uid' => 'cc0f8743-3f18-4214-ba4b-781e5dda9cb8', + 'currency' => 'NAIRA', + 'amount' => rand(10,30)*100, + "description" => "Thistransfer must have a description", + 'family_transfer_mode' => FAMILY_TRANSFER_DIRECT, + 'action'=>WRENCHBOARD_FAMILY_TRANSFER +); + +$out = array(); +$ret = $wrenchboard->wrenchboard_api($data,$out,'familytransfer'); + +?> + + diff --git a/public/wrenchboard/familytransferstart.php b/public/wrenchboard/familytransferstart.php new file mode 100644 index 0000000..caddd46 --- /dev/null +++ b/public/wrenchboard/familytransferstart.php @@ -0,0 +1,19 @@ + $member_id , + "sessionid" => $session_id , + "uid" => $uid, + "family_uid" => "1f385837-b5e6-420e-a17a-488c4b8ef015", + "wallet_uid" => "aa6e6488-2e71-4f83-b265-27c3c4339f73", + 'action'=>WRENCHBOARD_FAMILY_TRANSFERSTART +); + +$out = array(); +$ret = $wrenchboard->wrenchboard_api($data,$out,'familytransferstart'); + +?> diff --git a/public/wrenchboard/familyupdate.php b/public/wrenchboard/familyupdate.php index b91358d..bfdfc58 100644 --- a/public/wrenchboard/familyupdate.php +++ b/public/wrenchboard/familyupdate.php @@ -11,6 +11,9 @@ $data = array( "family_uid" => 'd04202a3-3d76-44da-be5b-c683998adc10', "firstname" => "NewFirst".rand(0,100), "lastname" => "NewLast".rand(0,100), + "year" => 2000 +rand(0,25) , + "month" => 1 + rand(0,11), + "enable_traking" => rand(0,1)*100, 'action'=> WRENCHBOARD_FAMILY_UPDATE ); diff --git a/public/wrenchboard/familywallet.php b/public/wrenchboard/familywallet.php new file mode 100644 index 0000000..c1629b8 --- /dev/null +++ b/public/wrenchboard/familywallet.php @@ -0,0 +1,38 @@ + $member_id , + "sessionid" => $session_id , + "uid" => $uid, + "family_uid" => '1f385837-b5e6-420e-a17a-488c4b8ef015', + 'action'=> WRENCHBOARD_FAMILY_WALLET +); + +$out = array(); +$ret = $wrenchboard->wrenchboard_api($data,$out,'familywallet'); + +/* +wrenchboard=> select uid,family_member_id from members_family where member_id =1; + uid | family_member_id +--------------------------------------+------------------ + 1f385837-b5e6-420e-a17a-488c4b8ef015 | 220 + 349c419a-2ad9-40b1-b747-37b710f62a8d | + 7b3f9ef1-28e1-493b-ac42-052cfbe0e384 | 195 + 65371fa3-6338-4a23-a993-3974010f5e8e | + e1ed7857-5dd0-4b78-b640-310bb224fd95 | 188 + 8c6100d7-91c4-47e9-b063-ac3e50385755 | 194 + a24f1193-7885-4c26-afac-3e5ad744ef40 | 187 + fd3246b5-0234-4b4d-bd0b-4d3a2c62f6ee | + d04202a3-3d76-44da-be5b-c683998adc10 | + c4db3b07-ce4a-4052-858a-b35c4b9691ce | + 6f3a7171-1bdf-48e9-b997-246c510b90ec | 203 +(11 rows) + +wrenchboard=> + +*/ + ?> diff --git a/public/wrenchboard/getmedia.php b/public/wrenchboard/getmedia.php index e8d6e76..f8dff64 100644 --- a/public/wrenchboard/getmedia.php +++ b/public/wrenchboard/getmedia.php @@ -22,9 +22,14 @@ $SERVER_URL = "https://apigate.lotus.g1.wrenchboard.com"; //$out = array(); //$ret = $wrenchboard->wrenchboard_api($data,$out,'getmedia'); +$family_uid = "1f385837-b5e6-420e-a17a-488c4b8ef015"; +$job_uid = "9e04cac7-bea2-498e-9d72-ef30830d0f92"; // sample $myFile_sample = $SERVER_URL."/en/wrench/api/v1/getmedia/".$session_id."/myfile/8be7f3dc-7fd8-4c0b-bc78-33dc5537cc3f"; $myFile_profile = $SERVER_URL."/en/wrench/api/v1/getmedia/".$session_id."/profile/".$uid; +$myFile_family_profile = $SERVER_URL."/en/wrench/api/v1/getmedia/".$session_id."/family/".$family_uid; +$myFile_jobs_picture = $SERVER_URL."/en/wrench/api/v1/getmedia/".$session_id."/job/".$job_uid; +$myFile_family_banner = $SERVER_URL."/en/wrench/api/v1/getmedia/".$session_id."/familybanner/".$uid; ?> @@ -46,7 +51,8 @@ $myFile_profile = $SERVER_URL."/en/wrench/api/v1/getmedia/".$session_id."/profil # Type - Last + Upload File + Read File Back Handle @@ -54,6 +60,7 @@ $myFile_profile = $SERVER_URL."/en/wrench/api/v1/getmedia/".$session_id."/profil 1 USERS UPLADED FILES + Upload
/en/wrench/api/v1/getmedia/session_id/myfile/file_uid @@ -62,18 +69,55 @@ $myFile_profile = $SERVER_URL."/en/wrench/api/v1/getmedia/".$session_id."/profil 2 Active Job Files - /en/wrench/api/v1/getmedia//contrats/9af67a04-6f4f-477f-a0a5-3336c7e9022b + Upload + /en/wrench/api/v1/getmedia//contracts/9af67a04-6f4f-477f-a0a5-3336c7e9022b
- /en/wrench/api/v1/getmedia/session_id/contrats/msg_uid + /en/wrench/api/v1/getmedia/session_id/contracts/msg_uid .... 3 Profile Picture - + Upload + + /en/wrench/api/v1/getmedia/session_id/profile/uid
+ ..... + + 4 + family Profile Picture + Upload + + /en/wrench/api/v1/getmedia/session_id/family/family_uid
+ + + ..... + + + + 5 + Job Creation Picture + Upload + + /en/wrench/api/v1/getmedia/session_id/job/job_uid
+ + + ..... + + + + 6 + family Profile Picture + Upload + + /en/wrench/api/v1/getmedia/session_id/familybanner/uid
+ + + ..... + + diff --git a/public/wrenchboard/index.php b/public/wrenchboard/index.php index 36dd238..8be1a97 100644 --- a/public/wrenchboard/index.php +++ b/public/wrenchboard/index.php @@ -19,16 +19,25 @@ include_once('def.php'); $dm ="http://".$_SERVER['HTTP_HOST']."/wrenchboard/"; $i=0; -echo ""; -foreach($tArr as $rr){ - $i++; - $urlS = $dm.$rr[0].".php"; - $docU = $dm.$rr[2]; - echo $rr[0]=='LINE'? "" : " - "; + +foreach($tArr as $x => $rrG){ +echo "".$x.""; +echo "
"; + + echo "
$i".$urlS ."".$rr[1]."".$docU ."
"; + foreach($rrG as $rr){ + $i++; + $urlS = $dm.$rr[0].".php"; + $docU = $dm.$rr[2]; + echo $rr[0]=='LINE'? "" : " + "; + } + + echo "
$i".$urlS ."".$rr[1]."".$docU ."
"; + } -echo ""; + //foreach ($_SERVER as $parm => $value) echo "$parm = '$value'\n"; diff --git a/public/wrenchboard/login.php b/public/wrenchboard/login.php index 24f03c8..286e684 100644 --- a/public/wrenchboard/login.php +++ b/public/wrenchboard/login.php @@ -4,7 +4,7 @@ include('wrenchboard_class.php'); $wrenchboard = new wrenchboard_class(); - $email = 'ses66181+2@gmail.com'; + $email = 'ses66181+1@gmail.com'; $data['username'] = $email; $data['password'] = 'may12002'; diff --git a/public/wrenchboard/mypagedetail.php b/public/wrenchboard/mypagedetail.php new file mode 100644 index 0000000..e69de29 diff --git a/public/wrenchboard/mypageintro.php b/public/wrenchboard/mypageintro.php new file mode 100644 index 0000000..e69de29 diff --git a/public/wrenchboard/mypageload.php b/public/wrenchboard/mypageload.php new file mode 100644 index 0000000..e69de29 diff --git a/public/wrenchboard/signup.php b/public/wrenchboard/signup.php index dbdc02c..7a9ea79 100644 --- a/public/wrenchboard/signup.php +++ b/public/wrenchboard/signup.php @@ -11,7 +11,8 @@ $data['firstname'] = 'Olu'. $country; $data['lastname'] = 'Amey'. $country; // $email = 'ses66181+'.rand(1000,9999).'@gmail.com'; - $email = 'ameye+aug'.rand(1000,9999).'@chiefsoft.com'; + $email = 'ameye+auglonger'.rand(1000,9999).'@chiefsoft.com'; + // $email = "victor.ebuka+aptest".rand(50,99)."@chiefsoft.com"; $data['email'] = $email; $data['username'] = $email; $data['password'] = 'may12002'; diff --git a/public/wrenchboard/signup2.php b/public/wrenchboard/signup2.php index db3127e..1d6d2a7 100644 --- a/public/wrenchboard/signup2.php +++ b/public/wrenchboard/signup2.php @@ -11,7 +11,7 @@ $data['firstname'] = 'Olu'. $country; $data['lastname'] = 'Amey'. $country; // $email = 'ses66181+'.rand(1000,9999).'@gmail.com'; - $email = 'ameye+aug'.rand(1000,9999).'@chiefsoft.com'; + $email = 'ameye+auglonger'.rand(1000,9999).'@chiefsoft.com'; $data['email'] = $email; $data['username'] = $email; $data['password'] = 'may12002'; diff --git a/public/wrenchboard/signup_victor.php b/public/wrenchboard/signup_victor.php new file mode 100644 index 0000000..e066b9a --- /dev/null +++ b/public/wrenchboard/signup_victor.php @@ -0,0 +1,33 @@ +wrenchboard_api($data,$out); + echo "
INPUT "; + var_dump($data); + echo "
OUTPUT "; + var_dump($out); + echo highlight_string(file_get_contents(__FILE__)); + +?> diff --git a/public/wrenchboard/signupcountry.php b/public/wrenchboard/signupcountry.php index 2e36894..150ed44 100644 --- a/public/wrenchboard/signupcountry.php +++ b/public/wrenchboard/signupcountry.php @@ -8,11 +8,11 @@ $wrenchboard = new wrenchboard_class(); $data = array( "limit" => 10, "page" => "1", - 'action' => 1200021, + 'action' => WRENCHBOARD_SIGNUP_COUNTRY, ); $out = array(); -$ret = $wrenchboard->wrenchboard_api($data,$out); +$ret = $wrenchboard->wrenchboard_api($data,$out,"signupcountry"); -//echo highlight_string(file_get_contents(__FILE__)); +echo highlight_string(file_get_contents(__FILE__)); ?> \ No newline at end of file diff --git a/public/wrenchboard/startcredit.php b/public/wrenchboard/startcredit.php index 1aa7279..5eb1a77 100644 --- a/public/wrenchboard/startcredit.php +++ b/public/wrenchboard/startcredit.php @@ -8,12 +8,18 @@ $cl =['USD','NAIRA']; define('WRENCHBOARD_USER_STARTCREDIT', 11053); $currn = $cl[rand(0,1) ]; + +$card_uid = ""; +if ($currn == 'USD'){ + $card_uid = "IF UING CARD - YOU HAVE TO SEND CARD UID"; +} $data = array( "member_id" => $member_id , "sessionid" => $session_id , "uid" => $uid, "currency" => $currn, "amount" => rand(10,200)*100, + "card_uid" => $card_uid, 'action'=>WRENCHBOARD_USER_STARTCREDIT ); diff --git a/public/wrenchboard/upload_family_banner.php b/public/wrenchboard/upload_family_banner.php new file mode 100644 index 0000000..2ae5fb1 --- /dev/null +++ b/public/wrenchboard/upload_family_banner.php @@ -0,0 +1,73 @@ + 2097152){ + $errors[]='File size must be excately 5 MB'; + } + + if(empty($errors)==true){ + + $image_source = file_get_contents($file_tmp); + $file_stream = base64_encode($image_source); + + $data = array( + "member_id" => $member_id , + "sessionid" => $session_id , + "uid" => $uid, + "file_name" => $file_name, + "file_size" => $file_size, + "file_type" => $file_type, + "file_data" => $file_stream, + "msg_type" => 'FILE', + 'action'=>WRENCHBOARD_PICTURE_FAMBANNER + ); + // NOTE "action" IS INTEGER ALWAYS - see define above + + $out = array(); + $ret = $wrenchboard->wrenchboard_api($data,$out,'uploads'); + +// "file_props" => $_FILES, + +var_dump( $data ); +var_dump( $out ); + + move_uploaded_file($file_tmp,"images_folder/".$file_name); + echo "Success"; + }else{ + print_r($errors); + } + } + + $tt_d = date('hisjmy'); + echo highlight_string(file_get_contents(__FILE__)); + +?> + + + +
+ + +
+ + + \ No newline at end of file diff --git a/public/wrenchboard/upload_family_profile.php b/public/wrenchboard/upload_family_profile.php new file mode 100644 index 0000000..b5bf008 --- /dev/null +++ b/public/wrenchboard/upload_family_profile.php @@ -0,0 +1,75 @@ + 2097152){ + $errors[]='File size must be excately 5 MB'; + } + + if(empty($errors)==true){ + + $image_source = file_get_contents($file_tmp); + $file_stream = base64_encode($image_source); + + $data = array( + "member_id" => $member_id , + "sessionid" => $session_id , + "uid" => $uid, + "family_uid" => $family_uid, + "file_name" => $file_name, + "file_size" => $file_size, + "file_type" => $file_type, + "file_data" => $file_stream, + "msg_type" => 'FILE', + 'action'=>WRENCHBOARD_PICTURE_FAMMEMBER + ); + + //const WRENCHBOARD_PICTURE_FAMMEMBER = 11305; + $out = array(); + $ret = $wrenchboard->wrenchboard_api($data,$out,'uploads'); + +// "file_props" => $_FILES, + +var_dump( $data ); +var_dump( $out ); + + move_uploaded_file($file_tmp,"images_folder/".$file_name); + echo "Success"; + }else{ + print_r($errors); + } + } + + $tt_d = date('hisjmy'); + echo highlight_string(file_get_contents(__FILE__)); + +?> + + + +
+ + +
+ + + \ No newline at end of file diff --git a/public/wrenchboard/upload_job_picture.php b/public/wrenchboard/upload_job_picture.php new file mode 100644 index 0000000..472d441 --- /dev/null +++ b/public/wrenchboard/upload_job_picture.php @@ -0,0 +1,77 @@ + 2097152){ + $errors[]='File size must be excately 5 MB'; + } + + if(empty($errors)==true){ + + $image_source = file_get_contents($file_tmp); + $file_stream = base64_encode($image_source); + + $data = array( + "member_id" => $member_id , + "sessionid" => $session_id , + "uid" => $uid, + "job_uid" => $job_uid, + "file_name" => $file_name, + "file_size" => $file_size, + "file_type" => $file_type, + "file_data" => $file_stream, + "msg_type" => 'FILE', + 'action'=>WRENCHBOARD_PICTURE_JOB + ); + + //const WRENCHBOARD_PICTURE_JOB = 11303; + $out = array(); + $ret = $wrenchboard->wrenchboard_api($data,$out,'uploads'); + +// "file_props" => $_FILES, + +var_dump( $data ); +var_dump( $out ); + + move_uploaded_file($file_tmp,"images_folder/".$file_name); + echo "Success"; + }else{ + print_r($errors); + } + } + + $tt_d = date('hisjmy'); + echo highlight_string(file_get_contents(__FILE__)); + +?> + + + +
+ + +
+ + + \ No newline at end of file diff --git a/public/wrenchboard/upload_profile.php b/public/wrenchboard/upload_profile.php new file mode 100644 index 0000000..8eb3e70 --- /dev/null +++ b/public/wrenchboard/upload_profile.php @@ -0,0 +1,73 @@ + 2097152){ + $errors[]='File size must be excately 5 MB'; + } + + if(empty($errors)==true){ + + $image_source = file_get_contents($file_tmp); + $file_stream = base64_encode($image_source); + + $data = array( + "member_id" => $member_id , + "sessionid" => $session_id , + "uid" => $uid, + "file_name" => $file_name, + "file_size" => $file_size, + "file_type" => $file_type, + "file_data" => $file_stream, + "msg_type" => 'FILE', + 'action'=>WRENCHBOARD_PICTURE_PROFILE + ); + // NOTE "action" IS INTEGER ALWAYS - see define above + + $out = array(); + $ret = $wrenchboard->wrenchboard_api($data,$out,'uploads'); + +// "file_props" => $_FILES, + +var_dump( $data ); +var_dump( $out ); + + move_uploaded_file($file_tmp,"images_folder/".$file_name); + echo "Success"; + }else{ + print_r($errors); + } + } + + $tt_d = date('hisjmy'); + echo highlight_string(file_get_contents(__FILE__)); + +?> + + + +
+ + +
+ + + \ No newline at end of file diff --git a/public/wrenchboard/wrenchboard_class.php b/public/wrenchboard/wrenchboard_class.php index d0f9541..9f6c837 100644 --- a/public/wrenchboard/wrenchboard_class.php +++ b/public/wrenchboard/wrenchboard_class.php @@ -6,13 +6,20 @@ class wrenchboard_class{ // public $REACT_APP_AUX_ENDPOINT = "https://apigate.lotus.g1.wrenchboard.com/svs/user"; // public $REACT_APP_USERS_ENDPOINT = "https://apigate.lotus.g1.wrenchboard.com/svs/user"; - // good ones - public $REACT_APP_AUX_ENDPOINT = "http://10.204.5.100:9083/en/wrench/api/v1"; //"https://apigate.lotus.g1.wrenchboard.com/svs/user"; - public $REACT_APP_USERS_ENDPOINT = "http://10.204.5.100:9083/en/wrench/api/v1"; // "https://apigate.lotus.g1.wre + // good ones DEV + // public $REACT_APP_AUX_ENDPOINT = "http://10.204.5.100:9083/en/wrench/api/v1"; //"https://apigate.lotus.g1.wrenchboard.com/svs/user"; + // public $REACT_APP_USERS_ENDPOINT = "http://10.204.5.100:9083/en/wrench/api/v1"; // "https://apigate.lotus.g1.wre + + // good ones QA + public $REACT_APP_AUX_ENDPOINT = "http://10.204.5.34:9083/en/wrench/api/v1"; //"https://apigate.lotus.g1.wrenchboard.com/svs/user"; + public $REACT_APP_USERS_ENDPOINT = "http://10.204.5.34:9083/en/wrench/api/v1"; // "https://apigate.lotus.g1.wre + +// public $REACT_APP_AUX_ENDPOINT = "http://10.0.0.235:9080/en/wrench/api/v1"; //"https://apigate.lotus.g1.wrenchboard.com/svs/user"; +// public $REACT_APP_USERS_ENDPOINT = "http://10.0.0.235:9080/en/wrench/api/v1"; // "https://apigate.lotus.g1.wre - //public $REACT_APP_AUX_ENDPOINT = "http://10.20.30.19:8000/en/wrench/api/v1"; //"https://apigate.lotus.g1.wrenchboard.com/svs/user"; - // public $REACT_APP_USERS_ENDPOINT = "http://10.20.30.19:8000/en/wrench/api/v1"; // "https://apigate.lotus.g1.wre +// public $REACT_APP_AUX_ENDPOINT = "http://10.20.30.19:9080/en/wrench/api/v1"; //"https://apigate.lotus.g1.wrenchboard.com/svs/user"; +// public $REACT_APP_USERS_ENDPOINT = "http://10.20.30.19:9080/en/wrench/api/v1"; // "https://apigate.lotus.g1.wre // public $REACT_APP_AUX_ENDPOINT = "http://10.204.5.100:9083/svs/user"; @@ -199,10 +206,13 @@ return $pathName; echo ("Error: call to URL $url failed with status $status, response $json_response, | curl_error " . curl_error($curl) . ", | curl_errno " . curl_errno($curl)); } + curl_close($curl); $response = json_decode($json_response, true); + var_dump($response); $this->showResult($url, $in, $response); $out = $response; + var_dump($out); return $response["internal_return"]; } diff --git a/writable/myfit_session.txt b/writable/myfit_session.txt index 88a5cde..0469b30 100644 --- a/writable/myfit_session.txt +++ b/writable/myfit_session.txt @@ -1,3 +1,3 @@ -58914299424016077730608274314642903631264178237880128136124353930296954921392288419326961050983 -16 -d274dcd9-7f5d-4919-b284-2a0cf137302e \ No newline at end of file +78094211946432457072167891950768920209058195588526769036687075040231711314241983553188136298683 +13 +31a6caaa-952a-4925-b25e-99bf1a301dbe \ No newline at end of file diff --git a/writable/session.txt b/writable/session.txt index 9e44e7d..7999fef 100644 --- a/writable/session.txt +++ b/writable/session.txt @@ -1,3 +1,3 @@ -FC0B1233880F5DF0677E6054887C3625 +7131FFA087A895077ECA6E5A4C64F7EE96808879F5B9D57702DC5BE983B48461 1 3119b744-42ad-4834-bb83-b737588754ca \ No newline at end of file diff --git a/writable/wrench_session.txt b/writable/wrench_session.txt index 0e73b63..ba1367e 100644 --- a/writable/wrench_session.txt +++ b/writable/wrench_session.txt @@ -1,3 +1,3 @@ -DFD8812B9A3ABE7FCF920B71A22AA3E93BB9F9C33AE22E90AAC47537367B2E2B +924566BE0880E58528BAF88F25CD3C1BDC2F913B1DD9BBF49D648F951267F2ED 1 3119b744-42ad-4834-bb83-b737588754ca \ No newline at end of file