2 files changed, 6 insertions, 11 deletions
diff --git a/public/app/routes/backend.php b/public/app/routes/backend.php
index 5d6189d..475f52b 100644
--- a/public/app/routes/backend.php
+++ b/public/app/routes/backend.php
@@ -3,7 +3,7 @@
 use app\controllers\Auth;
 use app\controllers\admin\Course_admin;
 use app\models\admin\Privilege_model;
-
+use app\extends\Cache_service;
 
 // admin panel
 // ---
@@ -91,10 +91,7 @@ Route::add('/admin/privileges', function () {
 // ---
 Route::add('/admin/api/privileges', function () {
     Auth::allowRoles([1, 2, 3]);    // allow few admin-panel roles
-    Render::json( proxy(
-        [\app\models\admin\Privilege_model::class, 'privileges'],
-        [], CACHE_ROOT_TTL
-    ));
+    Render::json( Cache_service::privileges_hierarchy() );
 });
 
 // add privilege
diff --git a/public/app/routes/frontend.php b/public/app/routes/frontend.php
index 898b23a..f9e74db 100644
--- a/public/app/routes/frontend.php
+++ b/public/app/routes/frontend.php
@@ -4,15 +4,13 @@ use app\controllers\Auth;
 use app\controllers\Classroom_user;
 use app\controllers\cms\Course;
 use app\models\cms\Course_model;
+use app\extends\Cache_service;
 
 // Home/Welcome
 // ---
 Route::add('/',         function() { // echo 'Welcome!'; });
     Render::view('welcome', [   // cache categories (while retrieving)
-        'categories' => proxy(
-            [\app\models\cms\Course_model::class, 'category_tree'],
-            [], CACHE_ROOT_TTL
-        )
+        'categories' => Cache_service::courses_struct()['tree']
     ]);
     // header('Location: /some/default/url', true, 302);
 });
@@ -46,8 +44,8 @@ Route::notFound(        function() {
 
 // Resolve urls
 // --- -- -- - - -
-Route::add('/course/([0-9a-zA-Z-_]*)',
-    function($label) { Course::show([$label]); }
+Route::add('/course/([0-9]*)',
+    function($id) { Course::course($id); }
 );
 
 Route::add('/lesson/([0-9a-f]*)/([0-9a-zA-Z-_]*)',