{valueElements}
diff --git a/client/homebrew/navbar/editTitle.navitem.jsx b/client/homebrew/navbar/editTitle.navitem.jsx
deleted file mode 100644
index 94ae5d0b0..000000000
--- a/client/homebrew/navbar/editTitle.navitem.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-const React = require('react');
-const createClass = require('create-react-class');
-const cx = require('classnames');
-const Nav = require('naturalcrit/nav/nav.jsx');
-
-const MAX_TITLE_LENGTH = 50;
-
-
-const EditTitle = createClass({
- displayName : 'EditTitleNavItem',
- getDefaultProps : function() {
- return {
- title : '',
- onChange : function(){}
- };
- },
-
- handleChange : function(e){
- if(e.target.value.length > MAX_TITLE_LENGTH) return;
- this.props.onChange(e.target.value);
- },
- render : function(){
- return
- = MAX_TITLE_LENGTH })}>
- {this.props.title.length}/{MAX_TITLE_LENGTH}
-
- ;
- },
-
-});
-
-module.exports = EditTitle;
diff --git a/client/homebrew/navbar/recent.navitem.jsx b/client/homebrew/navbar/recent.navitem.jsx
index 431bdd8df..a6cbbf406 100644
--- a/client/homebrew/navbar/recent.navitem.jsx
+++ b/client/homebrew/navbar/recent.navitem.jsx
@@ -36,7 +36,7 @@ const RecentItems = createClass({
//== Add current brew to appropriate recent items list (depending on storageKey) ==//
if(this.props.storageKey == 'edit'){
let editId = this.props.brew.editId;
- if(this.props.brew.googleId){
+ if(this.props.brew.googleId && !this.props.brew.stubbed){
editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
}
edited = _.filter(edited, (brew)=>{
@@ -51,7 +51,7 @@ const RecentItems = createClass({
}
if(this.props.storageKey == 'view'){
let shareId = this.props.brew.shareId;
- if(this.props.brew.googleId){
+ if(this.props.brew.googleId && !this.props.brew.stubbed){
shareId = `${this.props.brew.googleId}${this.props.brew.shareId}`;
}
viewed = _.filter(viewed, (brew)=>{
@@ -83,7 +83,7 @@ const RecentItems = createClass({
let edited = JSON.parse(localStorage.getItem(EDIT_KEY) || '[]');
if(this.props.storageKey == 'edit') {
let prevEditId = prevProps.brew.editId;
- if(prevProps.brew.googleId){
+ if(prevProps.brew.googleId && !this.props.brew.stubbed){
prevEditId = `${prevProps.brew.googleId}${prevProps.brew.editId}`;
}
@@ -91,7 +91,7 @@ const RecentItems = createClass({
return brew.id !== prevEditId;
});
let editId = this.props.brew.editId;
- if(this.props.brew.googleId){
+ if(this.props.brew.googleId && !this.props.brew.stubbed){
editId = `${this.props.brew.googleId}${this.props.brew.editId}`;
}
edited.unshift({
diff --git a/client/homebrew/navbar/reddit.navitem.jsx b/client/homebrew/navbar/reddit.navitem.jsx
deleted file mode 100644
index 1d9f95604..000000000
--- a/client/homebrew/navbar/reddit.navitem.jsx
+++ /dev/null
@@ -1,44 +0,0 @@
-const React = require('react');
-const createClass = require('create-react-class');
-const Nav = require('naturalcrit/nav/nav.jsx');
-
-const MAIN_URL = 'https://www.reddit.com/r/UnearthedArcana/submit?selftext=true';
-
-
-const RedditShare = createClass({
- displayName : 'RedditShareNavItem',
- getDefaultProps : function() {
- return {
- brew : {
- title : '',
- sharedId : '',
- text : ''
- }
- };
- },
-
- getText : function(){
-
- },
-
-
- handleClick : function(){
- const url = [
- MAIN_URL,
- `title=${encodeURIComponent(this.props.brew.title ? this.props.brew.title : 'Check out my brew!')}`,
- `text=${encodeURIComponent(this.props.brew.text)}`
- ].join('&');
-
- window.open(url, '_blank');
- },
-
-
- render : function(){
- return
- share on reddit
- ;
- },
-
-});
-
-module.exports = RedditShare;
diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 18cfb2d41..79bb01aa2 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -32,7 +32,7 @@ import { updateHistory, versionHistoryGarbageCollection } from '../../utils/vers
const googleDriveIcon = require('../../googleDrive.svg');
-const SAVE_TIMEOUT = 3000;
+const SAVE_TIMEOUT = 10000;
const EditPage = createClass({
displayName : 'EditPage',
diff --git a/client/homebrew/pages/sharePage/sharePage.jsx b/client/homebrew/pages/sharePage/sharePage.jsx
index 9b4f9b73d..2d96e1ce6 100644
--- a/client/homebrew/pages/sharePage/sharePage.jsx
+++ b/client/homebrew/pages/sharePage/sharePage.jsx
@@ -25,7 +25,8 @@ const SharePage = createClass({
getInitialState : function() {
return {
- themeBundle : {}
+ themeBundle : {},
+ currentBrewRendererPageNum : 1
};
},
@@ -39,6 +40,10 @@ const SharePage = createClass({
document.removeEventListener('keydown', this.handleControlKeys);
},
+ handleBrewRendererPageChange : function(pageNumber){
+ this.setState({ currentBrewRendererPageNum: pageNumber });
+ },
+
handleControlKeys : function(e){
if(!(e.ctrlKey || e.metaKey)) return;
const P_KEY = 80;
@@ -114,9 +119,12 @@ const SharePage = createClass({
diff --git a/client/homebrew/pages/vaultPage/vaultPage.jsx b/client/homebrew/pages/vaultPage/vaultPage.jsx
index bad1fbd57..a51039345 100644
--- a/client/homebrew/pages/vaultPage/vaultPage.jsx
+++ b/client/homebrew/pages/vaultPage/vaultPage.jsx
@@ -1,3 +1,5 @@
+/*eslint max-lines: ["warn", {"max": 400, "skipBlankLines": true, "skipComments": true}]*/
+/*eslint max-params:["warn", { max: 10 }], */
require('./vaultPage.less');
const React = require('react');
@@ -18,13 +20,15 @@ const request = require('../../utils/request-middleware.js');
const VaultPage = (props)=>{
const [pageState, setPageState] = useState(parseInt(props.query.page) || 1);
+ const [sortState, setSort] = useState(props.query.sort || 'title');
+ const [dirState, setdir] = useState(props.query.dir || 'asc');
+
//Response state
const [brewCollection, setBrewCollection] = useState(null);
const [totalBrews, setTotalBrews] = useState(null);
const [searching, setSearching] = useState(false);
const [error, setError] = useState(null);
-
const titleRef = useRef(null);
const authorRef = useRef(null);
const countRef = useRef(null);
@@ -34,7 +38,7 @@ const VaultPage = (props)=>{
useEffect(()=>{
disableSubmitIfFormInvalid();
- loadPage(pageState, true);
+ loadPage(pageState, true, props.query.sort, props.query.dir);
}, []);
const updateStateWithBrews = (brews, page)=>{
@@ -43,7 +47,7 @@ const VaultPage = (props)=>{
setSearching(false);
};
- const updateUrl = (titleValue, authorValue, countValue, v3Value, legacyValue, page)=>{
+ const updateUrl = (titleValue, authorValue, countValue, v3Value, legacyValue, page, sort, dir)=>{
const url = new URL(window.location.href);
const urlParams = new URLSearchParams(url.search);
@@ -53,21 +57,23 @@ const VaultPage = (props)=>{
urlParams.set('v3', v3Value);
urlParams.set('legacy', legacyValue);
urlParams.set('page', page);
+ urlParams.set('sort', sort);
+ urlParams.set('dir', dir);
url.search = urlParams.toString();
window.history.replaceState(null, '', url.toString());
};
- const performSearch = async (title, author, count, v3, legacy, page)=>{
- updateUrl(title, author, count, v3, legacy, page);
+ const performSearch = async (title, author, count, v3, legacy, page, sort, dir)=>{
+ updateUrl(title, author, count, v3, legacy, page, sort, dir);
- const response = await request.get(
- `/api/vault?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}&count=${count}&page=${page}`
- ).catch((error)=>{
- console.log('error at loadPage: ', error);
- setError(error);
- updateStateWithBrews([], 1);
- });
+ const response = await request
+ .get(`/api/vault?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}&count=${count}&page=${page}&sort=${sort}&dir=${dir}`)
+ .catch((error)=>{
+ console.log('error at loadPage: ', error);
+ setError(error);
+ updateStateWithBrews([], 1);
+ });
if(response.ok)
updateStateWithBrews(response.body.brews, page);
@@ -76,9 +82,8 @@ const VaultPage = (props)=>{
const loadTotal = async (title, author, v3, legacy)=>{
setTotalBrews(null);
- const response = await request.get(
- `/api/vault/total?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}`
- ).catch((error)=>{
+ const response = await request.get(`/api/vault/total?title=${title}&author=${author}&v3=${v3}&legacy=${legacy}`)
+ .catch((error)=>{
console.log('error at loadTotal: ', error);
setError(error);
updateStateWithBrews([], 1);
@@ -88,9 +93,8 @@ const VaultPage = (props)=>{
setTotalBrews(response.body.totalBrews);
};
- const loadPage = async (page, updateTotal)=>{
- if(!validateForm())
- return;
+ const loadPage = async (page, updateTotal, sort, dir)=>{
+ if(!validateForm()) return;
setSearching(true);
setError(null);
@@ -100,8 +104,14 @@ const VaultPage = (props)=>{
const count = countRef.current.value || 10;
const v3 = v3Ref.current.checked != false;
const legacy = legacyRef.current.checked != false;
+ const sortOption = sort || 'title';
+ const dirOption = dir || 'asc';
+ const pageProp = page || 1;
- performSearch(title, author, count, v3, legacy, page);
+ setSort(sortOption);
+ setdir(dirOption);
+
+ performSearch(title, author, count, v3, legacy, pageProp, sortOption, dirOption);
if(updateTotal)
loadTotal(title, author, v3, legacy);
@@ -248,6 +258,33 @@ const VaultPage = (props)=>{
);
+ const renderSortOption = (optionTitle, optionValue)=>{
+ const oppositeDir = dirState === 'asc' ? 'desc' : 'asc';
+
+ return (
+
+ {renderSortOption('Title', 'title', props.query.dir)}
+ {renderSortOption('Created Date', 'createdAt', props.query.dir)}
+ {renderSortOption('Updated Date', 'updatedAt', props.query.dir)}
+ {renderSortOption('Views', 'views', props.query.dir)}
+
+ );
+ };
+
const renderPaginationControls = ()=>{
if(!totalBrews) return null;
@@ -271,10 +308,8 @@ const VaultPage = (props)=>{
.map((_, index)=>(