From 1c0a540b740c739053c65a879aa0af1f7be098ec Mon Sep 17 00:00:00 2001
From: Enrico Fasoli <fazius2009@gmail.com>
Date: Tue, 17 Nov 2015 20:32:52 +0100
Subject: [PATCH] improved UI, implemented markdown and descriptions now show
 up

---
 package.json      |   1 +
 webapp/app.jsx    | 223 ++++++++++++++++++++++++++++++----------------
 webapp/index.html |   3 +-
 webapp/style.css  |  38 ++++++--
 4 files changed, 183 insertions(+), 82 deletions(-)

diff --git a/package.json b/package.json
index 3f4217e..99d6f6a 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "moment": "^2.10.6",
     "react": "^0.14.2",
     "react-dom": "^0.14.2",
+    "react-markdown": "^1.0.5",
     "react-router": "^1.0.0",
     "uglifyify": "^3.0.1",
     "vinyl-buffer": "^1.0.0",
diff --git a/webapp/app.jsx b/webapp/app.jsx
index 7b6ff05..96d7df5 100644
--- a/webapp/app.jsx
+++ b/webapp/app.jsx
@@ -5,11 +5,34 @@ var Route = require('react-router').Route
 var IndexRoute = require('react-router').IndexRoute
 var Link = require('react-router').Link
 
+var MarkdownLib = require('react-markdown')
 var ipfs = require('ipfs-api')('localhost',5001)
 var BoardsAPI = require('../lib/boards-api.js')
 
 var boards = new BoardsAPI(ipfs)
 
