Merge branch 'main' into joeykimsey-com

This commit is contained in:
Joey Kimsey
2025-02-02 02:29:08 -05:00
78 changed files with 923 additions and 591 deletions

View File

@ -54,15 +54,15 @@ class Home extends Controller {
return Issues::add( 'notice', 'You are already logged in. Please <a href="' . Routes::getAddress() . 'home/logout">click here</a> to log out.' );
}
if ( !Input::exists() ) {
return Views::view( 'login' );
return Views::view( 'auth.login' );
}
if ( !Forms::check( 'login' ) ) {
Issues::add( 'error', [ 'There was an error with your login.' => Check::userErrors() ] );
return Views::view( 'login' );
return Views::view( 'auth.login' );
}
if ( !self::$user->logIn( Input::post( 'username' ), Input::post( 'password' ), Input::post( 'remember' ) ) ) {
Issues::add( 'error', 'Username or password was incorrect.' );
return Views::view( 'login' );
return Views::view( 'auth.login' );
}
Session::flash( 'success', 'You have been logged in.' );
if ( Input::exists( 'rurl' ) ) {
@ -95,13 +95,13 @@ class Home extends Controller {
}
self::$title = $user->username . '\'s Profile - {SITENAME}';
self::$pageDescription = 'User Profile for ' . $user->username . ' - {SITENAME}';
Views::view( 'profile', $user );
Views::view( 'profilePage', $user );
}
public function terms() {
self::$title = 'Terms and Conditions - {SITENAME}';
self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.';
Components::set( 'TERMS', Views::simpleView( 'terms' ) );
Components::set( 'TERMS', Views::simpleView( 'auth.terms' ) );
Views::view( 'termsPage' );
}