Commit 1fb9ceb5 authored by Shpuld Shpludson's avatar Shpuld Shpludson

Merge branch 'feature/add-about-page-for-mobile' into 'develop'

Add instance information page for mobile

See merge request pleroma/pleroma-fe!451
parents 2184334a a60fc390
......@@ -16,6 +16,7 @@ import Notifications from 'components/notifications/notifications.vue'
import UserPanel from 'components/user_panel/user_panel.vue'
import LoginForm from 'components/login_form/login_form.vue'
import ChatPanel from 'components/chat_panel/chat_panel.vue'
import About from 'components/about/about.vue'
export default (store) => {
return [
......@@ -46,6 +47,7 @@ export default (store) => {
{ name: 'chat', path: '/chat', component: ChatPanel, props: () => ({ floating: false }) },
{ 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: 'about', path: '/about', component: About },
{ name: 'user-profile', path: '/(users/)?:name', component: UserProfile }
]
}
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
<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") }}
</router-link>
</li>
<li @click="toggleDrawer">
<router-link :to="{ name: 'about'}">
{{ $t("nav.about") }}
</router-link>
</li>
<li v-if="currentUser" @click="toggleDrawer">
<a @click="doLogout" href="#">
{{ $t("login.logout") }}
......
const TermsOfServicePanel = {
computed: {
content () {
return this.$store.state.instance.tos
}
}
}
export default TermsOfServicePanel
<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"
},
"nav": {
"about": "About",
"back": "Back",
"chat": "Local Chat",
"friend_requests": "Follow Requests",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment