Chiefsoft/CoreGrade
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2020-04-12 13:47:16 -04:00
parent 71d634b76e
commit 24ea6b9ae7
14 changed files with 494 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/application/config/constants.php
+8 -1
View File
@@ -89,7 +89,14 @@ defined('EXIT__AUTO_MAX') OR define('EXIT__AUTO_MAX', 125); // highest auto
define('COREGRADE_ACCOUNT_TESTEMAIL',11001);
define('COREGRADE_ACCOUNT_PENDING',11010);
define('COREGRADE_VERIFY_PENDING_LINK',11015);
define('COREGRADE_START_RESET_PASSWORD',11017);
define('COREGRADE_ACCOUNT_CREATEACC',11020);
define('COREGRADE_ACCOUNT_LOGIN',11025);
define('COREGRADE_ACCOUNT_ADDCARD', 11027);
define('COREGRADE_ACCOUNT_ADDPAGECARD', 11029);
define('COREGRADE_ACCOUNT_ADDPAGECARD', 11029);
define('RESET_START', 100);
define('RESET_CONFIRM', 200 );
define('RESET_COMPLETE', 300 );
www/application/controllers/Auth.php
+24 -14
View File
@@ -26,20 +26,20 @@ class Auth extends Start_Controller {
$data["page_title"] = "";
$data["username"] = $username; //"auxsupport";
$data["password"] = $password;
$data["sessionid"] ="12345678901234567890";
$data["sessionid"] = "12345678901234567890";
$out = [];
$this->coregrade_webapi(COREGRADE_ACCOUNT_LOGIN, $data, $out);
//print_r( $data );
//print_r( $out );
if (count($out) > 0 && isset($out["sessionid"]) && isset($out["member_id"]) && $out["member_id"] > 0 ) {
// print_r($out);
if (count($out) > 0 && isset($out["sessionid"]) && isset($out["member_id"]) && $out["member_id"] > 0) {
// print_r($out);
//$this->getSessionData($out[0], $session_data); // just for testing
$this->buildUserSession(PHP_API_OK, $out);
$valid_login = true;
$this->session->set_flashdata('in', $out);
redirect("member/index");
$login_done = true;
redirect("member/index");
$login_done = true;
} else {
$error_message = "Invalid Username/Password";
}
@@ -48,12 +48,11 @@ class Auth extends Start_Controller {
// $this->renderMemberPages('view_dash', $data);
// $login_done = true;
// $this->renderMemberPages('view_dash', $data);
// $login_done = true;
// exit();
}
// echo 'hhhh jjjj';
// echo 'hhhh jjjj';
//$this->coregrade_webapi(100, $data, $out);
// print_r($out);
@@ -105,17 +104,28 @@ class Auth extends Start_Controller {
}
public function resetpass() {
//$this->load->view('home/home');
//echo "START RESET 1";
$data = array();
$out = array();
$data["next_page"] = 0;
$data["error_message"] = "";
if ($_POST) {
$data['username'] = trim($this->input->post('username'));
$data["mode"] = RESET_START;
if ($data['username'] != '') {
$this->coregrade_webapi(COREGRADE_START_RESET_PASSWORD, $data, $out);
$data["next_page"] = 100;
} else {
$data["error_message"] = "Please enter a valis username to continue";
}
}
$this->load->view('auth/view_head');
$this->load->view('auth/view_reset_password');
$this->load->view('auth/view_reset_password', $data);
$this->load->view('auth/view_foot');
}
public function logout() {
$this->index();
}
}
www/application/views/auth/view_faq.php
+4 -4
View File
@@ -34,7 +34,7 @@ $next_page = isset($next_page) ? $next_page : 0;
<div class="collapse-margin search-content mt-0">
<div class="card-header" id="headingOne" role="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="false" aria-controls="collapseOne">
<span class="lead collapse-title">
What does royalty free mean?
How Do I Personalize My Learning Platforms?
</span>
</div>
<div id="collapseOne" class="collapse" aria-labelledby="headingOne" data-parent="#accordionExample">
@@ -46,7 +46,7 @@ $next_page = isset($next_page) ? $next_page : 0;
<div class="collapse-margin">
<div class="card-header" id="headingTwo" role="button" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
<span class="lead collapse-title collapsed">
What do you mean by item and end product?
How Do I create My Cards?
</span>
</div>
<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionExample">
@@ -70,7 +70,7 @@ $next_page = isset($next_page) ? $next_page : 0;
<div class="collapse-margin search-content">
<div class="card-header" id="headingFour" role="button" data-toggle="collapse" data-target="#collapseFour" aria-expanded="false" aria-controls="collapseFour">
<span class="lead collapse-title collapsed">
What does non-exclusive mean?
How to Add to my Cards?
</span>
</div>
<div id="collapseFour" class="collapse" aria-labelledby="headingFour" data-parent="#accordionExample">
@@ -118,7 +118,7 @@ $next_page = isset($next_page) ? $next_page : 0;
<div class="collapse-margin search-content">
<div class="card-header" id="headingEight" role="button" data-toggle="collapse" data-target="#collapseEight" aria-expanded="false" aria-controls="collapseEight">
<span class="lead collapse-title collapsed">
Can I re-distribute an item? What about under an Extended License?
How Do I Share my Personalized Cards?
</span>
</div>
<div id="collapseEight" class="collapse" aria-labelledby="headingEight" data-parent="#accordionExample">
www/application/views/auth/view_head.php
+7 -7
View File
@@ -44,19 +44,18 @@
<!-- BEGIN: Main Menu-->
<div class="horizontal-menu-wrapper">
<div class="header-navbar navbar-expand-sm navbar navbar-horizontal floating-nav navbar-light navbar-without-dd-arrow navbar-shadow menu-border" role="navigation" data-menu="menu-wrapper">
<div class="header-navbar navbar-expand-sm navbar navbar-horizontal floating-nav navbar-light navbar-without-dd-arrow navbar-shadow menu-border" role="navigation" data-menu="menu-wrapper" style=" background-color: aliceblue;">
<div class="navbar-header">
<ul class="nav navbar-nav flex-row">
<li class="nav-item mr-auto"><a class="navbar-brand" href="/">
<div class="brand-logo"></div>
<h2 class="brand-text mb-0">CoreGrade</h2>
<h2 class="brand-text mb-0" style="padding-left: 20px;">CoreGrade</h2>
</a></li>
<!-- li class="nav-item nav-toggle"><a class="nav-link modern-nav-toggle pr-0" data-toggle="collapse"><i class="feather icon-x d-block d-xl-none font-medium-4 primary toggle-icon"></i><i class="toggle-icon feather icon-disc font-medium-4 d-none d-xl-block collapse-toggle-icon primary" data-ticon="icon-disc"></i></a></li -->
</ul>
</div>
<!-- Horizontal menu content-->
<div class="navbar-container main-menu-content" data-menu="menu-container">
<!-- include ../../../includes/mixins-->
<div class="navbar-container main-menu-content menu-right" data-menu="menu-container">
<ul class="nav navbar-nav" id="main-menu-navigation" data-menu="menu-navigation">
<li class="dropdown nav-item" data-menu="dropdown"><a class="dropdown-toggle nav-link" href="/" data-toggle="dropdown"><i class="feather icon-home"></i><span data-i18n="Dashboard">Home</span></a>
@@ -65,10 +64,11 @@
</li>
</ul>
</li>
</ul>
</div>
</div>
</div>
<!-- END: Main Menu-->
<!-- END: Main Menu-->
www/application/views/auth/view_howitworks.php
-1
View File
@@ -2,7 +2,6 @@
$next_page = isset($next_page) ? $next_page : 0;
?>
<body class="vertical-layout vertical-menu-modern 1-column navbar-floating footer-static bg-full-screen-image blank-page blank-page" data-open="click" data-menu="vertical-menu-modern" data-col="1-column">
<!-- BEGIN: Content-->
<div class="app-content content">
<div class="content-overlay"></div>
www/application/views/auth/view_reset_password.php
+31 -6
View File
@@ -25,24 +25,26 @@ $next_page = isset($next_page) ? $next_page : 0;
<h4 class="mb-0">Reset Password</h4>
</div>
</div>
<p class="px-2">Please enter your new password.</p>
<div class="card-content">
<div class="card-body pt-1">
<?
if ($next_page == 0) {
?>
<form>
<p class="px-2">Please tell us your username.</p>
<form method="POST" action="/auth/resetpass">
<fieldset class="form-label-group">
<input type="text" class="form-control" id="user-email" placeholder="Email" required>
<input type="text" class="form-control" id="user-email" placeholder="Email" name="username" required>
<label for="user-email">Email</label>
</fieldset>
<fieldset class="form-label-group">
if the account is valid, you will receive instruction in your email to continue the reset process.
</fieldset>
<fieldset class="form-label-group">
<?= $error_message ?>
</fieldset>
<div class="row pt-2">
<div class="col-12 col-md-6 mb-1">
@@ -53,10 +55,33 @@ $next_page = isset($next_page) ? $next_page : 0;
</div>
</div>
</form>
<?php
} else if ($next_page == 100) {
?>
<form method="POST" action="/">
<fieldset class="form-label-group">
Check your email <b><?= $username ?></b> for a link to continue this process.
</fieldset>
<fieldset class="form-label-group">
<span style="color:red;">The email will expire in a few minutes if you did not receive the password reset email, please contact us.</span>
</fieldset>
<fieldset class="form-label-group">
<?= $error_message ?>
</fieldset>
<div class="row pt-2">
<div class="col-12 col-md-6 mb-1">
<button type="submit" class="btn btn-primary btn-block px-0">Return Home</button>
</div>
</div>
</form>
<?php
} else {
?>
<form>
<fieldset class="form-label-group">
<input type="text" class="form-control" id="user-email" placeholder="Email" required>
www/application/views/home/home.php
+8 -8
View File
@@ -40,7 +40,7 @@
<link rel="stylesheet" href="/assets/css/responsive.css">
<!-- Favicon -->
<link rel="shortcut icon" type="image/png" href="/assets/img/logo-sm.png">
<link rel="shortcut icon" type="image/png" href="/assets/img/coregrade.ico">
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -81,7 +81,7 @@
<li><a href="#pricing" class="smoothscroll">PLANS</a></li>
<li><a href="#download" class="smoothscroll">APP</a></li>
<li><a href="#contact" class="smoothscroll">CONTACT</a></li>
<li style="background-color: #FC6443;" onclick="viewLogin(); return;"><a href="/auth" >ACCOUNT</a></li>
<li style="background-color: #FC6443;" onclick="viewLogin(); return;"><a href="/auth" >START</a></li>
</ul>
</div>
</div>
@@ -200,7 +200,7 @@
<p class="pill-title">You Are</p>
<ul class="pricing-pill wow fadeIn">
<li class="active" data-value="individual"><span>Individual</span></li>
<li data-value="company"><span>Groups</span></li>
<li data-value="company"><span>Need More</span></li>
<!--
<li data-value="tutor"><span>Parents</span></li>
-->
@@ -216,19 +216,20 @@
<span class="price-tag">Free</span>
<h4 class="sublead">Empowering <br> New Skills</h4>
<ul class="pricing-list">
<li><p>Step-by-step Learning Path</p></li>
<li><p>Creative Learning Path</p></li>
<li><p>Stay in the loop</p></li>
<li><p>Accessibility</p></li>
</ul>
<a href="/auth/newuser" onclick="viewLogin(); return;" class="btn btn-default btn-outline">Get Started</a>
</li>
<li id="company">
<h2 class="lead2">Groups</h2>
<h2 class="lead2">CoreGrade Plus</h2>
<span class="price-tag">Contact Us</span>
<h4 class="sublead">Quality support that <br> drives success</h4>
<ul class="pricing-list">
<li><p>Everything Individual + </p></li>
<li><p>Integrations</p></li>
<li><p>Focus on laid-back acquirements</p></li>
<li><p>Flexible Learning</p></li>
<li><p>Personal Assistant</p></li>
</ul>
<a href="/auth/newuser" class="btn btn-default btn-outline">Make me a Pro</a>
@@ -264,7 +265,6 @@
<button class="btn btn-default btn-fill">Join CoreGrade</button>
</form>
</div>
</div>
</div>
</div>
@@ -293,7 +293,7 @@
<div class="row">
<div class="col-xs-12">
<div class="download-app text-center wow fadeIn">
<img src="/assets/img/mobile_slid.png" alt="Mobile Slide">
<!--dimg src="/assets/img/mobile_slid.png" alt="Mobile Slide" -->
</div>
</div>
</div>