up: update some web app service create logic, fix view render error

inhere · Aug 18, 2022 · 00661b8 · 00661b8
1 parent a85ab77
commit 00661b8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/app/Http/Controller.php b/app/Http/Controller.php
@@ -3,6 +3,7 @@
 namespace Inhere\Kite\Http;
 
 use Inhere\Kite\Kite;
+use function header;
 
 /**
  * Class Controller
@@ -17,6 +18,17 @@ abstract class Controller
      */
     protected function render(string $viewPath, array $vars = []): void
     {
-        Kite::webApp()->getRenderer()->renderOutput($viewPath, $vars);
+        Kite::webApp()->getRenderer()->render($viewPath, $vars);
+    }
+
+    /**
+     * @param string $html
+     *
+     * @return void
+     */
+    protected function renderHTML(string $html): void
+    {
+        header('Content-Type: text/html');
+        echo $html;
     }
 }
diff --git a/app/Http/Controller/HomeController.php b/app/Http/Controller/HomeController.php
@@ -3,6 +3,7 @@
 namespace Inhere\Kite\Http\Controller;
 
 use Inhere\Kite\Http\Controller;
+use Inhere\Kite\Kite;
 
 /**
  * Class HomeController
@@ -15,4 +16,15 @@ public function index(): void
     {
         $this->render('home');
     }
+
+    public function routes(): void
+    {
+        $str = Kite::webRouter()->toString();
+
+        $this->renderHTML(<<<HTML
+<h1>Routes:</h1>
+<pre>$str</pre>
+HTML
+        );
+    }
 }
diff --git a/app/Http/routes.php b/app/Http/routes.php
@@ -15,6 +15,7 @@
 $router = Kite::webRouter();
 
 $router->get('/', HomeController::class . '@index');
+$router->get('/routes', HomeController::class . '@routes');
 $router->get('/json5', JsonController::class . '@json5');
 $router->get('/json', JsonController::class . '@format');
 

diff --git a/app/Http/services.php b/app/Http/services.php
@@ -10,7 +10,9 @@
 use PhpPkg\EasyTpl\EasyTemplate;
 
 $box->set('webRouter', function () {
-    return new Router();
+    return new Router([
+        'name' => 'kite-router',
+    ]);
 });
 
 $box->set('renderer', function () {
@@ -19,7 +21,9 @@
 });
 
 $box->set('dispatcher', [
-    'class'        => Dispatcher::class,
+    'class'   => Dispatcher::class,
     // prop settings
-    'actionSuffix' => '',
-]);
+    'options' => [
+        'actionSuffix' => '',
+    ],
+]);