fix partials imports & removed Error route

This commit is contained in:
axolotle 2021-02-11 16:58:57 +01:00
parent d07b3550c5
commit a2705a3651
8 changed files with 25 additions and 36 deletions

View file

@ -33,7 +33,7 @@
</header> </header>
<!-- MAIN --> <!-- MAIN -->
<api-wait-overlay> <view-lock-overlay>
<breadcrumb /> <breadcrumb />
<main id="main"> <main id="main">
@ -44,10 +44,10 @@
</transition> </transition>
<router-view v-else class="static" :key="$route.fullPath" /> <router-view v-else class="static" :key="$route.fullPath" />
</main> </main>
</api-wait-overlay> </view-lock-overlay>
<!-- CONSOLE/HISTORY --> <!-- HISTORY CONSOLE -->
<ynh-console /> <history-console />
<!-- FOOTER --> <!-- FOOTER -->
<footer class="py-3 mt-auto"> <footer class="py-3 mt-auto">
@ -76,12 +76,16 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import ApiWaitOverlay from '@/components/ApiWaitOverlay' import { HistoryConsole, ViewLockOverlay } from '@/views/_partials'
import YnhConsole from '@/components/YnhConsole'
export default { export default {
name: 'App', name: 'App',
components: {
HistoryConsole,
ViewLockOverlay
},
data () { data () {
return { return {
transitionName: null transitionName: null
@ -109,11 +113,6 @@ export default {
} }
}, },
components: {
ApiWaitOverlay,
YnhConsole
},
// This hook is only triggered at page first load // This hook is only triggered at page first load
created () { created () {
// From this hook the value of `connected` always come from the localStorage. // From this hook the value of `connected` always come from the localStorage.

View file

@ -10,7 +10,6 @@
import Home from '@/views/Home' import Home from '@/views/Home'
import Login from '@/views/Login' import Login from '@/views/Login'
import ErrorPage from '@/views/ErrorPage'
import ToolList from '@/views/tool/ToolList' import ToolList from '@/views/tool/ToolList'
const routes = [ const routes = [
@ -29,18 +28,6 @@ const routes = [
meta: { noAuth: true, breadcrumb: [] } meta: { noAuth: true, breadcrumb: [] }
}, },
/*
ERROR
*/
{
name: 'error',
path: '/error/:type',
component: ErrorPage,
props: true,
// Leave the breadcrumb
meta: { noAuth: true, breadcrumb: [] }
},
/* /*
POST INSTALL POST INSTALL
*/ */

View file

@ -64,7 +64,7 @@
<script> <script>
import api from '@/api' import api from '@/api'
import { DomainForm, PasswordForm } from '@/components/reusableForms' import { DomainForm, PasswordForm } from '@/views/_partials'
import LoginView from '@/views/Login' import LoginView from '@/views/Login'
export default { export default {

View file

@ -59,7 +59,7 @@
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
name: 'YnhConsole', name: 'HistoryConsole',
props: { props: {
value: { type: Boolean, default: false }, value: { type: Boolean, default: false },

View file

@ -13,7 +13,7 @@
</div> </div>
<b-card-body v-if="error"> <b-card-body v-if="error">
<error-page /> <error-display />
</b-card-body> </b-card-body>
<b-card-body v-else class="pb-4"> <b-card-body v-else class="pb-4">
@ -40,10 +40,10 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import ErrorPage from '@/views/ErrorPage' import { ErrorDisplay } from '@/views/_partials'
export default { export default {
name: 'ApiWaitOverlay', name: 'ViewLockOverlay',
computed: { computed: {
...mapGetters(['waiting', 'lastAction', 'error', 'spinner']), ...mapGetters(['waiting', 'lastAction', 'error', 'spinner']),
@ -63,7 +63,7 @@ export default {
}, },
components: { components: {
ErrorPage ErrorDisplay
} }
} }
</script> </script>
@ -99,7 +99,7 @@ export default {
&.pacman { &.pacman {
height: 24px; height: 24px;
width: 24px; width: 24px;
background-image: url('../assets/spinners/pacman.gif'); background-image: url('../../assets/spinners/pacman.gif');
animation-name: back-and-forth-pacman; animation-name: back-and-forth-pacman;
@keyframes back-and-forth-pacman { @keyframes back-and-forth-pacman {
@ -113,7 +113,7 @@ export default {
&.magikarp { &.magikarp {
height: 32px; height: 32px;
width: 32px; width: 32px;
background-image: url('../assets/spinners/magikarp.gif'); background-image: url('../../assets/spinners/magikarp.gif');
animation-name: back-and-forth-magikarp; animation-name: back-and-forth-magikarp;
@keyframes back-and-forth-magikarp { @keyframes back-and-forth-magikarp {
@ -127,7 +127,7 @@ export default {
&.nyancat { &.nyancat {
height: 40px; height: 40px;
width: 100px; width: 100px;
background-image: url('../assets/spinners/nyancat.gif'); background-image: url('../../assets/spinners/nyancat.gif');
animation-name: back-and-forth-nyancat; animation-name: back-and-forth-nyancat;
@keyframes back-and-forth-nyancat { @keyframes back-and-forth-nyancat {

View file

@ -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 DomainForm } from './DomainForm'
export { default as PasswordForm } from './PasswordForm'

View file

@ -8,7 +8,7 @@
</template> </template>
<script> <script>
import { DomainForm } from '@/components/reusableForms' import { DomainForm } from '@/views/_partials'
export default { export default {
name: 'DomainAdd', name: 'DomainAdd',

View file

@ -11,7 +11,7 @@
import api from '@/api' import api from '@/api'
import { validationMixin } from 'vuelidate' import { validationMixin } from 'vuelidate'
import { PasswordForm } from '@/components/reusableForms' import { PasswordForm } from '@/views/_partials'
import { required, minLength } from '@/helpers/validators' import { required, minLength } from '@/helpers/validators'
export default { export default {