Refactoring input & toggle state

src/actions/inputActions.js

@@ -5,21 +5,21 @@
 
 const inputActions = {
 	// Handle changes to the document title input box
-	updateDocumentTitleInput: documentTitleInput =>
+	updateDocumentTitleInput: input =>
 		({
 			type: 'UPDATE_DOCUMENT_TITLE',
-			data: documentTitleInput.target.value
+			data: input.target.value
 		}),
-	updateColorPickerInput: colorPickerInput =>
+	updateColorPickerInput: input =>
 		({
 			type: 'UPDATE_COLOR_PICKER',
-			data: colorPickerInput.target.value
+			data: input.target.value
 		}),
 	// Handle changes to the search input box
-	updateSearchInput: searchInput =>
+	updateSearchInput: input =>
 		({
 			type: 'UPDATE_SEARCH_INPUT',
-			data: searchInput.target.value
+			data: input.target.value
 		})
 }
 

src/actions/userActions.js

@@ -18,13 +18,12 @@ const userActions = {
 			docType: docType
 		}),
 	// Click 'Submit' to save a document edit
-	submitDocumentEdit: (currentDocument, editorState, documentTitleInput, colorPickerInput, docType) =>
+	submitDocumentEdit: (currentDocument, editorState, inputs, docType) =>
 		({
 			type: 'SUBMIT_DOCUMENT_EDIT',
 			currentDocument: currentDocument,
 			editorState: editorState,
-			documentTitleInput: documentTitleInput,
-			colorPickerInput: colorPickerInput,
+			inputs: inputs,
 			docType: docType
 		}),
 	// Click 'Cancel' to discard document changes
@@ -62,10 +61,10 @@ const userActions = {
 			mode: mode
 		}),
 	// Click 'Search' to request search results
-	clickSearch: searchInput =>
+	clickSearch: inputs =>
 		({
 			type: 'CLICK_SEARCH',
-			data: searchInput
+			data: inputs.search
 		}),
 	// Set the DocType to choose from in the Editor
 	setDocType: docType =>
@@ -116,6 +115,10 @@ const userActions = {
 		({
 			type: 'CLEAR_ANNOTATION_TAG'
 		}),
+	hideAdmin: () =>
+		({
+			type: 'HIDE_ADMIN_HEADER'
+		})
 }
 
 export default userActions

src/components/adminHeader.js

@@ -0,0 +1,28 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+
+import api from '../modules/api'
+
+import { ReaderAnnotateButton, ReaderEditButton, EditorToolButton, EditorDeleteToolButton, AnnotatorNewButton, AnnotatorRemoveButton } from './button'
+
+const refreshElasticsearch = () => {
+	api.HTTPGetRefreshList().then(response =>
+		location.reload()
+	)
+}
+
+const AdminHeader = ({toggles, hideAdmin}) =>
+	<div id='admin_header' className={toggles.admin ? 'admin_show' : 'admin_hide'}>
+		<button type='button' className='btn btn-sm btn-outline-primary' onClick={refreshElasticsearch}>
+			Refresh Seed Data
+		</button>
+		<button className='btn btn-sm btn-outline-primary' onClick={hideAdmin}>
+			<i className='fa fa-times'></i>
+		</button>
+	</div>
+
+export default AdminHeader
+
+AdminHeader.propTypes = {
+	refreshElasticsearch: PropTypes.func,
+}

src/components/button.js

@@ -44,19 +44,19 @@ export const TagButton = ({tag, currentTag, onClick}) =>
 		</button>
 	</div>
 
-export const HighlightButton = ({highlightToggle, onClick, size='lg'}) =>
+export const HighlightButton = ({toggle, onClick, size='lg'}) =>
 	<div>
 		<div id='highlight_button' className='text-center'>
-			<button onClick={onClick} className={highlightToggle ? 'btn btn-primary btn-' + size : 'btn btn-outline-primary btn-' + size}>
-				{highlightToggle ? 'Hide Notes' : 'Highlight Notes'}
+			<button onClick={onClick} className={toggle ? 'btn btn-primary btn-' + size : 'btn btn-outline-primary btn-' + size}>
+				{toggle ? 'Hide Notes' : 'Highlight Notes'}
 			</button>
 		</div>
 	</div>
 
