Allow easier acces to new admin interface.

This commit is contained in:
Antoine Nguyen
2021-06-28 16:57:56 +02:00
parent eec5a95155
commit b29132fc05
7 changed files with 37 additions and 6 deletions
+18
View File
@@ -3,5 +3,23 @@
<v-toolbar flat>
<v-toolbar-title><translate>Welcome to Modoboa</translate></v-toolbar-title>
</v-toolbar>
<v-alert
type="info"
border="top"
colored-border
elevation="2"
class="mt-10"
>
<translate tag="p">This page is still in construction.</translate>
<translate tag="p">
It will present a summary of your Modoboa server's status and
some useful information about the product.
</translate>
<p>
Your feedback would be really appreciated, you can
use <a href="https://github.com/modoboa/modoboa/discussions">Github
discussions</a> to share your ideas and/or comments.
</p>
</v-alert>
</div>
</template>
+11 -2
View File
@@ -41,7 +41,13 @@
/>
</validation-observer>
<div class="d-flex justify-center">
<v-btn class="flex-grow-1" color="primary" large @click="authenticate">
<v-btn
class="flex-grow-1"
color="primary"
large
@click="authenticate"
:loading="loading"
>
<translate>Connect</translate>
</v-btn>
</div>
@@ -56,6 +62,7 @@ import auth from '@/api/auth'
export default {
data () {
return {
loading: false,
rememberMe: false,
username: '',
password: '',
@@ -72,13 +79,15 @@ export default {
username: this.username,
password: this.password
}
this.loading = true
auth.requestToken(payload).then(resp => {
Cookies.set('token', resp.data.access, { sameSite: 'strict' })
Cookies.set('refreshToken', resp.data.refresh, { sameSite: 'strict' })
this.$store.dispatch('auth/initialize').then(() => {
this.$router.push({ name: 'Dashboard' })
this.$router.push({ name: 'DomainList' })
})
}).catch(err => {
this.loading = false
if (err.response.status === 401) {
this.$refs.observer.setErrors({
password: this.$gettext('Invalid username and/or password')
+1 -1
View File
@@ -57,7 +57,7 @@ export default {
Cookies.set('token', resp.data.access, { sameSite: 'strict' })
Cookies.set('refreshToken', resp.data.refresh, { sameSite: 'strict' })
this.$store.dispatch('auth/initialize').then(() => {
this.$router.push({ name: 'Dashboard' })
this.$router.push({ name: 'DomainList' })
})
}).catch(error => {
this.$refs.observer.setErrors(error.response.data)
+1 -1
View File
@@ -71,7 +71,7 @@ class DomainAPITestCase(ModoAPITestCase):
url, {"name": "test4.com", "default_mailbox_quota": 10})
self.assertEqual(response.status_code, 403)
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
@mock.patch("socket.getaddrinfo")
def test_create_domain_with_mx_check(self, mock_getaddrinfo, mock_query):
"""Check domain creation when MX check is activated."""
+1 -1
View File
@@ -203,7 +203,7 @@ class DomainTestCase(ModoTestCase):
self.assertContains(response, "value=\"500\"")
self.assertContains(response, "value=\"50\"")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
@mock.patch("socket.getaddrinfo")
def test_create_and_check_mx(self, mock_getaddrinfo, mock_query):
"""Check for authorized MX record."""
+1 -1
View File
@@ -78,7 +78,7 @@ domainalias; domalias1.com; domain1.com; True
response,
"Default mailbox quota cannot be greater than domain quota")
@mock.patch.object(dns.resolver.Resolver, "query")
@mock.patch.object(dns.resolver.Resolver, "resolve")
@mock.patch("socket.getaddrinfo")
def test_domain_import_with_mx_check(self, mock_getaddrinfo, mock_query):
"""Check domain import when MX check is enabled."""
@@ -5,6 +5,10 @@
{% block pagetitle %}{% trans "Dashboard" %}{% endblock %}
{% block container_content %}
<div class="alert alert-warning text-center">
<strong>Want to check the new admin interface?</strong>
<a class="btn btn-default" style="margin-left: 20px;" href="/new-admin" target="_blank">Go to Modoboa v2</a>
</div>
<div class="row">
<div class="col-xs-12 col-sm-offset-1 col-sm-10">