PhpSlides · dconco · Aug 20, 2024 · Aug 16, 2024 · Aug 16, 2024 · Aug 16, 2024
diff --git a/.env.example b/.env.example
@@ -1,12 +1,15 @@
 APP_NAME=PhpSlides
-APP_VERSION=1.2.3
+APP_VERSION=1.2.5
 APP_DEBUG=true
+APP_ENV=development
+APP_URL=http://localhost
+JWT_SECRET=
 
 DB_CONN=mysql
 DB_PORT=3306
-DB_HOST=0.0.0
+DB_HOST=0.0.0.0
 DB_USER=root
-DB_PASS=root
+DB_PASS=
 DB_BASE=phpslides
 
 SMTP_HOST=smtp.example.com

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,8 @@
 /.vscode
 .log
 .env
+.env.dev
+.env.development
 log
 access_log
 requests.log

diff --git a/.htaccess b/.htaccess
@@ -1,5 +1,5 @@
 <IfModule mod_rewrite.c>
-   # Don't change this settings, instead edit the phpslides.config.json
+   # Don't change this settings, instead edit the configs.json
    RewriteEngine On
 
    # Accept Authorization Header

diff --git a/README.md b/README.md
@@ -26,7 +26,7 @@ streamlining the development process and enhancing productivity.
       -  [Or Clone the Repository](#or-clone-the-repository)
    -  [Configuration](#configuration)
       -  [.env](#env)
-      -  [phpslides.config.json](#phpslidesconfigjson)
+      -  [configs.json](#configsjson)
    -  [Syntax](#syntax)
       -  [Creating Web Layouts](#creating-web-layouts)
       -  [Styling Web Layouts](#styling-web-layouts)
@@ -105,12 +105,12 @@ Edit the .env file to configure database settings, application settings, and oth
 
 ```bash
 APP_NAME=PhpSlides
-APP_SERVER=localhost
-APP_URL=http://localhost
+APP_VERSION=1.2.5
 APP_DEBUG=true
+APP_ENV=development
 ```
 
-### phpslides.config.json
+### configs.json
 
 ```json
 {
@@ -217,16 +217,15 @@ project_root/<br>
 │ ├── configs/<br>
 │ ├── resources/<br>
 │ │ └── views/<br>
-│ │ └── errors/<br>
 ├── vendor/<br>
 ├── .env<br>
 ├── .env.example<br>
 ├── .htaccess<br>
 ├── composer.json<br>
+├── configs.json<br>
 ├── LICENSE<br>
-├── phpslides.config.json<br>
-└── README.md
-├── slide<br>
+├── README.md<br>
+└── slide
 
 ## Documentation
 

diff --git a/app/Controllers/api/.gitignore → app/Controller/api/.gitignore b/app/Controllers/api/.gitignore → app/Controller/api/.gitignore
diff --git a/app/Middleware/AuthMiddleware.php b/app/Middleware/AuthMiddleware.php
@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+namespace App\Middleware;
+
+use Closure;
+use PhpSlides\Web\JWT;
+use PhpSlides\Http\Request;
+use PhpSlides\Interface\MiddlewareInterface;
+
+final class AuthMiddleware implements MiddlewareInterface
+{
+	public function handle(Request $request, Closure $next)
+	{
+		$token = $request->auth->bearer;
+
+		if ($token && JWT::verify($token)) {
+			return $next($request);
+		}
+		return 'Invalid Token';
+	}
+}
diff --git a/app/Middlewares/.gitignore b/app/Middlewares/.gitignore
diff --git a/app/Models/database.php → app/Model/database.php b/app/Models/database.php → app/Model/database.php
diff --git a/composer.json b/composer.json
@@ -8,19 +8,20 @@
 	"autoload": {
 		"psr-4": {
 			"App\\": ["app/"],
-			"App\\Controllers\\": ["app/Controllers/api/"]
+			"App\\Controller\\": ["app/Controller/api/"]
 		}
 	},
 	"authors": [
 		{
 			"name": "Dave Conco",
 			"email": "concodave@gmail.com",
+			"role": "Developer",
 			"homepage": "https://dconco.github.io"
 		}
 	],
 	"require": {
-		"php": "^8.0",
-		"phpslides/framework": "^1.0.0-alpha"
+		"php": "^8.2",
+		"phpslides/framework": "^1.2.5"
 	},
 	"config": {
 		"optimize-autoloader": true,

diff --git a/phpslides.config.json → configs.json b/phpslides.config.json → configs.json
diff --git a/src/bootstrap/app.php b/src/bootstrap/app.php
@@ -4,9 +4,10 @@
 
 include dirname(__DIR__) . '/../vendor/autoload.php';
 
-Application::configure(basePath: dirname(dirname(__DIR__)))
-	->routing(
-		api: __DIR__ . '/../routes/api.php',
-		web: __DIR__ . '/../routes/web.php'
-	)
-	->create();
+/**
+ * --------------------------------------------------------------------
+ * This is the Bootstrap File in starting the application.
+ * The entry point for the PhpSlides project and functions.
+ * --------------------------------------------------------------------
+ */
+Application::configure(basePath: dirname(dirname(__DIR__)))->create();
diff --git a/src/configs/jwt.php b/src/configs/jwt.php
@@ -0,0 +1,8 @@
+<?php
+
+return [
+	'issuer' => [getenv('APP_URL')],
+	'audience' => [],
+	'algorithm' => 'HS256',
+	'secret_key' => getenv('JWT_SECRET')
+];
diff --git a/src/configs/middleware.php b/src/configs/middleware.php
@@ -1,3 +1,5 @@
 <?php
 
-return [];
+return [
+	'auth' => 'App\\Middleware\\AuthMiddleware'
+];
diff --git a/src/resources/views/app.view.php b/src/resources/views/app.view.php
@@ -52,7 +52,7 @@
 <body>
    <div class="container">
       <div class="logo">
-         <img src="<? asset('Assets::Logo.svg') ?>" alt="PhpSlides Logo">
+         <img src={{ asset('Assets::Logo.svg') }} alt="PhpSlides Logo">
       </div>
 
       <div class="description">
@@ -68,7 +68,9 @@
          </p>
       </div>
 
-      <a href="<? asset('any') ?>"><button class="btn">Navigate To Not Found Page</button></a>
+      <a href={{ asset('any') }}>
+         <button class="btn">Navigate To Not Found Page</button>
+      </a>
    </div>
 </body>
 

diff --git a/src/resources/views/components/Header.php b/src/resources/views/components/Header.php
@@ -2,9 +2,9 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="title" content="PhpSlides | PHP Framework" />
 
-<link rel="apple-touch-icon" href="<? asset('Assets::Icon.png') ?>" sizes="234x234" />
-<link rel="shortcut icon" href="<? asset('Assets::Icon.png') ?>" type="image/png" />
-<link rel="icon" href="<? asset('Assets::Icon.png') ?>" type="image/png" />
+<link rel="apple-touch-icon" href={{ asset('Assets::Icon.png') }} sizes="234x234" />
+<link rel="shortcut icon" href={{ asset('Assets::Icon.png') }} type="image/png" />
+<link rel="icon" href={{ asset('Assets::Icon.png') }} type="image/png" />
 
 <!-- Internal Styling -->
 <style>

diff --git a/src/resources/views/errors/404.view.php b/src/resources/views/errors/404.view.php
@@ -21,7 +21,7 @@
 <body>
    <div class="container">
       <h3 class="text">404 | Page Not Found</h3>
-      <a href="<? asset('') ?>"><button class="btn">Navigate Back To Dashboard</button></a>
+      <a href={{ asset('') }}><button class="btn">Navigate Back To Dashboard</button></a>
    </div>
 </body>
 

diff --git a/src/routes/api.php b/src/routes/api.php
@@ -1,6 +1,5 @@
 <?php
 
 use PhpSlides\Http\Api;
-use App\Controllers\UserController;
 
-Api::v1()->route('/user', UserController::class);
+Api::v1();
diff --git a/src/routes/render.php b/src/routes/render.php
@@ -0,0 +1,20 @@
+<?php
+
+use PhpSlides\Foundation\Render;
+use PhpSlides\Loader\FileLoader;
+
+/**
+ * -----------------------------------------------------
+ * Render all registered Routes here
+ * Any registered Routes format should be rendered
+ * before any routes can be executed.
+ * -----------------------------------------------------
+ */
+(new FileLoader())
+	->safeLoad(__DIR__ . '/web.php')
+	->safeLoad(__DIR__ . '/api.php')
+	->safeLoad(__DIR__ . '/forms.php');
+
+Render::FormsRoute();
+Render::ApiRoute();
+Render::WebRoute();
diff --git a/src/routes/web.php b/src/routes/web.php
@@ -5,7 +5,7 @@
 
 /**
  * --------------------------------------------------------------------
- * | Register all routes here to render according to request
+ * | Register web routes here to render according to request
  * | NOTE - that browser or any other request cannot access any page
  * | that are not coming from route, it redirects to 404
  * --------------------------------------------------------------------