Merge branch 'feature/add-about-page-for-mobile' into 'develop'
Add instance information page for mobile See merge request pleroma/pleroma-fe!451
This commit is contained in:
commit
1fb9ceb59b
@ -16,6 +16,7 @@ import Notifications from 'components/notifications/notifications.vue'
|
|||||||
import UserPanel from 'components/user_panel/user_panel.vue'
|
import UserPanel from 'components/user_panel/user_panel.vue'
|
||||||
import LoginForm from 'components/login_form/login_form.vue'
|
import LoginForm from 'components/login_form/login_form.vue'
|
||||||
import ChatPanel from 'components/chat_panel/chat_panel.vue'
|
import ChatPanel from 'components/chat_panel/chat_panel.vue'
|
||||||
|
import About from 'components/about/about.vue'
|
||||||
|
|
||||||
export default (store) => {
|
export default (store) => {
|
||||||
return [
|
return [
|
||||||
@ -46,6 +47,7 @@ export default (store) => {
|
|||||||
{ name: 'chat', path: '/chat', component: ChatPanel, props: () => ({ floating: false }) },
|
{ name: 'chat', path: '/chat', component: ChatPanel, props: () => ({ floating: false }) },
|
||||||
{ name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },
|
{ name: 'oauth-callback', path: '/oauth-callback', component: OAuthCallback, props: (route) => ({ code: route.query.code }) },
|
||||||
{ name: 'user-search', path: '/user-search', component: UserSearch, props: (route) => ({ query: route.query.query }) },
|
{ name: 'user-search', path: '/user-search', component: UserSearch, props: (route) => ({ query: route.query.query }) },
|
||||||
|
{ name: 'about', path: '/about', component: About },
|
||||||
{ name: 'user-profile', path: '/(users/)?:name', component: UserProfile }
|
{ name: 'user-profile', path: '/(users/)?:name', component: UserProfile }
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
13
src/components/about/about.js
Normal file
13
src/components/about/about.js
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
import InstanceSpecificPanel from '../instance_specific_panel/instance_specific_panel.vue'
|
||||||
|
import FeaturesPanel from '../features_panel/features_panel.vue'
|
||||||
|
import TermsOfServicePanel from '../terms_of_service_panel/terms_of_service_panel.vue'
|
||||||
|
|
||||||
|
const About = {
|
||||||
|
components: {
|
||||||
|
InstanceSpecificPanel,
|
||||||
|
FeaturesPanel,
|
||||||
|
TermsOfServicePanel
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default About
|
12
src/components/about/about.vue
Normal file
12
src/components/about/about.vue
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<template>
|
||||||
|
<div class="sidebar">
|
||||||
|
<instance-specific-panel></instance-specific-panel>
|
||||||
|
<features-panel></features-panel>
|
||||||
|
<terms-of-service-panel></terms-of-service-panel>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script src="./about.js" ></script>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
</style>
|
@ -71,6 +71,11 @@
|
|||||||
{{ $t("settings.settings") }}
|
{{ $t("settings.settings") }}
|
||||||
</router-link>
|
</router-link>
|
||||||
</li>
|
</li>
|
||||||
|
<li @click="toggleDrawer">
|
||||||
|
<router-link :to="{ name: 'about'}">
|
||||||
|
{{ $t("nav.about") }}
|
||||||
|
</router-link>
|
||||||
|
</li>
|
||||||
<li v-if="currentUser" @click="toggleDrawer">
|
<li v-if="currentUser" @click="toggleDrawer">
|
||||||
<a @click="doLogout" href="#">
|
<a @click="doLogout" href="#">
|
||||||
{{ $t("login.logout") }}
|
{{ $t("login.logout") }}
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
const TermsOfServicePanel = {
|
||||||
|
computed: {
|
||||||
|
content () {
|
||||||
|
return this.$store.state.instance.tos
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default TermsOfServicePanel
|
@ -0,0 +1,18 @@
|
|||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-body">
|
||||||
|
<div v-html="content" class="tos-content">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script src="./terms_of_service_panel.js" ></script>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
.tos-content {
|
||||||
|
margin: 1em
|
||||||
|
}
|
||||||
|
</style>
|
@ -29,6 +29,7 @@
|
|||||||
"username": "Username"
|
"username": "Username"
|
||||||
},
|
},
|
||||||
"nav": {
|
"nav": {
|
||||||
|
"about": "About",
|
||||||
"back": "Back",
|
"back": "Back",
|
||||||
"chat": "Local Chat",
|
"chat": "Local Chat",
|
||||||
"friend_requests": "Follow Requests",
|
"friend_requests": "Follow Requests",
|
||||||
|
Loading…
Reference in New Issue
Block a user