Merge branch 'develop' into feature/replace-panel-switcher

package.json

@@ -36,6 +36,8 @@
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
+    "@babel/polyfill": "^7.0.0",
+    "@vue/test-utils": "^1.0.0-beta.26",
     "autoprefixer": "^6.4.0",
     "babel-core": "^6.0.0",
     "babel-eslint": "^7.0.0",

src/boot/after_store.js

@@ -1,21 +1,8 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
+import routes from './routes'
 
 import App from '../App.vue'
-import PublicTimeline from '../components/public_timeline/public_timeline.vue'
-import PublicAndExternalTimeline from '../components/public_and_external_timeline/public_and_external_timeline.vue'
-import FriendsTimeline from '../components/friends_timeline/friends_timeline.vue'
-import TagTimeline from '../components/tag_timeline/tag_timeline.vue'
-import ConversationPage from '../components/conversation-page/conversation-page.vue'
-import Mentions from '../components/mentions/mentions.vue'
-import DMs from '../components/dm_timeline/dm_timeline.vue'
-import UserProfile from '../components/user_profile/user_profile.vue'
-import Settings from '../components/settings/settings.vue'
-import Registration from '../components/registration/registration.vue'
-import UserSettings from '../components/user_settings/user_settings.vue'
-import FollowRequests from '../components/follow_requests/follow_requests.vue'
-import OAuthCallback from '../components/oauth_callback/oauth_callback.vue'
-import UserSearch from '../components/user_search/user_search.vue'
 
 const afterStoreSetup = ({ store, i18n }) => {
   window.fetch('/api/statusnet/config.json')
@@ -102,35 +89,10 @@ const afterStoreSetup = ({ store, i18n }) => {
             store.dispatch('disableChat')
           }
 
-          const routes = [
-            { name: 'root',
-              path: '/',
-              redirect: to => {
-                return (store.state.users.currentUser
-                        ? store.state.instance.redirectRootLogin
-                        : store.state.instance.redirectRootNoLogin) || '/main/all'
-              }},
-            { path: '/main/all', component: PublicAndExternalTimeline },
-            { path: '/main/public', component: PublicTimeline },
-            { path: '/main/friends', component: FriendsTimeline },
-            { path: '/tag/:tag', component: TagTimeline },
-            { name: 'conversation', path: '/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
-            { name: 'user-profile', path: '/users/:id', component: UserProfile },
-            { name: 'mentions', path: '/:username/mentions', component: Mentions },
-            { name: 'dms', path: '/:username/dms', component: DMs },
-            { name: 'settings', path: '/settings', component: Settings },
-            { name: 'registration', path: '/registration', component: Registration },
-            { name: 'registration', path: '/registration/:token', component: Registration },
-            { name: 'friend-requests', path: '/friend-requests', component: FollowRequests },
-            { name: 'user-settings', path: '/user-settings', component: UserSettings },
-            { 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 }) }
-          ]
-
           const router = new VueRouter({
             mode: 'history',
-            routes,
+            routes: routes(store),
-            scrollBehavior: (to, from, savedPosition) => {
+            scrollBehavior: (to, _from, savedPosition) => {
               if (to.matched.some(m => m.meta.dontScroll)) {
                 return false
               }

src/boot/routes.js

@@ -0,0 +1,67 @@
+import PublicTimeline from 'components/public_timeline/public_timeline.vue'
+import PublicAndExternalTimeline from 'components/public_and_external_timeline/public_and_external_timeline.vue'
+import FriendsTimeline from 'components/friends_timeline/friends_timeline.vue'
+import TagTimeline from 'components/tag_timeline/tag_timeline.vue'
+import ConversationPage from 'components/conversation-page/conversation-page.vue'
+import Mentions from 'components/mentions/mentions.vue'
+import DMs from 'components/dm_timeline/dm_timeline.vue'
+import UserProfile from 'components/user_profile/user_profile.vue'
+import Settings from 'components/settings/settings.vue'
+import Registration from 'components/registration/registration.vue'
+import UserSettings from 'components/user_settings/user_settings.vue'
+import FollowRequests from 'components/follow_requests/follow_requests.vue'
+import OAuthCallback from 'components/oauth_callback/oauth_callback.vue'
+import UserSearch from 'components/user_search/user_search.vue'
+
+export default (store) => {
+  return [
+    { name: 'root',
+      path: '/',
+      redirect: _to => {
+        return (store.state.users.currentUser
+                ? store.state.instance.redirectRootLogin
+                : store.state.instance.redirectRootNoLogin) || '/~/main/all'
+      }
+    },
+    { name: 'public-external-timeline', path: '/~/main/all', component: PublicAndExternalTimeline },
+    { name: 'public-timeline', path: '/~/main/public', component: PublicTimeline },
+    { name: 'friends', path: '/~/main/friends', component: FriendsTimeline },
+    // Beginning of temporary redirects
+    { path: '/main/:route',
+      redirect: to => {
+        const { params } = to
+        const route = params.route ? params.route : 'all'
+
+        return { path: `/~/main/${route}` }
+      }
+    },
+    { path: '/tag/:tag',
+      redirect: to => {
+        const { params } = to
+
+        return { path: `/~/tag/${params.tag}` }
+      }
+    },
+    { path: '/notice/:id',
+      redirect: to => {
+        const { params } = to
+
+        return { path: `/~/notice/${params.id}` }
+      }
+    },
+    // End of temporary redirects
+    { name: 'tag-timeline', path: '/~/tag/:tag', component: TagTimeline },
+    { name: 'conversation', path: '/~/notice/:id', component: ConversationPage, meta: { dontScroll: true } },
+    { name: 'user-profile', path: '/:name', component: UserProfile },
+    { name: 'external-user-profile', path: '/~/users/:id', component: UserProfile },
+    { name: 'mentions', path: '/:username/mentions', component: Mentions },
+    { name: 'dms', path: '/:username/dms', component: DMs },
+    { name: 'settings', path: '/~/settings', component: Settings },
+    { name: 'registration', path: '/~/registration', component: Registration },
+    { name: 'registration', path: '/~/registration/:token', component: Registration },
+    { name: 'friend-requests', path: '/~/friend-requests', component: FollowRequests },
+    { name: 'user-settings', path: '/~/user-settings', component: UserSettings },
+    { 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 }) }
+  ]
+}

src/components/chat_panel/chat_panel.js

@@ -1,3 +1,5 @@
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
 const chatPanel = {
   data () {
     return {
@@ -18,6 +20,9 @@ const chatPanel = {
     },
     togglePanel () {
       this.collapsed = !this.collapsed
+    },
+    userProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name)
     }
   }
 }

src/components/chat_panel/chat_panel.vue

@@ -13,8 +13,10 @@
             <img :src="message.author.avatar" />
           </span>
           <div class="chat-content">
-            <router-link class="chat-name" :to="{ name: 'user-profile', params: { id: message.author.id } }">
+            <router-link
-              {{message.author.username}}
+              class="chat-name"
+              :to="userProfileLink(message.author)">
+                {{message.author.username}}
             </router-link>
             <br>
             <span class="chat-text">
@@ -67,9 +69,6 @@
   overflow-x: hidden;
 }
 
