Skip to content

Commit

Permalink
feat(text): better word by 尚軒
Browse files Browse the repository at this point in the history
  • Loading branch information
abalone0204 committed Jun 13, 2016
1 parent befe0e0 commit f36d930
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 15 deletions.
9 changes: 7 additions & 2 deletions front-end/app/components/FloatingBlock/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class FloatingBlock extends React.Component {

render() {
const {display} = this.state

const {job} = this.props
const handleClick = (e) => {
this.setState({display: !display})
}
Expand All @@ -27,7 +27,12 @@ class FloatingBlock extends React.Component {
<div styleName="body">
{this.props.children}
<div>
<h6>留言在最下方</h6>
{
job.job ?
<h6>留言在<a href={`#${job.job.job_name}Cla`}>最下方(點此直接看)</a></h6>
: null
}

</div>
<h3 styleName='toggle-display-word' onClick={handleClick}>關閉</h3>
</div>
Expand Down
2 changes: 1 addition & 1 deletion front-end/app/containers/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class App extends React.Component {
<div>
<FlashBlock {...{user}}/>

<FloatingBlock>
<FloatingBlock {...{job}}>
<StatusBlock {...{comments}}/>
</FloatingBlock>
<Header>Comments</Header>
Expand Down
27 changes: 17 additions & 10 deletions front-end/app/containers/Options.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,24 +107,31 @@ class Options extends React.Component {
:
<div>
<FacebookLoginBtn sendLoginRequest={bindSendLoginRequest(dispatch)}/>
<h2>為什麼需要臉書登入</h2>
<h2>登入後可以做什麼</h2>
<div>
<ul>
<li>簡易的認證機制,防止機器人帳號</li>
<li>未來會加上追蹤有留言的職缺</li>
<li>因為臉書目前普及率較高,所以先只做了臉書的,未來會再加上其他認證方式 :)</li>

<li>
使用匿名留言:其他人不會知道你的身分
</li>
<li>
使用一般留言:會署名、顯示大頭貼於討論區
</li>
<li>
即將開放: 追蹤留言職缺功能
</li>
</ul>
</div>
<h2>登入後可以做什麼</h2>
<h2>為什麼需要臉書登入</h2>
<div>
<ul>
<li>
你可以使用匿名留言,不會有人知道你的臉書帳號是什麼
</li>
<li>可以使用一般的留言,前面會留下你個人的大頭照</li>
<li>簡易認證機制,防止機器人帳號</li>
</ul>
<div style={{paddingLeft: '20px'}}>
※ 因臉書目前普及率較高,所以先開放臉書串聯, <br/>
未來將會加上其他認證方式 :)
</div>
</div>

</div>
}
<hr/>
Expand Down
3 changes: 1 addition & 2 deletions front-end/app/sagas/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ export function* loginFlow(action) {
}

export function* cleanAccessToken() {
console.log('cleanAccessToken');
chrome.storage.sync.remove('access_token')
yield call(chrome.storage.sync.clear)
// yield call(chrome.storage.sync.remove, 'access_token', (e) => {
// console.log('cleanAccessToken:' ,e);
// })
Expand Down

0 comments on commit f36d930

Please sign in to comment.