From e31ec1267518cb73dadc108e9040f4e813687c72 Mon Sep 17 00:00:00 2001
From: Olu Amey <ameye@chiefsoft.com>
Date: Tue, 15 Mar 2022 10:06:54 -0400
Subject: [PATCH] fix

---
 app/Config/mermsemr_faq.php        |   4 +-
 app/Controllers/BaseController.php |  24 ++++
 app/Controllers/Support.php        |   2 +-
 app/Services/WpContentsClient.php  |  28 +++++
 app/Views/contact.php              | 186 ++++++++++++++---------------
 5 files changed, 142 insertions(+), 102 deletions(-)

diff --git a/app/Config/mermsemr_faq.php b/app/Config/mermsemr_faq.php
index 06521fc..e492ec7 100644
--- a/app/Config/mermsemr_faq.php
+++ b/app/Config/mermsemr_faq.php
@@ -5,8 +5,8 @@ $merms_faq = array
 	[
 	'What is MERMS ?',
 	'What is MERMS ?',
-	'MERSM is a series of patient, users and providers platforms that assist providers in patient care processes and any users to manage health care goals.',
-	'MERSM is a series of patient, users and providers platforms that assist providers in patient care processes and any users to manage health care goals.'
+	'MERMS is a series of patient, users and providers platforms that assist providers in patient care processes and any users to manage health care goals.',
+	'MERMS is a series of patient, users and providers platforms that assist providers in patient care processes and any users to manage health care goals.'
 	],
 	[
 	'What is myFit App ?',
diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php
index 862f560..535b82f 100644
--- a/app/Controllers/BaseController.php
+++ b/app/Controllers/BaseController.php
@@ -52,6 +52,30 @@ class BaseController extends Controller {
     }
 
     protected function getBlogItems() {
+        $apiEndpointsConfig = config('ApiEndpoints');
+        $wpData =  WpContentsClient::serviceGetBlogItems($apiEndpointsConfig->baseUrl);
+        $blog_post = array();
+        $blog_cnt =0;
+        foreach ($wpData as $item) {
+            $itemA = array(
+                'title' => $item->post_title,
+                'desc' =>  substr($item->post_content,0,400),
+                'link' => $item->guid,
+                'date' => date_format(date_create( $item->post_date),'Y-m-d'),
+                'image' => "https://blog.mermsemr.com/wp-content/uploads/".$item->meta_value,
+            );
+            if ($blog_cnt == 0){
+                $this->session->blogItem =  $itemA ;
+            }
+            $blog_cnt++;
+            array_push($blog_post, $itemA);
+        }
+        var_dump($blog_post);
+
+        return $blog_post;
+    }
+
+    protected function getBlogItems2() {
         $apiEndpointsConfig = config('ApiEndpoints');
         $wpData =  WpContentsClient::serviceGetBlogItems($apiEndpointsConfig->baseUrl);
         $blog_post = array();
diff --git a/app/Controllers/Support.php b/app/Controllers/Support.php
index fb9d607..2293da2 100644
--- a/app/Controllers/Support.php
+++ b/app/Controllers/Support.php
@@ -7,7 +7,7 @@ class Support extends BaseController {
     public function index() {
         $data = array();
 		$data["country"] = MERMS_COUNTRIES;
-        $this->renderExtPage('support', $data);
+        $this->renderExtPage('contact', $data);
     }
     //--------------------------------------------------------------------
 }
diff --git a/app/Services/WpContentsClient.php b/app/Services/WpContentsClient.php
index b71fa09..aef8131 100644
--- a/app/Services/WpContentsClient.php
+++ b/app/Services/WpContentsClient.php
@@ -5,11 +5,39 @@ use GuzzleHttp\Client as HTTPClient;
 
 class WpContentsClient
 {
+//http://localhost:5101/wp
 
     public static function serviceGetBlogItems($apiEndpointsUrl)
     {
         $cache = \Config\Services::cache();
 
+        if (!$cache->get('BlogWebData')){
+            $client = new HTTPClient();
+
+            try {
+                $response = $client->request(
+                    'GET',
+                    "http://10.0.0.52:5102/merms/wp",
+                    ['connect_timeout' => 2, 'timeout' => 3, 'debug' => false]
+                );
+            } catch (Exception $e) {
+                // echo "\n".$e->getMessage()."\n";
+                $response= []; // empty array
+            }
+            $responseArray = json_decode($response->getBody());
+            $cache->save('BlogWebData',$responseArray,7200);
+        }
+        else{
+            $responseArray = $cache->get('BlogWebData');
+        }
+//var_dump($responseArray);
+        return $responseArray;
+    }
+
+    public static function serviceGetBlogItems2($apiEndpointsUrl)
+    {
+        $cache = \Config\Services::cache();
+
         if (!$cache->get('BlogWebData')){
             $client = new HTTPClient();
 
diff --git a/app/Views/contact.php b/app/Views/contact.php
index 39ea8f2..088729e 100644
--- a/app/Views/contact.php
+++ b/app/Views/contact.php
@@ -1,21 +1,94 @@
 
          <!------main-content------>
          <main class="main-content">
-            <section class="page_title">
-               <div class="container">
-                  <div class="row">
-                     <div class="col-lg-12 d-flex">
-                        <div class="content_box">
-                           <ul class="bread_crumb text-center">
-                              <li class="bread_crumb-item"><a href="#">Home</a></li>
-                              <li class="bread_crumb-item active"> Contact</li>
-                           </ul>
-                           <h1>Contact</h1>
-                        </div>
+
+
+             <section class="contact_form type_one " >
+
+                 <div class="container ">
+                     <div class="row ">
+                         <div class="col-lg-12 ">
+                             <div class="heading icon_dark tp_one ">
+                                 <h6>Get in Touch</h6>
+                                 <h1>Contact Us </h1>
+                                 <span class="flaticon-virus icon "></span>
+                             </div>
+                         </div>
                      </div>
-                  </div>
-               </div>
-            </section>
+                     <div class="row ">
+                         <div class="col-lg-7 col-md-12 ">
+                             <div class="contact_form_box type_one ">
+                                 <h2>Send us a message, We will be touch <br>with you shortly.</h2>
+                                 <form id="contact-form" method="post" action="inc/contact.php" role="form">
+                                     <div class="messages"></div>
+
+                                     <div class="controls">
+                                         <div class="row ">
+                                             <div class="col-lg-6 col-md-6 ">
+                                                 <div class="form-group ">
+                                                     <label> Name</label>
+                                                     <input type="text" name="name" placeholder="Enter Your Fullname" required="required" data-error="Enter Your Name">
+                                                     <div class="help-block with-errors"></div>
+                                                 </div>
+                                             </div>
+                                             <div class="col-lg-6 col-md-6 ">
+                                                 <div class="form-group "> <label> Email</label>
+                                                     <input type="email" name="email" placeholder="Enter Valid Email" required="required" data-error="Enter Your Email Id">
+                                                     <div class="help-block with-errors"></div>
+                                                 </div>
+                                             </div>
+                                             <div class="col-lg-6 col-md-6 ">
+                                                 <div class="form-group "> <label> Phone</label>
+                                                     <input type="text" name="phone" placeholder="Enter Valid Number" required="required" data-error="Enter Valid Number">
+                                                     <div class="help-block with-errors"></div>
+                                                 </div>
+                                             </div>
+                                             <div class="col-lg-6 col-md-6 ">
+                                                 <div class="form-group">
+                                                     <label>Country of Travel</label>
+                                                     <select name="country" id="country">
+                                                         <option selected="selected">Select Country</option>
+                                                         <option>Australia</option>
+                                                         <option>America</option>
+                                                         <option>South Korea</option>
+                                                         <option>North Korea</option>
+                                                         <option>Japan</option>
+                                                         <option>China</option>
+                                                         <option>England</option>
+                                                         <option>Netherland</option>
+                                                     </select>
+                                                     <div class="help-block with-errors"></div>
+                                                 </div>
+                                             </div>
+                                             <div class="col-lg-12 col-md-12 ">
+                                                 <div class="form-group">
+                                                     <label> Message</label>
+                                                     <textarea name="message" placeholder="Enter Your Message" required="required"  rows="3" data-error="Please, leave us a message."></textarea>
+                                                     <div class="help-block with-errors"></div>
+                                                 </div>
+                                             </div>
+                                             <div class="col-lg-12 col-md-12 ">
+                                                 <div class="form-group mg_top apbtn">
+                                                     <button class="theme_btn tp_one" type="submit">Send Message</button>
+                                                 </div>
+                                             </div>
+                                         </div>
+                                     </div>
+                                 </form>
+                             </div>
+                         </div>
+                         <div class="col-lg-5 ">
+                             <div class="image_box clearfix ">
+
+
+                                 <figure class="image image_bg ">
+                                     <img src="/assets/image/resources/contact-us-page.jpg" class="img-fluid " alt="contact-us-page" />
+                                 </figure>
+                             </div>
+                         </div>
+                     </div>
+                 </div>
+             </section>
             <!-- info-section -->
             <section class="info_section">
                <div class="container">
@@ -75,90 +148,5 @@
                </div>
             </section>
             <!-- info-section end -->
-            <section class="contact_form type_one " >
-              
-               <div class="container ">
-                  <div class="row ">
-                     <div class="col-lg-12 ">
-                        <div class="heading icon_dark tp_one ">
-                           <h6>Get in Touch</h6>
-                           <h1>Contact Us </h1>
-                           <span class="flaticon-virus icon "></span>
-                        </div>
-                     </div>
-                  </div>
-                  <div class="row ">
-                     <div class="col-lg-7 col-md-12 ">
-                        <div class="contact_form_box type_one ">
-                           <h2>Send us a message, We will be touch <br>with you shortly.</h2>
-                           <form id="contact-form" method="post" action="inc/contact.php" role="form">
-                              <div class="messages"></div>
 
-                              <div class="controls">
-                              <div class="row ">
-                                 <div class="col-lg-6 col-md-6 ">
-                                    <div class="form-group ">
-                                       <label> Name</label>
-                                       <input type="text" name="name" placeholder="Enter Your Fullname" required="required" data-error="Enter Your Name">
-                                       <div class="help-block with-errors"></div>
-                                    </div>
-                                 </div>
-                                 <div class="col-lg-6 col-md-6 ">
-                                    <div class="form-group "> <label> Email</label>
-                                       <input type="email" name="email" placeholder="Enter Valid Email" required="required" data-error="Enter Your Email Id">
-                                       <div class="help-block with-errors"></div>
-                                    </div>
-                                 </div>
-                                 <div class="col-lg-6 col-md-6 ">
-                                    <div class="form-group "> <label> Phone</label>
-                                       <input type="text" name="phone" placeholder="Enter Valid Number" required="required" data-error="Enter Valid Number">
-                                       <div class="help-block with-errors"></div>
-                                    </div>
-                                 </div>
-                                 <div class="col-lg-6 col-md-6 ">
-                                    <div class="form-group">
-                                       <label>Country of Travel</label>
-                                       <select name="country" id="country">
-                                          <option selected="selected">Select Country</option>
-                                          <option>Australia</option>
-                                          <option>America</option>
-                                          <option>South Korea</option>
-                                          <option>North Korea</option>
-                                          <option>Japan</option>
-                                          <option>China</option>
-                                          <option>England</option>
-                                          <option>Netherland</option>
-                                       </select>
-                                       <div class="help-block with-errors"></div>
-                                    </div>
-                                 </div>
-                                 <div class="col-lg-12 col-md-12 ">
-                                    <div class="form-group">
-                                        <label> Message</label>
-                                       <textarea name="message" placeholder="Enter Your Message" required="required"  rows="3" data-error="Please, leave us a message."></textarea>
-                                       <div class="help-block with-errors"></div>
-                                    </div>
-                                 </div>
-                                 <div class="col-lg-12 col-md-12 ">
-                                    <div class="form-group mg_top apbtn">
-                                       <button class="theme_btn tp_one" type="submit">Send Message</button>
-                                    </div>
-                                 </div>
-                              </div>
-                           </div>
-                           </form>
-                        </div>
-                     </div>
-                     <div class="col-lg-5 ">
-                        <div class="image_box clearfix ">
-                         
-                     
-                           <figure class="image image_bg ">
-                              <img src="/assets/image/resources/contact-us-page.jpg" class="img-fluid " alt="contact-us-page" />
-                           </figure>
-                        </div>
-                     </div>
-                  </div>
-               </div>
-            </section>
           
\ No newline at end of file