remove user/bookmarks and user/recent_create page

lib/models/page.js

@@ -393,7 +393,6 @@ module.exports = function(crowi) {
       /^\/_.*/, // /_api/* and so on
       /^\/\-\/.*/,
       /^\/_r\/.*/,
-      /^\/user\/[^\/]+\/(bookmarks|comments|activities|pages|recent-create|recent-edit)/, // reserved
       /^\/?https?:\/\/.+$/, // avoid miss in renaming
       /\/{2,}/,             // avoid miss in renaming
       /\s+\/\s+/,           // avoid miss in renaming

lib/routes/index.js

@@ -150,9 +150,6 @@ module.exports = function(crowi, app) {
   app.post('/_api/me/picture/upload'  , loginRequired(crowi, app) , uploads.single('userPicture'), me.api.uploadPicture);
   app.get( '/_api/user/bookmarks'     , loginRequired(crowi, app, false) , user.api.bookmarks);
 
-  app.get( '/user/:username([^/]+)/bookmarks'      , loginRequired(crowi, app, false) , page.userBookmarkList);
-  app.get( '/user/:username([^/]+)/recent-create'  , loginRequired(crowi, app, false) , page.userRecentCreatedList);
-
   // HTTP RPC Styled API (に徐々に移行していいこうと思う)
   app.get('/_api/users.list'          , accessTokenParser , loginRequired(crowi, app, false) , user.api.list);
   app.get('/_api/pages.list'          , accessTokenParser , loginRequired(crowi, app, false) , page.api.list);

lib/routes/page.js

@@ -637,80 +637,7 @@ module.exports = function(crowi, app) {
     });
   };
 
-  // app.get( '/users/:username([^/]+)/bookmarks'      , loginRequired(crowi, app) , page.userBookmarkList);
-  actions.userBookmarkList = function(req, res) {
-    var username = req.params.username;
-    var limit = 50;
-    var offset = parseInt(req.query.offset)  || 0;
-
-    var user;
-    var renderVars = {};
-
-    var pagerOptions = { offset: offset, limit : limit };
-    var queryOptions = { offset: offset, limit : limit + 1, populatePage: true, requestUser: req.user};
-
-    User.findUserByUsername(username)
-    .then(function(user) {
-      if (user === null) {
-        throw new Error('The user not found.');
-      }
-      renderVars.pageUser = user;
-
-      return Bookmark.findByUser(user, queryOptions);
-    }).then(function(bookmarks) {
-
-      if (bookmarks.length > limit) {
-        bookmarks.pop();
-      }
-      pagerOptions.length = bookmarks.length;
-
-      renderVars.pager = generatePager(pagerOptions);
-      renderVars.bookmarks = bookmarks;
-
-      return res.render('user/bookmarks', renderVars);
-    }).catch(function(err) {
-      debug('Error on rendereing bookmark', err);
-      res.redirect('/');
-    });
-  };
-
-  // app.get( '/users/:username([^/]+)/recent-create' , loginRequired(crowi, app) , page.userRecentCreatedList);
-  actions.userRecentCreatedList = function(req, res) {
-    var username = req.params.username;
-    var limit = 50;
-    var offset = parseInt(req.query.offset) || 0;
 
-    var user;
-    var renderVars = {};
-
-    var pagerOptions = { offset: offset, limit : limit };
-    var queryOptions = { offset: offset, limit : limit + 1};
-
-
-    User.findUserByUsername(username)
-    .then(function(user) {
-      if (user === null) {
-        throw new Error('The user not found.');
-      }
-      renderVars.pageUser = user;
-
-      return Page.findListByCreator(user, queryOptions, req.user);
-    }).then(function(pages) {
-
-      if (pages.length > limit) {
-        pages.pop();
-      }
-      pagerOptions.length = pages.length;
-
-      renderVars.pager = generatePager(pagerOptions);
-      renderVars.pages = pages;
-
-      return res.render('user/recent-create', renderVars);
-    }).catch(function(err) {
-      debug('Error on rendereing recent-created', err);
-      res.redirect('/');
-    });
-  };
 
   var api = actions.api = {};
 

lib/views/user/bookmarks.html

@@ -1,30 +0,0 @@
-{% extends '../layout/layout.html' %}
-
-{% block main_css_class %}bookmark-page{% endblock %}
-
-{% block html_title %}{{ pageUser.name }}'s Bookmarks · {% endblock %}
-
-{% block content_header %}
-<div class="header-wrap">
-  <header id="page-header">
-    <h1 class="title">{{ pageUser.name }}'s Bookmarks</h1>
-  </header>
-</div>
-{% endblock %}
-
-{% block content_main %}
-<div id="content-main" class="content-main page-list" >
-  <div class="page-list-container" id="bookamrk-list">
-    {% include '../widget/page_list.html' with { pages: bookmarks, pagePropertyName: 'page', pager: pager } %}
-  </div>
-</div>
-{% endblock %}
-
-{% block side_header %}
-{% endblock %} {# side_header #}
-
-{% block side_content %}
-{% endblock %}
-
-{% block layout_footer %}
-{% endblock %}

lib/views/user/recent-create.html

@@ -1,30 +0,0 @@
-{% extends '../layout/layout.html' %}
-
-{% block main_css_class %}recent-create-page{% endblock %}
-
-{% block html_title %}{{ pageUser.name }}'s Recent Created Pages 揃 {% endblock %}
-
-{% block content_header %}
-<div class="header-wrap">
-  <header id="page-header">
-    <h1 class="title">{{ pageUser.name }}'s Created Pages</h1>
-  </header>
-</div>
-{% endblock %}
-
-{% block content_main %}
-<div id="content-main" class="content-main page-list" >
-  <div class="page-list-container" id="bookamrk-list">
-    {% include '../widget/page_list.html' with { pages: pages, pager: pager } %}
-  </div>
-</div>
-{% endblock %}
-
-{% block side_header %}
-{% endblock %} {# side_header #}
-
-{% block side_content %}
-{% endblock %}
-
-{% block layout_footer %}
-{% endblock %}

lib/views/widget/user_page_content.html

@@ -21,9 +21,6 @@
         No bookmarks yet.
         {% else %}
           {% include 'page_list.html' with { pages: bookmarkList, pagePropertyName: 'page' } %}
-          <div class="user-page-list-additional-link">
-            <a href="/user/{{ pageUser.username }}/bookmarks"><i class="fa fa-angle-double-right"></i> See bookmarks</a>
-          </div>
         {% endif %}
       </div>
     </div>
@@ -34,9 +31,6 @@
         No created pages yet.
         {% else %}
           {% include 'page_list.html' with { pages: createdList } %}
-          <div class="user-page-list-additional-link">
-            <a href="/user/{{ pageUser.username }}/recent-create"><i class="fa fa-angle-double-right"></i> See created pages</a>
-          </div>
         {% endif %}
       </div>
     </div>

test/models/page.test.js

@@ -209,12 +209,6 @@ describe('Page', () => {
         expect(Page.isCreatableName('/' + pn + '/abc')).to.be.false;
       }
 
-      var forbidden = ['bookmarks', 'comments', 'activities', 'pages', 'recent-create', 'recent-edit'];
-      for (var i = 0; i < forbidden.length ; i++) {
-        var pn = forbidden[i];
-        expect(Page.isCreatableName('/user/aoi/' + pn)).to.be.false;
-        expect(Page.isCreatableName('/user/aoi/x/' + pn)).to.be.true;
-      }
     });
   });