From 3eb200b256a52ae34d1d08637164b41c9199e63c Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Sat, 11 Feb 2023 00:01:39 -0500 Subject: [PATCH] api UPDATE --- .gitignore | 3 +++ app/Config/Routes.php | 10 ++++++++-- app/Controllers/Myfituser.php | 6 +++++- app/Models/myfitHx.php | 8 ++++++-- app/Models/myfitResources.php | 8 +++++--- app/Models/myfitUserProfile.php | 26 ++++++++++++++++++++++++++ 6 files changed, 53 insertions(+), 8 deletions(-) create mode 100644 app/Models/myfitUserProfile.php diff --git a/.gitignore b/.gitignore index 7936d25..a8f2f12 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,9 @@ $RECYCLE.BIN/ *.msm *.msp +BACKUP +BACKUP/* +BAKUP/* # Windows shortcuts *.lnk diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 2c215bd..7e3b43d 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -47,6 +47,10 @@ $routes->get('/en/desktop/api/v2/myfit/faq', 'Myfit::faq'); $routes->post('/en/desktop/api/v2/myfit/contact', 'Myfit::contact'); $routes->get('/en/desktop/api/v2/myfit/pricing', 'Myfit::pricing'); + + + + //reset pass & login $routes->post('/en/desktop/api/v2/myfituser/resetpass', 'Myfitauth::users'); //MYFIT DESKTOP USERS @@ -58,8 +62,10 @@ $routes->post('/en/desktop/api/v2/myfituser/account', 'Myfitauth::users'); $routes->get('/en/desktop/api/v2/myfituser/profile', 'Myfituser::users'); $routes->get('/en/desktop/api/v2/myfituser/myfeed', 'Myfituser::users'); -$routes->get('/en/desktop/api/v2/myfituser/tracking', 'Myfituser::users'); +//Tracking +$routes->get('/en/desktop/api/v2/myfituser/tracking', 'Myfituser::users'); +$routes->get('/en/desktop/api/v2/myfituser/trackcategory', 'Myfituser::users'); // REMINDERS ------------------------------------------------------------- $routes->get('/en/desktop/api/v2/myfituser/reminders?(:any)', 'Myfituser::users/$1'); @@ -73,7 +79,7 @@ $routes->get('/en/desktop/api/v2/myfituser/loginhx', 'Myfituser::users'); $routes->get('/en/desktop/api/v2/myfituser/stats', 'Myfituser::users'); $routes->get('/en/desktop/api/v2/myfituser/resources', 'Myfituser::users'); -$routes->get('/en/desktop/api/v2/myfituser/trackcategory', 'Myfituser::users'); + //MYFIT DESKTOP USERS $routes->post('/en/mobile/api/v2/myfituser/login', 'Myfituser::users'); diff --git a/app/Controllers/Myfituser.php b/app/Controllers/Myfituser.php index 212c187..677c3eb 100644 --- a/app/Controllers/Myfituser.php +++ b/app/Controllers/Myfituser.php @@ -57,7 +57,8 @@ class Myfituser extends BaseController 'remcategory' => ['GET'], 'remmode' => ['GET'], 'resources' => ['GET'], - 'trackcategory' => ['GET'] + 'trackcategory' => ['GET'], + 'resetpass' => ['POST'], ]; $res1 = []; @@ -115,6 +116,9 @@ class Myfituser extends BaseController case 'calendar': $res1 = $this->dummyData($raw_array); break; + case 'resetpass': // reset password after login steps + $res1 = $this->dummyData($raw_array); + break; case 'profile': $res1 = $this->dummyData($raw_array); break; diff --git a/app/Models/myfitHx.php b/app/Models/myfitHx.php index 2c06d67..a25e49f 100644 --- a/app/Models/myfitHx.php +++ b/app/Models/myfitHx.php @@ -18,12 +18,16 @@ class myfitHx extends Model { // $in['member_id'] = 16; $member_id = - ( isset($in['member_id']) && $in['member_id'] > 0 && is_int($in['member_id']) ) + isset($in['member_id']) && + $in['member_id'] > 0 && + is_int($in['member_id']) ? $in['member_id'] : 0; + // $member_id = 13; $sqlQ = 'SELECT * FROM members_login_hx WHERE member_id=' . - $member_id; + $member_id . + ' ORDER BY id DESC LIMIT 15'; $query = $this->db->query($sqlQ); $data['loginhx_data'] = $query->getResultArray(); return $inx = [ diff --git a/app/Models/myfitResources.php b/app/Models/myfitResources.php index 511f37e..eab0d8a 100644 --- a/app/Models/myfitResources.php +++ b/app/Models/myfitResources.php @@ -17,14 +17,16 @@ class myfitResources extends Model $ar = [ 'id' => $i, 'description' => "This is the $i Desc $i", - 'img1' => 'https://blog.mermsemr.com/wp-content/uploads/2021/01/COVID-19-vaccine_002.jpg', + 'img1' => + 'https://blog.mermsemr.com/wp-content/uploads/2021/01/COVID-19-vaccine_002.jpg', ]; $dm[] = $ar; } - + return [ - 'resources' => $dm, + 'category' => ['Blogs', 'Exercises', 'Videos'], + 'resources' => ['blog'=>$dm], 'raw_data' => $in, ]; } diff --git a/app/Models/myfitUserProfile.php b/app/Models/myfitUserProfile.php new file mode 100644 index 0000000..9496b69 --- /dev/null +++ b/app/Models/myfitUserProfile.php @@ -0,0 +1,26 @@ +db = \Config\Database::connect($this->con_name); + } + + public function accountResetPassword($in) + { + return ['msg' => 'Profile Information']; + } + + public function getProfileInfo($in) + { + return ['msg' => 'Profile Information']; + } +}