修改logo 增加尾部的about的相关连接

hamuPP · Jul 5, 2016 · 09be7fc · 09be7fc
1 parent e502d9f
commit 09be7fc
Show file tree

Hide file tree

Showing 11 changed files with 156 additions and 9 deletions.
diff --git a/app.js b/app.js
@@ -21,10 +21,11 @@ var user = require('./routes/user');
 var mail = require('./routes/mail');
 var my = require('./routes/my');
 var editMyFile = require('./routes/editMyFile');
+var about = require("./routes/about");
 var app = express();
 
 // all environments
-app.set('port', process.env.PORT || 3001);
+app.set('port', process.env.PORT || 80);
 app.set('views', path.join(__dirname, 'views'));// 设置模板相对路径(相对当前目录)
 //app.set('view engine', 'jade');//设置模板引擎为jade
 app.set('view engine', 'ejs');//设置模板引擎为jade
@@ -94,6 +95,8 @@ app.get("/getSession",login.getSession);
 app.get("/editMyFile", editMyFile.navToEditMyFile);
 app.post("/updataAvatar", editMyFile.updataAvatar);
 
+app.get("/about", about.about);
+
 /*辅助方法，ejs用的*/
 /*转换毫秒时间到当地时间*/
 app.locals.showYear = function(sDate) {
@@ -135,12 +138,11 @@ log4js.configure({
 		{
 			type: 'file', //文件输出
 			filename: 'logs/access.log',
-			maxLogSize: 1024,
+			maxLogSize: 1024*16,
 			backups: 3,
 			category: 'normal'
 		}
-	],
-	replaceConsole: true
+	]
 });
 var logger = log4js.getLogger('normal');
 logger.setLevel('TRACE');

diff --git a/logs/access.log b/logs/access.log
@@ -1 +1,3 @@
-[2016-07-05 13:14:17.515] [TRACE] normal - ::1 - - "GET /imgs/justice.jpg HTTP/1.1" 404 29 "http://localhost:3001/my" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
+[2016-07-05 17:07:23.437] [TRACE] normal - ::1 - - "GET /about/js/common.js HTTP/1.1" 404 31 "http://localhost:3002/about/?cateid=contactEditor" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
+[2016-07-05 17:07:23.440] [TRACE] normal - ::1 - - "GET /about/js/indexJS.js HTTP/1.1" 404 32 "http://localhost:3002/about/?cateid=contactEditor" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
+[2016-07-05 17:07:23.442] [TRACE] normal - ::1 - - "GET /about/imgs/about/editor_avatar.png HTTP/1.1" 404 47 "http://localhost:3002/about/?cateid=contactEditor" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36"
diff --git a/public/css/helper.css b/public/css/helper.css
@@ -73,6 +73,9 @@
 .fr{
     float:right;
 }
