authentication; invitation; activation; base form setup

3 files changed, 23 insertions, 16 deletions

diff --git a/public/app/routes/backend.php b/public/app/routes/backend.php
index 1290f8a..6fbc157 100644
--- a/public/app/routes/backend.php
+++ b/public/app/routes/backend.php
@@ -1,9 +1,9 @@
 <?php
 
-use app\controllers\Auth;
-use app\controllers\CmsAdmin;
-use app\models\admin\Privilege_model;
-use app\extends\Cache_service;
+//// use app\controllers\Auth;
+//// use app\controllers\CmsAdmin;
+//// use app\models\admin\Privilege_model;
+//// use app\extends\Cache_service;
 
 
 /** admin pages
@@ -11,7 +11,7 @@ use app\extends\Cache_service;
  * NOTE:
  * All adminitration routes MUST INCLUDE an Auth::allowRoles() check
  */
-
+/*
 // admin panel
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -167,3 +167,4 @@ Route::add('/admin/api/pages', function () {      // ajax: get all pages
     CmsAdmin::all_pages();
 });
 
+*/
\ No newline at end of file
diff --git a/public/app/routes/frontend.php b/public/app/routes/frontend.php
index 2defce5..b0e064b 100644
--- a/public/app/routes/frontend.php
+++ b/public/app/routes/frontend.php
@@ -1,8 +1,8 @@
 <?php
 
 use app\controllers\Auth;
-use app\controllers\Classroom_user;
-use app\controllers\Cms;
+use app\controllers\App_user;
+use app\controllers\Office;
 use app\extends\Cache_service;
 
 
@@ -10,9 +10,16 @@ use app\extends\Cache_service;
 ////////////////////////////////////////////////////////////////////////////////
 
 // Route::add('/', function() { Render::view('welcome'); });
-Route::add('/', function() { Render::view('user/registration'); });
+Route::add('/', function() { Render::view('user/login'); });
 
-Route::add('/penalty', function() { Render::view('templates/penalty'); });
+
+Route::add('/invitation/([0-9]*)', function($id) {
+    Auth::invitation($id);
+});
+
+Route::add('/petition/([0-9a-z\-_]*)', function($tag) {
+    Office::request_petition($tag);
+});
 
 // Error pages
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/public/app/routes/user.php b/public/app/routes/user.php
index 146b212..a2d48d6 100644
--- a/public/app/routes/user.php
+++ b/public/app/routes/user.php
@@ -13,29 +13,28 @@ use app\controllers\Classroom_user;
 // request login ... -> then sends to POST:/account/check-login
 Route::add('/login', function() { Render::view('user/login'); });
 
-// request registration ... -> then sends to POST:/account/register
-Route::add('/registration', function() { Render::view('user/registration'); });
-
 // request logout
 Route::add('/logout', function() {
     Auth::logout();
     header('Location: /');  die();
 });
 
-// request activation
-Route::add('/account/activate', function() { Auth::activate(); } );
+// request activation (from invitation page; POST:form is sent)
+Route::add('/account/activate', function() { Auth::activate(); }, 'post');
 
 // request password reset
 Route::add('/account/reset_password', function() { Auth::reset_password(); } );
 
 
-// invite
+// invite some users
 Route::add('/invite', function() {
     Auth::allowRoles([1, 2, 3]);
     Render::view('admin/invite');
 });
 
-
+Route::add('/panel', function() {
+    Render::json(['connected' => Auth::is_connected()]);
+});
 
 // Replies to common requests (POST method)
 // --- -- -- - - -