v0.0.1

Author: qinhehu

.DS_Store

@@ -0,0 +1,21 @@
+#设置基础镜像,如果本地没有该镜像，会从daocloud.io服务器pull镜像
+FROM daocloud.io/node:latest
+
+#创建app目录,保存我们的代码
+RUN mkdir -p /usr/src/node
+#设置工作目录
+WORKDIR /usr/src/node
+
+#复制所有文件到 工作目录。
+COPY . /usr/src/node
+
+#编译运行node项目，使用npm安装程序的所有依赖,利用taobao的npm安装
+
+WORKDIR /usr/src/node/website
+RUN npm install --registry=https://registry.npm.taobao.org
+
+#暴露container的端口
+EXPOSE 3000
+
+#运行命令
+cmd ["npm","start"]

Dockerfile

@@ -15,6 +15,7 @@ var login = require('./routes/login');
 var editor = require('./routes/editor');
 var register = require('./routes/register');
 var dashboard = require('./routes/dashboard');
+var article = require('./routes/article');
 
 var app = express();
 
@@ -55,6 +56,7 @@ app.use('/login', login);
 app.use('/editor', editor);
 app.use('/register', register);
 app.use('/dashboard', dashboard);
+app.use('/article',article);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {

app.js

@@ -1,20 +1,24 @@
 module.exports = {
-  list: function(req, res, next) {
-    req.models.articles.find().limit(5).all(function(err, articles) {
+  list: function(req, res, next, offset) {
+    console.log(offset);
+    req.models.articles.find().order("createdate","Z").offset(offset*3).limit(3).all(function(err, articles) {
+
       if (err)
         return next(err);
 
       var items = articles.map(function(m) {
-        // if (!m.path) {
-        //   var key = m.filename;
-        //   m.path = policy.makeRequest(link + key);
-        // }
-        // console.log(m.path);
         return m.serialize();
       });
       console.log(items);
 
       res.send({items: items});
     });
+  },
+  count: function(req, res, next) {
+    req.models.articles.count(function(err, size) {
+      if (err)
+        return next(err);
+      res.send({count: size,index:0});
+    });
   }
 }

app/controllers/articles_controller.js

@@ -6,10 +6,13 @@ module.exports = function(orm, db) {
     },
     headline: String,
     subtitle: String,
+    summary: String,
     filename: String,
     imgpath: String,
     createdate: String,
-    lasteditdate: String
+    lasteditdate: String,
+    tags: String,
+    guid: String
   }, {
     methods: {
       serialize: function() {
@@ -27,10 +30,13 @@ module.exports = function(orm, db) {
           id: this.id,
           headline: this.headline,
           subtitle: this.subtitle,
+          summary: this.summary,
           filename: this.filename,
           imgpath: this.imgpath,
           createdate: this.createdate,
-          lasteditdate: this.lasteditdate
+          lasteditdate: this.lasteditdate,
+          tags: this.tags,
+          guid: this.guid
         };
       }
     }

app/models/articles.js

@@ -1,5 +1,5 @@
 module.exports = function(orm, db) {
-  var users = db.define("user", {
+  var users = db.define("users", {
     id: {
       type: 'serial',
       key: true

app/models/users.js

@@ -4,11 +4,12 @@ var settings = {
     query: {
       pool: true
     },
-    host: "localhost",
-    port: '3306',
-    database: "blog",
-    user: "root",
-    password: "123456"
+
+    // host: "localhost",
+    // port: '3306',
+    // database: "blog",
+    // user: "root",
+    // password: "123456"
   }
 };
 

config/settings.js

@@ -3,7 +3,8 @@ var webpack = require('webpack');
 module.exports = {
     entry: {
         markdown:'./react/markdown.js',
-        article_preview:'./react/article_preview.js'
+        article_preview:'./react/article_preview.js',
+        tag:'./react/tag.js'
     },
     output: {
         path: __dirname + '/static',

config/webpack.config.js

@@ -13,7 +13,7 @@
     "jade": "~1.11.0",
     "morgan": "~1.8.1",
     "serve-favicon": "~2.4.2",
-    "marked":"latest",
+    "marked":"0.3.6",
     "react": "~15.5.4",
     "react-dom": "~15.5.4",
     "webpack": "~2.4.1",
@@ -27,6 +27,9 @@
     "mysql":"~2.13.0",
     "moment":"~2.18.1",
     "qiniu":"~6.1.13",
-    "react-fileupload":"~2.4.0"
+    "react-fileupload":"~2.4.0",
+    "jsonwebtoken":"~7.4.1",
+    "uuid":"~3.0.1",
+    "forever-monitor":"~1.7.1"
   }
 }

package.json

@@ -22,3 +22,28 @@
 html, body {
   height: 100%;
 }
+
+ul .tag {
+  background-color: #f1f8ff;
+  padding-left: 9.6px;
+  margin-right: 4.8px;
+  margin-top: 10px;
+}
+
+ul .tag button {
+  background-color: #f1f8ff;
+  border-top: 0px;
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 1px solid #b4d9ff;
+  margin-left: 8px;
+  outline: none;
+}
+
+ul .tag button:hover {
+  background-color: #ddeeff;
+}
+
+ul li input:focus {
+  outline: none;
+}

public/stylesheets/markdownEditor.css

@@ -1,22 +1,45 @@
 body {
-    padding: 50px;
-    font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
-    background-color: rgb(235, 235, 235);
+  padding: 50px;
+  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
+  background-color: rgb(235, 235, 235);
 }
 
 a {
-    color: #00B7FF;
+  color: black;
 }
+
+a:hover {
+  color: black;
+  text-decoration: none;
+}
+
+
 p {
-  word-break:break-word;
+  word-break: break-word;
 }
+
 .article-preview {
-    padding: 50px;
-    background-color: white;
-    margin-bottom: 50px;
+  padding: 30px;
 }
 
 .content img {
-    width: 300px;
-    height: 300px;
+  width: 300px;
+  height: 300px;
+}
+
+#floor {}
+
+#floor li {
+  list-style-type: none;
+  display: list-item;
+}
+
+#floor li a {
+  color: #b8c4cc;
+  border-radius: 0px;
+}
+
+#floor li.active a {
+  background-color: white;
+  color: black;
 }

public/stylesheets/style.css

@@ -2,4 +2,4 @@ var React = require('react');
 var ReactDom = require('react-dom');
 var Preview = require('./components/article_preview.jsx');
 
-ReactDom.render(<Preview promise={$.getJSON('/getArticle')}/>,document.getElementById('content'));
+ReactDom.render(<Preview promise={$.getJSON('/getArticleSize')}/>,document.getElementById('content'));