From c85bf0570a92030936274b51d4139218c2e8c9b7 Mon Sep 17 00:00:00 2001
From: Eugen Ciur <eugen@papermerge.com>
Date: Sun, 20 Feb 2022 11:46:26 +0100
Subject: [PATCH] add links to browsable API. Fix minor bugs.
---
app/components/nav/topbar.hbs | 8 ++++++++
app/components/nav/topbar.js | 5 +++++
app/controllers/login.js | 4 ++++
app/templates/login.hbs | 5 +++++
app/utils/host.js | 2 +-
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/app/components/nav/topbar.hbs b/app/components/nav/topbar.hbs
index 0b05987..299cb94 100644
--- a/app/components/nav/topbar.hbs
+++ b/app/components/nav/topbar.hbs
@@ -43,6 +43,14 @@
Documentation
</a>
</li>
+ <li class="dropdown-item">
+ <i class="fa fa-book mx-2"></i>
+ <a
+ href="{{this.browsable_api_url}}"
+ class="text-decoration-none">
+ Browsable API
+ </a>
+ </li>
<li class="dropdown-item">
<i class="fa fa-question-circle mx-2"></i>
<a href="#" class="text-decoration-none">About</a>
diff --git a/app/components/nav/topbar.js b/app/components/nav/topbar.js
index 5637294..10e8503 100644
--- a/app/components/nav/topbar.js
+++ b/app/components/nav/topbar.js
@@ -1,6 +1,7 @@
import Component from '@glimmer/component';
import { action } from '@ember/object';
import { service } from '@ember/service';
+import { base_url } from 'papermerge/utils/host';
export default class TopbarComponent extends Component {
@@ -16,4 +17,8 @@ export default class TopbarComponent extends Component {
onSidebarToggle() {
this.args.onSidebarToggle();
}
+
+ get browsable_api_url() {
+ return base_url();
+ }
}
diff --git a/app/controllers/login.js b/app/controllers/login.js
index 520e587..78f4a21 100644
--- a/app/controllers/login.js
+++ b/app/controllers/login.js
@@ -42,4 +42,8 @@ export default class LoginController extends Controller {
get inProgress() {
return this.in_progress;
}
+
+ get browsable_api_url() {
+ return base_url();
+ }
}
diff --git a/app/templates/login.hbs b/app/templates/login.hbs
index 3b09875..0de6101 100644
--- a/app/templates/login.hbs
+++ b/app/templates/login.hbs
@@ -21,5 +21,10 @@
</div> <!-- card-body -->
</div> <!-- card -->
+
+ <ul class="list-inline list-unstiled p-3">
+ <li class="list-inline-item"><a class="text-decoration-none m-2" href="https://docs.papermerge.io">Documentation</a></li>
+ <li class="list-inline-item"><a class="text-decoration-none m-2" href="{{this.browsable_api_url}}">Browsable API</a></li>
+ </ul>
</div>
</main>
diff --git a/app/utils/host.js b/app/utils/host.js
index 70219f4..384ece6 100644
--- a/app/utils/host.js
+++ b/app/utils/host.js
@@ -37,7 +37,7 @@ function ws_base_url() {
// user can override BACKEND HOST by providing
// ENV.APP.HOST value
// e.g. ENV.APP.HOST = 'ws://127.0.0.1:8000';
- base = ENV.WS_APP.HOST;
+ base = ENV.APP.WS_HOST;
}
if (!ENV.APP.WS_NAMESPACE) {
--
GitLab