From 2b7a251f0105969bea3445d5f6ccc25bae18a89f Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Wed, 14 Jun 2023 16:25:32 +0530
Subject: [PATCH] susee

---
 app/Views/forgot_password_otp.php  |  1 -
 app/Views/member_layout/footer.php | 41 +++++++++++++---
 app/Views/member_layout/header.php | 78 +++---------------------------
 app/Views/rule.php                 |  2 +-
 4 files changed, 43 insertions(+), 79 deletions(-)

diff --git a/app/Views/forgot_password_otp.php b/app/Views/forgot_password_otp.php
index 956357c..904b070 100644
--- a/app/Views/forgot_password_otp.php
+++ b/app/Views/forgot_password_otp.php
@@ -67,7 +67,6 @@ $(document).on('click','#submit1',function(){
     var user_role = $('#user').val();
     if ($('#user').val() == 'member') { url = "<?php echo base_url();?>forgot_password" } 
     else { url = "<?php echo base_url();?>user_forgot_password" }
-    alert(url)
     $.ajax({ 
       type: "post",
       url: url,
diff --git a/app/Views/member_layout/footer.php b/app/Views/member_layout/footer.php
index 599756c..d450ab8 100644
--- a/app/Views/member_layout/footer.php
+++ b/app/Views/member_layout/footer.php
@@ -47,18 +47,47 @@
 
                     <div class="col-lg-6 col-6">
                         <ul>
-                            <li><a href="https://golfevolutionkelowna.ca/evo-membership/">Pre-Sales Offer</a></li>
-                            <li><a href="#">Member Access</a></li>
-                            <li><a href="https://golfevolutionkelowna.ca/about-us/">About Us</a></li>
-                            <li><a href="https://golfevolutionkelowna.ca/contact-us/">Contact Us</a></li>                            
+                            <li><a href="<?php  if (isset($token)) 
+                            {
+                                if ($token == '')
+                                {
+                                    if(!session()->has('token'))
+                                    echo base_url('membership');
+                                    else 
+                                    echo base_url('/continue_membership/').session()->get('token'); 
+                                } 
+                                else if(session()->has('token'))
+                                {
+                                    echo base_url('/continue_membership/').session()->get('token'); 
+                                }
+                                else
+                                {
+                                    echo base_url('/continue_membership/').md5($token); 
+                                }
+                                
+                            }
+                            else
+                            {
+                                if(session()->has('token'))
+                                {
+                                    echo base_url('/continue_membership/').session()->get('token'); 
+                                }
+                                else
+                                {
+                                    echo base_url('membership'); 
+                                }
+                            } ?>">Pre-Sales Offer</a></li>
+                            <li><a href="<?php if(session()->has('logged_user')) { echo base_url()."member_home";  }else{ echo base_url();  } ?>">Member Access</a></li>
+                            <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us</a></li>
+                            <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/contact-us/">Contact Us</a></li>                            
                         </ul>
                     </div>
 
                     <div class="col-lg-6 col-6 ">
                         <ul>
-                            <li><a href="#">FAQ</a></li>
+                            <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/faq/">FAQ</a></li>
                             <li><a href="#">Blog</a></li>
-                            <li><a href="#">Terms & Conditions</a></li>                            
+                            <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/terms-conditions/">Terms & Conditions</a></li>                            
                         </ul>
                     </div>
                     
diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php
index 15da6d7..5a92f70 100644
--- a/app/Views/member_layout/header.php
+++ b/app/Views/member_layout/header.php
@@ -10,39 +10,7 @@
                 <div class="row d-flex align-items-baseline">                        
                     <div class="col-lg-5 header1">
                         <ul>
-                            <li><a href="<?php 
-                            if (isset($token)) 
-                            {
-                                if ($token == '')
-                                {
-                                    if(!session()->has('token'))
-                                    echo base_url('membership');
-                                    else 
-                                    echo base_url('/continue_membership/').session()->get('token'); 
-                                } 
-                                else if(session()->has('token'))
-                                {
-                                    echo base_url('/continue_membership/').session()->get('token'); 
-                                }
-                                else
-                                {
-                                    echo base_url('/continue_membership/').md5($token); 
-                                }
-                                
-                            }
-                            else
-                            {
-                                if(session()->has('token'))
-                                {
-                                    echo base_url('/continue_membership/').session()->get('token'); 
-                                }
-                                else
-                                {
-                                    echo base_url('membership'); 
-                                }
-                            } 
-                            
-                            ?>">Home</a></li>
+                            <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home</a></li>
                             <li><a href="<?php 
                             if (isset($token)) 
                             {
@@ -81,12 +49,12 @@
 
                     <div class="col-lg-2 text-center">
                         <div>
-                            <a href="https://golfevolutionkelowna.ca" class="custom-logo-link" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89"></a>
+                            <a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>" class="custom-logo-link" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="120" height="89"></a>
                         </div>         
                     </div>  
                     <div class="col-lg-5 header2">
                         <ul>
-                            <li><a href="https://golfevolutionkelowna.ca/about-us/">About Us</a></li>
+                            <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us</a></li>
                             <li><a href="<?php if(session()->has('logged_user')) { echo base_url()."member_home";  }else{ echo base_url();  } ?>" 
                             class="nav-button"><img src="<?= base_url()."/public"; ?>/assets/member_images/button-logo.png" width="20" height="20">
                             <?php if(session()->has('logged_user')) { echo session()->get('logged_user_name');  }else{ ?>MEMBER ACCESS<?php  } ?></a></li>
@@ -108,7 +76,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <div class="nav-main">                    
-                    <a href="https://golfevolutionkelowna.ca" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="100" height="74"></a>
+                    <a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="100" height="74"></a>
                     <button class="button-menu"><i class="fa fa-bars"></i></button>
                 </div>
             </div>
@@ -122,39 +90,7 @@
         <div class="row">
             <div class="col-lg-12">
                 <ul>
-                    <li><a href="<?php 
-                            if (isset($token)) 
-                            {
-                                if ($token == '')
-                                {
-                                    if(!session()->has('token'))
-                                    echo base_url('membership');
-                                    else 
-                                    echo base_url('/continue_membership/').session()->get('token'); 
-                                } 
-                                else if(session()->has('token'))
-                                {
-                                    echo base_url('/continue_membership/').session()->get('token'); 
-                                }
-                                else
-                                {
-                                    echo base_url('/continue_membership/').md5($token); 
-                                }
-                                
-                            }
-                            else
-                            {
-                                if(session()->has('token'))
-                                {
-                                    echo base_url('/continue_membership/').session()->get('token'); 
-                                }
-                                else
-                                {
-                                    echo base_url('membership'); 
-                                }
-                            } 
-                            
-                            ?>">Home <?= session()->get('token') ?></a></li>
+                    <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>">Home <?= session()->get('token') ?></a></li>
                     <li><a href="<?php  if (isset($token)) 
                             {
                                 if ($token == '')
@@ -185,8 +121,8 @@
                                     echo base_url('membership'); 
                                 }
                             } ?>">Pre-Sales Offer</a></li>
-                    <li><a href="https://golfevolutionkelowna.ca/about-us/">About Us</a></li>
-                    <li><a href="https://golfevolutionkelowna.ca/contact-us/">Contact Us</a> </li>                    
+                    <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/about-us/">About Us <?php echo $_SERVER['SERVER_NAME']; ?></a></li>
+                    <li><a href="https://<?php echo $_SERVER['SERVER_NAME']; ?>/contact-us/">Contact Us</a> </li>                    
                 </ul>        
             </div>
         </div>
diff --git a/app/Views/rule.php b/app/Views/rule.php
index ffb71db..94cdfeb 100644
--- a/app/Views/rule.php
+++ b/app/Views/rule.php
@@ -52,7 +52,7 @@ $(".tabledit-edit-button").click(function(){
 
    $(this).closest('tr').find('td.editableColumns_1').each(function(index) {
     var html = $(this).html();
-    var input = $('<input class="form-control" id="_'+index+'" type="text" />');
+    var input = $('<input class="form-control" id="_'+index+'" type="number" />');
     input.val(html.substring(0, html.indexOf(' ') + ''.length));
     $(this).html(input);
    });