+.fl{
+    float:left;
+}
 
 /*active  */
 .active{

diff --git a/public/imgs/about/editor_avatar.png b/public/imgs/about/editor_avatar.png
diff --git a/public/imgs/icons/tarot_logo.png b/public/imgs/icons/tarot_logo.png
diff --git a/routes/about.js b/routes/about.js
@@ -0,0 +1,18 @@
+/**
+ * Created by ty on 16/7/5.
+ */
+exports.about = function(req, res) {
+	var cateId = req.query.cateid;
+
+	switch (cateId){
+		case "aboutUS":res.render("aboutUs");
+			break;
+		case "contactEditor":res.render("contactEditor");
+			break;
+		case "feedback":res.render("feedback");
+			break;
+		default:
+			res.render("indexv2");
+			break;
+	}
+};
diff --git a/views/aboutUs.ejs b/views/aboutUs.ejs
@@ -0,0 +1,66 @@
+<% include common-tags.ejs %>
+    <title>塔罗Ju--关于本站</title>
+    <style>
+        .main-content a{
+            text-decoration: underline;
+        }
+    </style>
+</head>
+<body>
+    <div class="wrapper">
+
+        <% include common-header.ejs %>
+        <% include IENotice.ejs %>
+
+        <div class="container main-content">
+            <div class="row">
+                <div class="col-xs-12 col-sm-8 col-sm-push-2 col-lg-6 col-lg-push-3">
+                    <h3>本站内容</h3>
+                    <ol>
+                        <li>
+                            <p>本站所有内容基于标准伟特塔罗，所有牌意解释来源于《你已经很塔罗》，牌型来源于同本书以及其他塔罗书籍。本站所有卡牌和牌型，可以通过网站头部的搜索框搜索到</p>
+                        </li>
+                        <li>
+                            <p>本站属于个人网站，基于站主的个人爱好，可能会不定期加入一些我收集的我觉得好看的牌面</p>
+                        </li>
+                        <li>
+                            <p>本站没有经营任何盈利性行为</p>
+                        </li>
+                        <li>
+                            <p>若您有任何疑问，或者您希望本站加入一些其他您感兴趣的内容，可以联系QQ：
+                                <a target="_blank" class="color-green" href="http://wpa.qq.com/msgrd?v=3&uin=3450302573&site=jusctice.cn&menu=yes">3450302573</a>
+                                <br/>也可以给我发邮件：<a href="mailto:[email protected]" target="_blank" class="color-green">[email protected]</a>
+                            </p>
+                        </li>
+                    </ol>
+
+                    <h3>本站开发与维护</h3>
+                        <ol>
+                            <li>
+                                <p>站主个人开发。采用nodejs+express+bootstrap+jq+gulp</p>
+                            </li>
+                            <li>
+                                <p>兼容：不兼容ie11以下，若你发现有兼容问题，可以反馈给我，等我懒够了再改</p>
+                            </li>
+                            <li>
+                                <p>由于比较懒，所以gulp只用了一个编译sass的功能233333</p>
+                            </li>
+                            <li>
+                                <p>若您发现本站代码有bug,请联系QQ:
+                                    <a target="_blank" href="http://wpa.qq.com/msgrd?v=3&uin=3450302573&site=jusctice.cn&menu=yes" class="color-green">3450302573</a>
+                                    <br/>或者给我发邮件：<a href="mailto:[email protected]" target="_blank" class="color-green">[email protected]</a>
+                                </p>
+                            </li>
+                        </ol>
+                        <p></p>
+                </div>
+            </div>
+        </div>
+        <% include common-footer.ejs%>
+    </div>
+    <script src="js/jquery-1.11.2-min.js"></script>
+    <script src="js/bootstrap.min.js"></script>
+    <script src="js/common.js"></script>
+    <script src="js/indexJS.js"></script>
+</body>
+</html>
diff --git a/views/common-footer.ejs b/views/common-footer.ejs
@@ -6,9 +6,9 @@
 <footer class="footer">
     <div class="container">
         <div class="row text-center mtb30">
-            <a class="mlr15" href="about/thisSite.html">关于本站</a>
-            <a class="mlr15" href="about/editor.html">和站主搞基（←不</a>
-            <a class="mlr15" href="about/feedback.html">反馈意见建议</a>
+            <a class="mlr15" href="/about?cateid=aboutUS">关于本站</a>
+            <a class="mlr15" href="/about?cateid=contactEditor">和站主搞基</a>
+            <a class="mlr15" href="/about?cateid=feedback">反馈意见建议</a>
 
         </div>
     </div>

diff --git a/views/common-header.ejs b/views/common-header.ejs
@@ -13,7 +13,7 @@
                     <input type="search" id="headerSearchInputMobile" name="search-input" placeholder="输入卡名或牌型名" class="header-search-input">
                 </form>
             </div>
-            <img src="../imgs/logo200.png" alt="logo" class="logo-img"/>
+            <img src="../imgs/icons/tarot_logo.png" alt="logo" class="logo-img"/>
         </div>
         <div class="collapse navbar-collapse no-border" id="bs-example-navbar-collapse-1" style="position: relative;z-index: 110;">
             <ul class="nav navbar-nav navbar-right text-nonselect" id="headerNavUl">

diff --git a/views/contactEditor.ejs b/views/contactEditor.ejs
@@ -0,0 +1,29 @@
+<% include common-tags.ejs %>
+    <title>塔罗Ju--关于作者</title>
+</head>
+<body>
+    <div class="wrapper">
+
+        <% include common-header.ejs %>
+        <% include IENotice.ejs %>
+
+        <div class="container main-content">
+            <div class="row">
+                <div class="col-xs-12 col-sm-8 col-sm-push-2 col-lg-6 col-lg-push-3">
+                    <img src="imgs/about/editor_avatar.png" alt="作者的头像" class="img-circle fl">
+                    <div>
+                        <h3>[email protected]</h3>
+                        <p><label>职业：</label>web前端</p>
+                        <p><label>联系方式：</label>见上邮箱</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <% include common-footer.ejs%>
+    </div>
+    <script src="js/jquery-1.11.2-min.js"></script>
+    <script src="js/bootstrap.min.js"></script>
+    <script src="js/common.js"></script>
+    <script src="js/indexJS.js"></script>
+</body>
+</html>
diff --git a/views/feedback.ejs b/views/feedback.ejs
@@ -0,0 +1,27 @@
+<% include common-tags.ejs %>
+    <title>塔罗Ju--反馈</title>
+</head>
+<body>
+    <div class="wrapper">
+
+        <% include common-header.ejs %>
+        <% include IENotice.ejs %>
+
+        <div class="container main-content">
+            <div class="row">
+                <div class="col-xs-12 col-sm-8 col-sm-push-2 col-lg-6 col-lg-push-3">
+                    <p>若您有任何疑问，或者您希望本站加入一些其他您感兴趣的内容，或者您想反馈BUG等，请联系QQ：
+                        <a target="_blank" class="color-green" href="http://wpa.qq.com/msgrd?v=3&uin=3450302573&site=jusctice.cn&menu=yes">3450302573</a>
+                        <br/>也可以给我发邮件：<a href="mailto:[email protected]" target="_blank" class="color-green">[email protected]</a>
+                    </p>
+                </div>
+            </div>
+        </div>
+        <% include common-footer.ejs%>
+    </div>
+    <script src="js/jquery-1.11.2-min.js"></script>
+    <script src="js/bootstrap.min.js"></script>
+    <script src="js/common.js"></script>
+    <script src="js/indexJS.js"></script>
+</body>
+</html>