8 files changed, 69 insertions, 3 deletions
diff --git a/src/components/follow_requests/follow_requests.js b/src/components/follow_requests/follow_requests.js
new file mode 100644
index 00000000..11a228aa
--- /dev/null
+++ b/src/components/follow_requests/follow_requests.js
@@ -0,0 +1,23 @@
+import UserCard from '../user_card/user_card.vue'
+
+const FollowRequests = {
+  components: {
+    UserCard
+  },
+  created () {
+    this.updateRequests()
+  },
+  computed: {
+    requests () {
+      return this.$store.state.api.followRequests
+    }
+  },
+  methods: {
+    updateRequests () {
+      this.$store.state.api.backendInteractor.fetchFollowRequests()
+        .then((requests) => { this.$store.commit('setFollowRequests', requests) })
+    }
+  }
+}
+
+export default FollowRequests
diff --git a/src/components/follow_requests/follow_requests.vue b/src/components/follow_requests/follow_requests.vue
new file mode 100644
index 00000000..87dc4194
--- /dev/null
+++ b/src/components/follow_requests/follow_requests.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="settings panel panel-default">
+    <div class="panel-heading">
+      {{$t('nav.friend_requests')}}
+    </div>
+    <div class="panel-body">
+      <user-card v-for="request in requests" :key="request.id" :user="request" :showFollows="false" :showApproval="true"></user-card>
+    </div>
+  </div>
+</template>
+
+<script src="./follow_requests.js"></script>
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 2e1a6c7a..0b188f9a 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -12,6 +12,11 @@
             {{ $t("nav.mentions") }}
           </router-link>
         </li>
+        <li v-if='currentUser && currentUser.locked'>
+          <router-link to='/friend-requests'>
+            {{ $t("nav.friend_requests") }}
+          </router-link>
+        </li>
         <li>
           <router-link to='/main/public'>
             {{ $t("nav.public_tl") }}
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index a7a871c3..a019627a 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -3,7 +3,8 @@ import UserCardContent from '../user_card_content/user_card_content.vue'
 const UserCard = {
   props: [
     'user',
-    'showFollows'
+    'showFollows',
+    'showApproval'
   ],
   data () {
     return {
@@ -16,6 +17,14 @@ const UserCard = {
   methods: {
     toggleUserExpanded () {
       this.userExpanded = !this.userExpanded
+    },
+    approveUser () {
+      this.$store.state.api.backendInteractor.approveUser(this.user.id)
+      this.$store.dispatch('removeFollowRequest', this.user)
+    },
+    denyUser () {
+      this.$store.state.api.backendInteractor.denyUser(this.user.id)
+      this.$store.dispatch('removeFollowRequest', this.user)
     }
   }
 }
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 51d6965f..6478a65f 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -15,6 +15,10 @@
       </div>
       <a :href="user.statusnet_profile_url" target="blank"><div class="user-screen-name">@{{ user.screen_name }}</div></a>
     </div>
+    <div class="approval" v-if="showApproval">
+      <button class="btn btn-default" @click="approveUser">{{ $t('user_card.approve') }}</button>
+      <button class="btn btn-default" @click="denyUser">{{ $t('user_card.deny') }}</button>
+    </div>
   </div>
 </template>
 
@@ -75,4 +79,11 @@
     margin-bottom: 0;
   }
 }
+
+.approval {
+  button {
+    width: 100%;
+    margin-bottom: 0.5em;
+  }
+}
 </style>
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index c120df9a..09e91271 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -15,7 +15,7 @@
           <div class="name-and-screen-name">
             <div :title="user.name" class='user-name'>{{user.name}}</div>
             <router-link class='user-screen-name':to="{ name: 'user-profile', params: { id: user.id } }">
-              <span>@{{user.screen_name}}</span>
+              <span>@{{user.screen_name}}</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
               <span class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
             </router-link>
           </div>
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index b6026e18..443e63dd 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -5,6 +5,7 @@ const UserSettings = {
     return {
       newname: this.$store.state.users.currentUser.name,
       newbio: this.$store.state.users.currentUser.description,
+      newlocked: this.$store.state.users.currentUser.locked,
       followList: null,
       followImportError: false,
       followsImported: false,
@@ -34,7 +35,8 @@ const UserSettings = {
     updateProfile () {
       const name = this.newname
       const description = this.newbio
-      this.$store.state.api.backendInteractor.updateProfile({params: {name, description}}).then((user) => {
+      const locked = this.newlocked
+      this.$store.state.api.backendInteractor.updateProfile({params: {name, description, locked}}).then((user) => {
         if (!user.error) {
           this.$store.commit('addNewUsers', [user])
           this.$store.commit('setCurrentUser', user)
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index fbf3f651..4abdfc8e 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -10,6 +10,10 @@
         <input class='name-changer' id='username' v-model="newname"></input>
         <p>{{$t('settings.bio')}}</p>
         <textarea class="bio" v-model="newbio"></textarea>
+        <div class="setting-item">
+          <input type="checkbox" v-model="newlocked" id="account-locked">
+          <label for="account-locked">{{$t('settings.lock_account_description')}}</label>
+        </div>
         <button :disabled='newname.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
       </div>
       <div class="setting-item">