pleroma-fe

commit: 1fb9ceb59bf0dca5f755f5988f90bdd24a89dd53
parent: 2184334ad919fdcf167ac2f1657d508481ec431b
Author: Shpuld Shpludson <shp@cock.li>
Date:   Mon,  7 Jan 2019 17:26:47 +0000

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

Add instance information page for mobile

See merge request pleroma/pleroma-fe!451
Diffstat:
M
src/boot/routes.js
2
++
A
src/components/about/about.js
13
+++++++++++++
A
src/components/about/about.vue
12
++++++++++++
M
src/components/side_drawer/side_drawer.vue
5
+++++
A
src/components/terms_of_service_panel/terms_of_service_panel.js
9
+++++++++
A
src/components/terms_of_service_panel/terms_of_service_panel.vue
18
++++++++++++++++++
M
src/i18n/en.json
1
+

7 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/boot/routes.js b/src/boot/routes.js
@@ -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 }
   ]
 }
diff --git a/src/components/about/about.js b/src/components/about/about.js
@@ -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
diff --git a/src/components/about/about.vue b/src/components/about/about.vue
@@ -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>
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
@@ -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") }}
diff --git a/src/components/terms_of_service_panel/terms_of_service_panel.js b/src/components/terms_of_service_panel/terms_of_service_panel.js
@@ -0,0 +1,9 @@
+const TermsOfServicePanel = {
+  computed: {
+    content () {
+      return this.$store.state.instance.tos
+    }
+  }
+}
+
+export default TermsOfServicePanel
diff --git a/src/components/terms_of_service_panel/terms_of_service_panel.vue b/src/components/terms_of_service_panel/terms_of_service_panel.vue
@@ -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>
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -29,6 +29,7 @@
     "username": "Username"
   },
   "nav": {
+    "about": "About",
     "back": "Back",
     "chat": "Local Chat",
     "friend_requests": "Follow Requests",