From 3ba3f532187106ea7e597d8e25c3bcab9c4c2db1 Mon Sep 17 00:00:00 2001 From: eldadfux Date: Mon, 5 Aug 2019 08:51:02 +0300 Subject: [PATCH] Fixed some style issues --- app/config/locale/en.php | 6 +- app/controllers/account.php | 4 +- app/controllers/locale.php | 2 +- app/controllers/users.php | 4 +- app/views/console/comps/header.phtml | 14 ++-- app/views/console/home/index.phtml | 4 +- app/views/console/keys/index.phtml | 9 ++- app/views/console/settings/index.phtml | 105 ++++++++++--------------- app/views/console/tasks/index.phtml | 9 ++- app/views/console/webhooks/index.phtml | 8 +- public/dist/styles/default-ltr.css | 2 +- public/styles/comps/cover.less | 15 +++- public/styles/comps/header.less | 4 +- public/styles/default.less | 2 +- public/styles/scopes/console.less | 50 ++++++------ 15 files changed, 122 insertions(+), 116 deletions(-) diff --git a/app/config/locale/en.php b/app/config/locale/en.php index 2c0b93ec4..778f23d46 100644 --- a/app/config/locale/en.php +++ b/app/config/locale/en.php @@ -251,12 +251,16 @@ return [ 'console.database.title' => 'Database', 'console.storage.title' => 'Storage', - + 'console.users.title' => 'Users', 'console.users.section.users.title' => 'Users', 'console.users.section.teams.title' => 'Teams', 'console.users.section.providers.title' => 'Providers', 'console.users.section.templates.title' => 'Templates', + + 'console.webhooks.title' => 'Webhooks', + 'console.keys.title' => 'API Keys', + 'console.tasks.title' => 'Tasks', // Service - Users 'auth.emails.team' => '%s Team', diff --git a/app/controllers/account.php b/app/controllers/account.php index cfeed98a5..cce270ab3 100644 --- a/app/controllers/account.php +++ b/app/controllers/account.php @@ -85,7 +85,7 @@ $utopia->get('/v1/account/sessions') ->action( function() use ($response, $user) { $tokens = $user->getAttribute('tokens', []); - $reader = new Reader(__DIR__ . '/../app/db/GeoLite2/GeoLite2-Country.mmdb'); + $reader = new Reader(__DIR__ . '/../db/GeoLite2/GeoLite2-Country.mmdb'); $sessions = []; $current = Auth::tokenVerify($tokens, Auth::TOKEN_TYPE_LOGIN, Auth::$secret); $index = 0; @@ -165,7 +165,7 @@ $utopia->get('/v1/account/security') 'account.update.password', ]); - $reader = new Reader(__DIR__ . '/../app/db/GeoLite2/GeoLite2-Country.mmdb'); + $reader = new Reader(__DIR__ . '/../db/GeoLite2/GeoLite2-Country.mmdb'); $output = []; foreach($logs as $i => &$log) { diff --git a/app/controllers/locale.php b/app/controllers/locale.php index b9ac2d21d..552fedb7a 100644 --- a/app/controllers/locale.php +++ b/app/controllers/locale.php @@ -17,7 +17,7 @@ $utopia->get('/v1/locale') { $eu = include __DIR__ . '/../config/eu.php'; $currencies = include __DIR__ . '/../config/currencies.php'; - $reader = new Reader(__DIR__ . '/../app/db/GeoLite2/GeoLite2-Country.mmdb'); + $reader = new Reader(__DIR__ . '/../db/GeoLite2/GeoLite2-Country.mmdb'); $output = []; $ip = $request->getIP(); $time = (60 * 60 * 24 * 45); // 45 days cache diff --git a/app/controllers/users.php b/app/controllers/users.php index 62b1153d1..48ebfeb81 100644 --- a/app/controllers/users.php +++ b/app/controllers/users.php @@ -170,7 +170,7 @@ $utopia->get('/v1/users/:userId/sessions') } $tokens = $user->getAttribute('tokens', []); - $reader = new Reader(__DIR__ . '/../app/db/GeoLite2/GeoLite2-Country.mmdb'); + $reader = new Reader(__DIR__ . '/../db/GeoLite2/GeoLite2-Country.mmdb'); $sessions = []; $index = 0; $countries = Locale::getText('countries'); @@ -239,7 +239,7 @@ $utopia->get('/v1/users/:userId/logs') $logs = $au->getLogsByUser($user->getUid(), $user->getAttribute('type', 0)); - $reader = new Reader(__DIR__ . '/../app/db/GeoLite2/GeoLite2-Country.mmdb'); + $reader = new Reader(__DIR__ . '/../db/GeoLite2/GeoLite2-Country.mmdb'); $output = []; foreach($logs as $i => &$log) { diff --git a/app/views/console/comps/header.phtml b/app/views/console/comps/header.phtml index 4807dad46..a7463d1fb 100644 --- a/app/views/console/comps/header.phtml +++ b/app/views/console/comps/header.phtml @@ -37,7 +37,7 @@ Appwrite Logo -
+
  • @@ -93,13 +93,13 @@
- -
+ + diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml index a46b36836..2e3c7f557 100644 --- a/app/views/console/home/index.phtml +++ b/app/views/console/home/index.phtml @@ -28,7 +28,7 @@ $graph = $this->getParam('graph', false); data-error="render" data-success-triggers="usage.load"> - +
@@ -129,7 +129,7 @@ $graph = $this->getParam('graph', false);
- Manage Your API Keys + Manage Your API Keys
    diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml index bc55529dc..4a340af36 100644 --- a/app/views/console/keys/index.phtml +++ b/app/views/console/keys/index.phtml @@ -26,12 +26,15 @@ $scopes = [ // TODO sync with project list //'health.read', ]; ?> -

    - +
    +

    + +

    +
    diff --git a/app/views/console/settings/index.phtml b/app/views/console/settings/index.phtml index 9e654591a..144ffb865 100644 --- a/app/views/console/settings/index.phtml +++ b/app/views/console/settings/index.phtml @@ -10,32 +10,14 @@ use Utopia\Locale\Locale;
    -
    +

    • -
      + @@ -126,42 +108,57 @@ use Utopia\Locale\Locale;
      - +
    +
  • + +
    +

    Privacy & Legal

    + +
    + + +
    +
    + + + + + + + + +
    + +
    + + + + + + + + +
    +
    + + +
    +
    +

  • -
    +
    • -
      + @@ -169,15 +166,7 @@ use Utopia\Locale\Locale;