-.chat-name {
-}
-
 .chat-message {
   display: flex;
   padding: 0.2em 0.5em

src/components/login_form/login_form.js

@@ -32,7 +32,7 @@ const LoginForm = {
           .then((result) => {
             this.$store.commit('setToken', result.access_token)
             this.$store.dispatch('loginUser', result.access_token)
-            this.$router.push('/main/friends')
+            this.$router.push('/~/main/friends')
           })
       })
     }

src/components/nav_panel/nav_panel.vue

@@ -3,7 +3,7 @@
     <div class="panel panel-default">
       <ul>
         <li v-if='currentUser'>
-          <router-link @click.native="activatePanel('timeline')" to='/main/friends'>
+          <router-link @click.native="activatePanel('timeline')" :to="{ name: 'friends' }">
             {{ $t("nav.timeline") }}
           </router-link>
         </li>
@@ -18,17 +18,17 @@
           </router-link>
         </li>
         <li v-if='currentUser && currentUser.locked'>
-          <router-link @click.native="activatePanel('timeline')" to='/friend-requests'>
+          <router-link @click.native="activatePanel('timeline')" :to="{ name: 'friend-requests' }">
             {{ $t("nav.friend_requests") }}
           </router-link>
         </li>
         <li>
-          <router-link @click.native="activatePanel('timeline')" to='/main/public'>
+          <router-link @click.native="activatePanel('timeline')" :to="{ name: 'public-timeline' }">
             {{ $t("nav.public_tl") }}
           </router-link>
         </li>
         <li>
-          <router-link @click.native="activatePanel('timeline')" to='/main/all'>
+          <router-link @click.native="activatePanel('timeline')" :to="{ name: 'public-external-timeline' }">
             {{ $t("nav.twkn") }}
           </router-link>
         </li>

src/components/notification/notification.js

@@ -2,6 +2,7 @@ import Status from '../status/status.vue'
 import StillImage from '../still-image/still-image.vue'
 import UserCardContent from '../user_card_content/user_card_content.vue'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 const Notification = {
   data () {
@@ -20,6 +21,9 @@ const Notification = {
   methods: {
     toggleUserExpanded () {
       this.userExpanded = !this.userExpanded
+    },
+    userProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name)
     }
   },
   computed: {

src/components/notification/notification.vue

@@ -28,7 +28,9 @@
         <small class="timeago"><router-link @click.native="activatePanel('timeline')" v-if="notification.status" :to="{ name: 'conversation', params: { id: notification.status.id } }"><timeago :since="notification.action.created_at" :auto-update="240"></timeago></router-link></small>
       </span>
       <div class="follow-text" v-if="notification.type === 'follow'">
-        <router-link @click.native="activatePanel('timeline')" :to="{ name: 'user-profile', params: { id: notification.action.user.id } }">@{{notification.action.user.screen_name}}</router-link>
+        <router-link @click.native="activatePanel('timeline')" :to="userProfileLink(notification.action.user)">
+          @{{notification.action.user.screen_name}}
+        </router-link>
       </div>
       <template v-else>
         <status :activatePanel="activatePanel" v-if="notification.status"  class="faint" :compact="true" :statusoid="notification.status" :noHeading="true"></status>

src/components/oauth_callback/oauth_callback.js

@@ -11,7 +11,7 @@ const oac = {
       }).then((result) => {
         this.$store.commit('setToken', result.access_token)
         this.$store.dispatch('loginUser', result.access_token)
-        this.$router.push('/main/friends')
+        this.$router.push('/~/main/friends')
       })
     }
   }