-export const SearchButton = ({searchInput, onClick}) =>
+export const SearchButton = ({input, onClick}) =>
 	<div>
 		<div id='search_button' className='text-center'>
-			<button className='btn btn-primary btn-sm' onClick={()=>onClick(searchInput)}>
+			<button className='btn btn-primary btn-sm' onClick={()=>onClick(input)}>
 				Search <i className='fa fa_inline fa-search'></i>
 			</button>
 		</div>
@@ -146,7 +146,7 @@ NoteButton.propTypes = {
 }
 
 HighlightButton.propTypes = {
-	highlightToggle: PropTypes.bool,
+	toggle: PropTypes.bool,
 	onClick: PropTypes.func,
 }
 

src/components/contentBottomBar.js

@@ -5,10 +5,10 @@ import { EditorCancelButton, EditorSubmitButton } from '../components/button'
 
 export const EditModeBottomBar = ({cancelEdit, onSubmitClick}) =>
 	<div className='row'>
-		<div className='col-md-5'>
+		<div className='col-5'>
 			<EditorCancelButton onClick={()=>cancelEdit()}/>
 		</div>
-		<div className='col-md-5 offset-md-2'>
+		<div className='col-5 offset-2'>
 			<EditorSubmitButton onClick={onSubmitClick} />
 		</div>
 	</div>

src/components/editorAnnotateMode.js

