mirror of
https://github.com/YunoHost/yunohost-admin.git
synced 2024-09-03 20:06:15 +02:00
fix partials imports & removed Error route
This commit is contained in:
parent
d07b3550c5
commit
a2705a3651
8 changed files with 25 additions and 36 deletions
|
@ -33,7 +33,7 @@
|
|||
</header>
|
||||
|
||||
<!-- MAIN -->
|
||||
<api-wait-overlay>
|
||||
<view-lock-overlay>
|
||||
<breadcrumb />
|
||||
|
||||
<main id="main">
|
||||
|
@ -44,10 +44,10 @@
|
|||
</transition>
|
||||
<router-view v-else class="static" :key="$route.fullPath" />
|
||||
</main>
|
||||
</api-wait-overlay>
|
||||
</view-lock-overlay>
|
||||
|
||||
<!-- CONSOLE/HISTORY -->
|
||||
<ynh-console />
|
||||
<!-- HISTORY CONSOLE -->
|
||||
<history-console />
|
||||
|
||||
<!-- FOOTER -->
|
||||
<footer class="py-3 mt-auto">
|
||||
|
@ -76,12 +76,16 @@
|
|||
<script>
|
||||
import { mapGetters } from 'vuex'
|
||||
|
||||
import ApiWaitOverlay from '@/components/ApiWaitOverlay'
|
||||
import YnhConsole from '@/components/YnhConsole'
|
||||
import { HistoryConsole, ViewLockOverlay } from '@/views/_partials'
|
||||
|
||||
export default {
|
||||
name: 'App',
|
||||
|
||||
components: {
|
||||
HistoryConsole,
|
||||
ViewLockOverlay
|
||||
},
|
||||
|
||||
data () {
|
||||
return {
|
||||
transitionName: null
|
||||
|
@ -109,11 +113,6 @@ export default {
|
|||
}
|
||||
},
|
||||
|
||||
components: {
|
||||
ApiWaitOverlay,
|
||||
YnhConsole
|
||||
},
|
||||
|
||||
// This hook is only triggered at page first load
|
||||
created () {
|
||||
// From this hook the value of `connected` always come from the localStorage.
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
|
||||
import Home from '@/views/Home'
|
||||
import Login from '@/views/Login'
|
||||
import ErrorPage from '@/views/ErrorPage'
|
||||
import ToolList from '@/views/tool/ToolList'
|
||||
|
||||
const routes = [
|
||||
|
@ -29,18 +28,6 @@ const routes = [
|
|||
meta: { noAuth: true, breadcrumb: [] }
|
||||
},
|
||||
|
||||
/* ────────╮
|
||||
│ ERROR │
|
||||
╰──────── */
|
||||
{
|
||||
name: 'error',
|
||||
path: '/error/:type',
|
||||
component: ErrorPage,
|
||||
props: true,
|
||||
// Leave the breadcrumb
|
||||
meta: { noAuth: true, breadcrumb: [] }
|
||||
},
|
||||
|
||||
/* ───────────────╮
|
||||
│ POST INSTALL │
|
||||
╰─────────────── */
|
||||
|
|
|
@ -64,7 +64,7 @@
|
|||
|
||||
<script>
|
||||
import api from '@/api'
|
||||
import { DomainForm, PasswordForm } from '@/components/reusableForms'
|
||||
import { DomainForm, PasswordForm } from '@/views/_partials'
|
||||
import LoginView from '@/views/Login'
|
||||
|
||||
export default {
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
import { mapGetters } from 'vuex'
|
||||
|
||||
export default {
|
||||
name: 'YnhConsole',
|
||||
name: 'HistoryConsole',
|
||||
|
||||
props: {
|
||||
value: { type: Boolean, default: false },
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
</div>
|
||||
|
||||
<b-card-body v-if="error">
|
||||
<error-page />
|
||||
<error-display />
|
||||
</b-card-body>
|
||||
|
||||
<b-card-body v-else class="pb-4">
|
||||
|
@ -40,10 +40,10 @@
|
|||
|
||||
<script>
|
||||
import { mapGetters } from 'vuex'
|
||||
import ErrorPage from '@/views/ErrorPage'
|
||||
import { ErrorDisplay } from '@/views/_partials'
|
||||
|
||||
export default {
|
||||
name: 'ApiWaitOverlay',
|
||||
name: 'ViewLockOverlay',
|
||||
|
||||
computed: {
|
||||
...mapGetters(['waiting', 'lastAction', 'error', 'spinner']),
|
||||
|
@ -63,7 +63,7 @@ export default {
|
|||
},
|
||||
|
||||
components: {
|
||||
ErrorPage
|
||||
ErrorDisplay
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
@ -99,7 +99,7 @@ export default {
|
|||
&.pacman {
|
||||
height: 24px;
|
||||
width: 24px;
|
||||
background-image: url('../assets/spinners/pacman.gif');
|
||||
background-image: url('../../assets/spinners/pacman.gif');
|
||||
animation-name: back-and-forth-pacman;
|
||||
|
||||
@keyframes back-and-forth-pacman {
|
||||
|
@ -113,7 +113,7 @@ export default {
|
|||
&.magikarp {
|
||||
height: 32px;
|
||||
width: 32px;
|
||||
background-image: url('../assets/spinners/magikarp.gif');
|
||||
background-image: url('../../assets/spinners/magikarp.gif');
|
||||
animation-name: back-and-forth-magikarp;
|
||||
|
||||
@keyframes back-and-forth-magikarp {
|
||||
|
@ -127,7 +127,7 @@ export default {
|
|||
&.nyancat {
|
||||
height: 40px;
|
||||
width: 100px;
|
||||
background-image: url('../assets/spinners/nyancat.gif');
|
||||
background-image: url('../../assets/spinners/nyancat.gif');
|
||||
animation-name: back-and-forth-nyancat;
|
||||
|
||||
@keyframes back-and-forth-nyancat {
|
||||
|
|
|
@ -1,2 +1,5 @@
|
|||
export { default as PasswordForm } from './PasswordForm'
|
||||
export { default as ErrorDisplay } from './ErrorDisplay'
|
||||
export { default as HistoryConsole } from './HistoryConsole'
|
||||
export { default as ViewLockOverlay } from './ViewLockOverlay'
|
||||
export { default as DomainForm } from './DomainForm'
|
||||
export { default as PasswordForm } from './PasswordForm'
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { DomainForm } from '@/components/reusableForms'
|
||||
import { DomainForm } from '@/views/_partials'
|
||||
|
||||
export default {
|
||||
name: 'DomainAdd',
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
import api from '@/api'
|
||||
import { validationMixin } from 'vuelidate'
|
||||
|
||||
import { PasswordForm } from '@/components/reusableForms'
|
||||
import { PasswordForm } from '@/views/_partials'
|
||||
import { required, minLength } from '@/helpers/validators'
|
||||
|
||||
export default {
|
||||
|
|
Loading…
Add table
Reference in a new issue