carte-server 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e29e4e73482abcd5e6155e32ea8a5765f38247
-  data.tar.gz: a4495c673b963ba553581bf4d9c47c0accb88e30
+  metadata.gz: e0bfef4c6ba86e6cce646264ebf2e52818ec097f
+  data.tar.gz: 693f0efaf70c3ec9b5e35e5b5c20838f1a51cdb3
 SHA512:
-  metadata.gz: b77a2714e6a6188549a7c9ea9b6a4da6df1684c54c71a76e9322a2a751a1fc4eecd58593e2108eefbf51c1e7482487a300794e347bc1e4561bad8d7b34412731
-  data.tar.gz: e241efb22b9a7db1f53832c63e6900e47252556ef73aadbebe91c9ecaf48439692f3b39d904dc796e5a787bc597254bc27203e3b74e64e7e043b98546e6ccaf5
+  metadata.gz: d679b7217daad508664271b41e9238433cc56d49ee1f335113489c2f8b6afcaffd98be5e38f11fd2c854b066939a847e61880876a201b4d2a9f2f2d27205601f
+  data.tar.gz: b3c674856434d6a70e069a23c419b4c0a26977647325ca81503e5cd08f2c659ad5babed67de1c89883088a87535b85e5cb8a1a11dcbeb04f4545f12be052307e

data/config.json

@@ -1,6 +1,7 @@
 {
   "title": "carte sandbox",
-  "description": "something like dictionary, wiki, or information card",
+  "description": "sandbox for carte",
   "public_folder": "public",
-  "script_path": "public/app.js"
+  "script_path": "public/app.js",
+  "link_color": "#2C21A6"
 }

data/config.ru

@@ -5,9 +5,7 @@ class Carte::Server
   configure do
     Mongoid.load! './mongoid.yml'
     config = JSON.parse File.read('config.json')
-    config.each do |k, v|
-      set k.to_sym, v
-    end
+    set :carte, config
   end
 end
 

data/lib/carte/client/views/card.cjsx

@@ -6,6 +6,7 @@ markdownIt = require('markdown-it')(linkify: true)
 
 module.exports = React.createClass
   displayName: 'Card'
+  isSafariOrUiWebView: /(iPhone|iPod|iPad).*AppleWebKit/i.test(navigator.userAgent)
 
   componentDidMount: ->
     @props.card.on 'change', @forceUpdate.bind(@, null)
@@ -27,13 +28,8 @@ module.exports = React.createClass
 
   render: ->
     console.log 'Card: render'
-    style = {height:'220px'}
-    if @props.card.get('focused')
-      #style.color = 'red'
-      style.borderColor = '#ccc'
-    <div className='col-sm-4' style={padding:'5px'} onMouseOver={@onMouseOver} onMouseLeave={@onMouseLeave}>
-      <div className='list-group' style={margin:'0px',padding:'0px'}>
-        <div className='list-group-item' style={style}>
+    <div className='col-sm-4 col-xs-12 list-group' style={marginBottom:'0px',padding:"5px"} onMouseOver={@onMouseOver} onMouseLeave={@onMouseLeave}>
+        <div className='list-group-item' style={height:'220px'}>
           <div>
             {
               if @props.card.get('focused')
@@ -42,7 +38,7 @@ module.exports = React.createClass
             <strong>
               {@props.card.get('title')}
             </strong>
-            <span className='pull-right' style={{visibility: if @state.showTools then 'visible' else 'hidden'}}>
+            <span className='pull-right tools' style={{visibility: if @isSafariOrUiWebView || @state.showTools then 'visible' else 'hidden'}}>
               <ModalTrigger modal={<Edit card={@props.card} />}>
                 <a href="javascript:void(0)">
                   <i className='glyphicon glyphicon-edit' />
@@ -55,11 +51,8 @@ module.exports = React.createClass
               </a>
             </span>
           </div>
-          <div style={overflow:'scroll',width:'100%',height:'80%',wordWrap:'break-word'}>
-            <p>
-              <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} />
-            </p>
+          <div style={overflow:'hidden',width:'100%',height:'80%',wordWrap:'break-word'}>
+            <p dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} />
           </div>
-        </div>
       </div>
     </div>

data/lib/carte/client/views/content.cjsx

@@ -61,7 +61,7 @@ module.exports = React.createClass
           error: (card, response)=>
             console.log response
         document.title = card.get('title') + ' - ' + config.title
-        <List key='show' cards={cards} showNav=false />
+        <List key='show' cards={cards} card={card} />
       else
         console.log 'else'
         <div>Loading ...</div>

data/lib/carte/client/views/header.cjsx

@@ -1,4 +1,5 @@
 # @cjsx React.DOM 
+$ = require('jquery')
 React = require('react')
 Edit = require('./edit')
 CardModel = require('../models/card')
@@ -8,6 +9,9 @@ config = require('../../shared/config.json')
 module.exports = React.createClass
   displayName: 'Header'
 
+  getInitialState: ()->
+    searchText: ''
+
   componentWillMount: ()->
     console.log 'header mounted'
     @card = new CardModel()
@@ -18,8 +22,18 @@ module.exports = React.createClass
       @card._isNew = true
       @forceUpdate()
 
+  onChangeSearchText: ()->
+    @setState searchText: event.target.value
+
+  onKeyPressSearchText: ()->
+    if event.keyCode == 13 # ENTER
+      console.log '13 enter'
+      event.preventDefault()
+      query = {title: @state.searchText}
+      location.hash = '/?' + $.param(query)
+
   render: ->