@@ -12,7 +12,7 @@ const EditorAnnotateMode = ({
 	currentDocument,
 	editorState,
 	docType,
-	loadingToggle,
+	toggles,
 	onChangeEditorState,
 	onNewAnnotationClick,
 	annotateKeyBindings,
@@ -22,7 +22,7 @@ const EditorAnnotateMode = ({
 }) =>
 	<div>
 		<div id='editor_metadata'>
-			{loadingToggle === true &&
+			{toggles.loading === true &&
 				<LoadingSpinner />
 			}
 			<DocumentTitle docType={docType} currentDocument={currentDocument} />

src/components/editorEditMode.js

@@ -13,15 +13,14 @@ const EditorEditMode = ({
 	currentDocument,
 	editorState,
 	docType,
-	loadingToggle,
+	toggles,
 	handleKeyCommand,
 	onChangeEditorState,
 	onToolButtonClick,
 	setMode,
 	cancelEdit,
 	onSubmitClick,
-	colorPickerInput,
-	documentTitleInput,
+	inputs,
 	onDocumentTitleChange,
 	onColorPickerInputChange,
 	onColorSwatchClick,
@@ -29,10 +28,10 @@ const EditorEditMode = ({
 }) =>
 	<div>
 		<div id='editor_metadata'>
-			{loadingToggle === true &&
+			{toggles.loading === true &&
 				<LoadingSpinner />
 			}
-			<input type='text' value={documentTitleInput} onChange={onDocumentTitleChange}/>
+			<input type='text' value={inputs.documentTitle} onChange={onDocumentTitleChange}/>
 		</div>
 		<div id='editor_topbar'>
 			<EditModeTopBar 
@@ -50,7 +49,7 @@ const EditorEditMode = ({
 		</div>
 		<div id='editor_attributes'>
 			{docType === 'tags' &&
-				<TagColorPicker colorPickerInput={colorPickerInput} onChange={onColorPickerInputChange} onColorSwatchClick={onColorSwatchClick}/>
+				<TagColorPicker input={inputs.colorPicker} onChange={onColorPickerInputChange} onColorSwatchClick={onColorSwatchClick}/>
 			}
 		</div>		
 		<div id='editor_bottombar'>

src/components/editorReadMode.js

@@ -11,12 +11,12 @@ const EditorReadMode = ({
 	currentDocument,
 	editorState,
 	docType,
-	loadingToggle,
+	toggles,
 	setMode
 }) =>
 	<div id='editor_read_mode'>
 		<div id='editor_metadata'>
-			{loadingToggle === true &&
+			{toggles.loading === true &&
 				<LoadingSpinner />
 			}
 			<DocumentTitle docType={docType} currentDocument={currentDocument} />

src/components/mobileSidebarOptions.js

@@ -7,7 +7,7 @@ import { ReaderDocDropdown } from './dropdown'
 export const ReaderSidebarOptions = ({docs, currentDocument, highlightToggle, docType, onHighlightClick, onDocumentClick}) =>
 	<div id='mobile_reader_sidebar' className='row'>
 		<div className='col-6 d-block d-md-none'>
-			<HighlightButton highlightToggle={highlightToggle} onClick={onHighlightClick} size='md'/>
+			<HighlightButton toggle={highlightToggle} onClick={onHighlightClick} size='md'/>
 		</div>
 		<div className='col-6 d-block d-md-none'>
 			<ReaderDocDropdown currentDocument={currentDocument} docs={docs} docType={docType} onDocumentClick={onDocumentClick}/>

src/components/tagColorPicker.js

@@ -2,12 +2,12 @@ import React from 'react'
 
 import defaultTagColors from '../modules/editorSettings'
 
-const TagColorPicker = ({colorPickerInput, onChange, onColorSwatchClick}) =>
+const TagColorPicker = ({input, onChange, onColorSwatchClick}) =>
 	<div className='input-group'>
 	  <div className='input-group-prepend'>
 	    <span className='input-group-text' id='basic-addon1'>#</span>
 	  </div>
-	  <input type='text' className='form-control' placeholder='Color' value={colorPickerInput} onChange={onChange}/>
+	  <input type='text' className='form-control' placeholder='Color' value={input} onChange={onChange}/>
 	  <div className='input-group-append'>
 	    <button className='btn btn-primary dropdown-toggle caret-off' data-toggle='dropdown' type='button'><i className='fa fa-chevron-down'></i></button>
 		<div className='dropdown-menu'>

src/containers/editorContentContainer.js

@@ -8,11 +8,15 @@ import EditorAnnotateMode from '../components/editorAnnotateMode'
 import EditorEditMode from '../components/editorEditMode'
 
 const EditorContent = ({
+	// State
 	currentDocument,
 	editorState,
 	docType,
 	mode,
-	loadingToggle,
+	toggles,
+	inputs,
+	userErrors,
+	//Dispatch
 	handleKeyCommand,
 	onChangeEditorState,
 	onToolButtonClick,
@@ -20,14 +24,11 @@ const EditorContent = ({
 	cancelEdit,
 	onSubmitClick,
 	onColorSwatchClick,
-	documentTitleInput,
-	colorPickerInput,
 	onDocumentTitleChange,
 	onColorPickerInputChange,
 	onNewAnnotationClick,
 	annotateKeyBindings,
 	onRemoveAnnotationClick,
-	userErrors,
 }) =>
 	<div id='editor_container'>
 		{mode === 'READ_MODE' &&
@@ -35,7 +36,7 @@ const EditorContent = ({
 				currentDocument={currentDocument} 
 				editorState={editorState} 
 				docType={docType}
-				loadingToggle={loadingToggle} 
+				toggles={toggles} 
 				setMode={setMode} 
 			/>
 		}
@@ -44,7 +45,7 @@ const EditorContent = ({
 				currentDocument={currentDocument} 
 				editorState={editorState}	
 				docType={docType} 
-				loadingToggle={loadingToggle} 
+				toggles={toggles} 
 				handleKeyCommand={handleKeyCommand}	
 				onNewAnnotationClick={()=>onNewAnnotationClick(editorState.getSelection())}
 				onRemoveAnnotationClick={()=>onRemoveAnnotationClick(editorState)}
@@ -53,7 +54,7 @@ const EditorContent = ({
 				onToolButtonClick={onToolButtonClick} 
 				setMode={setMode}
 				cancelEdit={cancelEdit} 
-				onSubmitClick={()=>onSubmitClick(currentDocument, editorState, documentTitleInput, colorPickerInput, docType)}	
+				onSubmitClick={()=>onSubmitClick(currentDocument, editorState, inputs, docType)}	
 			/>
 		}
 		{mode === 'EDIT_MODE' &&
@@ -61,12 +62,11 @@ const EditorContent = ({
 				currentDocument={currentDocument}
 				editorState={editorState}
 				docType={docType}
-				loadingToggle={loadingToggle}
+				toggles={toggles}
 				onChangeEditorState={onChangeEditorState}
 				cancelEdit={cancelEdit}
-				onSubmitClick={()=>onSubmitClick(currentDocument, editorState, documentTitleInput, colorPickerInput, docType)}
-				documentTitleInput={documentTitleInput}
-				colorPickerInput={colorPickerInput}
+				onSubmitClick={()=>onSubmitClick(currentDocument, editorState, inputs, docType)}
+				inputs={inputs}
 				onColorSwatchClick={onColorSwatchClick}
 				onDocumentTitleChange={onDocumentTitleChange}
 				onColorPickerInputChange={onColorPickerInputChange}
@@ -81,9 +81,8 @@ const mapStateToProps = (state, props) => {
 		mode: state.mode,
 		docType: state.docType,
 		editorState: state.editorState,
-		documentTitleInput: state.documentTitleInput,
-		colorPickerInput: state.colorPickerInput,
-		loadingToggle: state.loadingToggle,
+		inputs: state.inputs,
+		toggles: state.toggles,
 		userErrors: state.userErrors,
 	}
 }
@@ -93,11 +92,11 @@ const mapDispatchToProps = dispatch => {
 		onChangeEditorState: editorState => {
 			dispatch(actions.updateEditorState(editorState))
 		},
-		onDocumentTitleChange: documentTitleInput => {
-			dispatch(actions.updateDocumentTitleInput(documentTitleInput))
+		onDocumentTitleChange: input => {
+			dispatch(actions.updateDocumentTitleInput(input))
 		},
-		onColorPickerInputChange: colorPickerInput => {
-			dispatch(actions.updateColorPickerInput(colorPickerInput))
+		onColorPickerInputChange: input => {
+			dispatch(actions.updateColorPickerInput(input))
 		},
 		handleKeyCommand: (command, editorState) => {
 			dispatch(actions.handleEditorKeyCommand(editorState, command))
@@ -124,8 +123,8 @@ const mapDispatchToProps = dispatch => {
 		onToolButtonClick: (editorState, style) => {
 			dispatch(actions.applyInlineStyles(editorState, style))
 		},
-		onSubmitClick: (currentDocument, editorState, documentTitleInput, colorPickerInput, docType) => {
-			dispatch(actions.submitDocumentEdit(currentDocument, editorState, documentTitleInput, colorPickerInput, docType))
+		onSubmitClick: (currentDocument, editorState, inputs, docType) => {
+			dispatch(actions.submitDocumentEdit(currentDocument, editorState, inputs, docType))
 		}		
 	}
 }
@@ -133,10 +132,10 @@ const mapDispatchToProps = dispatch => {
 EditorContent.propTypes = {
 	currentDocument: PropTypes.object,
 	editorState: PropTypes.object,
-	documentTitleInput: PropTypes.string,
+	inputs: PropTypes.object,
 	docType: PropTypes.string,
 	mode: PropTypes.string,
-	loadingToggle: PropTypes.bool,
+	toggles: PropTypes.object,
 	handleKeyCommand: PropTypes.func,
 	onChangeEditorState: PropTypes.func,
 	onToolButtonClick: PropTypes.func,

src/containers/editorPageContainer.js

@@ -21,7 +21,7 @@ const EditorPage = ({
 	modalEditorState,
 	docType,
 	tags,
-	loadingToggle,
+	toggles,
 	onDeleteConfirm,
 	onSubmitAnnotationClick,
 	selectAnnotationNote,
@@ -34,13 +34,13 @@ const EditorPage = ({
 		<div className="row">
 			<EditorSidebarContainer />
 			<Content>
-				{loadingToggle === true &&
+				{toggles.loading === true &&
 					<LoadingSpinner size={4} />
 				}
-				{(Object.keys(currentDocument).length > 0 && loadingToggle === false) &&
+				{(Object.keys(currentDocument).length > 0 && toggles.loading === false) &&
 					<EditorContentContainer />
 				}
-				{(Object.keys(currentDocument).length === 0 && loadingToggle === false) &&
+				{(Object.keys(currentDocument).length === 0 && toggles.loading === false) &&
 					<EditorWelcome />
 				}					
 			</Content>
@@ -72,7 +72,7 @@ const mapStateToProps = state => {
 		modalEditorState: state.modalEditorState,
 		selectionState: state.selectionState,
 		docType: state.docType,
-		loadingToggle: state.loadingToggle,
+		toggles: state.toggles,
 		userErrors: state.userErrors,
 	}
 }
@@ -107,7 +107,7 @@ EditorPage.propTypes = {
 	modalEditorState: PropTypes.object,
 	selectionState: PropTypes.object,
 	docType: PropTypes.string,
-	loadingToggle: PropTypes.bool,
+	toggles: PropTypes.object,
 	onDeleteConfirm: PropTypes.func,
 	onSubmitAnnotationClick: PropTypes.func,
 	selectAnnotationNote: PropTypes.func,

src/containers/readerContentContainer.js

@@ -9,11 +9,10 @@ import LoadingSpinner from '../components/loadingSpinner'
 const ReaderContent = ({
 	currentDocument,
 	editorState,
-	loadingToggle,
-	highlightToggle,
+	toggles,
 }) =>
-	<div id="page" className={highlightToggle ? 'annotations' : 'hidden_annotations'}>
-		{loadingToggle === true &&
+	<div id="page" className={toggles.highlights ? 'annotations' : 'hidden_annotations'}>
+		{toggles.loading === true &&
 			<LoadingSpinner />
 		}
 		<br />
@@ -28,16 +27,14 @@ const mapStateToProps = state => {
 	return {
 		currentDocument: state.currentDocument,
 		editorState: state.editorState,
-		highlightToggle: state.highlightToggle,
-		loadingToggle: state.loadingToggle
+		toggles: state.toggles,
 	}
 }
 
 ReaderContent.propTypes = {
 	currentDocument: PropTypes.object,
 	editorState: PropTypes.object,
-	loadingToggle: PropTypes.bool,
-	highlightToggle: PropTypes.bool,
+	toggles: PropTypes.object,
 }
 
 const ReaderContentContainer = connect(mapStateToProps)(ReaderContent)

src/containers/readerPageContainer.js

@@ -21,8 +21,7 @@ const ReaderPage = ({
 	docType,
 	annotationNote,
 	modalEditorState,
-	loadingToggle,
-	highlightToggle,
+	toggles,
 	onDocumentClick,
 	onHighlightClick,
 }) =>
@@ -30,7 +29,7 @@ const ReaderPage = ({
 		<ReaderSidebarOptions
 			docs={helpers.documentsOfDocType(docType, chapters, notes, tags)}
 			currentDocument={currentDocument}
-			highlightToggle={highlightToggle}
+			highlightToggle={toggles.highlights}
 			docType={docType}
 			onHighlightClick={onHighlightClick}
 			onDocumentClick={onDocumentClick}
@@ -38,13 +37,13 @@ const ReaderPage = ({
 		<div id='content_container' className='row'>
 			<ReaderSidebarContainer />
 			<Content>
-				{loadingToggle === true &&
+				{toggles.loading === true &&
 					<LoadingSpinner size={4} />
 				}
-				{(Object.keys(currentDocument).length > 0 && loadingToggle === false) &&
+				{(Object.keys(currentDocument).length > 0 && toggles.loading === false) &&
 					<ReaderContentContainer />
 				}
-				{(Object.keys(currentDocument).length === 0 && loadingToggle === false) &&
+				{(Object.keys(currentDocument).length === 0 && toggles.loading === false) &&
 					<ReaderWelcome />
 				}				
 			</Content>
@@ -61,8 +60,7 @@ const mapStateToProps = state => {
 		docType: state.docType,
 		annotationNote: state.annotationNote,
 		modalEditorState: state.modalEditorState,
-		loadingToggle: state.loadingToggle,
-		highlightToggle: state.highlightToggle,
+		toggles: state.toggles,
 	}
 }
 
@@ -73,15 +71,19 @@ const mapDispatchToProps = dispatch => {
 		},
 		onHighlightClick: () => {
 			dispatch(actions.toggleHighlight())
-		}		
+		}
 	}
 }
 
 ReaderPage.propTypes = {
+	chapters: PropTypes.arrayOf(PropTypes.object),
+	notes: PropTypes.arrayOf(PropTypes.object),
+	tags: PropTypes.arrayOf(PropTypes.object),
 	currentDocument: PropTypes.object,
-	modalEditorState: PropTypes.object, 
+	docType: PropTypes.string,
 	annotationNote: PropTypes.object,
-	loadingToggle: PropTypes.bool,
+	modalEditorState: PropTypes.object, 
+	toggles: PropTypes.object,
 }
 
 const ReaderPageContainer = connect(mapStateToProps, mapDispatchToProps)(ReaderPage)

src/containers/readerSidebarContainer.js

@@ -13,13 +13,13 @@ const ReaderSidebar = ({
 	notes,
 	currentDocument,
 	docType,
-	highlightToggle,
+	toggles,
 	onDocumentClick,
 	onHighlightClick,
 }) =>
 	<div className='col-md-3 d-none d-md-block' id='sidebar'>
 		<div>
-			<HighlightButton highlightToggle={highlightToggle} onClick={onHighlightClick}/>
+			<HighlightButton toggle={toggles.highlights} onClick={onHighlightClick}/>
 			<SidebarSpacer />
 			<DocumentList docs={helpers.documentsOfDocType(docType, chapters, notes)} currentDocument={currentDocument} onDocumentClick={onDocumentClick} docType={docType}/>
 		</div>
@@ -31,7 +31,7 @@ const mapStateToProps = state => {
 		notes: state.notes,
 		docType: state.docType,
 		currentDocument: state.currentDocument,
-		highlightToggle: state.highlightToggle
+		toggles: state.toggles,
 	}
 }
 
@@ -51,7 +51,7 @@ ReaderSidebar.propTypes = {
 	notes: PropTypes.arrayOf(PropTypes.object),
 	currentDocument: PropTypes.object,
 	docType: PropTypes.string,	
-	highlightToggle: PropTypes.bool,
+	toggles: PropTypes.object,
 	onDocumentClick: PropTypes.func,
 	onHighlightClick: PropTypes.func,
 }

src/containers/searchContentContainer.js

@@ -9,17 +9,17 @@ import SearchResultsBox from '../components/searchResultsBox'
 
 const SearchContent = ({
 	searchResults,
-	searchInput,
+	inputs,
 	onSearchInputChange,
 	onSearchClick,
 }) =>
 	<div className='container'>
 		<div className='row'>
 			<div className='col-sm-2'>
-				<SearchButton onClick={onSearchClick} searchInput={searchInput}/>
+				<SearchButton onClick={onSearchClick} input={inputs.search}/>
 			</div>
 			<div className='col-sm-10'>
-				<input id='search_input' type='text' value={searchInput} onChange={onSearchInputChange} />
+				<input id='search_input' type='text' value={inputs.search} onChange={onSearchInputChange} />
 			</div>
 		</div>
 		<div className='row'>
@@ -30,14 +30,14 @@ const SearchContent = ({
 const mapStateToProps = state => {
 	return {
 		searchResults: state.searchResults,
-		searchInput: state.searchInput
+		inputs: state.inputs
 	}
 }
 
 const mapDispatchToProps = dispatch => {
 	return {
-		onSearchInputChange: searchInput => {
-			dispatch(actions.updateSearchInput(searchInput))
+		onSearchInputChange: input => {
+			dispatch(actions.updateSearchInput(inputs))
 		},
 		onSearchClick: searchInput => {
 			dispatch(actions.clickSearch(searchInput))
@@ -47,7 +47,7 @@ const mapDispatchToProps = dispatch => {
 
 SearchContent.propTypes = {
 	searchResults: PropTypes.object,
-	searchInput: PropTypes.string,
+	inputs: PropTypes.object,
 	onSearchInputChange: PropTypes.func,
 	onSearchClick: PropTypes.func,
 }

src/joyce.js

@@ -12,11 +12,11 @@ import 'bootstrap'
 import Navbar from './components/navbar'
 import reduceJoyce from './reducers/reduceJoyce'
 import actions from './actions'
-import api from './modules/api'
 import { logger, joyceAPI, joyceInterface, joyceRouter } from './middleware/'
 import ReaderPageContainer from './containers/readerPageContainer'
 import EditorPageContainer from './containers/editorPageContainer'
 import SearchPageContainer from './containers/searchPageContainer'
+import AdminHeader from './components/adminHeader'
 
 const history = createHistory()
 const router = routerMiddleware(history)
@@ -24,12 +24,6 @@ const store = createStore(reduceJoyce,
 	applyMiddleware(logger, router, joyceAPI, joyceInterface, joyceRouter))	
 const state = store.getState()
 
-const refreshElasticsearch = () => {
-	api.HTTPGetRefreshList().then(response =>
-		location.reload()
-	)
-}
-
 store.dispatch(actions.getDocumentList({docType: 'chapters'}))
 store.dispatch(actions.getDocumentList({docType: 'notes'}))
 store.dispatch(actions.getDocumentList({docType: 'tags'}))
@@ -38,7 +32,7 @@ ReactDOM.render(
 	<Provider store={store}>
 		<ConnectedRouter history={history}>
 			<div>
-				<div id='admin_toolbar'><button type='button' className='btn btn-sm btn-outline-primary' onClick={refreshElasticsearch}>Refresh</button></div>
+				<AdminHeader toggles={state.toggles} hideAdmin={()=>store.dispatch(actions.hideAdmin())}/>
 				<Navbar />
 				<Switch>
 					<Route exact path='/' render={() =>

src/middleware/joyceInterface.js

@@ -14,7 +14,7 @@ const joyceInterface = store => next => action => {
 			store.dispatch(actions.getDocumentText({id: action.id, docType: action.docType, state: 'currentDocument'}))
 			break
 		case 'SUBMIT_DOCUMENT_EDIT':
-			const docErrors = validateSubmittedDocument(action.docType, action.documentTitleInput, action.colorPickerInput)
+			const docErrors = validateSubmittedDocument(action.docType, action.inputs)
 			if (docErrors.length < 1) {
 				const textContent = action.editorState.getCurrentContent()
 				const data = { 

src/modules/validation.js

@@ -1,15 +1,15 @@
 import regex from './regex'
 
-export const validateSubmittedDocument = (docType, documentTitleInput, colorPickerInput) => {
+export const validateSubmittedDocument = (docType, inputs) => {
 	const errors = []
 	if (docType === 'tags') {
-		if (colorPickerInput.length < 1) {
+		if (inputs.colorPicker.length < 1) {
 			errors.push('Please select a tag color.')
-		} else if (!regex.checkColorPickerHexValue(colorPickerInput)) {
+		} else if (!regex.checkColorPickerHexValue(inputs.colorPicker)) {
 			errors.push('Please select a valid hex code color.')
 		}
 	}
-	if (documentTitleInput.length < 1) {
+	if (inputs.documentTitle.length < 1) {
 		errors.push('Please enter a title.')
 	}
 	return errors

src/reducers/inputs.js

@@ -0,0 +1,61 @@
+const initialState = {
+	documentTitle: '',
+	search: '',
+	colorPicker: '',
+}
+
+const inputs = (state=initialState, action) => {
+	switch(action.type) {
+		// Document Title
+		case 'GET_DOCUMENT_TEXT': 
+			if (action.status === 'success' && action.state === 'currentDocument') {
+				return {
+					...state,
+					documentTitle: action.data.title
+				}
+			} else { return state }
+		case 'CREATE_DOCUMENT':
+			return {
+					...state,
+					documentTitle: ''
+			}
+		case 'UPDATE_DOCUMENT_TITLE':
+			return {
+					...state,
+					documentTitle: action.data
+			}
+		// Search
+		case 'UPDATE_SEARCH_INPUT':
+			return {
+				...state,
+				search: action.data
+			}
+		// Color Picker
+		case 'GET_DOCUMENT_TEXT': 
+			if (action.status === 'success' && action.state === 'currentDocument' && action.docType === 'tags') {
+				return {
+					...state,
+					colorPicker: action.data.color
+				}
+			} else { return state }
+		case 'CREATE_DOCUMENT':
+			return {
+				...state,
+				colorPicker: ''
+			}
+		case 'SELECT_COLOR_SWATCH':
+			return {
+				...state,
+				colorPicker: action.data
+			}
+		case 'UPDATE_COLOR_PICKER':
+			return {
+				...state,
+				colorPicker: action.data.toUpperCase()
+			}
+		default:
+			return state
+	}
+}
+
+export default inputs

src/reducers/reduceJoyce.js

@@ -15,15 +15,17 @@ import searchResults from './searchResults'
 import editorState from './editorState'
 import modalEditorState from './modalEditorState'
 import selectionState from './selectionState'
-import documentTitleInput from './documentTitleInput'
-import colorPickerInput from './colorPickerInput'
-import searchInput from './searchInput'
+import inputs from './inputs'
+// import documentTitleInput from './documentTitleInput'
+// import colorPickerInput from './colorPickerInput'
+// import searchInput from './searchInput'
 
-// Toggles
 import docType from './docType'
 import mode from './mode'
-import highlightToggle from './highlightToggle'
-import loadingToggle from './loadingToggle'
+// Toggles
+import toggles from './toggles'
+// import highlightToggle from './highlightToggle'
+// import loadingToggle from './loadingToggle'
 
 // Validation
 import userErrors from './userErrors'
@@ -42,14 +44,16 @@ const reduceJoyce = combineReducers({
 	editorState,
 	modalEditorState,
 	selectionState,
-	colorPickerInput,
-	documentTitleInput,
-	searchInput,
+	inputs,
+	// colorPickerInput,
+	// documentTitleInput,
+	// searchInput,
 	// Toggles
 	docType,
 	mode,
-	highlightToggle,
-	loadingToggle,
+	toggles,
+	// highlightToggle,
+	// loadingToggle,
 	// Validation
 	userErrors,
 })

src/reducers/toggles.js

@@ -0,0 +1,46 @@
+const initialState = {
+	loading: true,
+	highlights: true,
+	admin: true,
+}
+
+const toggles = (state=initialState, action) => {
+	switch(action.type) {
+		// Loading
+		case 'GET_DOCUMENT_TEXT':
+			if (action.status === 'request' && action.state === 'currentDocument') {
+				return {
+					...state,
+					loading: true
+				}
+			} else if (action.status === 'success' && action.state === 'currentDocument') {
+				return {
+					...state,
+					loading: false
+				}
+			}
+		case 'GET_DOCUMENT_LIST':
+			if (action.status === 'success' && !action.data[0] && action.state === 'currentDocType') {
+				return {
+					...state,
+					loading: false
+				}
+			}
+		// Highlights
+		case 'TOGGLE_HIGHLIGHT':
+			return {
+				...state,
+				highlights: !state.highlights
+			}
+		// Admin
+		case 'HIDE_ADMIN_HEADER':
+			return {
+				...state,
+				admin: false
+			}
+		default:
+			return state
+	}
+}
+
+export default toggles

src/reducers/userErrors.js

@@ -3,7 +3,7 @@ import { validateSubmittedDocument, validateSubmittedAnnotation } from '../modul
 const userErrors = (state=[], action) => {
 	switch(action.type) {
 		case 'SUBMIT_DOCUMENT_EDIT':
-			return validateSubmittedDocument(action.docType, action.documentTitleInput, action.colorPickerInput)
+			return validateSubmittedDocument(action.docType, action.inputs)
 		case 'SUBMIT_ANNOTATION':
 			return validateSubmittedAnnotation(action.annotationNote, action.annotationTag)
 		case 'GET_DOCUMENT_TEXT': 

src/stylesheets/_dev.scss

@@ -1,5 +1,9 @@
 @import "variables";
 
-#admin_toolbar {
+#admin_header {
 	padding: .3rem;
+}
+
+.admin_hide {
+	display: none;
 }

templates/joyce.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <head>
-	<title>Joyce - Reader</title>
+	<title>Joyce</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<link rel="icon" type="image/png" href="/static/icon.png">
     <script>const assets = {{ assets|tojson }}</script>