From f3be271ebdf7aa3857615062d53605fcd9393da0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-BC3NEC6\\chiefsoft" <works@chiefsoft.com>
Date: Wed, 25 Jan 2023 20:44:42 -0500
Subject: [PATCH] addded routes

---
 app/Config/Routes.php     | 15 ++++++++++++---
 app/Models/userAccess.php | 12 ++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index e15cb0c..1356d34 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -39,7 +39,7 @@ $routes->get('/merms/wp/', 'Merms::index');
 $routes->get('/chiefsoft/site/blogdata', 'Chiefsoft::blogdata');  // when no limit is sent
 $routes->post('/chiefsoft/site/contact', 'Chiefsoft::contact');
 
-//MERMS MYFIT 
+//MERMS MYFIT NO SESSION DATA
 $routes->get('/en/desktop/api/v2/myfit/country', 'Myfit::country');
 $routes->get('/en/desktop/api/v2/myfit/blogdata/(:any)', 'Myfit::blogdata/$1');
 $routes->get('/en/desktop/api/v2/myfit/blogdata', 'Myfit::blogdata');  // when no limit is sent
@@ -48,17 +48,26 @@ $routes->post('/en/desktop/api/v2/myfit/contact', 'Myfit::contact');
 $routes->get('/en/desktop/api/v2/myfit/pricing', 'Myfit::pricing');
    
 //MYFIT DESKTOP USERS  
+//-- login
 $routes->post('/en/desktop/api/v2/myfituser/login', 'Myfituser::users');
+//--create acount
 $routes->post('/en/desktop/api/v2/myfituser/account', 'Myfituser::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');
+$routes->get('/en/desktop/api/v2/myfituser/reminders', 'Myfituser::users');
+$routes->get('/en/desktop/api/v2/myfituser/calendar', 'Myfituser::users');
+
+
 //MYFIT DESKTOP USERS  
 $routes->post('/en/mobile/api/v2/myfituser/login', 'Myfituser::users');
 $routes->post('/en/mobile/api/v2/myfituser/account', 'Myfituser::users');
 $routes->get('/en/mobile/api/v2/myfit/blogdata', 'Myfit::blogdata');
 
 
-$routes->get('/en/desktop/api/v2/myfituser/profile', 'Myfituser::users');
-$routes->get('/en/desktop/api/v2/myfituser/myfeed', 'Myfituser::users');
+
 
 /*
 https://devapi.mermsemr.com/en/desktop/api/v2/myfit/country    GET
diff --git a/app/Models/userAccess.php b/app/Models/userAccess.php
index 93b48c8..1743495 100644
--- a/app/Models/userAccess.php
+++ b/app/Models/userAccess.php
@@ -18,17 +18,17 @@ class userAccess extends Model
     public function startLogin($in)
     {
         $sqlQ =
-            'SELECT m.*,mp.* FROM members m LEFT JOIN members_profile mp ON m.id=mp.member_id WHERE m.id =12';
+            'SELECT m.id as member_id, m.*,mp.* FROM members m LEFT JOIN members_profile mp ON m.id=mp.member_id WHERE m.id =12';
         $query = $this->db->query($sqlQ);
-        $data['test_data'] = $query->getResultArray();
+        $data['profile_data'] = $query->getResultArray();
 
-        if (count($data['test_data']) == 1) {
-            $data['test_data'][0]['password'] = '**REMOVED**';
-            $member_id =  $data['test_data'][0]['id'];
+        if (count($data['profile_data']) == 1) {
+            $data['profile_data'][0]['password'] = '**REMOVED**';
+            $member_id =  $data['profile_data'][0]['member_id'];
             return $inx = [
                 'session_token' => $this->generateSession($member_id),
                 'member_id'=> $member_id,
-                'profile' => $data['test_data'],
+                'profile' => $data['profile_data'],
                 'settings' => [],
                 'preferences' => [],
                 'status' => 1,