src/components/post_status_form/post_status_form.vue

@@ -7,7 +7,7 @@
         path="post_status.account_not_locked_warning"
         tag="p"
         class="visibility-notice">
-        <router-link to="/user-settings">{{ $t('post_status.account_not_locked_warning_link') }}</router-link>
+        <router-link :to="{ name: 'user-settings' }">{{ $t('post_status.account_not_locked_warning_link') }}</router-link>
       </i18n>
       <p v-if="this.newStatus.visibility == 'direct'" class="visibility-notice">{{ $t('post_status.direct_warning') }}</p>
       <input

src/components/registration/registration.js

@@ -11,7 +11,8 @@ const registration = {
       username: '',
       password: '',
       confirm: ''
-    }
+    },
+    captcha: {}
   }),
   validations: {
     user: {
@@ -27,8 +28,10 @@ const registration = {
   },
   created () {
     if ((!this.registrationOpen && !this.token) || this.signedIn) {
-      this.$router.push('/main/all')
+      this.$router.push('/~/main/all')
     }
+
+    this.setCaptcha()
   },
   computed: {
     token () { return this.$route.params.token },
@@ -41,21 +44,26 @@ const registration = {
     })
   },
   methods: {
-    ...mapActions(['signUp']),
+    ...mapActions(['signUp', 'getCaptcha']),
     async submit () {
       this.user.nickname = this.user.username
       this.user.token = this.token
+      this.user.captcha_solution = this.captcha.solution
+      this.user.captcha_token = this.captcha.token
 
       this.$v.$touch()
 
       if (!this.$v.$invalid) {
         try {
           await this.signUp(this.user)
-          this.$router.push('/main/friends')
+          this.$router.push('/~/main/friends')
         } catch (error) {
           console.warn('Registration failed: ' + error)
         }
       }
+    },
+    setCaptcha () {
+      this.getCaptcha().then(cpt => { this.captcha = cpt })
     }
   }
 }

src/components/registration/registration.vue

@@ -75,6 +75,19 @@
               </ul>
             </div>
 
+            <div class="form-group" id="captcha-group" v-if="captcha.type != 'none'">
+              <template v-if="captcha.type == 'kocaptcha'">
+                <img v-bind:src="captcha.url" v-on:click="setCaptcha">
+
+                <sub>Click the image to get a new captcha</sub>
+                <label class='form--label' for='captcha-label'>CAPTCHA</label>
+
+                <input :disabled="isPending"
+                  v-model='captcha.solution'
+                  class='form-control' id='captcha-answer' type='text'>
+              </template>
+            </div>
+
             <div class='form-group' v-if='token' >
               <label for='token'>{{$t('registration.token')}}</label>
               <input disabled='true' v-model='token' class='form-control' id='token' type='text'>

src/components/status/status.js

@@ -7,6 +7,7 @@ import UserCardContent from '../user_card_content/user_card_content.vue'
 import StillImage from '../still-image/still-image.vue'
 import { filter, find } from 'lodash'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 const Status = {
   name: 'Status',
@@ -286,6 +287,9 @@ const Status = {
     },
     replyLeave () {
       this.showPreview = false
+    },
+    userProfileLink (id, name) {
+      return generateProfileLink(id, name)
     }
   },
   watch: {

src/components/status/status.vue

@@ -2,7 +2,11 @@
   <div class="status-el" v-if="!hideReply && !deleted" :class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]">
     <template v-if="muted && !noReplyLinks">
       <div class="media status container muted">
-        <small><router-link @click.native="activatePanel('timeline')" :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link></small>
+        <small>
+          <router-link @click.native="activatePanel('timeline')" :to="userProfileLink(status.user.id, status.user.screen_name)">
+            {{status.user.screen_name}}
+          </router-link>
+        </small>
         <small class="muteWords">{{muteWordHits.join(', ')}}</small>
         <a href="#" class="unmute" @click.prevent="toggleMute"><i class="icon-eye-off"></i></a>
       </div>
@@ -34,10 +38,12 @@
                 <h4 class="user-name" v-if="status.user.name_html" v-html="status.user.name_html"></h4>
                 <h4 class="user-name" v-else>{{status.user.name}}</h4>
                 <span class="links">
-                  <router-link @click.native="activatePanel('timeline')" :to="{ name: 'user-profile', params: { id: status.user.id } }">{{status.user.screen_name}}</router-link>
+                  <router-link @click.native="activatePanel('timeline')" :to="userProfileLink(status.user.id, status.user.screen_name)">
+                    {{status.user.screen_name}}
+                  </router-link>
                   <span v-if="status.in_reply_to_screen_name" class="faint reply-info">
                     <i class="icon-right-open"></i>
