From 9a87d0295231d1c6b443eecdcb1505308aa826c5 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Mon, 10 Feb 2020 20:30:58 -0500 Subject: [PATCH 1/6] fix --- .../views/auth/view_reset_password.php | 85 +++++++++++++------ www/application/views/home/home.php | 6 +- www/assets/js/theme.js | 4 +- 3 files changed, 66 insertions(+), 29 deletions(-) diff --git a/www/application/views/auth/view_reset_password.php b/www/application/views/auth/view_reset_password.php index 28a8b20..3645184 100644 --- a/www/application/views/auth/view_reset_password.php +++ b/www/application/views/auth/view_reset_password.php @@ -1,6 +1,6 @@ - - - + @@ -28,30 +28,68 @@

Please enter your new password.

-
-
- - -
+ + +
+ + +
-
- - -
+
+ +
-
- - -
-
-
- Go Back to Login +
+ +
+
+
+ Go Back to Login +
+
+ +
-
- + + + +
+
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ Go Back to Login +
+
+ +
-
- + + + + + + + +
@@ -67,4 +105,3 @@ - \ No newline at end of file diff --git a/www/application/views/home/home.php b/www/application/views/home/home.php index 1751762..077634b 100644 --- a/www/application/views/home/home.php +++ b/www/application/views/home/home.php @@ -77,7 +77,7 @@
  • HOME
  • FEATURE
  • PLANS
    • -
  • DOWNLOAD
    • +
  • APP
  • CONTACT
  • ACCOUNT
    • @@ -94,8 +94,8 @@
    -

    Idea

    -

    +

    Creative

    +

    diff --git a/www/assets/js/theme.js b/www/assets/js/theme.js index 0561fca..2ec1772 100644 --- a/www/assets/js/theme.js +++ b/www/assets/js/theme.js @@ -94,11 +94,11 @@ $(window).load(function() { // Typed Js $(".lead").typed({ - strings: ["", "Creative"], + strings: ["", "Learning"], typeSpeed: 100, }); $(".lead-text").typed({ - strings: ["", "New Applatction For App"], + strings: ["", "Learn . Practice . Acquire . Grow"], typeSpeed: 100, startDelay: 1200 }); From c0c5ca6eb92f7ae7328e4bd19116c9e0b4dfc9e6 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Mon, 10 Feb 2020 20:39:06 -0500 Subject: [PATCH 2/6] fix --- www/application/views/home/home.php | 4 ++-- www/assets/css/style.css | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/application/views/home/home.php b/www/application/views/home/home.php index 077634b..de4c7f7 100644 --- a/www/application/views/home/home.php +++ b/www/application/views/home/home.php @@ -256,10 +256,10 @@
    -

    30000+ people using now

    +

    Join people using CoreGrade

    - +
    diff --git a/www/assets/css/style.css b/www/assets/css/style.css index bbbf6d0..4f3e2fc 100644 --- a/www/assets/css/style.css +++ b/www/assets/css/style.css @@ -132,7 +132,7 @@ Table of Contents */ .hero-area { width: 100%; - min-height: 80vh; + min-height: 75vh; background-image: url('../img/bg.jpg'); background-repeat: no-repeat; background-position: center; From fbf39a87893bc8765f30c58691812d8bfa542868 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Mon, 10 Feb 2020 20:54:02 -0500 Subject: [PATCH 3/6] fix --- www/application/controllers/Home.php | 17 +++++++++++++++++ www/application/views/home/home.php | 19 +++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 www/application/controllers/Home.php diff --git a/www/application/controllers/Home.php b/www/application/controllers/Home.php new file mode 100644 index 0000000..ba0dcbd --- /dev/null +++ b/www/application/controllers/Home.php @@ -0,0 +1,17 @@ +load->view('home/home'); + // redirect("auth/index"); + } + + public function viewLogin() { + + } + +} diff --git a/www/application/views/home/home.php b/www/application/views/home/home.php index de4c7f7..00476b4 100644 --- a/www/application/views/home/home.php +++ b/www/application/views/home/home.php @@ -324,9 +324,9 @@

    Learn More

    @@ -335,10 +335,10 @@

    About Us

    @@ -346,9 +346,8 @@

    Support

    From ca103203948ff29d55dd5d94401f7caeb1915a15 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Mon, 10 Feb 2020 21:01:45 -0500 Subject: [PATCH 4/6] fix --- www/application/controllers/Home.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/www/application/controllers/Home.php b/www/application/controllers/Home.php index ba0dcbd..5c69dbc 100644 --- a/www/application/controllers/Home.php +++ b/www/application/controllers/Home.php @@ -4,14 +4,32 @@ defined('BASEPATH') OR exit('No direct script access allowed'); class Home extends CI_Controller { - public function index() { $this->load->view('home/home'); // redirect("auth/index"); } - public function viewLogin() { + public function security() { } + public function howitworks() { + + } + + public function privacy() { + + } + + public function faq() { + + } + + public function terms(){ + + } + + public function contatus(){ + + } } From 79357aca24daf309397e78a00631b7cdaf467dc0 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Mon, 10 Feb 2020 21:46:46 -0500 Subject: [PATCH 5/6] fix --- www/application/views/home/home.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/application/views/home/home.php b/www/application/views/home/home.php index 00476b4..aca806a 100644 --- a/www/application/views/home/home.php +++ b/www/application/views/home/home.php @@ -372,8 +372,8 @@

    Email :support@coregrade.com

    Phone : 404-858-7966

    From 4f9cb46f0fc5d75f3da005eddbe6d60f1ef4f17b Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Tue, 11 Feb 2020 21:17:42 -0500 Subject: [PATCH 6/6] fix --- www/application/controllers/Auth.php | 2 ++ www/application/controllers/Home.php | 24 +++++++++++++----- www/application/views/home/home.php | 38 ++++++++++++++-------------- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/www/application/controllers/Auth.php b/www/application/controllers/Auth.php index e2f1344..f4112d7 100644 --- a/www/application/controllers/Auth.php +++ b/www/application/controllers/Auth.php @@ -115,5 +115,7 @@ class Auth extends Start_Controller { public function logout() { $this->index(); } + + } diff --git a/www/application/controllers/Home.php b/www/application/controllers/Home.php index 5c69dbc..447f1ef 100644 --- a/www/application/controllers/Home.php +++ b/www/application/controllers/Home.php @@ -2,11 +2,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); -class Home extends CI_Controller { +class Home extends Start_Controller { public function index() { - $this->load->view('home/home'); - // redirect("auth/index"); + $data=[]; + $this->viewHomePages("view_reset_password",$data); } public function security() { @@ -25,11 +25,21 @@ class Home extends CI_Controller { } - public function terms(){ + public function terms() { + + } + + public function contatus() { } - public function contatus(){ - + private function viewHomePages($page_name,$data) { + //$this->load->view('home/home'); + //echo "START RESET 1"; + $this->load->view('auth/view_head'); + $this->load->view('auth/'.$page_name, $data); + $this->load->view('auth/view_foot'); } -} + + +} \ No newline at end of file diff --git a/www/application/views/home/home.php b/www/application/views/home/home.php index aca806a..4a742d8 100644 --- a/www/application/views/home/home.php +++ b/www/application/views/home/home.php @@ -109,13 +109,13 @@
    - + Apple Google Play - - - - + + + +
    @@ -262,7 +262,7 @@ - + @@ -404,21 +404,21 @@ - - +