Skip to content

Commit 6174f60

Browse files
tangguangyaotangguangyao
committed
重构
1 parent bcf3278 commit 6174f60

File tree

8 files changed

+126
-22
lines changed

8 files changed

+126
-22
lines changed

‎app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ app.set('view engine', 'ejs');
2121
/*
2222
* 前端单页面重构
2323
*/
24-
//app.engine('html', require('ejs').renderFile);
24+
app.engine('html', require('ejs').renderFile);
2525

2626
app.use(flash());
2727
app.use(express.favicon());

‎public/js/app/controllers.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
var routeApp = angular.module('routeApp',[]);
2+
routeApp.config(['$routeProvider',function ($routeProvider) {
3+
$routeProvider
4+
.when('/index', {
5+
templateUrl: 'index.html',
6+
controller: 'RouteIndexCtl'
7+
})
8+
.when('/login', {
9+
templateUrl: 'login.html',
10+
controller: 'RouteLoginCtl'
11+
})
12+
// .otherwise({
13+
// redirectTo: '/index'
14+
// });
15+
}]);

‎routes/index.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ module.exports = function(app){
1616
/*
1717
* 准备重构为单页面
1818
*/
19-
// app.get('/',function(req,res){
20-
// res.render('index.html', {
21-
// user:req.session.user,
22-
// isStock:true
23-
// });
24-
// })
19+
app.get('/app',function(req,res){
20+
res.render('app/app.html', {
21+
user:req.session.user,
22+
isStock:true
23+
});
24+
})
2525

2626

2727
app.get('/',function(req,res){

‎views/app/app.html

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<!DOCTYPE html>
2+
<html lang="zh-CN">
3+
4+
<meta charset='utf-8'>
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>money</title>
7+
<base href="/" />
8+
<link href="css/bootstrap.css" rel="stylesheet">
9+
<link href="css/bootstrap-theme.css" rel="stylesheet">
10+
<link href="css/index.css" rel="stylesheet">
11+
<script src="js/jquery-1.10.2.min.js"></script>
12+
<script src="js/bootstrap.js"></script>
13+
<script src="js/angular.min.js"></script>
14+
<!-- <script src="http://code.angularjs.org/1.2.12/angular-route.min.js"></script> -->
15+
<script src="/socket.io/socket.io.js"></script>
16+
<script>
17+
var xueqiuUrl="key=47bce5c74f&access_token=S8nfhytJNtRNHoV9ntmtHY&_=1392196535991";
18+
//雪球接口长变化的参数
19+
</script>
20+
</head>
21+
<body ng-app="routeApp">
22+
<header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner">
23+
<div class="container">
24+
<div class="navbar-header">
25+
<a href="/" class="navbar-brand">Money</a>
26+
</div>
27+
<nav class="navbar-collapse bs-navbar-collapse" role="navigation">
28+
<ul class="nav navbar-nav">
29+
<li>
30+
<a href="/">首页</a>
31+
</li>
32+
<li class="dropdown">
33+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">广场<b class="caret"></b></a>
34+
<ul class="dropdown-menu">
35+
<li><a href="/baike">行情</a></li>
36+
<li><a href="/baike">行情</a></li>
37+
<li><a href="/baike">行情</a></li>
38+
<li><a href="/baike">行情</a></li>
39+
</ul>
40+
</li>
41+
42+
<!-- <li>
43+
<a href="people/<%= user.name %>">个人主页</a>
44+
</li> -->
45+
46+
</ul>
47+
48+
<div class="navbar-form navbar-right" id="isloginOut" style="display:none">
49+
<div class="form-group ">
50+
<input type="text" placeholder="用户名" class="form-control" id="headName">
51+
</div>
52+
<div class="form-group">
53+
<input type="password" placeholder="密码" class="form-control" id="headPassword">
54+
</div>
55+
<button type="submit" class="btn btn-success" id="headerLogin">登陆</button>
56+
<a href="/login" class="btn btn-default" role="button">注册</a>
57+
</ul>
58+
</div>
59+
<ul class="nav navbar-nav navbar-right" id="islogin">
60+
<li class="dropdown">
61+
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span id="headShowName" top="top" login="in">name</span><b class="caret"></b></a>
62+
<ul class="dropdown-menu">
63+
<li><a href="setting">设置</a></li>
64+
<li><a id="loginOut" loginOut="target">注销</a></li>
65+
<!-- <li><a id="loginOut">注销</a></li> -->
66+
</ul>
67+
</li>
68+
</ul>
69+
70+
<!-- <div class="navbar-form navbar-right" id="isloginOut">
71+
<div class="form-group ">
72+
<input type="text" placeholder="用户名" class="form-control" id="headName">
73+
</div>
74+
<div class="form-group">
75+
<input type="password" placeholder="密码" class="form-control" id="headPassword">
76+
</div>
77+
<button type="submit" class="btn btn-success" id="headerLogin">登陆</button>
78+
<a href="/login" class="btn btn-default" role="button">注册</a>
79+
</ul>
80+
</div>
81+
<ul class="nav navbar-nav navbar-right" id="islogin" style="display:none">
82+
<li class="dropdown">
83+
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><span id="headShowName" login="out" ></span><b class="caret"></b></a>
84+
<ul class="dropdown-menu">
85+
<li><a href="/baike">设置</a></li>
86+
<li><a id="loginOut">注销</a></li>
87+
</ul>
88+
</li>
89+
</ul>
90+
-->
91+
</nav>
92+
93+
</div>
94+
</header>
95+
96+
<script src="js/min/header.min.js"></script>
97+
98+
<div ng-view></div>
99+
100+
</body>
101+
</html>

‎views/app/index.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h3>Route : index.html</h3>

‎views/app/login.html

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h3>Route : login.html</h3>

‎views/index.html

-14
This file was deleted.

‎views/top.ejs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE html>
22
<html lang="zh-CN">
3-
3+
<head>
44
<meta charset='utf-8'>
55
<meta name="viewport" content="width=device-width, initial-scale=1.0">
66
<title>money</title>

0 commit comments

Comments
 (0)