+// Components
+
+var Markdown = React.createClass({
+  renderIfApplicable: function(){
+    if(this.props.source)
+      return <MarkdownLib source={this.props.source} skipHtml={true} />
+    return <p>...</p>
+  },
+  render: function(){
+    return this.renderIfApplicable()
+  }
+})
+
+var Icon = React.createClass({
+  class: function(){
+    return 'fa fa-'+this.props.name+' '+this.props.class
+  },
+  render: function(){
+    return ( <i className={this.class()}></i> )
+  }
+})
+
 var Container = React.createClass({
   render: function(){
     return ( <div className="container app">{this.props.children}</div> )
@@ -22,69 +45,26 @@ var App = React.createClass({
   }
 })
 
-var Homepage = React.createClass({
-  render: function(){
-    return (
-      <div>
-        <h3>Welcome to the IPFS Boards Prototype</h3>
-        <p>Not much is implemented...</p>
-        <p>You can try <Link to="@QmXnfA41SXMX3tqFD4kjED7ehyvgTsuAho86TkEoTbZdpw">Opening my Profile</Link> though :)</p>
-        <p>More information about the project on <a href="https://github.com/fazo96/ipfs-board">GitHub</a></p>
-      </div>
-    )
-  }
-})
-
 var Navbar = React.createClass({
   render: function(){
     return (
       <div className="navbar">
         <div className="container">
-          <h4><Link to="/">Boards</Link></h4>
+          <div className="row">
+            <div className="twelve columns">
+              <h4><Link to="/"><Icon name="comments" class="light"/> Boards</Link></h4>
+              <div className="u-pull-right iconbar">
+                <Link className="nounderline" to="/users"><Icon name="globe" class="fa-2x light"/></Link>
+                <Link className="nounderline" to="/settings"><Icon name="cog" class="fa-2x light"/></Link>
+                <a className="nounderline" href="https://github.com/fazo96/ipfs-boards"><Icon name="github" class="fa-2x light"/></a>
+              </div>
+            </div>
+          </div>
         </div>
       </div>)
   }
 })
 
-var Profile = React.createClass({
-  getInitialState: function(){
-    return { name: '...', boards: [] }
-  },
-  componentDidMount: function(){
-    var ee = boards.getProfile(this.props.params.userid, (err,res) => {
-      if(!this.isMounted()) return true
-      if(err){
-        console.log(err)
-        this.setState({
-          name: '?',
-          error: 'Invalid profile'
-        })
-      } else {
-        console.log(res)
-        this.setState({ name: res.name })
-      }
-    })
-    ee.on('boards for '+this.props.params.userid,l => {
-      if(!this.isMounted()) return true
-      this.setState({ boards: l })
-    })
-  },
-  render: function(){
-    return (<div className="profile">
-      <h1>{this.state.name}</h1>
-      <p>{this.state.error}</p>
-      <h5 className="light">@{this.props.params.userid}</h5>
-      <ul>
-        {this.state.boards.map(n => {
-          return <li key={this.props.params.userid+'/'+n.name}>
-            <Link to={'/@'+this.props.params.userid+'/'+n.name}>{n.name}</Link>
-          </li>
-        })}
-      </ul>
-    </div>)
-  }
-})
-
 var PostList = React.createClass({
   getInitialState: function(){
     return { posts: [] }
@@ -103,7 +83,7 @@ var PostList = React.createClass({
         {this.state.posts.map(post => {
           return (<div key={post.title} className="post">
             <h5>{post.title}</h5>
-            <p>{post.text}</p>
+            <Markdown source={post.text} skipHtml={true} />
           </div>)
         })}
       </div>
@@ -119,37 +99,31 @@ var UserID = React.createClass({
     boards.getProfile(this.props.id, (err,res) => {
       if(!this.isMounted()) return true
       if(!err) {
-        this.setState({ name: '@'+res.name.trim() })
+        this.setState({ name: res.name.trim() })
       }
     })
   },
   render: function(){
     return (<div className="board">
-      <Link to={'/@'+this.props.id}>
-        <h5 className="light">{this.state.name}</h5>
+      <Link className="light nounderline" to={'/@'+this.props.id}>
+        <Icon name="user"/> {this.state.name}
       </Link>
     </div>)
   }
 })
 
-var Board = React.createClass({
-  getInitialState: function(){
-    return { name: '# '+this.props.params.boardname }
-  },
-  componentDidMount: function(){
-    var ee = boards.getBoardSettings(this.props.params.userid,this.props.params.boardname)
-    ee.on('settings for '+this.props.params.boardname+'@'+this.props.params.userid, (res) => {
-      if(!this.isMounted()) return true
-      console.log('Found name:',res.fullname)
-      this.setState({ name: '# '+res.fullname.trim() })
-    })
-  },
+// Static pages
+
+var Homepage = React.createClass({
   render: function(){
-    return (<div className="board">
-      <h2>{this.state.name}</h2>
-      <UserID id={this.props.params.userid} />
-      <PostList board={this.props.params.boardname} admin={this.props.params.userid}/>
-    </div>)
+    return (
+      <div>
+        <h3>Welcome to the IPFS Boards Prototype</h3>
+        <p>Not much is implemented...</p>
+        <p>You can try <Link to="@QmXnfA41SXMX3tqFD4kjED7ehyvgTsuAho86TkEoTbZdpw">Opening my Profile</Link> though :)</p>
+        <p>More information about the project on <a href="https://github.com/fazo96/ipfs-board">GitHub</a></p>
+      </div>
+    )
   }
 })
 
@@ -171,6 +145,102 @@ var GetIPFS = React.createClass({
   }
 })
 
+var NotFound = React.createClass({
+  render: function(){
+    return (<div className="text-center">
+      <h1><Icon name="ban"/></h1>
+      <p>Sorry, there's nothing here!</p>
+    </div>)
+  }
+})
+
+var NotImplemented = React.createClass({
+  render: function(){
+    return ( <div className="text-center">
+      <h1>Not yet implemented</h1>
+      <h1><Icon name="cog" class="fa-spin"/></h1>
+      <p>Sorry, working on it!</p>
+    </div> )
+  }
+})
+
+// Dynamic pages
+
+var Profile = React.createClass({
+  getInitialState: function(){
+    return { name: '...', boards: [] }
+  },
+  componentDidMount: function(){
+    var ee = boards.getProfile(this.props.params.userid, (err,res) => {
+      if(!this.isMounted()) return true
+      if(err){
+        console.log(err)
+        this.setState({
+          name: '?',
+          error: 'Invalid profile'
+        })
+      } else {
+        console.log(res)
+        this.setState({ name: res.name, description: res.description })
+      }
+    })
+    ee.on('boards for '+this.props.params.userid,l => {
+      if(!this.isMounted()) return true
+      this.setState({ boards: l })
+    })
+  },
+  render: function(){
+    return (<div className="profile">
+      <h1>{this.state.name}</h1>
+      <p>{this.state.error}</p>
+      <Markdown source={this.state.description} skipHtml={true} />
+      <hr/>
+      <h5 className="light">@{this.props.params.userid}</h5>
+      {this.state.boards.map(n => {
+        return <h6 className="light" key={this.props.params.userid+'/'+n.name}>
+          <Link to={'/@'+this.props.params.userid+'/'+n.name}># {n.name}</Link>
+        </h6>
+      })}
+    </div>)
+  }
+})
+
+var Board = React.createClass({
+  getInitialState: function(){
+    return { name: this.props.params.boardname }
+  },
+  componentDidMount: function(){
+    var ee = boards.getBoardSettings(this.props.params.userid,this.props.params.boardname)
+    ee.on('settings for '+this.props.params.boardname+'@'+this.props.params.userid, (res) => {
+      if(!this.isMounted()) return true
+      console.log('Found name:',res.fullname)
+      this.setState({ name: res.fullname.trim(), description: res.description })
+    })
+  },
+  render: function(){
+    return (<div className="board">
+      <h2>{this.state.name}</h2>
+      <Markdown source={this.state.description} skipHtml={true} />
+      <h5><UserID id={this.props.params.userid} /></h5>
+      <PostList board={this.props.params.boardname} admin={this.props.params.userid}/>
+    </div>)
+  }
+})
+
+var Users = React.createClass({
+  render: function(){
+    return <NotImplemented />
+  }
+})
+
+var Settings = React.createClass({
+  render: function(){
+    return <NotImplemented />
+  }
+})
+
+// Start
+
 boards.init(err => {
   if(err){
     console.log('FATAL: IPFS NODE NOT AVAILABLE')
@@ -182,8 +252,11 @@ boards.init(err => {
           <IndexRoute component={Homepage} />
           <Route path="/@:userid">
             <IndexRoute component={Profile} />
-            <Route path=":boardname" component={Board}/>
+            <Route path=":boardname" component={Board} />
           </Route>
+          <Route path="/users" component={Users} />
+          <Route path="/settings" component={Settings} />
+          <Route path="*" component={NotFound} />
         </Route>
       </Router>, document.getElementById('root')
     )
diff --git a/webapp/index.html b/webapp/index.html
index 74fa390..aaddaf1 100644
--- a/webapp/index.html
+++ b/webapp/index.html
@@ -3,6 +3,7 @@
     <title>IPFS Board</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link href="//fonts.googleapis.com/css?family=Raleway:400,300,600" rel="stylesheet" type="text/css">
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <link rel="stylesheet" href="normalize.css">
     <link rel="stylesheet" href="skeleton.css">
     <link rel="stylesheet" href="style.css">
@@ -10,7 +11,7 @@
   <body>
   <div id="root">
     <div id="loading">
-      <h1>Loading</h1>
+      <i class="fa fa-3x fa-cog fa-spin"></i>
     </div>
   </div>
   <script src="app.js"></script>
diff --git a/webapp/style.css b/webapp/style.css
index d135d60..2b00fae 100644
--- a/webapp/style.css
+++ b/webapp/style.css
@@ -6,12 +6,35 @@
   top: 20%;
 }
 
+hr {
+  margin-top: 2rem;
+  margin-bottom: 2.5rem;
+}
+
+a {
+  text-decoration: underline;
+  color: #ababab;
+}
+
+.nounderline {
+  text-decoration: none;
+}
+
+.navbar a {
+  text-decoration: none;
+  color: inherit;
+}
+
+a:hover {
+  color: black;
+}
+
 .text-center {
   text-align: center
 }
 
 .light {
-  color: #ababab
+  color: #707070
 }
 
 .app {
@@ -24,11 +47,14 @@
   height: 4.5em
 }
 
-.navbar a {
-  text-decoration: none;
-  color: inherit;
-}
-
 .navbar .container {
   padding-top: 1em
 }
+
+.navbar .iconbar {
+  margin-top: -5.2rem;
+}
+
+.navbar .iconbar .fa {
+  margin-left: .5rem;
+}