fe / yoho-activity-platform · Commits

Go to a project

Authored by 李奇
Commit f2abf17c91144991e9391c4733e246fe019a5196 1 parent f1b47974

postcss配置修改

Inline Side-by-side
Showing 12 changed files with 216 additions and 724 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 12 of 12+ files are displayed.

@@ -17,6 +17,8 @@ const article = { @@ -17,6 +17,8 @@ const article = {
17 */ 17 */
18 indexPage(req, res) { 18 indexPage(req, res) {
19 res.render('home', { 19 res.render('home', {
  20 + page: 'login',
  21 + module: 'admin',
20 bodyClass: 'nav-md' 22 bodyClass: 'nav-md'
21 }); 23 });
22 }, 24 },
@@ -28,6 +30,8 @@ const article = { @@ -28,6 +30,8 @@ const article = {
28 */ 30 */
29 loginPage(req, res) { 31 loginPage(req, res) {
30 res.render('login', { 32 res.render('login', {
  33 + page: 'login',
  34 + module: 'admin',
31 bodyClass: 'login' 35 bodyClass: 'login'
32 }); 36 });
33 }, 37 },
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 const express = require('express'); 6 const express = require('express');
7 const router = express.Router(); // eslint-disable-line 7 const router = express.Router(); // eslint-disable-line
8 -const authAdmin = require('../../middleware/authAdmin'); 8 +const authAdmin = require('../../doraemon/middleware/authAdmin');
9 const admin = require('./controllers/admin'); 9 const admin = require('./controllers/admin');
10 10
11 router.get('/', authAdmin, admin.indexPage); 11 router.get('/', authAdmin, admin.indexPage);
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="col-md-3 left_col"> 3 <div class="col-md-3 left_col">
4 <div class="left_col scroll-view"> 4 <div class="left_col scroll-view">
5 <div class="navbar nav_title" style="border: 0;"> 5 <div class="navbar nav_title" style="border: 0;">
6 - <a href="index.html" class="site_title"><span>YOHO!活动管理</span></a> 6 + <a href="index.html" class="site_title"><i class="fa fa-paw"></i> <span>Gentelella Alela!</span></a>
7 </div> 7 </div>
8 8
9 <div class="clearfix"></div> 9 <div class="clearfix"></div>
@@ -11,12 +11,13 @@ @@ -11,12 +11,13 @@
11 <!-- menu profile quick info --> 11 <!-- menu profile quick info -->
12 <div class="profile clearfix"> 12 <div class="profile clearfix">
13 <div class="profile_pic"> 13 <div class="profile_pic">
14 - <img src="images/admin_avatar.png" alt="..." class="img-circle profile_img"> 14 + <img src="images/img.jpg" alt="..." class="img-circle profile_img">
15 </div> 15 </div>
16 <div class="profile_info"> 16 <div class="profile_info">
17 - <span>欢迎,</span>  
18 - <h2>Admin</h2> 17 + <span>Welcome,</span>
  18 + <h2>John Doe</h2>
19 </div> 19 </div>
  20 + <div class="clearfix"></div>
20 </div> 21 </div>
21 <!-- /menu profile quick info --> 22 <!-- /menu profile quick info -->
22 23
@@ -25,8 +26,16 @@ @@ -25,8 +26,16 @@
25 <!-- sidebar menu --> 26 <!-- sidebar menu -->
26 <div id="sidebar-menu" class="main_menu_side hidden-print main_menu"> 27 <div id="sidebar-menu" class="main_menu_side hidden-print main_menu">
27 <div class="menu_section"> 28 <div class="menu_section">
  29 + <h3>General</h3>
28 <ul class="nav side-menu"> 30 <ul class="nav side-menu">
29 - <li><a><i class="fa fa-edit"></i> 编辑 <span class="fa fa-chevron-down"></span></a> 31 + <li><a><i class="fa fa-home"></i> Home <span class="fa fa-chevron-down"></span></a>
  32 + <ul class="nav child_menu">
  33 + <li><a href="index.html">Dashboard</a></li>
  34 + <li><a href="index2.html">Dashboard2</a></li>
  35 + <li><a href="index3.html">Dashboard3</a></li>
  36 + </ul>
  37 + </li>
  38 + <li><a><i class="fa fa-edit"></i> Forms <span class="fa fa-chevron-down"></span></a>
30 <ul class="nav child_menu"> 39 <ul class="nav child_menu">
31 <li><a href="form.html">General Form</a></li> 40 <li><a href="form.html">General Form</a></li>
32 <li><a href="form_advanced.html">Advanced Components</a></li> 41 <li><a href="form_advanced.html">Advanced Components</a></li>
@@ -36,8 +45,85 @@ @@ -36,8 +45,85 @@
36 <li><a href="form_buttons.html">Form Buttons</a></li> 45 <li><a href="form_buttons.html">Form Buttons</a></li>
37 </ul> 46 </ul>
38 </li> 47 </li>
  48 + <li><a><i class="fa fa-desktop"></i> UI Elements <span class="fa fa-chevron-down"></span></a>
  49 + <ul class="nav child_menu">
  50 + <li><a href="general_elements.html">General Elements</a></li>
  51 + <li><a href="media_gallery.html">Media Gallery</a></li>
  52 + <li><a href="typography.html">Typography</a></li>
  53 + <li><a href="icons.html">Icons</a></li>
  54 + <li><a href="glyphicons.html">Glyphicons</a></li>
  55 + <li><a href="widgets.html">Widgets</a></li>
  56 + <li><a href="invoice.html">Invoice</a></li>
  57 + <li><a href="inbox.html">Inbox</a></li>
  58 + <li><a href="calendar.html">Calendar</a></li>
  59 + </ul>
  60 + </li>
  61 + <li><a><i class="fa fa-table"></i> Tables <span class="fa fa-chevron-down"></span></a>
  62 + <ul class="nav child_menu">
  63 + <li><a href="tables.html">Tables</a></li>
  64 + <li><a href="tables_dynamic.html">Table Dynamic</a></li>
  65 + </ul>
  66 + </li>
  67 + <li><a><i class="fa fa-bar-chart-o"></i> Data Presentation <span class="fa fa-chevron-down"></span></a>
  68 + <ul class="nav child_menu">
  69 + <li><a href="chartjs.html">Chart JS</a></li>
  70 + <li><a href="chartjs2.html">Chart JS2</a></li>
  71 + <li><a href="morisjs.html">Moris JS</a></li>
  72 + <li><a href="echarts.html">ECharts</a></li>
  73 + <li><a href="other_charts.html">Other Charts</a></li>
  74 + </ul>
  75 + </li>
  76 + <li><a><i class="fa fa-clone"></i>Layouts <span class="fa fa-chevron-down"></span></a>
  77 + <ul class="nav child_menu">
  78 + <li><a href="fixed_sidebar.html">Fixed Sidebar</a></li>
  79 + <li><a href="fixed_footer.html">Fixed Footer</a></li>
  80 + </ul>
  81 + </li>
  82 + </ul>
  83 + </div>
  84 + <div class="menu_section">
  85 + <h3>Live On</h3>
  86 + <ul class="nav side-menu">
  87 + <li><a><i class="fa fa-bug"></i> Additional Pages <span class="fa fa-chevron-down"></span></a>
  88 + <ul class="nav child_menu">
  89 + <li><a href="e_commerce.html">E-commerce</a></li>
  90 + <li><a href="projects.html">Projects</a></li>
  91 + <li><a href="project_detail.html">Project Detail</a></li>
  92 + <li><a href="contacts.html">Contacts</a></li>
  93 + <li><a href="profile.html">Profile</a></li>
  94 + </ul>
  95 + </li>
  96 + <li><a><i class="fa fa-windows"></i> Extras <span class="fa fa-chevron-down"></span></a>
  97 + <ul class="nav child_menu">
  98 + <li><a href="page_403.html">403 Error</a></li>
  99 + <li><a href="page_404.html">404 Error</a></li>
  100 + <li><a href="page_500.html">500 Error</a></li>
  101 + <li><a href="plain_page.html">Plain Page</a></li>
  102 + <li><a href="login.html">Login Page</a></li>
  103 + <li><a href="pricing_tables.html">Pricing Tables</a></li>
  104 + </ul>
  105 + </li>
  106 + <li><a><i class="fa fa-sitemap"></i> Multilevel Menu <span class="fa fa-chevron-down"></span></a>
  107 + <ul class="nav child_menu">
  108 + <li><a href="#level1_1">Level One</a>
  109 + <li><a>Level One<span class="fa fa-chevron-down"></span></a>
  110 + <ul class="nav child_menu">
  111 + <li class="sub_menu"><a href="level2.html">Level Two</a>
  112 + </li>
  113 + <li><a href="#level2_1">Level Two</a>
  114 + </li>
  115 + <li><a href="#level2_2">Level Two</a>
  116 + </li>
  117 + </ul>
  118 + </li>
  119 + <li><a href="#level1_2">Level One</a>
  120 + </li>
  121 + </ul>
  122 + </li>
  123 + <li><a href="javascript:void(0)"><i class="fa fa-laptop"></i> Landing Page <span class="label label-success pull-right">Coming Soon</span></a></li>
39 </ul> 124 </ul>
40 </div> 125 </div>
  126 +
41 </div> 127 </div>
42 <!-- /sidebar menu --> 128 <!-- /sidebar menu -->
43 129
@@ -71,12 +157,19 @@ @@ -71,12 +157,19 @@
71 <ul class="nav navbar-nav navbar-right"> 157 <ul class="nav navbar-nav navbar-right">
72 <li class=""> 158 <li class="">
73 <a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false"> 159 <a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
74 - <img src="images/admin_avatar.png" alt="">John Doe 160 + <img src="images/img.jpg" alt="">John Doe
75 <span class=" fa fa-angle-down"></span> 161 <span class=" fa fa-angle-down"></span>
76 </a> 162 </a>
77 <ul class="dropdown-menu dropdown-usermenu pull-right"> 163 <ul class="dropdown-menu dropdown-usermenu pull-right">
78 - <li><a><i class="fa fa-sign-out pull-right logout-btn"></i>退出  
79 - </a></li> 164 + <li><a href="javascript:;"> Profile</a></li>
  165 + <li>
  166 + <a href="javascript:;">
  167 + <span class="badge bg-red pull-right">50%</span>
  168 + <span>Settings</span>
  169 + </a>
  170 + </li>
  171 + <li><a href="javascript:;">Help</a></li>
  172 + <li><a href="login.html"><i class="fa fa-sign-out pull-right"></i> Log Out</a></li>
80 </ul> 173 </ul>
81 </li> 174 </li>
82 175
@@ -88,8 +181,7 @@ @@ -88,8 +181,7 @@
88 <ul id="menu1" class="dropdown-menu list-unstyled msg_list" role="menu"> 181 <ul id="menu1" class="dropdown-menu list-unstyled msg_list" role="menu">
89 <li> 182 <li>
90 <a> 183 <a>
91 - <span  
92 - class="image"><img src="images/admin_avatar.png" alt="Profile Image" /></span> 184 + <span class="image"><img src="images/img.jpg" alt="Profile Image" /></span>
93 <span> 185 <span>
94 <span>John Smith</span> 186 <span>John Smith</span>
95 <span class="time">3 mins ago</span> 187 <span class="time">3 mins ago</span>
@@ -101,8 +193,7 @@ @@ -101,8 +193,7 @@
101 </li> 193 </li>
102 <li> 194 <li>
103 <a> 195 <a>
104 - <span  
105 - class="image"><img src="images/admin_avatar.png" alt="Profile Image" /></span> 196 + <span class="image"><img src="images/img.jpg" alt="Profile Image" /></span>
106 <span> 197 <span>
107 <span>John Smith</span> 198 <span>John Smith</span>
108 <span class="time">3 mins ago</span> 199 <span class="time">3 mins ago</span>
@@ -114,8 +205,7 @@ @@ -114,8 +205,7 @@
114 </li> 205 </li>
115 <li> 206 <li>
116 <a> 207 <a>
117 - <span  
118 - class="image"><img src="images/admin_avatar.png" alt="Profile Image" /></span> 208 + <span class="image"><img src="images/img.jpg" alt="Profile Image" /></span>
119 <span> 209 <span>
120 <span>John Smith</span> 210 <span>John Smith</span>
121 <span class="time">3 mins ago</span> 211 <span class="time">3 mins ago</span>
@@ -127,8 +217,7 @@ @@ -127,8 +217,7 @@
127 </li> 217 </li>
128 <li> 218 <li>
129 <a> 219 <a>
130 - <span  
131 - class="image"><img src="images/admin_avatar.png" alt="Profile Image" /></span> 220 + <span class="image"><img src="images/img.jpg" alt="Profile Image" /></span>
132 <span> 221 <span>
133 <span>John Smith</span> 222 <span>John Smith</span>
134 <span class="time">3 mins ago</span> 223 <span class="time">3 mins ago</span>
@@ -156,692 +245,52 @@ @@ -156,692 +245,52 @@
156 245
157 <!-- page content --> 246 <!-- page content -->
158 <div class="right_col" role="main"> 247 <div class="right_col" role="main">
159 - <!-- top tiles -->  
160 - <div class="row tile_count">  
161 - <div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">  
162 - <span class="count_top"><i class="fa fa-user"></i> Total Users</span>  
163 - <div class="count">2500</div>  
164 - <span class="count_bottom"><i class="green">4% </i> From last Week</span>  
165 - </div>  
166 - <div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">  
167 - <span class="count_top"><i class="fa fa-clock-o"></i> Average Time</span>  
168 - <div class="count">123.50</div>  
169 - <span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>3% </i> From last Week</span>  
170 - </div>  
171 - <div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">  
172 - <span class="count_top"><i class="fa fa-user"></i> Total Males</span>  
173 - <div class="count green">2,500</div>  
174 - <span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>34% </i> From last Week</span>  
175 - </div>  
176 - <div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">  
177 - <span class="count_top"><i class="fa fa-user"></i> Total Females</span>  
178 - <div class="count">4,567</div>  
179 - <span class="count_bottom"><i class="red"><i class="fa fa-sort-desc"></i>12% </i> From last Week</span>  
180 - </div>  
181 - <div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">  
182 - <span class="count_top"><i class="fa fa-user"></i> Total Collections</span>  
183 - <div class="count">2,315</div>  
184 - <span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>34% </i> From last Week</span>  
185 - </div>  
186 - <div class="col-md-2 col-sm-4 col-xs-6 tile_stats_count">  
187 - <span class="count_top"><i class="fa fa-user"></i> Total Connections</span>  
188 - <div class="count">7,325</div>  
189 - <span class="count_bottom"><i class="green"><i class="fa fa-sort-asc"></i>34% </i> From last Week</span>  
190 - </div>  
191 - </div>  
192 - <!-- /top tiles -->  
193 -  
194 - <div class="row">  
195 - <div class="col-md-12 col-sm-12 col-xs-12">  
196 - <div class="dashboard_graph">  
197 -  
198 - <div class="row x_title">  
199 - <div class="col-md-6">  
200 - <h3>Network Activities <small>Graph title sub-title</small></h3>  
201 - </div>  
202 - <div class="col-md-6">  
203 - <div id="reportrange" class="pull-right" style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc">  
204 - <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>  
205 - <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>  
206 - </div>  
207 - </div>  
208 - </div>  
209 -  
210 - <div class="col-md-9 col-sm-9 col-xs-12">  
211 - <div id="chart_plot_01" class="demo-placeholder"></div>  
212 - </div>  
213 - <div class="col-md-3 col-sm-3 col-xs-12 bg-white">  
214 - <div class="x_title">  
215 - <h2>Top Campaign Performance</h2>  
216 - <div class="clearfix"></div>  
217 - </div>  
218 -  
219 - <div class="col-md-12 col-sm-12 col-xs-6">  
220 - <div>  
221 - <p>Facebook Campaign</p>  
222 - <div class="">  
223 - <div class="progress progress_sm" style="width: 76%;">  
224 - <div class="progress-bar bg-green" role="progressbar" data-transitiongoal="80"></div>  
225 - </div>  
226 - </div>  
227 - </div>  
228 - <div>  
229 - <p>Twitter Campaign</p>  
230 - <div class="">  
231 - <div class="progress progress_sm" style="width: 76%;">  
232 - <div class="progress-bar bg-green" role="progressbar" data-transitiongoal="60"></div>  
233 - </div>  
234 - </div>  
235 - </div>  
236 - </div>  
237 - <div class="col-md-12 col-sm-12 col-xs-6">  
238 - <div>  
239 - <p>Conventional Media</p>  
240 - <div class="">  
241 - <div class="progress progress_sm" style="width: 76%;">  
242 - <div class="progress-bar bg-green" role="progressbar" data-transitiongoal="40"></div>  
243 - </div>  
244 - </div>  
245 - </div>  
246 - <div>  
247 - <p>Bill boards</p>  
248 - <div class="">  
249 - <div class="progress progress_sm" style="width: 76%;">  
250 - <div class="progress-bar bg-green" role="progressbar" data-transitiongoal="50"></div>  
251 - </div>  
252 - </div>  
253 - </div>  
254 - </div>  
255 -  
256 - </div>  
257 -  
258 - <div class="clearfix"></div>  
259 - </div>  
260 - </div>  
261 -  
262 - </div>  
263 - <br />  
264 -  
265 - <div class="row">  
266 -  
267 -  
268 - <div class="col-md-4 col-sm-4 col-xs-12">  
269 - <div class="x_panel tile fixed_height_320">  
270 - <div class="x_title">  
271 - <h2>App Versions</h2>  
272 - <ul class="nav navbar-right panel_toolbox">  
273 - <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>  
274 - </li>  
275 - <li class="dropdown">  
276 - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>  
277 - <ul class="dropdown-menu" role="menu">  
278 - <li><a href="#">Settings 1</a>  
279 - </li>  
280 - <li><a href="#">Settings 2</a>  
281 - </li>  
282 - </ul>  
283 - </li>  
284 - <li><a class="close-link"><i class="fa fa-close"></i></a>  
285 - </li>  
286 - </ul>  
287 - <div class="clearfix"></div>  
288 - </div>  
289 - <div class="x_content">  
290 - <h4>App Usage across versions</h4>  
291 - <div class="widget_summary">  
292 - <div class="w_left w_25">  
293 - <span>0.1.5.2</span>  
294 - </div>  
295 - <div class="w_center w_55">  
296 - <div class="progress">  
297 - <div class="progress-bar bg-green" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 66%;">  
298 - <span class="sr-only">60% Complete</span>  
299 - </div>  
300 - </div>  
301 - </div>  
302 - <div class="w_right w_20">  
303 - <span>123k</span>  
304 - </div>  
305 - <div class="clearfix"></div>  
306 - </div>  
307 -  
308 - <div class="widget_summary">  
309 - <div class="w_left w_25">  
310 - <span>0.1.5.3</span>  
311 - </div>  
312 - <div class="w_center w_55">  
313 - <div class="progress">  
314 - <div class="progress-bar bg-green" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 45%;">  
315 - <span class="sr-only">60% Complete</span>  
316 - </div>  
317 - </div>  
318 - </div>  
319 - <div class="w_right w_20">  
320 - <span>53k</span>  
321 - </div>  
322 - <div class="clearfix"></div>  
323 - </div>  
324 - <div class="widget_summary">  
325 - <div class="w_left w_25">  
326 - <span>0.1.5.4</span>  
327 - </div>  
328 - <div class="w_center w_55">  
329 - <div class="progress">  
330 - <div class="progress-bar bg-green" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 25%;">  
331 - <span class="sr-only">60% Complete</span>  
332 - </div>  
333 - </div>  
334 - </div>  
335 - <div class="w_right w_20">  
336 - <span>23k</span>  
337 - </div>  
338 - <div class="clearfix"></div>  
339 - </div>  
340 - <div class="widget_summary">  
341 - <div class="w_left w_25">  
342 - <span>0.1.5.5</span>  
343 - </div>  
344 - <div class="w_center w_55">  
345 - <div class="progress">  
346 - <div class="progress-bar bg-green" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 5%;">  
347 - <span class="sr-only">60% Complete</span>  
348 - </div>  
349 - </div>  
350 - </div>  
351 - <div class="w_right w_20">  
352 - <span>3k</span>  
353 - </div>  
354 - <div class="clearfix"></div>  
355 - </div>  
356 - <div class="widget_summary">  
357 - <div class="w_left w_25">  
358 - <span>0.1.5.6</span>  
359 - </div>  
360 - <div class="w_center w_55">  
361 - <div class="progress">  
362 - <div class="progress-bar bg-green" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: 2%;">  
363 - <span class="sr-only">60% Complete</span>  
364 - </div>  
365 - </div>  
366 - </div>  
367 - <div class="w_right w_20">  
368 - <span>1k</span>  
369 - </div>  
370 - <div class="clearfix"></div>  
371 - </div>  
372 -  
373 - </div>  
374 - </div>  
375 - </div>  
376 -  
377 - <div class="col-md-4 col-sm-4 col-xs-12">  
378 - <div class="x_panel tile fixed_height_320 overflow_hidden">  
379 - <div class="x_title">  
380 - <h2>Device Usage</h2>  
381 - <ul class="nav navbar-right panel_toolbox">  
382 - <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>  
383 - </li>  
384 - <li class="dropdown">  
385 - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>  
386 - <ul class="dropdown-menu" role="menu">  
387 - <li><a href="#">Settings 1</a>  
388 - </li>  
389 - <li><a href="#">Settings 2</a>  
390 - </li>  
391 - </ul>  
392 - </li>  
393 - <li><a class="close-link"><i class="fa fa-close"></i></a>  
394 - </li>  
395 - </ul>  
396 - <div class="clearfix"></div>  
397 - </div>  
398 - <div class="x_content">  
399 - <table class="" style="width:100%">  
400 - <tr>  
401 - <th style="width:37%;">  
402 - <p>Top 5</p>  
403 - </th>  
404 - <th>  
405 - <div class="col-lg-7 col-md-7 col-sm-7 col-xs-7">  
406 - <p class="">Device</p>  
407 - </div>  
408 - <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5">  
409 - <p class="">Progress</p>  
410 - </div>  
411 - </th>  
412 - </tr>  
413 - <tr>  
414 - <td>  
415 - <canvas class="canvasDoughnut" height="140" width="140" style="margin: 15px 10px 10px 0"></canvas>  
416 - </td>  
417 - <td>  
418 - <table class="tile_info">  
419 - <tr>  
420 - <td>  
421 - <p><i class="fa fa-square blue"></i>IOS </p>  
422 - </td>  
423 - <td>30%</td>  
424 - </tr>  
425 - <tr>  
426 - <td>  
427 - <p><i class="fa fa-square green"></i>Android </p>  
428 - </td>  
429 - <td>10%</td>  
430 - </tr>  
431 - <tr>  
432 - <td>  
433 - <p><i class="fa fa-square purple"></i>Blackberry </p>  
434 - </td>  
435 - <td>20%</td>  
436 - </tr>  
437 - <tr>  
438 - <td>  
439 - <p><i class="fa fa-square aero"></i>Symbian </p>  
440 - </td>  
441 - <td>15%</td>  
442 - </tr>  
443 - <tr>  
444 - <td>  
445 - <p><i class="fa fa-square red"></i>Others </p>  
446 - </td>  
447 - <td>30%</td>  
448 - </tr>  
449 - </table>  
450 - </td>  
451 - </tr>  
452 - </table>  
453 - </div> 248 + <div class="">
  249 + <div class="page-title">
  250 + <div class="title_left">
  251 + <h3>Plain Page</h3>
454 </div> 252 </div>
455 - </div>  
456 -  
457 -  
458 - <div class="col-md-4 col-sm-4 col-xs-12">  
459 - <div class="x_panel tile fixed_height_320">  
460 - <div class="x_title">  
461 - <h2>Quick Settings</h2>  
462 - <ul class="nav navbar-right panel_toolbox">  
463 - <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>  
464 - </li>  
465 - <li class="dropdown">  
466 - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>  
467 - <ul class="dropdown-menu" role="menu">  
468 - <li><a href="#">Settings 1</a>  
469 - </li>  
470 - <li><a href="#">Settings 2</a>  
471 - </li>  
472 - </ul>  
473 - </li>  
474 - <li><a class="close-link"><i class="fa fa-close"></i></a>  
475 - </li>  
476 - </ul>  
477 - <div class="clearfix"></div>  
478 - </div>  
479 - <div class="x_content">  
480 - <div class="dashboard-widget-content">  
481 - <ul class="quick-list">  
482 - <li><i class="fa fa-calendar-o"></i><a href="#">Settings</a>  
483 - </li>  
484 - <li><i class="fa fa-bars"></i><a href="#">Subscription</a>  
485 - </li>  
486 - <li><i class="fa fa-bar-chart"></i><a href="#">Auto Renewal</a> </li>  
487 - <li><i class="fa fa-line-chart"></i><a href="#">Achievements</a>  
488 - </li>  
489 - <li><i class="fa fa-bar-chart"></i><a href="#">Auto Renewal</a> </li>  
490 - <li><i class="fa fa-line-chart"></i><a href="#">Achievements</a>  
491 - </li>  
492 - <li><i class="fa fa-area-chart"></i><a href="#">Logout</a>  
493 - </li>  
494 - </ul>  
495 253
496 - <div class="sidebar-widget">  
497 - <h4>Profile Completion</h4>  
498 - <canvas width="150" height="80" id="chart_gauge_01" class="" style="width: 160px; height: 100px;"></canvas>  
499 - <div class="goal-wrapper">  
500 - <span id="gauge-text" class="gauge-value pull-left">0</span>  
501 - <span class="gauge-value pull-left">%</span>  
502 - <span id="goal-text" class="goal-value pull-right">100%</span>  
503 - </div>  
504 - </div> 254 + <div class="title_right">
  255 + <div class="col-md-5 col-sm-5 col-xs-12 form-group pull-right top_search">
  256 + <div class="input-group">
  257 + <input type="text" class="form-control" placeholder="Search for...">
  258 + <span class="input-group-btn">
  259 + <button class="btn btn-default" type="button">Go!</button>
  260 + </span>
505 </div> 261 </div>
506 </div> 262 </div>
507 </div> 263 </div>
508 </div> 264 </div>
509 265
510 - </div>  
511 -  
512 -  
513 - <div class="row">  
514 - <div class="col-md-4 col-sm-4 col-xs-12">  
515 - <div class="x_panel">  
516 - <div class="x_title">  
517 - <h2>Recent Activities <small>Sessions</small></h2>  
518 - <ul class="nav navbar-right panel_toolbox">  
519 - <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>  
520 - </li>  
521 - <li class="dropdown">  
522 - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>  
523 - <ul class="dropdown-menu" role="menu">  
524 - <li><a href="#">Settings 1</a>  
525 - </li>  
526 - <li><a href="#">Settings 2</a>  
527 - </li>  
528 - </ul>  
529 - </li>  
530 - <li><a class="close-link"><i class="fa fa-close"></i></a>  
531 - </li>  
532 - </ul>  
533 - <div class="clearfix"></div>  
534 - </div>  
535 - <div class="x_content">  
536 - <div class="dashboard-widget-content"> 266 + <div class="clearfix"></div>
537 267
538 - <ul class="list-unstyled timeline widget">  
539 - <li>  
540 - <div class="block">  
541 - <div class="block_content">  
542 - <h2 class="title">  
543 - <a>Who Needs Sundance When You’ve Got&nbsp;Crowdfunding?</a>  
544 - </h2>  
545 - <div class="byline">  
546 - <span>13 hours ago</span> by <a>Jane Smith</a>  
547 - </div>  
548 - <p class="excerpt">Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that could fund your project, and if the buyers liked your flick, they’d pay to Fast-forward and… <a>Read&nbsp;More</a>  
549 - </p>  
550 - </div>  
551 - </div>  
552 - </li>  
553 - <li>  
554 - <div class="block">  
555 - <div class="block_content">  
556 - <h2 class="title">  
557 - <a>Who Needs Sundance When You’ve Got&nbsp;Crowdfunding?</a>  
558 - </h2>  
559 - <div class="byline">  
560 - <span>13 hours ago</span> by <a>Jane Smith</a>  
561 - </div>  
562 - <p class="excerpt">Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that could fund your project, and if the buyers liked your flick, they’d pay to Fast-forward and… <a>Read&nbsp;More</a>  
563 - </p>  
564 - </div>  
565 - </div>  
566 - </li>  
567 - <li>  
568 - <div class="block">  
569 - <div class="block_content">  
570 - <h2 class="title">  
571 - <a>Who Needs Sundance When You’ve Got&nbsp;Crowdfunding?</a>  
572 - </h2>  
573 - <div class="byline">  
574 - <span>13 hours ago</span> by <a>Jane Smith</a>  
575 - </div>  
576 - <p class="excerpt">Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that could fund your project, and if the buyers liked your flick, they’d pay to Fast-forward and… <a>Read&nbsp;More</a>  
577 - </p>  
578 - </div>  
579 - </div>  
580 - </li>  
581 - <li>  
582 - <div class="block">  
583 - <div class="block_content">  
584 - <h2 class="title">  
585 - <a>Who Needs Sundance When You’ve Got&nbsp;Crowdfunding?</a>  
586 - </h2>  
587 - <div class="byline">  
588 - <span>13 hours ago</span> by <a>Jane Smith</a>  
589 - </div>  
590 - <p class="excerpt">Film festivals used to be do-or-die moments for movie makers. They were where you met the producers that could fund your project, and if the buyers liked your flick, they’d pay to Fast-forward and… <a>Read&nbsp;More</a>  
591 - </p>  
592 - </div>  
593 - </div> 268 + <div class="row">
  269 + <div class="col-md-12 col-sm-12 col-xs-12">
  270 + <div class="x_panel">
  271 + <div class="x_title">
  272 + <h2>Plain Page</h2>
  273 + <ul class="nav navbar-right panel_toolbox">
  274 + <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
594 </li> 275 </li>
595 - </ul>  
596 - </div>  
597 - </div>  
598 - </div>  
599 - </div>  
600 -  
601 -  
602 - <div class="col-md-8 col-sm-8 col-xs-12">  
603 -  
604 -  
605 -  
606 - <div class="row">  
607 -  
608 - <div class="col-md-12 col-sm-12 col-xs-12">  
609 - <div class="x_panel">  
610 - <div class="x_title">  
611 - <h2>Visitors location <small>geo-presentation</small></h2>  
612 - <ul class="nav navbar-right panel_toolbox">  
613 - <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>  
614 - </li>  
615 - <li class="dropdown">  
616 - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>  
617 - <ul class="dropdown-menu" role="menu">  
618 - <li><a href="#">Settings 1</a>  
619 - </li>  
620 - <li><a href="#">Settings 2</a>  
621 - </li>  
622 - </ul>  
623 - </li>  
624 - <li><a class="close-link"><i class="fa fa-close"></i></a>  
625 - </li>  
626 - </ul>  
627 - <div class="clearfix"></div>  
628 - </div>  
629 - <div class="x_content">  
630 - <div class="dashboard-widget-content">  
631 - <div class="col-md-4 hidden-small">  
632 - <h2 class="line_30">125.7k Views from 60 countries</h2>  
633 -  
634 - <table class="countries_list">  
635 - <tbody>  
636 - <tr>  
637 - <td>United States</td>  
638 - <td class="fs15 fw700 text-right">33%</td>  
639 - </tr>  
640 - <tr>  
641 - <td>France</td>  
642 - <td class="fs15 fw700 text-right">27%</td>  
643 - </tr>  
644 - <tr>  
645 - <td>Germany</td>  
646 - <td class="fs15 fw700 text-right">16%</td>  
647 - </tr>  
648 - <tr>  
649 - <td>Spain</td>  
650 - <td class="fs15 fw700 text-right">11%</td>  
651 - </tr>  
652 - <tr>  
653 - <td>Britain</td>  
654 - <td class="fs15 fw700 text-right">10%</td>  
655 - </tr>  
656 - </tbody>  
657 - </table>  
658 - </div>  
659 - <div id="world-map-gdp" class="col-md-8 col-sm-12 col-xs-12" style="height:230px;"></div>  
660 - </div>  
661 - </div>  
662 - </div>  
663 - </div>  
664 -  
665 - </div>  
666 - <div class="row">  
667 -  
668 -  
669 - <!-- Start to do list -->  
670 - <div class="col-md-6 col-sm-6 col-xs-12">  
671 - <div class="x_panel">  
672 - <div class="x_title">  
673 - <h2>To Do List <small>Sample tasks</small></h2>  
674 - <ul class="nav navbar-right panel_toolbox">  
675 - <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>  
676 - </li>  
677 - <li class="dropdown">  
678 - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>  
679 - <ul class="dropdown-menu" role="menu">  
680 - <li><a href="#">Settings 1</a>  
681 - </li>  
682 - <li><a href="#">Settings 2</a>  
683 - </li>  
684 - </ul>  
685 - </li>  
686 - <li><a class="close-link"><i class="fa fa-close"></i></a>  
687 - </li>  
688 - </ul>  
689 - <div class="clearfix"></div>  
690 - </div>  
691 - <div class="x_content">  
692 -  
693 - <div class="">  
694 - <ul class="to_do">  
695 - <li>  
696 - <p>  
697 - <input type="checkbox" class="flat"> Schedule meeting with new client </p>  
698 - </li>  
699 - <li>  
700 - <p>  
701 - <input type="checkbox" class="flat"> Create email address for new intern</p> 276 + <li class="dropdown">
  277 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
  278 + <ul class="dropdown-menu" role="menu">
  279 + <li><a href="#">Settings 1</a>
702 </li> 280 </li>
703 - <li>  
704 - <p>  
705 - <input type="checkbox" class="flat"> Have IT fix the network printer</p>  
706 - </li>  
707 - <li>  
708 - <p>  
709 - <input type="checkbox" class="flat"> Copy backups to offsite location</p>  
710 - </li>  
711 - <li>  
712 - <p>  
713 - <input type="checkbox" class="flat"> Food truck fixie locavors mcsweeney</p>  
714 - </li>  
715 - <li>  
716 - <p>  
717 - <input type="checkbox" class="flat"> Food truck fixie locavors mcsweeney</p>  
718 - </li>  
719 - <li>  
720 - <p>  
721 - <input type="checkbox" class="flat"> Create email address for new intern</p>  
722 - </li>  
723 - <li>  
724 - <p>  
725 - <input type="checkbox" class="flat"> Have IT fix the network printer</p>  
726 - </li>  
727 - <li>  
728 - <p>  
729 - <input type="checkbox" class="flat"> Copy backups to offsite location</p> 281 + <li><a href="#">Settings 2</a>
730 </li> 282 </li>
731 </ul> 283 </ul>
732 - </div>  
733 - </div> 284 + </li>
  285 + <li><a class="close-link"><i class="fa fa-close"></i></a>
  286 + </li>
  287 + </ul>
  288 + <div class="clearfix"></div>
734 </div> 289 </div>
735 - </div>  
736 - <!-- End to do list -->  
737 -  
738 - <!-- start of weather widget -->  
739 - <div class="col-md-6 col-sm-6 col-xs-12">  
740 - <div class="x_panel">  
741 - <div class="x_title">  
742 - <h2>Daily active users <small>Sessions</small></h2>  
743 - <ul class="nav navbar-right panel_toolbox">  
744 - <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>  
745 - </li>  
746 - <li class="dropdown">  
747 - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>  
748 - <ul class="dropdown-menu" role="menu">  
749 - <li><a href="#">Settings 1</a>  
750 - </li>  
751 - <li><a href="#">Settings 2</a>  
752 - </li>  
753 - </ul>  
754 - </li>  
755 - <li><a class="close-link"><i class="fa fa-close"></i></a>  
756 - </li>  
757 - </ul>  
758 - <div class="clearfix"></div>  
759 - </div>  
760 - <div class="x_content">  
761 - <div class="row">  
762 - <div class="col-sm-12">  
763 - <div class="temperature"><b>Monday</b>, 07:30 AM  
764 - <span>F</span>  
765 - <span><b>C</b></span>  
766 - </div>  
767 - </div>  
768 - </div>  
769 - <div class="row">  
770 - <div class="col-sm-4">  
771 - <div class="weather-icon">  
772 - <canvas height="84" width="84" id="partly-cloudy-day"></canvas>  
773 - </div>  
774 - </div>  
775 - <div class="col-sm-8">  
776 - <div class="weather-text">  
777 - <h2>Texas <br><i>Partly Cloudy Day</i></h2>  
778 - </div>  
779 - </div>  
780 - </div>  
781 - <div class="col-sm-12">  
782 - <div class="weather-text pull-right">  
783 - <h3 class="degrees">23</h3>  
784 - </div>  
785 - </div>  
786 -  
787 - <div class="clearfix"></div>  
788 -  
789 - <div class="row weather-days">  
790 - <div class="col-sm-2">  
791 - <div class="daily-weather">  
792 - <h2 class="day">Mon</h2>  
793 - <h3 class="degrees">25</h3>  
794 - <canvas id="clear-day" width="32" height="32"></canvas>  
795 - <h5>15 <i>km/h</i></h5>  
796 - </div>  
797 - </div>  
798 - <div class="col-sm-2">  
799 - <div class="daily-weather">  
800 - <h2 class="day">Tue</h2>  
801 - <h3 class="degrees">25</h3>  
802 - <canvas height="32" width="32" id="rain"></canvas>  
803 - <h5>12 <i>km/h</i></h5>  
804 - </div>  
805 - </div>  
806 - <div class="col-sm-2">  
807 - <div class="daily-weather">  
808 - <h2 class="day">Wed</h2>  
809 - <h3 class="degrees">27</h3>  
810 - <canvas height="32" width="32" id="snow"></canvas>  
811 - <h5>14 <i>km/h</i></h5>  
812 - </div>  
813 - </div>  
814 - <div class="col-sm-2">  
815 - <div class="daily-weather">  
816 - <h2 class="day">Thu</h2>  
817 - <h3 class="degrees">28</h3>  
818 - <canvas height="32" width="32" id="sleet"></canvas>  
819 - <h5>15 <i>km/h</i></h5>  
820 - </div>  
821 - </div>  
822 - <div class="col-sm-2">  
823 - <div class="daily-weather">  
824 - <h2 class="day">Fri</h2>  
825 - <h3 class="degrees">28</h3>  
826 - <canvas height="32" width="32" id="wind"></canvas>  
827 - <h5>11 <i>km/h</i></h5>  
828 - </div>  
829 - </div>  
830 - <div class="col-sm-2">  
831 - <div class="daily-weather">  
832 - <h2 class="day">Sat</h2>  
833 - <h3 class="degrees">26</h3>  
834 - <canvas height="32" width="32" id="cloudy"></canvas>  
835 - <h5>10 <i>km/h</i></h5>  
836 - </div>  
837 - </div>  
838 - <div class="clearfix"></div>  
839 - </div>  
840 - </div> 290 + <div class="x_content">
  291 + Add content to the page ...
841 </div> 292 </div>
842 -  
843 </div> 293 </div>
844 - <!-- end of weather widget -->  
845 </div> 294 </div>
846 </div> 295 </div>
847 </div> 296 </div>
@@ -851,7 +300,7 @@ @@ -851,7 +300,7 @@
851 <!-- footer content --> 300 <!-- footer content -->
852 <footer> 301 <footer>
853 <div class="pull-right"> 302 <div class="pull-right">
854 - Copyright © 2017-2020 YOHO集团 All rights reserved 303 + Gentelella - Bootstrap Admin Template by <a href="https://colorlib.com">Colorlib</a>
855 </div> 304 </div>
856 <div class="clearfix"></div> 305 <div class="clearfix"></div>
857 </footer> 306 </footer>
@@ -859,4 +308,3 @@ @@ -859,4 +308,3 @@
859 </div> 308 </div>
860 </div> 309 </div>
861 310
862 -  
@@ -5,24 +5,67 @@ @@ -5,24 +5,67 @@
5 <div class="animate form login_form"> 5 <div class="animate form login_form">
6 <section class="login_content"> 6 <section class="login_content">
7 <form> 7 <form>
8 - <h1>YOHO!活动平台</h1> 8 + <h1>Login Form</h1>
9 <div> 9 <div>
10 - <input type="text" class="form-control" placeholder="用户名" required=""/>  
11 - <img src="{{imgSrc 'img/404.png'}}" alt="" /> 10 + <input type="text" class="form-control" placeholder="Username" required="" />
12 </div> 11 </div>
13 <div> 12 <div>
14 - <input type="password" class="form-control" placeholder="密码" required=""/> 13 + <input type="password" class="form-control" placeholder="Password" required="" />
15 </div> 14 </div>
16 <div> 15 <div>
17 - <a class="btn btn-default login-btn">登录</a> 16 + <a class="btn btn-default submit" href="index.html">Log in</a>
  17 + <a class="reset_pass" href="#">Lost your password?</a>
18 </div> 18 </div>
  19 +
19 <div class="clearfix"></div> 20 <div class="clearfix"></div>
  21 +
20 <div class="separator"> 22 <div class="separator">
  23 + <p class="change_link">New to site?
  24 + <a href="#signup" class="to_register"> Create Account </a>
  25 + </p>
  26 +
  27 + <div class="clearfix"></div>
  28 + <br />
  29 +
  30 + <div>
  31 + <h1><i class="fa fa-paw"></i> Gentelella Alela!</h1>
  32 + <p>©2016 All Rights Reserved. Gentelella Alela! is a Bootstrap 3 template. Privacy and Terms</p>
  33 + </div>
  34 + </div>
  35 + </form>
  36 + </section>
  37 + </div>
  38 +
  39 + <div id="register" class="animate form registration_form">
  40 + <section class="login_content">
  41 + <form>
  42 + <h1>Create Account</h1>
  43 + <div>
  44 + <input type="text" class="form-control" placeholder="Username" required="" />
  45 + </div>
  46 + <div>
  47 + <input type="email" class="form-control" placeholder="Email" required="" />
  48 + </div>
  49 + <div>
  50 + <input type="password" class="form-control" placeholder="Password" required="" />
  51 + </div>
  52 + <div>
  53 + <a class="btn btn-default submit" href="index.html">Submit</a>
  54 + </div>
  55 +
  56 + <div class="clearfix"></div>
  57 +
  58 + <div class="separator">
  59 + <p class="change_link">Already a member ?
  60 + <a href="#signin" class="to_register"> Log in </a>
  61 + </p>
  62 +
21 <div class="clearfix"></div> 63 <div class="clearfix"></div>
22 - <br/> 64 + <br />
23 65
24 <div> 66 <div>
25 - <p>Copyright &copy; 2017-2020 YOHO集团 All rights reserved</p> 67 + <h1><i class="fa fa-paw"></i> Gentelella Alela!</h1>
  68 + <p>©2016 All Rights Reserved. Gentelella Alela! is a Bootstrap 3 template. Privacy and Terms</p>
26 </div> 69 </div>
27 </div> 70 </div>
28 </form> 71 </form>
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 */ 5 */
6 const express = require('express'); 6 const express = require('express');
7 const router = express.Router(); // eslint-disable-line 7 const router = express.Router(); // eslint-disable-line
8 -const auth = require('../../middleware/auth'); 8 +const auth = require('../../doraemon/middleware/auth');
9 const article = require('./controllers/article'); 9 const article = require('./controllers/article');
10 10
11 router.post('/like', article.like); 11 router.post('/like', article.like);
@@ -90,13 +90,21 @@ exports.postcssPlugin = (et) => { @@ -90,13 +90,21 @@ exports.postcssPlugin = (et) => {
90 90
91 plugins = [ 91 plugins = [
92 postImport({ 92 postImport({
93 - path: [path.join(__dirname, '../public/scss')], 93 + path: [
  94 + path.join(__dirname, '../public/scss'),
  95 + path.join(__dirname, '../node_modules')
  96 + ],
94 resolve(id) { 97 resolve(id) {
  98 + if (/^~/.test(id)) {
  99 + return id.substr(1);
  100 + }
  101 +
95 let name = path.basename(id); 102 let name = path.basename(id);
96 103
97 if (!/^_/.test(name)) { 104 if (!/^_/.test(name)) {
98 id = path.dirname(id) + '/_' + name; 105 id = path.dirname(id) + '/_' + name;
99 } 106 }
  107 +
100 return id; 108 return id;
101 } 109 }
102 }), 110 }),
@@ -104,13 +112,6 @@ exports.postcssPlugin = (et) => { @@ -104,13 +112,6 @@ exports.postcssPlugin = (et) => {
104 postSprites(sprites), 112 postSprites(sprites),
105 postAssets(assets), 113 postAssets(assets),
106 postCalc(), 114 postCalc(),
107 - postPxtorem({  
108 - rootValue: 40,  
109 - unitPrecision: 5, // 保留5位小数字  
110 - minPixelValue: 2, // 小于 2 时，不转换  
111 - selectorBlackList: [], // 选择器黑名单，可以使用正则  
112 - propWhiteList: [] // 属性名称为空，表示替换所有属性的值  
113 - }),  
114 autoprefixer({ 115 autoprefixer({
115 browsers: ['> 1%', 'android >=4', 'ios >=8'] 116 browsers: ['> 1%', 'android >=4', 'ios >=8']
116 }), 117 }),
@@ -11,10 +11,14 @@ module.exports = (req, res, next) => { @@ -11,10 +11,14 @@ module.exports = (req, res, next) => {
11 const isAdmin = _.get(req.session, 'user.isAdmin', false); 11 const isAdmin = _.get(req.session, 'user.isAdmin', false);
12 12
13 if (!isAdmin) { 13 if (!isAdmin) {
14 - return res.json({  
15 - code: 401,  
16 - message: '抱歉，您没有管理员权限，请使用管理员账号登陆后重试'  
17 - }); 14 + if (req.xhr) {
  15 + return res.json({
  16 + code: 401,
  17 + message: '抱歉，您没有管理员权限，请使用管理员账号登陆后重试'
  18 + });
  19 + }
  20 +
  21 + return res.render('error/404');
18 } 22 }
19 23
20 next(); 24 next();
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 }, 31 },
32 "license": "MIT", 32 "license": "MIT",
33 "dependencies": { 33 "dependencies": {
  34 + "animate.css": "^3.5.2",
34 "bluebird": "^3.4.7", 35 "bluebird": "^3.4.7",
35 "body-parser": "^1.17.2", 36 "body-parser": "^1.17.2",
36 "camelcase": "^4.1.0", 37 "camelcase": "^4.1.0",
@@ -80,12 +81,15 @@ @@ -80,12 +81,15 @@
80 "babel-preset-env": "^1.2.1", 81 "babel-preset-env": "^1.2.1",
81 "babel-preset-es2015": "^6.24.1", 82 "babel-preset-es2015": "^6.24.1",
82 "babel-register": "^6.22.0", 83 "babel-register": "^6.22.0",
  84 + "bootstrap": "^3.3.7",
83 "css-loader": "^0.28.4", 85 "css-loader": "^0.28.4",
84 "eslint": "^3.19.0", 86 "eslint": "^3.19.0",
85 "eslint-config-yoho": "^1.0.1", 87 "eslint-config-yoho": "^1.0.1",
86 "eslint-loader": "^1.7.1", 88 "eslint-loader": "^1.7.1",
87 "eslint-plugin-html": "^2.0.3", 89 "eslint-plugin-html": "^2.0.3",
88 "extract-text-webpack-plugin": "^2.1.0", 90 "extract-text-webpack-plugin": "^2.1.0",
  91 + "font-awesome": "^4.7.0",
  92 + "gentelella": "^1.3.0",
89 "gulp": "^3.9.1", 93 "gulp": "^3.9.1",
90 "gulp-autoprefixer": "^3.1.0", 94 "gulp-autoprefixer": "^3.1.0",
91 "gulp-concat": "^2.6.0", 95 "gulp-concat": "^2.6.0",
@@ -99,6 +103,7 @@ @@ -99,6 +103,7 @@
99 "install": "^0.10.1", 103 "install": "^0.10.1",
100 "nodemon": "^1.11.0", 104 "nodemon": "^1.11.0",
101 "npm": "^5.0.4", 105 "npm": "^5.0.4",
  106 + "nprogress": "^0.2.0",
102 "optimist": "^0.6.1", 107 "optimist": "^0.6.1",
103 "postcss-assets": "^4.0.1", 108 "postcss-assets": "^4.0.1",
104 "postcss-calc": "^6.0.0", 109 "postcss-calc": "^6.0.0",
1 -require('admin/login.page.css');  
2 -  
3 -let $ = require('yoho-jquery');  
4 -  
5 -let a = () => {  
6 - console.log($);  
7 -};  
8 -  
9 -a();  
10 -  
11 1
This diff could not be displayed because it is too large.
1 -@import './login/login';  
  1 +@import 'login/login';
1 -h1 {  
2 - background-color: red;  
3 -}