Contact Modal追加

browser/finder/Components/FinderDetail.jsx

@@ -13,20 +13,20 @@ module.exports = React.createClass({
     var article = this.props.currentArticle
 
     if (article != null) {
-      if (article.type === 'snippet') {
+      if (article.type === 'code') {
         return (
           <div className='FinderDetail'>
-            <div className='header'>{article.callSign}</div>
+            <div className='header'><i className='fa fa-code fa-fw'/> {article.description}</div>
             <div className='content'>
               <CodeViewer code={article.content} mode={article.mode}/>
             </div>
           </div>
         )
-      } else if (article.type === 'blueprint') {
+      } else if (article.type === 'note') {
 
         return (
           <div className='FinderDetail'>
-            <div className='header'>{article.title}</div>
+            <div className='header'><i className='fa fa-file-text-o fa-fw'/> {article.title}</div>
             <div className='content'>
               <div className='marked' dangerouslySetInnerHTML={{__html: ' ' + this.markdown(article.content)}}></div>
             </div>

browser/finder/Components/FinderList.jsx

@@ -6,7 +6,8 @@ module.exports = React.createClass({
     currentArticle: React.PropTypes.shape({
       id: React.PropTypes.number,
       type: React.PropTypes.string
-    })
+    }),
+    selectArticle: React.PropTypes.func
   },
   componentDidUpdate: function () {
     var index = this.props.articles.indexOf(this.props.currentArticle)
@@ -26,6 +27,11 @@ module.exports = React.createClass({
       el.scrollTop = li.offsetTop
     }
   },
+  handleArticleClick: function (article) {
+    return function () {
+      this.props.selectArticle(article)
+    }.bind(this)
+  },
   render: function () {
     var list = this.props.articles.map(function (article) {
       if (article == null) {
@@ -38,17 +44,17 @@ module.exports = React.createClass({
       }
 
       var isActive = this.props.currentArticle != null && (article.type === this.props.currentArticle.type && article.id === this.props.currentArticle.id)
-      if (article.type === 'snippet') {
+      if (article.type === 'code') {
         return (
-          <li className={isActive ? 'active' : ''}>
-            <div className='articleItem'><i className='fa fa-code fa-fw'/> {article.callSign} / {article.description.substring(0, 10)}</div>
+          <li onClick={this.handleArticleClick(article)} className={isActive ? 'active' : ''}>
+            <div className='articleItem'><i className='fa fa-code fa-fw'/> {article.description}</div>
             <div className='divider'/>
           </li>
         )
       }
-      if (article.type === 'blueprint') {
+      if (article.type === 'note') {
         return (
-          <li className={isActive ? 'active' : ''}>
+          <li onClick={this.handleArticleClick(article)} className={isActive ? 'active' : ''}>
             <div className='articleItem'><i className='fa fa-file-text-o fa-fw'/> {article.title}</div>
             <div className='divider'/>
           </li>

browser/finder/index.jsx

@@ -5,79 +5,12 @@ var clipboard = require('clipboard')
 
 var React = require('react/addons')
 
+var ArticleFilter = require('../main/Mixins/ArticleFilter')
+
 var FinderInput = require('./Components/FinderInput')
 var FinderList = require('./Components/FinderList')
 var FinderDetail = require('./Components/FinderDetail')
 
-// filter start
-function basicFilter (keyword, articles) {
-  if (keyword === '' || keyword == null) return articles
-  var firstFiltered = articles.filter(function (article) {
-
-    var first = article.type === 'snippet' ? article.callSign : article.title
-    if (first.match(new RegExp(keyword, 'i'))) return true
-
-    return false
-  })
-
-  var secondFiltered = articles.filter(function (article) {
-    var second = article.type === 'snippet' ? article.description : article.content
-    if (second.match(new RegExp(keyword, 'i'))) return true
-
-    return false
-  })
-
-  var thirdFiltered = articles.filter(function (article) {
-    if (article.type === 'snippet') {
-      if (article.content.match(new RegExp(keyword, 'i'))) return true
-    }
-    return false
-  })
-
-  return firstFiltered.concat(secondFiltered, thirdFiltered).filter(function (value, index, self) {
-    return self.indexOf(value) === index
-  })
-}
-
-function snippetFilter (articles) {
-  return articles.filter(function (article) {
-    return article.type === 'snippet'
-  })
-}
-
-function blueprintFilter (articles) {
-  return articles.filter(function (article) {
-    return article.type === 'blueprint'
-  })
-}
-
-function tagFilter (keyword, articles) {
-  return articles.filter(function (article) {
-    return article.Tags.some(function (tag) {
-      return tag.name.match(new RegExp('^' + keyword, 'i'))
-    })
-  })
-}
-
-function searchArticle (search, articles) {
-  var keywords = search.split(' ')
-
-  for (var keyword of keywords) {
-    if (keyword.match(/^\$s/, 'i')) {
-      articles = snippetFilter(articles)
-      continue
-    } else if (keyword.match(/^\$b/, 'i')) {
-      articles = blueprintFilter(articles)
-      continue
-    } else if (keyword.match(/^#[A-Za-z0-9]+/)) {
-      articles = tagFilter(keyword.substring(1, keyword.length), articles)
-      continue
-    }
-    articles = basicFilter(keyword, articles)
-  }
-
-  return articles
-}
 // Filter end
 
 function fetchArticles () {
@@ -90,14 +23,20 @@ function fetchArticles () {
   var articles = []
   user.Planets.forEach(function (planet) {
     var _planet = JSON.parse(localStorage.getItem('planet-' + planet.id))
-    articles = articles.concat(_planet.Snippets, _planet.Blueprints)
+    articles = articles.concat(_planet.Codes, _planet.Notes)
+  })
+  user.Teams.forEach(function (team) {
+    team.Planets.forEach(function (planet) {
+      var _planet = JSON.parse(localStorage.getItem('planet-' + planet.id))
+      articles = articles.concat(_planet.Codes, _planet.Notes)
+    })
   })
-  console.log(articles.length + ' articles')
 
   return articles
 }
 
 var Finder = React.createClass({
+  mixins: [ArticleFilter],
   getInitialState: function () {
     var articles = fetchArticles()
     return {
@@ -122,8 +61,14 @@ var Finder = React.createClass({
     var articles = fetchArticles()
     this.setState({
       articles: articles,
-      currentArticle: articles[0],
       search: ''
+    }, function () {
+      var firstArticle = this.refs.finderList.props.articles[0]
+      if (firstArticle) {
+        this.setState({
+          currentArticle: firstArticle
+        })
+      }
     })
   },
   handleKeyDown: function (e) {
@@ -139,11 +84,9 @@ var Finder = React.createClass({
 
     if (e.keyCode === 13) {
       var article = this.state.currentArticle
-      if (article.type === 'snippet') {
-        clipboard.writeText(article.content)
-        hideFinder()
-        e.preventDefault()
-      }
+      clipboard.writeText(article.content)
+      hideFinder()
+      e.preventDefault()
     }
     if (e.keyCode === 27) {
       hideFinder()
@@ -168,17 +111,20 @@ var Finder = React.createClass({
       this.setState({currentArticle: this.refs.finderList.props.articles[index + 1]})
     }
   },
+  selectArticle: function (article) {
+    this.setState({currentArticle: article})
+  },
   handleChange: function (e) {
     this.setState({search: e.target.value}, function () {
       this.setState({currentArticle: this.refs.finderList.props.articles[0]})
     })
   },
   render: function () {
-    var articles = searchArticle(this.state.search, this.state.articles)
+    var articles = this.searchArticle(this.state.search, this.state.articles)
     return (
       <div className='Finder'>
         <FinderInput ref='finderInput' onChange={this.handleChange} search={this.state.search}/>
-        <FinderList ref='finderList' currentArticle={this.state.currentArticle} articles={articles}/>
+        <FinderList ref='finderList' currentArticle={this.state.currentArticle} articles={articles} selectArticle={this.selectArticle}/>
         <FinderDetail currentArticle={this.state.currentArticle}/>
       </div>
     )