[CE-48] Add store statement for user dashboard

And refine redirect after user login Change-Id: I8af515682990c5733c001856747629b3063e710b Signed-off-by: lixucheng <lixucheng@aliyun.com>
hyperledger · May 17, 2017 · 7758c75 · 7758c75
1 parent da38561
commit 7758c75
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 2 deletions.
diff --git a/user-dashboard/app.js b/user-dashboard/app.js
@@ -30,6 +30,7 @@ app.use("/dashboard", require("./routes/dashboard/home"));
 app.use("/dashboard", require("./routes/dashboard/chain"));
 app.use("/dashboard", require("./routes/dashboard/contract"));
 app.use("/dashboard", require("./routes/dashboard/analytics"));
+app.use("/dashboard", require("./routes/dashboard/store"));
 app.use(function(err, req, res, next) {
     res.status(err.status || 500);
     res.send(err.message);

diff --git a/user-dashboard/public/css/dashboard/store.css b/user-dashboard/public/css/dashboard/store.css
@@ -0,0 +1,12 @@
+@CHARSET "UTF-8";
+.ds-store-list{width:80%;margin-top:60px;font-family:"Helvetica Neue",Arial,sans-serif;
+text-align:center;padding-top:10%;}
+.ds-store-list h1{font-size:24px;color:#4178BE;margin-top:42px;border-bottom:2px solid #4178BE;}
+.dashboard-bgi{position:fixed;top:0;left:0;width:100%;height:100%;
+background-image:url(/images/dashboard-bgi.jpg);
+background-position:center center;
+background-repeat:no-repeat;
+-webkit-background-size:cover;
+background-size:cover;
+z-index:-1;
+}
diff --git a/user-dashboard/public/js/app/dashboard/store.js b/user-dashboard/public/js/app/dashboard/store.js
@@ -0,0 +1,12 @@
+/**
+ * Created by lixuc on 2017/5/17.
+ */
+define([
+    "jquery",
+    "app/dashboard/profile",
+    "uikit"
+], function($, Profile) {
+    $(function() {
+        new Profile();
+    });
+});
diff --git a/user-dashboard/public/js/app/index.js b/user-dashboard/public/js/app/index.js
@@ -1,8 +1,9 @@
 define([
     "jquery",
+	"cookie",
     "app/index/login",
     "uikit"
-], function($, login) {
+], function($, Cookies, login) {
     $(function() {
     	$("#signin").click(function() {
     		login.show();
@@ -11,8 +12,10 @@ define([
     		if ($("#apikey").val() == "") {
     			login.show();
     		} else {
+				var referer = Cookies.get("referer");
+				Cookies.remove("referer");
     			$(this).attr("disabled", true).append($("<i class='uk-icon-spinner uk-icon-spin'></i>"));
-    			$(location).attr("href", "/dashboard");
+    			$(location).attr("href", referer || "/dashboard");
     		}
     	});
     });

diff --git a/user-dashboard/public/js/entry/store.js b/user-dashboard/public/js/entry/store.js
@@ -0,0 +1,6 @@
+/**
+ * Created by lixuc on 2017/5/17.
+ */
+requirejs(["../common"], function(common) {
+    requirejs(["app/dashboard/store"]);
+});
diff --git a/user-dashboard/routes/dashboard/filter.js b/user-dashboard/routes/dashboard/filter.js
@@ -33,6 +33,7 @@ router.get([
             next(e);
         });
     } else {
+        res.cookie("referer", req.originalUrl);
         res.redirect("/");
     }
 });

diff --git a/user-dashboard/routes/dashboard/store.js b/user-dashboard/routes/dashboard/store.js
@@ -0,0 +1,10 @@
+/**
+ * Created by lixuc on 2017/5/17.
+ */
+var express = require("express");
+var router = express.Router();
+
+router.get("/store", function(req, res) {
+    res.render("dashboard/store");
+});
+module.exports = router;
diff --git a/user-dashboard/views/dashboard/store.pug b/user-dashboard/views/dashboard/store.pug
@@ -0,0 +1,15 @@
+extends ../layout
+
+block css
+    link(rel="stylesheet", href="/css/dashboard/navbar.css")
+    link(rel="stylesheet", href="/css/dashboard/store.css")
+block js
+    script(data-main="/js/entry/store" src="/js/lib/require.js")
+block content
+    include includes/navbar.pug
+    +active("store")
+    section.ds-store-list.uk-container.uk-container-center
+        .dashboard-bgi
+        label(style="font-size:52px;font-style:italic;color:#4178BE;")
+            i.uk-icon-warning.uk-margin-right
+            | Under construction...