Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
7cd3071905 | |||
77b60d34f6 | |||
b858af3b55 | |||
937e4581ba | |||
f19f59d53a | |||
0c96ba6c90 | |||
713a44ad98 | |||
ea40fc8e38 | |||
8190b5ed71 |
@ -16,8 +16,7 @@ Master Repo: https://git.4lt.ca/4lt/novaconium
|
||||
```bash
|
||||
mkdir project_name;
|
||||
cd project_name;
|
||||
mkdir -p App/controllers App/templates App/views public
|
||||
touch App/controllers/404.php App/controllers/index.php App/views/index.html.twig public/index.php public/.htaccess App/routes.php
|
||||
|
||||
composer require 4lt/novaconium
|
||||
cp -R vendor/4lt/novaconium/examples/App/ .
|
||||
cp -R vendor/4lt/novaconium/examples/public/ .
|
||||
```
|
||||
|
@ -1 +1,14 @@
|
||||
<h1>This is 404</h1>
|
||||
<?php
|
||||
|
||||
// Define our status code and message
|
||||
$status_code = 404;
|
||||
$status_message = 'The requested resource could not be found.';
|
||||
|
||||
// Set the HTTP response code and message
|
||||
http_response_code($status_code);
|
||||
header("Content-Type: text/html");
|
||||
?>
|
||||
|
||||
<h1>Error 404 Resource Not found</h1>
|
||||
<p><?php echo $status_message; ?></p>
|
||||
|
||||
|
@ -1,6 +0,0 @@
|
||||
<?php
|
||||
error_reporting(E_ALL);
|
||||
ini_set('display_errors', 1);
|
||||
define('BASEPATH', dirname(__DIR__, 1));
|
||||
require_once(BASEPATH . '/vendor/4lt/novaconium/src/bootstrap.php');
|
||||
?>
|
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
$routes = [
|
||||
'/about' => [
|
||||
'file' => 'about'
|
||||
'get' => 'about'
|
||||
],
|
||||
'/' => [
|
||||
'file' => 'index'
|
||||
'get' => 'index'
|
||||
]
|
||||
];
|
1
examples/App/templates/override.html.twig
Normal file
1
examples/App/templates/override.html.twig
Normal file
@ -0,0 +1 @@
|
||||
{# Overrides go here #}
|
@ -1,6 +1,4 @@
|
||||
RewriteEngine On
|
||||
|
||||
RewriteCond %{REQUEST_FILENAME} !-f
|
||||
RewriteCond %{REQUEST_FILENAME} !-d
|
||||
|
||||
RewriteRule ^(.*)$ index.php?_uri=$1 [QSA,L]
|
6
examples/public/index.php
Normal file
6
examples/public/index.php
Normal file
@ -0,0 +1,6 @@
|
||||
<?php
|
||||
// error_reporting(E_ALL);
|
||||
// ini_set('display_errors', 1);
|
||||
define('BASEPATH', dirname(__DIR__, 1));
|
||||
require_once(BASEPATH . '/vendor/4lt/novaconium/src/novaconium.php');
|
||||
?>
|
75
src/Database.php
Normal file
75
src/Database.php
Normal file
@ -0,0 +1,75 @@
|
||||
<?php
|
||||
|
||||
class Database {
|
||||
|
||||
private $host;
|
||||
private $user;
|
||||
private $pass;
|
||||
private $dbname;
|
||||
private $conn;
|
||||
|
||||
public function __construct($dbinfo) {
|
||||
$this->host = $dbinfo['host'];
|
||||
$this->user = $dbinfo['user'];
|
||||
$this->pass = $dbinfo['pass'];
|
||||
$this->dbname = $dbinfo['name'];
|
||||
|
||||
$this->connect();
|
||||
}
|
||||
|
||||
private function connect() {
|
||||
$this->conn = new mysqli($this->host, $this->user, $this->pass, $this->dbname);
|
||||
|
||||
if ($this->conn->connect_error) {
|
||||
die("Connection failed: " . $this->conn->connect_error);
|
||||
}
|
||||
}
|
||||
|
||||
public function query($query) {
|
||||
$stmt = $this->conn->prepare($query);
|
||||
$stmt->execute();
|
||||
|
||||
return $stmt->get_result();
|
||||
}
|
||||
|
||||
public function getRow($query) {
|
||||
$result = $this->query($query);
|
||||
return $result->fetch_assoc();
|
||||
}
|
||||
|
||||
public function debugGetRow($query) {
|
||||
echo "<h1>Debug GetRow Query</h1>";
|
||||
echo "<div class='debug-query'>Query: $query</div>";
|
||||
$result = $this->query($query);
|
||||
$row = $result->fetch_assoc();
|
||||
|
||||
echo "<pre>";
|
||||
print_r($row);
|
||||
echo "</pre>";
|
||||
|
||||
die();
|
||||
}
|
||||
|
||||
public function getRows($query) {
|
||||
$result = $this->query($query);
|
||||
return $result->fetch_all(MYSQLI_ASSOC);
|
||||
}
|
||||
|
||||
public function debugGetRows($query) {
|
||||
echo "<h1>Debug GetRows Query</h1>";
|
||||
echo "<div class='debug-query'>Query: $query</div>";
|
||||
|
||||
$result = $this->query($query);
|
||||
$rows = $result->fetch_all(MYSQLI_ASSOC);
|
||||
|
||||
echo "<pre>";
|
||||
print_r($rows);
|
||||
echo "</pre>";
|
||||
|
||||
die();
|
||||
}
|
||||
|
||||
public function close() {
|
||||
$this->conn->close();
|
||||
}
|
||||
}
|
109
src/Router.php
109
src/Router.php
@ -4,22 +4,40 @@ class Router {
|
||||
public $routes = [];
|
||||
public $query = [];
|
||||
public $path;
|
||||
public $controllerPath = BASEPATH . '/App/controllers/404.php';
|
||||
public $controller;
|
||||
public $controllerPath;
|
||||
public $parameters = [];
|
||||
public $requestType = 'get';
|
||||
|
||||
public function __construct() {
|
||||
$this->loadRoutes();
|
||||
$this->preparePath();
|
||||
$this->prepareQuery();
|
||||
$this->setRouteFile();
|
||||
$this->routes = $this->loadRoutes();
|
||||
$this->path = $this->preparePath();
|
||||
$this->query = $this->prepareQuery();
|
||||
$this->requestType = $this->getRequestType();
|
||||
$this->controller = $this->findController();
|
||||
$this->controllerPath = $this->setRouteFile();
|
||||
}
|
||||
|
||||
private function loadRoutes() {
|
||||
require_once( BASEPATH . '/App/routes.php');
|
||||
$this->routes = $routes;
|
||||
return $routes;
|
||||
}
|
||||
|
||||
private function preparePath() {
|
||||
$this->path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
|
||||
$path = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
|
||||
|
||||
//homepage
|
||||
if ($path === '/') {
|
||||
return $path;
|
||||
}
|
||||
|
||||
// remove empty directory path
|
||||
$path = rtrim($path, '/'); // remove trailing slash
|
||||
|
||||
//remove anything after and including ampersand
|
||||
$path = preg_replace('/&.+$/', '', $path);
|
||||
|
||||
return $path;
|
||||
}
|
||||
|
||||
private function prepareQuery() {
|
||||
@ -28,16 +46,83 @@ class Router {
|
||||
if (isset($parsedUri['query'])) {
|
||||
parse_str($parsedUri['query'], $queryArray);
|
||||
}
|
||||
$this->query = $queryArray;
|
||||
return $queryArray;
|
||||
}
|
||||
|
||||
private function getRequestType() {
|
||||
// is the requewst a get or post?
|
||||
if (empty($_POST)) {
|
||||
return 'get';
|
||||
} else {
|
||||
return 'post';
|
||||
}
|
||||
}
|
||||
|
||||
private function findController() {
|
||||
|
||||
// one to one match
|
||||
if (array_key_exists($this->path, $this->routes)) {
|
||||
return $this->routes[$this->path][$this->requestType];
|
||||
}
|
||||
|
||||
private function setRouteFile() {
|
||||
foreach ($this->routes as $key => $value) {
|
||||
if ( $this->path == $key) {
|
||||
$this->controllerPath = BASEPATH . '/App/controllers/' . $value['file'] . '.php';
|
||||
break;
|
||||
// Check if key contains a curly bracket, if not continue. We already checked above.
|
||||
if (!strpos($key, '{')) continue;
|
||||
|
||||
// Remove everything after the curly bracket, from key
|
||||
$keyPath = substr($key, 0, strpos($key, '{'));
|
||||
|
||||
//see if keyPath matches the first characters of $this->path, only the first characters have to match
|
||||
if (strpos($this->path, $keyPath) === 0) {
|
||||
|
||||
// We have a potential match. Now check if the parameter count is equal
|
||||
$keyParams = explode('/', $key);
|
||||
$pathParams = explode('/', $this->path);
|
||||
$keyParamCount = count($keyParams);
|
||||
$pathParamCount = count($pathParams);
|
||||
if ($keyParamCount === $pathParamCount) {
|
||||
for ($i=0; $i < $pathParamCount; $i++) {
|
||||
if (strpos($keyParams[$i], '{') !== false) {
|
||||
$keyParams[$i] = substr($keyParams[$i], 1, -1);
|
||||
$this->parameters[$keyParams[$i]] = $pathParams[$i];
|
||||
return $this->routes[$key][$this->requestType];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return '404';
|
||||
|
||||
}
|
||||
|
||||
// checks if the file exists, sets file path
|
||||
private function setRouteFile() {
|
||||
|
||||
$cp = BASEPATH . '/App/controllers/' . $this->controller . '.php';
|
||||
|
||||
if (file_exists($cp)) {
|
||||
return $cp;
|
||||
} else {
|
||||
return BASEPATH . '/App/controllers/404.php';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function debug() {
|
||||
echo '<h1>Debugging Router</h1>';
|
||||
echo '<h2>Url Path</h2>';
|
||||
echo $this->path . '<br>';
|
||||
echo '<h2>ControllerPath</h2>';
|
||||
echo $this->controllerPath;
|
||||
echo '<h2>Parameters</h2>';
|
||||
echo '<pre>';
|
||||
print_r($this->parameters);
|
||||
echo '</pre>';
|
||||
echo '<h2>Routes Variable</h2><pre>';
|
||||
print_r($this->routes);
|
||||
echo '</pre>';
|
||||
die();
|
||||
}
|
||||
|
||||
}
|
51
src/Session.php
Normal file
51
src/Session.php
Normal file
@ -0,0 +1,51 @@
|
||||
<?php
|
||||
|
||||
class Session {
|
||||
private $session;
|
||||
|
||||
public function __construct() {
|
||||
if (!isset($_SESSION)) {
|
||||
session_start();
|
||||
$this->session = $_SESSION;
|
||||
} else {
|
||||
$this->session = $_SESSION;
|
||||
}
|
||||
$this->setToken();
|
||||
}
|
||||
|
||||
public function setToken() {
|
||||
if (!isset($this->session['token'])) {
|
||||
$this->session['token'] = bin2hex(random_bytes(32));
|
||||
}
|
||||
}
|
||||
|
||||
public function set($key, $value) {
|
||||
$this->session[$key] = $value;
|
||||
}
|
||||
|
||||
public function get($key) {
|
||||
return isset($this->session[$key]) ? $this->session[$key] : null;
|
||||
}
|
||||
|
||||
public function flash($key) {
|
||||
$return = $this->get($key);
|
||||
$this->delete($key);
|
||||
return $return;
|
||||
}
|
||||
|
||||
public function debug() {
|
||||
print_r($this->session);
|
||||
}
|
||||
|
||||
public function delete($key) {
|
||||
if (isset($this->session[$key])) {
|
||||
unset($this->session[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
public function write() {
|
||||
$_SESSION = $this->session;
|
||||
session_write_close();
|
||||
}
|
||||
|
||||
}
|
@ -1,13 +0,0 @@
|
||||
<?php
|
||||
require_once(BASEPATH . '/vendor/autoload.php');
|
||||
|
||||
//Twig
|
||||
$loader = new Twig\Loader\FilesystemLoader(BASEPATH . '/App/views/');
|
||||
$loader->addPath(BASEPATH . '/vendor/4lt/novaconium/twig', 'novaconium');
|
||||
$loader->addPath(BASEPATH . '/App/templates', 'override');
|
||||
$twig = new Twig\Environment($loader);
|
||||
|
||||
// Load a controller
|
||||
require_once('Router.php');
|
||||
$router = new Router();
|
||||
require_once($router->controllerPath);
|
23
src/novaconium.php
Normal file
23
src/novaconium.php
Normal file
@ -0,0 +1,23 @@
|
||||
<?php
|
||||
require_once(BASEPATH . '/vendor/autoload.php');
|
||||
require_once(BASEPATH . '/App/config.php');
|
||||
|
||||
// Creates twig and the view() function
|
||||
require_once(BASEPATH . '/vendor/4lt/novaconium/src/twig.php');
|
||||
|
||||
// Start a Session
|
||||
require_once(BASEPATH . '/vendor/4lt/novaconium/src/Session.php');
|
||||
$session = new Session();
|
||||
|
||||
// Load Database Class
|
||||
require_once(BASEPATH . '/vendor/4lt/novaconium/src/Database.php');
|
||||
$db = new Database($config['database']);
|
||||
|
||||
// Load a controller
|
||||
require_once(BASEPATH . '/vendor/4lt/novaconium/src/Router.php');
|
||||
$router = new Router();
|
||||
//$router->debug();
|
||||
require_once($router->controllerPath);
|
||||
|
||||
//write the session
|
||||
$session->write();
|
17
src/twig.php
Normal file
17
src/twig.php
Normal file
@ -0,0 +1,17 @@
|
||||
<?php
|
||||
|
||||
//Twig
|
||||
function view($name = '', $data = [] ) {
|
||||
$loader = new Twig\Loader\FilesystemLoader(BASEPATH . '/App/views/');
|
||||
$loader->addPath(BASEPATH . '/vendor/4lt/novaconium/twig', 'novaconium');
|
||||
$loader->addPath(BASEPATH . '/App/templates', 'override');
|
||||
$twig = new Twig\Environment($loader);
|
||||
//check if file exists
|
||||
if (file_exists(BASEPATH . '/App/views/' . $name . '.html.twig')) {
|
||||
echo $twig->render("$name" . '.html.twig', $data);
|
||||
return true;
|
||||
} else {
|
||||
echo "Error: Twig Template ($name) Not Found.";
|
||||
return false;
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user