-                    <router-link @click.native="activatePanel('timeline')" :to="{ name: 'user-profile', params: { id: status.in_reply_to_user_id } }">
+                    <router-link @click.native="activatePanel('timeline')" :to="userProfileLink(status.in_reply_to_user_id, status.in_reply_to_screen_name)">
                       {{status.in_reply_to_screen_name}}
                     </router-link>
                   </span>
@@ -474,7 +480,7 @@
   }
 }
 
-.avatar {
+.avatar.still-image {
   width: 48px;
   height: 48px;
   box-shadow: var(--avatarStatusShadow);

src/components/tab_switcher/tab_switcher.jsx

@@ -18,12 +18,18 @@ export default Vue.component('tab-switcher', {
     const tabs = this.$slots.default
           .filter(slot => slot.data)
           .map((slot, index) => {
-            const classes = ['tab']
+            const classesTab = ['tab']
+            const classesWrapper = ['tab-wrapper']
 
             if (index === this.active) {
-              classes.push('active')
+              classesTab.push('active')
+              classesWrapper.push('active')
             }
-            return (<button onClick={this.activateTab(index)} class={ classes.join(' ') }>{slot.data.attrs.label}</button>)
+            return (
+              <div class={ classesWrapper.join(' ')}>
+                <button onClick={this.activateTab(index)} class={ classesTab.join(' ') }>{slot.data.attrs.label}</button>
+              </div>
+            )
           });
     const contents = this.$slots.default.filter(_=>_.data).map(( slot, index ) => {
       const active = index === this.active

src/components/tab_switcher/tab_switcher.scss

@@ -9,57 +9,67 @@
   .tabs {
     display: flex;
     position: relative;
-    justify-content: center;
     width: 100%;
     overflow-y: hidden;
     overflow-x: auto;
     padding-top: 5px;
-    height: 32px;
     box-sizing: border-box;
 
     &::after, &::before {
       display: block;
       content: '';
       flex: 1 1 auto;
-    }
-
-    .tab, &::after, &::before {
       border-bottom: 1px solid;
       border-bottom-color: $fallback--border;
       border-bottom-color: var(--border, $fallback--border);
     }
 
-    .tab {
+    .tab-wrapper {
+      height: 28px;
+      overflow: hidden;
       position: relative;
-      border-bottom-left-radius: 0;
+      display: flex;
-      border-bottom-right-radius: 0;
+      flex: 0 0 auto;
-      padding: 5px 1em 99px;
-      white-space: nowrap;
 
-      &:not(.active) {
+      .tab {
-        z-index: 4;
+        width: 100%;
+        min-width: 1px;
+        position: relative;
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+        padding: 6px 1em;
+        padding-bottom: 99px;
+        margin-bottom: 6px - 99px;
+        white-space: nowrap;
 
-        &:hover {
+        &:not(.active) {
-          z-index: 6;
+          z-index: 4;
+
+          &:hover {
+            z-index: 6;
+          }
         }
 
+        &.active {
+          background: transparent;
+          z-index: 5;
+        }
+      }
+
+      &:not(.active) {
         &::after {
           content: '';
           position: absolute;
           left: 0;
           right: 0;
-          top: 26px;
+          bottom: 0;
+          z-index: 7;
           border-bottom: 1px solid;
           border-bottom-color: $fallback--border;
           border-bottom-color: var(--border, $fallback--border);
         }
       }
-
-      &.active {
-        background: transparent;
-        border-bottom: none;
-        z-index: 5;
-      }
     }
+
   }
 }

src/components/user_card/user_card.js

@@ -1,4 +1,5 @@
 import UserCardContent from '../user_card_content/user_card_content.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 const UserCard = {
   props: [
@@ -28,6 +29,9 @@ const UserCard = {
     denyUser () {
       this.$store.state.api.backendInteractor.denyUser(this.user.id)
       this.$store.dispatch('removeFollowRequest', this.user)
+    },
+    userProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name)
     }
   }
 }

src/components/user_card/user_card.vue

@@ -19,7 +19,8 @@
           {{ currentUser.id == user.id ? $t('user_card.its_you') : $t('user_card.follows_you') }}
         </span>
       </div>
-      <router-link class='user-screen-name' :to="{ name: 'user-profile', params: { id: user.id } }">
+
+      <router-link class='user-screen-name' :to="userProfileLink(user)">
         @{{user.screen_name}}
       </router-link>
     </div>

src/components/user_card_content/user_card_content.js

@@ -1,5 +1,6 @@
 import StillImage from '../still-image/still-image.vue'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 export default {
   props: [ 'user', 'switcher', 'selected', 'hideBio', 'activatePanel' ],
@@ -177,6 +178,9 @@ export default {
       if (target.tagName === 'A') {
         window.open(target.href, '_blank')
       }
+    },
+    userProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name)
     }
   }
 }

src/components/user_card_content/user_card_content.vue

@@ -2,20 +2,20 @@
 <div id="heading" class="profile-panel-background" :style="headingStyle">
   <div class="panel-heading text-center">
     <div class='user-info'>
-      <router-link @click.native="activatePanel && activatePanel('timeline')" to='/user-settings' style="float: right; margin-top:16px;" v-if="!isOtherUser">
+      <router-link @click.native="activatePanel && activatePanel('timeline')" :to="{ name: 'user-settings' }" style="float: right; margin-top:16px;" v-if="!isOtherUser">
         <i class="icon-cog usersettings" :title="$t('tool_tip.user_settings')"></i>
       </router-link>
       <a :href="user.statusnet_profile_url" target="_blank" class="floater" v-if="isOtherUser">
         <i class="icon-link-ext usersettings"></i>
       </a>
       <div class='container'>
-        <router-link @click.native="activatePanel && activatePanel('timeline')" :to="{ name: 'user-profile', params: { id: user.id } }">
+        <router-link @click.native="activatePanel && activatePanel('timeline')" :to="userProfileLink(user)">
           <StillImage class="avatar" :class='{ "better-shadow": betterShadow }' :src="user.profile_image_url_original"/>
         </router-link>
         <div class="name-and-screen-name">
           <div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
           <div :title="user.name" class='user-name' v-else>{{user.name}}</div>
-          <router-link @click.native="activatePanel && activatePanel('timeline')" class='user-screen-name':to="{ name: 'user-profile', params: { id: user.id } }">
+          <router-link @click.native="activatePanel && activatePanel('timeline')" class='user-screen-name' :to="userProfileLink(user)">
             <span>@{{user.screen_name}}</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
             <span v-if="!hideUserStatsLocal" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
           </router-link>
@@ -25,7 +25,7 @@
         <div v-if="user.follows_you && loggedIn && isOtherUser" class="following">
           {{ $t('user_card.follows_you') }}
         </div>
-        <div class="floater" v-if="switcher || isOtherUser">
+        <div class="floater" v-if="isOtherUser && (loggedIn || !switcher)">
           <!-- id's need to be unique, otherwise vue confuses which user-card checkbox belongs to -->
           <input class="userHighlightText" type="text" :id="'userHighlightColorTx'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/>
           <input class="userHighlightCl" type="color" :id="'userHighlightColor'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/>
@@ -67,7 +67,7 @@
             </button>
           </span>
         </div>
-        <div class='mute' v-if='isOtherUser'>
+        <div class='mute' v-if='isOtherUser && loggedIn'>
           <span v-if='user.muted'>
             <button @click="toggleMute" class="pressed">
               {{ $t('user_card.muted') }}

src/components/user_profile/user_profile.js

@@ -3,30 +3,55 @@ import Timeline from '../timeline/timeline.vue'
 
 const UserProfile = {
   created () {
+    debugger
     this.$store.commit('clearTimeline', { timeline: 'user' })
-    this.$store.dispatch('startFetching', ['user', this.userId])
+    this.$store.dispatch('startFetching', ['user', this.fetchBy])
-    if (!this.$store.state.users.usersObject[this.userId]) {
+    if (!this.user) {
-      this.$store.dispatch('fetchUser', this.userId)
+      this.$store.dispatch('fetchUser', this.fetchBy)
     }
   },
   destroyed () {
     this.$store.dispatch('stopFetching', 'user')
   },
   computed: {
-    timeline () { return this.$store.state.statuses.timelines.user },
+    timeline () {
+      return this.$store.state.statuses.timelines.user
+    },
     userId () {
       return this.$route.params.id
     },
+    userName () {
+      return this.$route.params.name
+    },
     user () {
       if (this.timeline.statuses[0]) {
         return this.timeline.statuses[0].user
       } else {
-        return this.$store.state.users.usersObject[this.userId] || false
+        return Object.values(this.$store.state.users.usersObject).filter(user => {
+          return (this.isExternal ? user.id === this.userId : user.screen_name === this.userName)
+        })[0] || false
       }
+    },
+    fetchBy () {
+      return this.isExternal ? this.userId : this.userName
+    },
+    isExternal () {
+      return this.$route.name === 'external-user-profile'
     }
   },
   watch: {
+    userName () {
+      if (this.isExternal) {
+        return
+      }
+      this.$store.dispatch('stopFetching', 'user')
+      this.$store.commit('clearTimeline', { timeline: 'user' })
+      this.$store.dispatch('startFetching', ['user', this.userName])
+    },
     userId () {
+      if (!this.isExternal) {
+        return
+      }
       this.$store.dispatch('stopFetching', 'user')
       this.$store.commit('clearTimeline', { timeline: 'user' })
       this.$store.dispatch('startFetching', ['user', this.userId])

src/components/user_settings/user_settings.js

@@ -257,7 +257,7 @@ const UserSettings = {
         .then((res) => {
           if (res.status === 'success') {
             this.$store.dispatch('logout')
-            this.$router.push('/main/all')
+            this.$router.push('/~/main/all')
           } else {
             this.deleteAccountError = res.error
           }

src/components/who_to_follow_panel/who_to_follow_panel.js

@@ -1,4 +1,5 @@
 import apiService from '../../services/api/api.service.js'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 function showWhoToFollow (panel, reply) {
   var users = reply
@@ -93,6 +94,11 @@ const WhoToFollowPanel = {
       return this.$store.state.instance.suggestionsEnabled
     }
   },
+  methods: {
+    userProfileLink (id, name) {
+      return generateProfileLink(id, name)
+    }
+  },
   watch: {
     user: function (user, oldUser) {
       if (this.suggestionsEnabled) {

src/components/who_to_follow_panel/who_to_follow_panel.vue

@@ -8,9 +8,9 @@
       </div>
       <div class="panel-body who-to-follow">
         <p>
-          <img v-bind:src="img1"/> <router-link :to="{ name: 'user-profile', params: { id: id1 } }">{{ name1 }}</router-link><br>
+          <img v-bind:src="img1"/> <router-link :to="userProfileLink(id1, name1)">{{ name1 }}</router-link><br>
-          <img v-bind:src="img2"/> <router-link :to="{ name: 'user-profile', params: { id: id2 } }">{{ name2 }}</router-link><br>
+          <img v-bind:src="img2"/> <router-link :to="userProfileLink(id2, name2)">{{ name2 }}</router-link><br>
-          <img v-bind:src="img3"/> <router-link :to="{ name: 'user-profile', params: { id: id3 } }">{{ name3 }}</router-link><br>
+          <img v-bind:src="img3"/> <router-link :to="userProfileLink(id3, name3)">{{ name3 }}</router-link><br>
           <img v-bind:src="$store.state.instance.logo"> <a v-bind:href="moreUrl" target="_blank">{{$t('who_to_follow.more')}}</a>
         </p>
       </div>

src/modules/instance.js

@@ -12,8 +12,8 @@ const defaultState = {
   logo: '/static/logo.png',
   logoMask: true,
   logoMargin: '.2em',
-  redirectRootNoLogin: '/main/all',
+  redirectRootNoLogin: '/~/main/all',
-  redirectRootLogin: '/main/friends',
+  redirectRootLogin: '/~/main/friends',
   showInstanceSpecificPanel: false,
   scopeOptionsEnabled: true,
   formattingOptionsEnabled: false,

src/modules/users.js

@@ -142,6 +142,10 @@ const users = {
         throw Error(errors)
       }
     },
+    async getCaptcha (store) {
+      return await store.rootState.api.backendInteractor.getCaptcha()
+    },
+
     logout (store) {
       store.commit('clearCurrentUser')
       store.commit('setToken', false)

src/services/api/api.service.js

@@ -167,6 +167,8 @@ const register = (params) => {
   })
 }
 
+const getCaptcha = () => fetch('/api/pleroma/captcha').then(resp => resp.json())
+
 const authHeaders = (accessToken) => {
   if (accessToken) {
     return { 'Authorization': `Bearer ${accessToken}` }
@@ -496,6 +498,7 @@ const apiService = {
   setUserMute,
   fetchMutes,
   register,
+  getCaptcha,
   updateAvatar,
   updateBg,
   updateProfile,

src/services/backend_interactor_service/backend_interactor_service.js

@@ -71,6 +71,7 @@ const backendInteractorService = (credentials) => {
   const fetchMutes = () => apiService.fetchMutes({credentials})
   const fetchFollowRequests = () => apiService.fetchFollowRequests({credentials})
 
+  const getCaptcha = () => apiService.getCaptcha()
   const register = (params) => apiService.register(params)
   const updateAvatar = ({params}) => apiService.updateAvatar({credentials, params})
   const updateBg = ({params}) => apiService.updateBg({credentials, params})
@@ -100,6 +101,7 @@ const backendInteractorService = (credentials) => {
     setUserMute,
     fetchMutes,
     register,
+    getCaptcha,
     updateAvatar,
     updateBg,
     updateBanner,

src/services/new_api/oauth.js

@@ -5,7 +5,7 @@ const getOrCreateApp = ({oauth, instance}) => {
   const form = new window.FormData()
 
   form.append('client_name', `PleromaFE_${Math.random()}`)
-  form.append('redirect_uris', `${window.location.origin}/oauth-callback`)
+  form.append('redirect_uris', `${window.location.origin}/~/oauth-callback`)
   form.append('scopes', 'read write follow')
 
   return window.fetch(url, {
@@ -64,7 +64,7 @@ const getToken = ({app, instance, code}) => {
   form.append('client_secret', app.client_secret)
   form.append('grant_type', 'authorization_code')
   form.append('code', code)
-  form.append('redirect_uri', `${window.location.origin}/oauth-callback`)
+  form.append('redirect_uri', `${window.location.origin}/~/oauth-callback`)
 
   return window.fetch(url, {
     method: 'POST',

src/services/user_profile_link_generator/user_profile_link_generator.js

@@ -0,0 +1,10 @@
+const generateProfileLink = (id, screenName) => {
+  return {
+    name: (isExternal(screenName) ? 'external-user-profile' : 'user-profile'),
+    params: (isExternal(screenName) ? { id } : { name: screenName })
+  }
+}
+
+const isExternal = screenName => screenName.includes('@')
+
+export default generateProfileLink

static/config.json

@@ -4,8 +4,8 @@
   "logo": "/static/logo.png",
   "logoMask": true,
   "logoMargin": ".1em",
-  "redirectRootNoLogin": "/main/all",
+  "redirectRootNoLogin": "/~/main/all",
-  "redirectRootLogin": "/main/friends",
+  "redirectRootLogin": "/~/main/friends",
   "chatDisabled": false,
   "showInstanceSpecificPanel": false,
   "scopeOptionsEnabled": false,

test/unit/karma.conf.js

@@ -56,7 +56,10 @@ module.exports = function (config) {
     browsers: ['PhantomJS'],
     frameworks: ['mocha', 'sinon-chai'],
     reporters: ['mocha'],
-    files: ['./index.js'],
+    files: [
+      '../../node_modules/@babel/polyfill/dist/polyfill.js',
+      './index.js'
+    ],
     preprocessors: {
       './index.js': ['webpack', 'sourcemap']
     },

test/unit/specs/Hello.spec.js

@@ -1,13 +0,0 @@
-// import Vue from 'vue'
-// import Hello from 'src/components/Hello'
-
-// describe('Hello.vue', () => {
-//   xit('should render correct contents', () => {
-//     const vm = new Vue({
-//       el: document.createElement('div'),
-//       render: (h) => h(Hello)
-//     })
-//     expect(vm.$el.querySelector('.hello h1').textContent)
-//       .to.equal('Welcome to Your Vue.js App')
-//   })
-// })

test/unit/specs/boot/routes.spec.js

@@ -0,0 +1,29 @@
+import routes from 'src/boot/routes'
+import { createLocalVue } from '@vue/test-utils'
+import VueRouter from 'vue-router'
+
+const localVue = createLocalVue()
+localVue.use(VueRouter)
+
+describe('routes', () => {
+  const router = new VueRouter({
+    mode: 'abstract',
+    routes: routes({})
+  })
+
+  it('root path', () => {
+    router.push('/~/main/all')
+
+    const matchedComponents = router.getMatchedComponents()
+
+    expect(matchedComponents[0].components.hasOwnProperty('Timeline')).to.eql(true)
+  })
+
+  it('user\'s profile', () => {
+    router.push('/fake-user-name')
+
+    const matchedComponents = router.getMatchedComponents()
+
+    expect(matchedComponents[0].components.hasOwnProperty('UserCardContent')).to.eql(true)
+  })
+})

test/unit/specs/components/user_profile.spec.js

@@ -0,0 +1,231 @@
+import { mount, createLocalVue } from '@vue/test-utils'
+import Vuex from 'vuex'
+import UserProfile from 'src/components/user_profile/user_profile.vue'
+import backendInteractorService from 'src/services/backend_interactor_service/backend_interactor_service.js'
+
+const localVue = createLocalVue()
+localVue.use(Vuex)
+
+const mutations = {
+  clearTimeline: () => {}
+}
+
+const externalProfileStore = new Vuex.Store({
+  mutations,
+  state: {
+    api: {
+      backendInteractor: backendInteractorService('')
+    },
+    interface: {
+      browserSupport: ''
+    },
+    config: {
+      colors: '',
+      highlight: {},
+      customTheme: {
+        colors: []
+      }
+    },
+    instance: {
+      hideUserStats: true
+    },
+    statuses: {
+      timelines: {
+        user: {
+          statuses: [],
+          statusesObject: {},
+          faves: [],
+          visibleStatuses: [],
+          visibleStatusesObject: {},
+          newStatusCount: 0,
+          maxId: 0,
+          minVisibleId: 0,
+          loading: false,
+          followers: [],
+          friends: [],
+          viewing: 'statuses',
+          userId: 701,
+          flushMarker: 0
+        }
+      }
+    },
+    users: {
+      currentUser: {
+        credentials: ''
+      },
+      usersObject: [
+        {
+          background_image: null,
+          cover_photo: 'https://playvicious.social/system/accounts/headers/000/000/001/original/7dae4fc0e8330e83.jpg?1507329206',
+          created_at: 'Mon Dec 18 16:01:35 +0000 2017',
+          default_scope: 'public',
+          description: "Your favorite person's favorite person.",
+          description_html: "<p>Your favorite person's favorite person.</p>",
+          favourites_count: 0,
+          fields: [
+            {
+              name: '✌🏾',
+              value: '<a href="https://thetwelfth.house" rel="me nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">thetwelfth.house</span><span class="invisible"></span></a>'
+            },
+            {
+              name: '🚧',
+              value: '<a href="https://code.playvicio.us" rel="me nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">code.playvicio.us</span><span class="invisible"></span></a>'
+            },
+            {
+              name: '❤️',
+              value: '<a href="https://www.patreon.com/Are0h" rel="me nofollow noopener" target="_blank"><span class="invisible">https://www.</span><span class="">patreon.com/Are0h</span><span class="invisible"></span></a>'
+            }
+          ],
+          followers_count: 2,
+          following: false,
+          follows_you: false,
+          friends_count: 0,
+          id: 701,
+          is_local: false,
+          locked: false,
+          name: 'Are0h',
+          name_html: 'Are0h',
+          no_rich_text: false,
+          profile_image_url: 'https://playvicious.social/system/accounts/avatars/000/000/001/original/33e9983bc2d96aeb.png?1520872572',
+          profile_image_url_https: 'https://playvicious.social/system/accounts/avatars/000/000/001/original/33e9983bc2d96aeb.png?1520872572',
+          profile_image_url_original: 'https://playvicious.social/system/accounts/avatars/000/000/001/original/33e9983bc2d96aeb.png?1520872572',
+          profile_image_url_profile_size: 'https://playvicious.social/system/accounts/avatars/000/000/001/original/33e9983bc2d96aeb.png?1520872572',
+          rights: {
+            delete_others_notice: false
+          },
+          screen_name: 'Are0h@playvicious.social',
+          statuses_count: 6727,
+          statusnet_blocking: false,
+          statusnet_profile_url: 'https://playvicious.social/users/Are0h'
+        }
+      ]
+    }
+  }
+})
+
+const localProfileStore = new Vuex.Store({
+  mutations,
+  state: {
+    api: {
+      backendInteractor: backendInteractorService('')
+    },
+    interface: {
+      browserSupport: ''
+    },
+    config: {
+      colors: '',
+      highlight: {},
+      customTheme: {
+        colors: []
+      }
+    },
+    instance: {
+      hideUserStats: true
+    },
+    statuses: {
+      timelines: {
+        user: {
+          statuses: [],
+          statusesObject: {},
+          faves: [],
+          visibleStatuses: [],
+          visibleStatusesObject: {},
+          newStatusCount: 0,
+          maxId: 0,
+          minVisibleId: 0,
+          loading: false,
+          followers: [],
+          friends: [],
+          viewing: 'statuses',
+          userId: 701,
+          flushMarker: 0
+        }
+      }
+    },
+    users: {
+      currentUser: {
+        credentials: ''
+      },
+      usersObject: [
+        {
+          background_image: null,
+          cover_photo: 'https://playvicious.social/system/accounts/headers/000/000/001/original/7dae4fc0e8330e83.jpg?1507329206',
+          created_at: 'Mon Dec 18 16:01:35 +0000 2017',
+          default_scope: 'public',
+          description: "Your favorite person's favorite person.",
+          description_html: "<p>Your favorite person's favorite person.</p>",
+          favourites_count: 0,
+          fields: [
+            {
+              name: '✌🏾',
+              value: '<a href="https://thetwelfth.house" rel="me nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">thetwelfth.house</span><span class="invisible"></span></a>'
+            },
+            {
+              name: '🚧',
+              value: '<a href="https://code.playvicio.us" rel="me nofollow noopener" target="_blank"><span class="invisible">https://</span><span class="">code.playvicio.us</span><span class="invisible"></span></a>'
+            },
+            {
+              name: '❤️',
+              value: '<a href="https://www.patreon.com/Are0h" rel="me nofollow noopener" target="_blank"><span class="invisible">https://www.</span><span class="">patreon.com/Are0h</span><span class="invisible"></span></a>'
+            }
+          ],
+          followers_count: 2,
+          following: false,
+          follows_you: false,
+          friends_count: 0,
+          id: 701,
+          is_local: false,
+          locked: false,
+          name: 'Are0h',
+          name_html: 'Are0h',
+          no_rich_text: false,
+          profile_image_url: 'https://playvicious.social/system/accounts/avatars/000/000/001/original/33e9983bc2d96aeb.png?1520872572',
+          profile_image_url_https: 'https://playvicious.social/system/accounts/avatars/000/000/001/original/33e9983bc2d96aeb.png?1520872572',
+          profile_image_url_original: 'https://playvicious.social/system/accounts/avatars/000/000/001/original/33e9983bc2d96aeb.png?1520872572',
+          profile_image_url_profile_size: 'https://playvicious.social/system/accounts/avatars/000/000/001/original/33e9983bc2d96aeb.png?1520872572',
+          rights: {
+            delete_others_notice: false
+          },
+          screen_name: 'Are0h',
+          statuses_count: 6727,
+          statusnet_blocking: false,
+          statusnet_profile_url: 'https://playvicious.social/users/Are0h'
+        }
+      ]
+    }
+  }
+})
+
+describe('UserProfile', () => {
+  it('renders external profile', () => {
+    const wrapper = mount(UserProfile, {
+      localVue,
+      store: externalProfileStore,
+      mocks: {
+        $route: {
+          params: { id: 701 },
+          name: 'external-user-profile'
+        },
+        $t: (msg) => msg
+      }
+    })
+
+    expect(wrapper.find('.user-screen-name').text()).to.eql('@Are0h@playvicious.social')
+  })
+
+  it('renders local profile', () => {
+    const wrapper = mount(UserProfile, {
+      localVue,
+      store: localProfileStore,
+      mocks: {
+        $route: {
+          params: { name: 'Are0h' },
+          name: 'user-profile'
+        },
+        $t: (msg) => msg
+      }
+    })
+
+    expect(wrapper.find('.user-screen-name').text()).to.eql('@Are0h')
+  })
+})

test/unit/specs/services/user_profile_link_generator/user_profile_link_generator.spec.js

@@ -0,0 +1,15 @@
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+
+describe('generateProfileLink', () => {
+  it('returns obj for local user', () => {
+    expect(generateProfileLink(1, 'jack')).to.eql({
+      name: 'user-profile', params: { name: 'jack' }
+    })
+  })
+
+  it('returns obj for external user', () => {
+    expect(generateProfileLink(1, 'john@domain')).to.eql({
+      name: 'external-user-profile', params: { id: 1 }
+    })
+  })
+})