From e0d22698ef52818be9b7c4b854ae62f335ffb021 Mon Sep 17 00:00:00 2001 From: Christine Slotty Date: Wed, 10 Jun 2020 18:30:02 +0200 Subject: [PATCH] CSS WIP --- src/Controller/AppController.php | 51 +- .../{navi_header.ctp => navi_notify.ctp} | 16 +- src/Template/Layout/frontend.ctp | 4 +- src/Template/TransactionSendCoins/create.ctp | 4 +- webroot/css/grd_styles.css | 590 ++++++++++++------ websrc/src/less-files.css | 590 ++++++++++++------ websrc/src/less/01-layout.less | 9 +- websrc/src/less/02-colors.less | 7 + websrc/src/less/05-screen.less | 11 +- websrc/src/less/08-navi.less | 8 +- websrc/src/less/09-notification.less | 181 ++++++ websrc/src/less/{list.less => 20-list.less} | 9 +- websrc/src/less/{form.less => 30-form.less} | 43 +- 13 files changed, 1102 insertions(+), 421 deletions(-) rename src/Template/Element/{navi_header.ctp => navi_notify.ctp} (78%) create mode 100644 websrc/src/less/09-notification.less rename websrc/src/less/{list.less => 20-list.less} (91%) rename websrc/src/less/{form.less => 30-form.less} (77%) diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php index 94bd06099..b52faad32 100644 --- a/src/Controller/AppController.php +++ b/src/Controller/AppController.php @@ -21,6 +21,7 @@ use Cake\Routing\Router; use Cake\ORM\TableRegistry; use Cake\Core\Configure; use Cake\I18n\Time; +use Cake\I18n\I18n; /** * Application Controller @@ -72,16 +73,16 @@ class AppController extends Controller ] ] ]); - + $this->Auth->deny(['index']); - + /* * Enable the following component for recommended CakePHP security settings. * see https://book.cakephp.org/3.0/en/controllers/components/security.html */ //$this->loadComponent('Security'); - - + + // load current balance $session = $this->getRequest()->getSession(); $state_user_id = $session->read('StateUser.id'); @@ -98,7 +99,7 @@ class AppController extends Controller //echo "stateUser.balance: " . $session->read('StateUser.balance'); } } - + // load error count if($state_user_id) { $stateErrorsTable = TableRegistry::getTableLocator()->get('stateErrors'); @@ -110,8 +111,8 @@ class AppController extends Controller $session->write('StateUser.errorCount', $stateErrorQuery->count()); } //echo "initialize"; - - + + // put current page into global for navi $GLOBALS["passed"] = null; $side = $this->request->getParam('controller'); @@ -122,14 +123,14 @@ class AppController extends Controller $GLOBALS["passed"] = $passedArguments[0]; } $GLOBALS["subside"] = $subside; - + // server login if($this->Auth->user('id')) { $GLOBALS['ServerUser'] = $this->Auth->user(); } } - + protected function requestLogin() { $session = $this->getRequest()->getSession(); @@ -144,20 +145,20 @@ class AppController extends Controller // login server cannot detect host ip // TODO: update login server, recognize nginx real ip header $loginServer = Configure::read('LoginServer'); - + if($session_id != 0) { $userStored = $session->read('StateUser'); $transactionPendings = $session->read('Transactions.pending'); $transactionExecutings = $session->read('Transaction.executing'); - if($session->read('session_id') != $session_id || + if($session->read('session_id') != $session_id || ( $userStored && !isset($userStored['id'])) || intval($transactionPendings) > 0 || intval($transactionExecutings) > 0) { $http = new Client(); - + try { $url = $loginServer['host'] . ':' . $loginServer['port']; - + $response = $http->get($url . '/login', ['session_id' => $session_id]); $json = $response->getJson(); @@ -165,7 +166,7 @@ class AppController extends Controller if($json['state'] === 'success' && intval($json['user']['email_checked']) === 1) { //echo "email checked: " . $json['user']['email_checked'] . ";
"; - if($session->read('session_id') != $session_id || + if($session->read('session_id') != $session_id || ( $userStored && !isset($userStored['id']))) { $session->destroy(); } @@ -247,20 +248,20 @@ class AppController extends Controller } return true; } - + /* public function beforeFilter(Event $event) { //$this->Auth->allow(['display']); } */ - + public function addAdminError($controller, $action, array $returnTable, $state_user_id) { if(!is_array($returnTable)) { $this->addAdminError('AppController', 'addAdminError', ['state' => 'error', 'msg' => 'returnTable isn\'t array', 'details' => gettype($returnTable)]); return false; } - $adminErrorTable = TableRegistry::getTableLocator()->get('AdminErrors'); + $adminErrorTable = TableRegistry::getTableLocator()->get('AdminErrors'); $adminErrorEntity = $adminErrorTable->newEntity(); $adminErrorEntity->state_user_id = $state_user_id; $adminErrorEntity->controller = $controller; @@ -268,6 +269,8 @@ class AppController extends Controller $adminErrorEntity->state = $returnTable['state']; if(isset($returnTable['msg'])) { $adminErrorEntity->msg = $returnTable['msg']; + } else { + $adminErrorEntity->msg = __('(Leere Message)'); } if(isset($returnTable['details'])) { $adminErrorEntity->details = $returnTable['details']; @@ -277,25 +280,25 @@ class AppController extends Controller } return true; } - + public function getAdminEmailLink($text) { - $serverAdminEmail = Configure::read('ServerAdminEmail'); + $serverAdminEmail = Configure::read('ServerAdminEmail'); return ''. $serverAdminEmail . ''; } - + public function returnJsonEncoded($json) { $this->autoRender = false; $response = $this->response->withType('application/json'); return $response->withStringBody($json); } - + public function returnJson($array) { $this->autoRender = false; $response = $this->response->withType('application/json'); return $response->withStringBody(json_encode($array)); } - - public function getStartEndForMonth($month, $year) + + public function getStartEndForMonth($month, $year) { $timeString = $year . '-' . $month . '-01 00:00'; $firstDay = new Time($timeString); @@ -303,5 +306,5 @@ class AppController extends Controller $lastDay = $lastDay->addMonth(1); return [$firstDay, $lastDay]; } - + } diff --git a/src/Template/Element/navi_header.ctp b/src/Template/Element/navi_notify.ctp similarity index 78% rename from src/Template/Element/navi_header.ctp rename to src/Template/Element/navi_notify.ctp index 4e0b6323b..8d24f4253 100644 --- a/src/Template/Element/navi_header.ctp +++ b/src/Template/Element/navi_notify.ctp @@ -24,20 +24,20 @@ class NavHeaderEntry */ ?> 0) : ?> -
  • Html->link( - '' - . '', + 'announcement' + . 'ss', ['controller' => 'StateErrors', 'action' => 'ShowForUser'], ['class' => 'nav-link', 'escape' => false, 'title' => "$errorCount " . __('Fehler')]) ?> -
    • 0) : ?> -
  • " href="account/checkTransactions"> - + verified_user + - + ss -
    • diff --git a/src/Template/Layout/frontend.ctp b/src/Template/Layout/frontend.ctp index 451323d69..0c4886399 100644 --- a/src/Template/Layout/frontend.ctp +++ b/src/Template/Layout/frontend.ctp @@ -38,6 +38,9 @@ $GLOBALS["self"] = $this;
    +
    + element('navi_notify'); ?> +