Merge branch 'feature/48-404-template' into 'develop'

Fixed #48: basic 404 error template

Closes #48

See merge request funkwhale/funkwhale!27
This commit is contained in:
Eliot Berriot 2017-12-15 21:45:48 +00:00
commit aa3815dcdb
3 changed files with 38 additions and 2 deletions

View File

@ -8,6 +8,7 @@ Changelog
- Import: can now specify search template when querying import sources (#45)
- Player: better handling of errors when fetching the audio file (#46)
- Login form: now redirect to previous page after login (#2)
- 404: a decent 404 template, at least (#48)
0.2.4 (2017-12-14)

View File

@ -0,0 +1,34 @@
<template>
<div class="main pusher">
<div class="ui vertical stripe segment">
<div class="ui text container">
<h1 class="ui huge header">
<i class="warning icon"></i>
<div class="content">
<strike>Whale</strike> Page not found!
</div>
</h1>
<p>We're sorry, the page you asked for does not exists.</p>
<p>Requested URL: <a :href="path">{{ path }}</a></p>
<router-link class="ui icon button" to="/">
Go to home page
<i class="right arrow icon"></i>
</router-link>
</div>
</div>
</div>
</template>
<script>
export default {
data: function () {
return {
path: window.location.href
}
}
}
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style scoped>
</style>

View File

@ -1,5 +1,6 @@
import Vue from 'vue'
import Router from 'vue-router'
import PageNotFound from '@/components/PageNotFound'
import Home from '@/components/Home'
import Login from '@/components/auth/Login'
import Profile from '@/components/auth/Profile'
@ -72,7 +73,7 @@ export default new Router({
},
{ path: 'import/batches/:id', name: 'library.import.batches.detail', component: BatchDetail, props: true }
]
}
},
{ path: '*', component: PageNotFound }
]
})