-    <nav className="navbar navbar-default" style={{padding:"0px",backgroundColor:"white"}}>
+    <nav className="navbar navbar-default" style={{padding:"0px",backgroundColor:"white",marginBottom:"5px"}}>
       <div className="container-fluid">
         <div className="navbar-header">
           <a className="navbar-brand" href="#/" style={{paddingTop:"10px"}}>
@@ -29,7 +43,12 @@ module.exports = React.createClass
             {config.title}
           </a>
         </div>
-        <div className="collapse navbar-collapse">
+        <div>
+          <form className="navbar-form navbar-left" role="search">
+            <div className="form-group">
+              <input type="text" className="form-control" value={@state.searchText} onChange={@onChangeSearchText} onKeyPress={@onKeyPressSearchText} placeholder='Search ...' style={width:"344px"} />
+            </div>
+          </form>
           <ul className="nav navbar-nav navbar-right">
             <li>
               <ModalTrigger modal={<Edit card={@card} />}>

data/lib/carte/client/views/list.cjsx

@@ -14,20 +14,6 @@ module.exports = React.createClass
     console.log 'List: component will receive props'
     nextProps.cards.on 'sync', @forceUpdate.bind(@, null)
 
-  getInitialState: ()->
-    searchText: ''
-
-  onChangeSearchText: ()->
-    @setState searchText: event.target.value
-
-  onKeyPressSearchText: ()->
-    if event.keyCode == 13 # ENTER
-      console.log '13 enter', @props.cards.query
-      event.preventDefault()
-      query = $.extend {}, @props.cards.query
-      query = $.extend query, {title: @state.searchText}
-      location.hash = '/?' + $.param(query)
-
   atozParam: ()->
     query = $.extend {}, @props.cards.query
     query = $.extend query, {sort: 'title', order: 'asc', page: 1}
@@ -54,16 +40,9 @@ module.exports = React.createClass
 
   render: ->
     console.log 'render', @props.cards.query
-    <div className="container" style={{paddingLeft:"5px",paddingRight:"5px",paddingBottom:"20px"}}>
-      {if @props.showNav
+    <div className="container" style={{paddingLeft:"5px",paddingRight:"5px"}}>
+      {if !@props.card
         <div className="row">
-          <div className="col-sm-12" style={{padding:"5px"}}>
-            <form>
-              <div className="form-group">
-                <input type="text" className="form-control" value={@state.searchText} onChange={@onChangeSearchText} onKeyPress={@onKeyPressSearchText} placeholder='Type search text and press enter ...' />
-              </div>
-            </form>
-          </div>
           <div className="col-sm-6" style={{padding:"0px"}}>
             <ul className="nav nav-pills">
               <li><a href={"/#/?" + @atozParam()} style={{padding:'6px 12px',fontWeight: if @props.cards.query.sort == 'title' and @props.cards.query.order != 'random' then 'bold' else 'normal'}}>A to Z</a></li>
@@ -134,6 +113,14 @@ module.exports = React.createClass
             }
           </div>
         </div>
+      else
+        <div className="row">
+          <div className="col-sm-12" style={{padding:"0px"}}>
+            <ul className="nav nav-pills">
+              <li><a href={"/#/" + @props.card.get('title')} style={fontWeight:'bold'}>{@props.card.get('title')}</a></li>
+            </ul>
+          </div>
+        </div>
       } 
       <Cards cards={@props.cards} />
     </div>

data/lib/carte/server.rb

@@ -45,7 +45,7 @@ module Carte
     end
 
     get '/app.js' do
-      send_file settings.script_path
+      send_file settings.carte['script_path']
     end
 
     namespace '/api' do

data/lib/carte/server/version.rb

@@ -2,6 +2,6 @@ require 'sinatra/base'
 
 module Carte
   class Server < Sinatra::Base
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/carte/server/views/cards.builder

@@ -2,8 +2,8 @@ xml.instruct! :xml, version: '1.0'
 xml.rss version: "2.0", :"xmlns:atom" => "http://www.w3.org/2005/Atom" do
   xml.channel do
     xml.tag! "atom:link", href: "http://#{request.host}/api/cards.xml?#{request.env['QUERY_STRING']}", rel: "self", type: "application/rss+xml"
-    xml.title "carte"
-    xml.description "something like dictionary, wiki, or information card"
+    xml.title settings.carte['title']
+    xml.description settings.carte['description']
     xml.link "http://#{request.host}/"
     @cards.each do |card|
       xml.item do

data/lib/carte/server/views/index.haml

@@ -2,15 +2,30 @@
 %html
   %head
     %meta{charset:"utf-8"}
-    %title= settings.title
+    %title= settings.carte['title']
     %meta{name:"viewport",content:"width=device-width,initial-scale=1.0"}
-    %meta{name:"description",content:settings.description}
+    %meta{name:"description",content:settings.carte['description']}
     %script{type:"text/javascript",src:"/app.js"}
     :css
-      a, a:hover, a:visited, a:active {
+      .navbar-default a,
+      .navbar-default a:hover,
+      .navbar-default a:visited,
+      .navbar-default a:active,
+      .nav-pills a,
+      .nav-pills a:hover,
+      .nav-pills a:visited,
+      .nav-pills a:active,
+      .tools a,
+      .tools a:hover,
+      .tools a:visited,
+      .tools a:active
+      {
         color: #333333 !important;
         text-decoration: none !important;
       }
+      a, a:hover, a:visited, a:active {
+        color: #{settings.carte['link_color']}; 
+      }
       .glyphicon-refresh-animate {
         -animation: spin .7s infinite linear;
         -webkit-animation: spin2 .7s infinite linear;

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "carte-client",
   "description": "something like dictionary, wiki, or information card",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "main": "lib/carte.coffee",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carte-server
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - tily
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler