adding activity log page

app/javascript/mastodon/features/activity_log/index.js

@@ -0,0 +1,37 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import { injectIntl } from 'react-intl';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+
+const getOrderedLists = createSelector([state => state.get('lists')], lists => {
+  if (!lists) {
+    return lists;
+  }
+
+  return lists.toList().filter(item => !!item).sort((a, b) => a.get('title').localeCompare(b.get('title')));
+});
+
+const mapStateToProps = state => ({
+  lists: getOrderedLists(state),
+});
+
+export default @connect(mapStateToProps)
+@injectIntl
+class Lists extends ImmutablePureComponent {
+
+  static propTypes = {
+    params: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    lists: ImmutablePropTypes.list,
+    intl: PropTypes.object.isRequired,
+    multiColumn: PropTypes.bool,
+  };
+
+  render () {
+    return <div>Hello world</div>;
+  }
+
+}

app/javascript/mastodon/features/compose/components/action_bar.js

@@ -7,22 +7,38 @@ import { defineMessages, injectIntl } from 'react-intl';
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
   pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned posts' },
-  preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
-  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
+  preferences: {
+    id: 'navigation_bar.preferences',
+    defaultMessage: 'Preferences',
+  },
+  follow_requests: {
+    id: 'navigation_bar.follow_requests',
+    defaultMessage: 'Follow requests',
+  },
+  activity_log: {
+    id: 'navigation_bar.activity_log',
+    defaultMessage: 'Activity log',
+  },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
   lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
-  followed_tags: { id: 'navigation_bar.followed_tags', defaultMessage: 'Followed hashtags' },
+  followed_tags: {
+    id: 'navigation_bar.followed_tags',
+    defaultMessage: 'Followed hashtags',
+  },
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
-  domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
+  domain_blocks: {
+    id: 'navigation_bar.domain_blocks',
+    defaultMessage: 'Hidden domains',
+  },
   mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
   filters: { id: 'navigation_bar.filters', defaultMessage: 'Muted words' },
   logout: { id: 'navigation_bar.logout', defaultMessage: 'Logout' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
 });
 
-export default @injectIntl
+export default
+@injectIntl
 class ActionBar extends React.PureComponent {
-
   static propTypes = {
     account: ImmutablePropTypes.map.isRequired,
     onLogout: PropTypes.func.isRequired,
@@ -33,35 +49,67 @@ class ActionBar extends React.PureComponent {
     this.props.onLogout();
   };
 
-  render () {
+  render() {
     const { intl } = this.props;
 
     let menu = [];
 
-    menu.push({ text: intl.formatMessage(messages.edit_profile), href: '/settings/profile' });
-    menu.push({ text: intl.formatMessage(messages.preferences), href: '/settings/preferences' });
+    menu.push({
+      text: intl.formatMessage(messages.edit_profile),
+      href: '/settings/profile',
+    });
+    menu.push({
+      text: intl.formatMessage(messages.preferences),
+      href: '/settings/preferences',
+    });
     menu.push({ text: intl.formatMessage(messages.pins), to: '/pinned' });
     menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.follow_requests), to: '/follow_requests' });
-    menu.push({ text: intl.formatMessage(messages.favourites), to: '/favourites' });
-    menu.push({ text: intl.formatMessage(messages.bookmarks), to: '/bookmarks' });
+    menu.push({
+      text: intl.formatMessage(messages.follow_requests),
+      to: '/follow_requests',
+    });
+    menu.push({
+      text: intl.formatMessage(messages.favourites),
+      to: '/favourites',
+    });
+    menu.push({
+      text: intl.formatMessage(messages.bookmarks),
+      to: '/bookmarks',
+    });
     menu.push({ text: intl.formatMessage(messages.lists), to: '/lists' });
-    menu.push({ text: intl.formatMessage(messages.followed_tags), to: '/followed_tags' });
+    menu.push({
+      text: intl.formatMessage(messages.followed_tags),
+      to: '/followed_tags',
+    });
+    menu.push({
+      text: intl.formatMessage(messages.activity_log),
+      to: '/activity_log',
+    });
     menu.push(null);
     menu.push({ text: intl.formatMessage(messages.mutes), to: '/mutes' });
     menu.push({ text: intl.formatMessage(messages.blocks), to: '/blocks' });
-    menu.push({ text: intl.formatMessage(messages.domain_blocks), to: '/domain_blocks' });
+    menu.push({
+      text: intl.formatMessage(messages.domain_blocks),
+      to: '/domain_blocks',
+    });
     menu.push({ text: intl.formatMessage(messages.filters), href: '/filters' });
     menu.push(null);
-    menu.push({ text: intl.formatMessage(messages.logout), action: this.handleLogout });
+    menu.push({
+      text: intl.formatMessage(messages.logout),
+      action: this.handleLogout,
+    });
 
     return (
-      <div className='compose__action-bar'>
-        <div className='compose__action-bar-dropdown'>
-          <DropdownMenuContainer items={menu} icon='ellipsis-v' size={18} direction='right' />
+      <div className="compose__action-bar">
+        <div className="compose__action-bar-dropdown">
+          <DropdownMenuContainer
+            items={menu}
+            icon="ellipsis-v"
+            size={18}
+            direction="right"
+          />
         </div>
       </div>
     );
   }
-
 }

app/javascript/mastodon/features/ui/index.js

@@ -49,6 +49,7 @@ import {
   Mutes,
   PinnedStatuses,
   Lists,
+  ActivityLog,
   Directory,
   Explore,
   FollowRecommendations,
@@ -220,6 +221,7 @@ class SwitchingColumnsArea extends React.PureComponent {
           <WrappedRoute path='/followed_tags' component={FollowedTags} content={children} />
           <WrappedRoute path='/mutes' component={Mutes} content={children} />
           <WrappedRoute path='/lists' component={Lists} content={children} />
+          <WrappedRoute path='/activity_log' component={ActivityLog} content={children} />
 
           <Route component={BundleColumnError} />
         </WrappedSwitch>

app/javascript/mastodon/features/ui/util/async-components.js

@@ -38,6 +38,10 @@ export function Lists () {
   return import(/* webpackChunkName: "features/lists" */'../../lists');
 }
 
+export function ActivityLog () {
+  return import(/* webpackChunkName: "features/activity_log" */'../../activity_log');
+}
+
 export function Status () {
   return import(/* webpackChunkName: "features/status" */'../../status');
 }

config/routes.rb

@@ -24,6 +24,7 @@ Rails.application.routes.draw do
     /search
     /publish
     /follow_requests
+    /activity_log
     /blocks
     /domain_blocks
     /mutes