From da9e184ac394f2b63c32ff636a7021866ff6c004 Mon Sep 17 00:00:00 2001
From: Stanislav Romanov <kaermorchen@gmail.com>
Date: Wed, 24 May 2023 09:09:42 +0300
Subject: [PATCH 1/2] Move logout link to menu

---
 app/templates/admin.hbs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/templates/admin.hbs b/app/templates/admin.hbs
index 5e0e973..75d9d18 100644
--- a/app/templates/admin.hbs
+++ b/app/templates/admin.hbs
@@ -69,6 +69,19 @@
               Meiliadmin
               <Icons::OpenInNew @size={{10}} class='mt-1 ml-0.5 self-start' />
             </a>
+
+            <div
+              class='{{classLink}} cursor-pointer'
+              role='button'
+              {{on 'click' this.invalidateSession}}
+            >
+              <Icons::Logout
+                role='presentation'
+                class='fill-base-3 mr-2'
+                @title='Logout'
+              />
+              Logout
+            </div>
           </div>
 
           <div class='mb-4 p-4 bg-base-6 rounded'>
@@ -85,20 +98,7 @@
           <ThemeToggler class='mb-6 mt-5' />
 
           <div class='flex items-center mb-4'>
-            <Icons::ServerNetwork
-              @size={{40}}
-              class='fill-base-3 mx-2 flex-shrink-0'
-            />
 
-            <span class='font-semibold mr-2 truncate'>
-              {{this.session.data.authenticated.url}}
-            </span>
-
-            <Icons::Logout
-              @title='Logout'
-              class='fill-base-3 ml-auto flex-shrink-0 cursor-pointer'
-              {{on 'click' this.invalidateSession}}
-            />
           </div>
         </div>
       </div>

From 49b131b7adb57c837423ec718eea4697951e3b52 Mon Sep 17 00:00:00 2001
From: Stanislav Romanov <kaermorchen@gmail.com>
Date: Wed, 24 May 2023 09:21:45 +0300
Subject: [PATCH 2/2] Add version of Meiliadmin

---
 app/controllers/admin.js  |  3 +++
 app/routes/admin.js       | 11 +++++++++++
 app/routes/admin/index.js | 17 -----------------
 app/templates/admin.hbs   |  4 ++--
 4 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 app/routes/admin/index.js

diff --git a/app/controllers/admin.js b/app/controllers/admin.js
index aab2058..165ba75 100644
--- a/app/controllers/admin.js
+++ b/app/controllers/admin.js
@@ -1,10 +1,13 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
+import config from 'meiliadmin/config/environment';
 
 export default class AdminController extends Controller {
   @service session;
 
+  config = config;
+
   @action
   invalidateSession() {
     this.session.invalidate();
diff --git a/app/routes/admin.js b/app/routes/admin.js
index 89ca0e7..de7a631 100644
--- a/app/routes/admin.js
+++ b/app/routes/admin.js
@@ -1,10 +1,21 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
+import { hash } from 'rsvp';
 
 export default class AdminRoute extends Route {
   @service session;
+  @service meilisearch;
 
   beforeModel(transition) {
     this.session.requireAuthentication(transition, 'login');
   }
+
+  model() {
+    return hash({
+      indexes: this.meilisearch.getIndexes(),
+      health: this.meilisearch.getHealth(),
+      version: this.meilisearch.getVersion(),
+      stats: this.meilisearch.getStats(),
+    });
+  }
 }
diff --git a/app/routes/admin/index.js b/app/routes/admin/index.js
deleted file mode 100644
index 9393cad..0000000
--- a/app/routes/admin/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
-import { hash } from 'rsvp';
-
-export default class AdminIndexRoute extends Route {
-  @service meilisearch;
-  @service session;
-
-  async model() {
-    return hash({
-      indexes: this.meilisearch.getIndexes(),
-      health: this.meilisearch.getHealth(),
-      version: this.meilisearch.getVersion(),
-      stats: this.meilisearch.getStats(),
-    });
-  }
-}
diff --git a/app/templates/admin.hbs b/app/templates/admin.hbs
index 75d9d18..01370df 100644
--- a/app/templates/admin.hbs
+++ b/app/templates/admin.hbs
@@ -97,8 +97,8 @@
 
           <ThemeToggler class='mb-6 mt-5' />
 
-          <div class='flex items-center mb-4'>
-
+          <div class='text-center text-sm'>
+            {{this.config.APP.version}}
           </div>
         </div>
       </div>