Skip to content

Update layout #698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 10, 2017
Merged

Update layout #698

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
345008e
Fix info area layout at NoteDetail
Jul 10, 2017
7e087bf
Fix info panel layout
Jul 10, 2017
110c1ea
Delete update date at under of NoteDetail
Jul 10, 2017
17535cc
Add Info Panel at SnippetDetail
Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add Info Panel at SnippetDetail
  • Loading branch information
Kazu Yokomizo committed Jul 10, 2017
commit 17535ccd4cb0368ef2e4e1928fa1b1dd4314b6ab
36 changes: 34 additions & 2 deletions browser/main/Detail/SnippetNoteDetail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ import _ from 'lodash'
import { findNoteTitle } from 'browser/lib/findNoteTitle'
import AwsMobileAnalyticsConfig from 'browser/main/lib/AwsMobileAnalyticsConfig'
import TrashButton from './TrashButton'
import InfoButton from './InfoButton'
import InfoPanel from './InfoPanel'
import { formatDate } from 'browser/lib/date-formatter'

function pass (name) {
switch (name) {
Expand Down Expand Up @@ -54,7 +57,7 @@ class SnippetNoteDetail extends React.Component {
}

componentWillReceiveProps (nextProps) {
if (nextProps.note.key !== this.props.note.key) {
if (nextProps.note.key !== this.props.note.key && !this.isMovingNote) {
if (this.saveQueue != null) this.saveNow()
let nextNote = Object.assign({
description: ''
Expand Down Expand Up @@ -433,10 +436,18 @@ class SnippetNoteDetail extends React.Component {
this.refs['code-' + this.state.snippetIndex].focus()
}

handleInfoButtonClick (e) {
const infoPanel = document.querySelector('.infoPanel')
if (infoPanel.style) infoPanel.style.display = infoPanel.style.display === 'none' ? 'inline' : 'none'
}

render () {
let { data, config } = this.props
let { data, config, location } = this.props
let { note } = this.state

let storageKey = note.storage
let folderKey = note.folder
Copy link
Contributor

@asmsuechan asmsuechan Jul 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use const instead of let.

Copy link
Member Author

@kazup01 kazup01 Jul 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done💯


let editorFontSize = parseInt(config.editor.fontSize, 10)
if (!(editorFontSize > 0 && editorFontSize < 101)) editorFontSize = 14
let editorIndentSize = parseInt(config.editor.indentSize, 10)
Expand Down Expand Up @@ -491,6 +502,17 @@ class SnippetNoteDetail extends React.Component {
</div>
})

let options = []
data.storageMap.forEach((storage, index) => {
storage.folders.forEach((folder) => {
options.push({
storage: storage,
folder: folder
})
})
})
let currentOption = options.filter((option) => option.storage.key === storageKey && option.folder.key === folderKey)[0]
Copy link
Contributor

@asmsuechan asmsuechan Jul 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should use const instead of let.

Copy link
Member Author

@kazup01 kazup01 Jul 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doen🎶


return (
<div className='NoteDetail'
style={this.props.style}
Expand Down Expand Up @@ -527,6 +549,16 @@ class SnippetNoteDetail extends React.Component {
>
<i className='fa fa-expand' styleName='fullScreen-button' />
</button>
<InfoButton
onClick={(e) => this.handleInfoButtonClick(e)}
/>
<InfoPanel
storageName={currentOption.storage.name}
folderName={currentOption.folder.name}
noteKey={location.query.key}
updatedAt={formatDate(note.updatedAt)}
createdAt={formatDate(note.createdAt)}
/>
</div>
</div>

Expand Down