mirror of
https://github.com/taobataoma/meanTorrent.git
synced 2026-03-06 20:21:01 +01:00
Merge pull request #236 from fyockm/master
use consolidate to make template engine configurable
This commit is contained in:
Lior Kesos
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,6 +1,8 @@
|
||||
.DS_Store
|
||||
.nodemonignore
|
||||
.sass-cache/
|
||||
.bower-*/
|
||||
.idea/
|
||||
node_modules/
|
||||
public/lib
|
||||
test/coverage/
|
||||
|
||||
17
app/views/404.html
Normal file
17
app/views/404.html
Normal file
@@ -0,0 +1,17 @@
|
||||
{% extends 'layouts/default.html' %}
|
||||
|
||||
{% block main %}
|
||||
<h1>Oops something went wrong</h1>
|
||||
<br>
|
||||
<span>404</span>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div id="error-message-box">
|
||||
<div id="error-stack-trace">
|
||||
<pre>
|
||||
<code>{{error}}</code>
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -1,13 +0,0 @@
|
||||
extends layouts/default
|
||||
|
||||
block main
|
||||
h1 Oops something went wrong
|
||||
br
|
||||
span 404
|
||||
|
||||
block content
|
||||
#error-message-box
|
||||
#error-stack-trace
|
||||
pre
|
||||
code!= error
|
||||
|
||||
17
app/views/500.html
Normal file
17
app/views/500.html
Normal file
@@ -0,0 +1,17 @@
|
||||
{% extends 'layouts/default.html' %}
|
||||
|
||||
{% block main %}
|
||||
<h1>Oops something went wrong</h1>
|
||||
<br>
|
||||
<span>500</span>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div id="error-message-box">
|
||||
<div id="error-stack-trace">
|
||||
<pre>
|
||||
<code>{{error}}</code>
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -1,12 +0,0 @@
|
||||
extends layouts/default
|
||||
|
||||
block main
|
||||
h1 Oops something went wrong
|
||||
br
|
||||
span 500
|
||||
|
||||
block content
|
||||
#error-message-box
|
||||
#error-stack-trace
|
||||
pre
|
||||
code!= error
|
||||
32
app/views/includes/foot.html
Normal file
32
app/views/includes/foot.html
Normal file
@@ -0,0 +1,32 @@
|
||||
<!-- Angular JS -->
|
||||
<script type="text/javascript" src="/lib/angular/angular.min.js"></script>
|
||||
<script type="text/javascript" src="/lib/angular-cookies/angular-cookies.min.js"></script>
|
||||
<script type="text/javascript" src="/lib/angular-resource/angular-resource.min.js"></script>
|
||||
<script type="text/javascript" src="/lib/angular-route/angular-route.js"></script>
|
||||
|
||||
<!-- Angular UI -->
|
||||
<script type="text/javascript" src="/lib/angular-bootstrap/ui-bootstrap.js"></script>
|
||||
<script type="text/javascript" src="/lib/angular-bootstrap/ui-bootstrap-tpls.js"></script>
|
||||
<script type="text/javascript" src="/lib/angular-ui-utils/ui-utils.min.js"></script>
|
||||
|
||||
<!-- Application Init -->
|
||||
<script type="text/javascript" src="/js/app.js"></script>
|
||||
<script type="text/javascript" src="/js/config.js"></script>
|
||||
<script type="text/javascript" src="/js/directives.js"></script>
|
||||
<script type="text/javascript" src="/js/filters.js"></script>
|
||||
|
||||
<!-- Application Services -->
|
||||
<script type="text/javascript" src="/js/services/global.js"></script>
|
||||
<script type="text/javascript" src="/js/services/articles.js"></script>
|
||||
|
||||
<!-- Application Controllers -->
|
||||
<script type="text/javascript" src="/js/controllers/articles.js"></script>
|
||||
<script type="text/javascript" src="/js/controllers/index.js"></script>
|
||||
<script type="text/javascript" src="/js/controllers/header.js"></script>
|
||||
<script type="text/javascript" src="/js/init.js"></script>
|
||||
|
||||
|
||||
{% if (process.env.NODE_ENV == 'development') %}
|
||||
<!-- Livereload script rendered -->
|
||||
<script type="text/javascript", src="http://" + req.host + ":35729/livereload.js"></script>
|
||||
{% endif %}
|
||||
@@ -1,30 +0,0 @@
|
||||
//AngularJS
|
||||
script(type='text/javascript', src='/lib/angular/angular.js')
|
||||
script(type='text/javascript', src='/lib/angular-cookies/angular-cookies.js')
|
||||
script(type='text/javascript', src='/lib/angular-resource/angular-resource.js')
|
||||
script(type='text/javascript', src='/lib/angular-route/angular-route.js')
|
||||
|
||||
//Angular UI
|
||||
script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap.js')
|
||||
script(type='text/javascript', src='/lib/angular-bootstrap/ui-bootstrap-tpls.js')
|
||||
script(type='text/javascript', src='/lib/angular-ui-utils/ui-utils.min.js')
|
||||
|
||||
//Application Init
|
||||
script(type='text/javascript', src='/js/app.js')
|
||||
script(type='text/javascript', src='/js/config.js')
|
||||
script(type='text/javascript', src='/js/directives.js')
|
||||
script(type='text/javascript', src='/js/filters.js')
|
||||
|
||||
//Application Services
|
||||
script(type='text/javascript', src='/js/services/global.js')
|
||||
script(type='text/javascript', src='/js/services/articles.js')
|
||||
|
||||
//Application Controllers
|
||||
script(type='text/javascript', src='/js/controllers/articles.js')
|
||||
script(type='text/javascript', src='/js/controllers/index.js')
|
||||
script(type='text/javascript', src='/js/controllers/header.js')
|
||||
script(type='text/javascript', src='/js/init.js')
|
||||
|
||||
if (process.env.NODE_ENV == 'development')
|
||||
//Livereload script rendered
|
||||
script(type='text/javascript', src='http://' + req.host + ':35729/livereload.js')
|
||||
31
app/views/includes/head.html
Normal file
31
app/views/includes/head.html
Normal file
@@ -0,0 +1,31 @@
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
|
||||
<title>{{appName}} - {{title}}</title>
|
||||
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
||||
<meta name="keywords" content="node.js, express, mongoose, mongodb, angularjs, swig">
|
||||
<meta name="description" content="MEAN - A Modern Stack: MongoDB, ExpressJS, AngularJS, NodeJS. (BONUS: Passport User Support).">
|
||||
|
||||
<link href="/img/icons/favicon.ico" rel="shortcut icon" type="image/x-icon">
|
||||
|
||||
<meta property="fb:app_id" content="APP_ID">
|
||||
<meta property="og:title" content="{{appName}} - {{title}}">
|
||||
<meta property="og:description" content="MEAN - A Modern Stack: MongoDB, ExpressJS, AngularJS, NodeJS. (BONUS: Passport User Support).">
|
||||
<meta property="og:type" content="website">
|
||||
<meta property="og:url" content="APP_URL">
|
||||
<meta property="og:image" content="APP_LOGO">
|
||||
<meta property="og:site_name" content="MEAN - A Modern Stack">
|
||||
<meta property="fb:admins" content="APP_ADMIN">
|
||||
|
||||
<link rel="stylesheet" href="/lib/bootstrap/dist/css/bootstrap.min.css">
|
||||
<!-- <link rel="stylesheet" href="/lib/bootstrap/dist/css/bootstrap-responsive.css"> -->
|
||||
<link rel="stylesheet" href="/css/common.css">
|
||||
|
||||
<link rel="stylesheet" href="/css/views/articles.css">
|
||||
|
||||
<!--[if lt IE 9]>
|
||||
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
|
||||
<![endif]-->
|
||||
</head>
|
||||
@@ -1,29 +0,0 @@
|
||||
head
|
||||
meta(charset='utf-8')
|
||||
meta(http-equiv='X-UA-Compatible', content='IE=edge,chrome=1')
|
||||
meta(name='viewport', content='width=device-width,initial-scale=1')
|
||||
|
||||
title= appName+' - '+title
|
||||
meta(http-equiv='Content-type', content='text/html;charset=UTF-8')
|
||||
meta(name="keywords", content="node.js, express, mongoose, mongodb, angularjs")
|
||||
meta(name="description", content="MEAN - A Modern Stack: MongoDB, ExpressJS, AngularJS, NodeJS. (BONUS: Passport User Support).")
|
||||
|
||||
link(href='/img/icons/favicon.ico', rel='shortcut icon', type='image/x-icon')
|
||||
|
||||
meta(property='fb:app_id', content='APP_ID')
|
||||
meta(property='og:title', content='#{appName} - #{title}')
|
||||
meta(property='og:description', content='MEAN - A Modern Stack: MongoDB, ExpressJS, AngularJS, NodeJS. (BONUS: Passport User Support).')
|
||||
meta(property='og:type', content='website')
|
||||
meta(property='og:url', content='APP_URL')
|
||||
meta(property='og:image', content='APP_LOGO')
|
||||
meta(property='og:site_name', content='MEAN - A Modern Stack')
|
||||
meta(property='fb:admins', content='APP_ADMIN')
|
||||
|
||||
link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap.min.css')
|
||||
//- link(rel='stylesheet', href='/lib/bootstrap/dist/css/bootstrap-responsive.css')
|
||||
link(rel='stylesheet', href='/css/common.css')
|
||||
|
||||
link(rel='stylesheet', href='/css/views/articles.css')
|
||||
|
||||
//if lt IE 9
|
||||
script(src='http://html5shim.googlecode.com/svn/trunk/html5.js')
|
||||
7
app/views/index.html
Normal file
7
app/views/index.html
Normal file
@@ -0,0 +1,7 @@
|
||||
{% extends 'layouts/default.html' %}
|
||||
{% block content %}
|
||||
<section data-ng-view />
|
||||
<script type="text/javascript">
|
||||
window.user = {{user|safe}};
|
||||
</script>
|
||||
{% endblock %}
|
||||
@@ -1,6 +0,0 @@
|
||||
extends layouts/default
|
||||
|
||||
block content
|
||||
section(data-ng-view)
|
||||
script(type="text/javascript").
|
||||
window.user = !{user};
|
||||
13
app/views/layouts/default.html
Normal file
13
app/views/layouts/default.html
Normal file
@@ -0,0 +1,13 @@
|
||||
<!doctype html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="https://www.facebook.com/2008/fbml" itemscope="itemscope" itemtype="http://schema.org/Product">
|
||||
{% include '../includes/head.html' %}
|
||||
<body>
|
||||
<div class="navbar navbar-inverse navbar-fixed-top" data-ng-include="'views/header.html'" data-role="navigation"></div>
|
||||
<section class="content">
|
||||
<section class="container">
|
||||
{% block content %}{% endblock %}
|
||||
</section>
|
||||
</section>
|
||||
{% include '../includes/foot.html' %}
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,9 +0,0 @@
|
||||
doctype html
|
||||
html(lang='en', xmlns='http://www.w3.org/1999/xhtml', xmlns:fb='https://www.facebook.com/2008/fbml', itemscope='itemscope', itemtype='http://schema.org/Product')
|
||||
include ../includes/head
|
||||
body
|
||||
.navbar.navbar-inverse.navbar-fixed-top(data-ng-include="'views/header.html'", data-role="navigation")
|
||||
section.content
|
||||
section.container
|
||||
block content
|
||||
include ../includes/foot
|
||||
24
app/views/users/auth.html
Normal file
24
app/views/users/auth.html
Normal file
@@ -0,0 +1,24 @@
|
||||
{% extends '../layouts/default.html' %}
|
||||
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="col-md-offset-1 col-md-5">
|
||||
<a href="/auth/facebook"><img src="/img/icons/facebook.png"></a>
|
||||
<a href="/auth/github"><img src="/img/icons/github.png"></a>
|
||||
<a href="/auth/twitter"><img src="/img/icons/twitter.png"></a>
|
||||
<a href="/auth/google"><img src="/img/icons/google.png"></a>
|
||||
<a href="/auth/linkedin"><img src="/img/icons/linkedin.png"></a>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
{% if message && message.length %}
|
||||
<div class="fade in alert alert-error">
|
||||
<button class="close" data-dismiss="alert">×</button>
|
||||
<div class="strong">
|
||||
{{ message }}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% block auth %}{% endblock %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -1,21 +0,0 @@
|
||||
extends ../layouts/default
|
||||
|
||||
block content
|
||||
.row
|
||||
.col-md-offset-1.col-md-5
|
||||
a(href="/auth/facebook")
|
||||
img(src="/img/icons/facebook.png")
|
||||
a(href="/auth/github")
|
||||
img(src="/img/icons/github.png")
|
||||
a(href="/auth/twitter")
|
||||
img(src="/img/icons/twitter.png")
|
||||
a(href="/auth/google")
|
||||
img(src="/img/icons/google.png")
|
||||
a(href="/auth/linkedin")
|
||||
img(src="/img/icons/linkedin.png")
|
||||
.col-md-6
|
||||
if message && message.length
|
||||
.fade.in.alert.alert-error
|
||||
button.close(type="button", data-dismiss="alert") ×
|
||||
strong #{message}
|
||||
block auth
|
||||
24
app/views/users/signin.html
Normal file
24
app/views/users/signin.html
Normal file
@@ -0,0 +1,24 @@
|
||||
{% extends 'auth.html' %}
|
||||
|
||||
{% block auth %}
|
||||
<form class="signin form-horizontal" action="/users/session" method="post">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="email">Email</label>
|
||||
<div class="col-md-8">
|
||||
<input id="email" class="form-control" type="text" name="email" placeholder="Email">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="password">Password</label>
|
||||
<div class="col-md-8">
|
||||
<input id="password" class="form-control" type="password" name="password" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-md-offset-4 col-md-8">
|
||||
<button class="btn btn-primary" type="submit">Sign in</button>
|
||||
or <a class="show-signup" href="/signup">Sign up</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
@@ -1,20 +0,0 @@
|
||||
extends auth
|
||||
|
||||
block auth
|
||||
form.signin.form-horizontal(action="/users/session", method="post")
|
||||
.form-group
|
||||
label.col-md-4.control-label(for='email') Email
|
||||
.col-md-8
|
||||
input#email.form-control(type='text', name="email", placeholder='Email')
|
||||
|
||||
.form-group
|
||||
label.col-md-4.control-label(for='password') Password
|
||||
.col-md-8
|
||||
input#password.form-control(type='password', name="password", placeholder='Password')
|
||||
|
||||
.form-group
|
||||
.col-md-offset-4.col-md-8
|
||||
button.btn.btn-primary(type='submit') Sign in
|
||||
|
||||
| or
|
||||
a.show-signup(href="/signup") Sign up
|
||||
36
app/views/users/signup.html
Normal file
36
app/views/users/signup.html
Normal file
@@ -0,0 +1,36 @@
|
||||
{% extends 'auth.html' %}
|
||||
|
||||
{% block auth %}
|
||||
<form class="signin form-horizontal" action="/users" method="post">
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="name">Full Name</label>
|
||||
<div class="col-md-8">
|
||||
<input id="name" class="form-control" type="text" name="name" placeholder="Full Name" value="{{user.name}}" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="email">Email</label>
|
||||
<div class="col-md-8">
|
||||
<input id="email" class="form-control" type="text" name="email" placeholder="Email" value="{{user.email}}" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="username">Username</label>
|
||||
<div class="col-md-8">
|
||||
<input id="username" class="form-control" type="text" name="username" placeholder="Username" value="{{user.username}}" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-md-4 control-label" for="password">Password</label>
|
||||
<div class="col-md-8">
|
||||
<input id="password" class="form-control" type="password" name="password" placeholder="Password" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-md-offset-4 col-md-8">
|
||||
<button class="btn btn-primary" type="submit">Sign up</button>
|
||||
or <a class="show-login" href="/signin">login</a>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
@@ -1,30 +0,0 @@
|
||||
extends auth
|
||||
|
||||
block auth
|
||||
form.signup.form-horizontal(action="/users", method="post")
|
||||
.form-group
|
||||
label.col-md-4.control-label(for='name') Full Name
|
||||
.col-md-8
|
||||
input#name.form-control(type='text', name="name", placeholder='Full name', value=user.name)
|
||||
|
||||
.form-group
|
||||
label.col-md-4.control-label(for='email') Email
|
||||
.col-md-8
|
||||
input#email.form-control(type='text', name="email", placeholder='Email', value=user.email)
|
||||
|
||||
.form-group
|
||||
label.col-md-4.control-label(for='username') Username
|
||||
.col-md-8
|
||||
input#username.form-control(type='text', name="username", placeholder='Username', value=user.username)
|
||||
|
||||
.form-group
|
||||
label.col-md-4.control-label(for='password') Password
|
||||
.col-md-8
|
||||
input#password.form-control(type='password', name="password", placeholder='Password')
|
||||
|
||||
.form-group
|
||||
.col-md-offset-4.col-md-8
|
||||
button.btn.btn-primary(type='submit') Sign up
|
||||
|
||||
| or
|
||||
a.show-login(href="/signin") login
|
||||
@@ -2,7 +2,7 @@
|
||||
"name": "mean",
|
||||
"version": "0.1.3",
|
||||
"dependencies": {
|
||||
"angular": "1.2.10",
|
||||
"angular": "latest",
|
||||
"angular-resource": "latest",
|
||||
"angular-cookies": "latest",
|
||||
"angular-mocks": "latest",
|
||||
|
||||
3
config/env/all.js
vendored
3
config/env/all.js
vendored
@@ -7,10 +7,11 @@ module.exports = {
|
||||
root: rootPath,
|
||||
port: process.env.PORT || 3000,
|
||||
db: process.env.MONGOHQ_URL,
|
||||
templateEngine: 'swig',
|
||||
|
||||
// The secret should be set to a non-guessable string that
|
||||
// is used to compute a session hash
|
||||
sessionSecret: 'MEAN',
|
||||
// The name of the MongoDB collection to store sessions in
|
||||
sessionCollection: 'sessions'
|
||||
}
|
||||
};
|
||||
|
||||
36
config/env/development.js
vendored
36
config/env/development.js
vendored
@@ -1,33 +1,33 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
db: "mongodb://localhost/mean-dev",
|
||||
db: 'mongodb://localhost/mean-dev',
|
||||
app: {
|
||||
name: "MEAN - A Modern Stack - Development"
|
||||
name: 'MEAN - A Modern Stack - Development'
|
||||
},
|
||||
facebook: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/facebook/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/facebook/callback'
|
||||
},
|
||||
twitter: {
|
||||
clientID: "CONSUMER_KEY",
|
||||
clientSecret: "CONSUMER_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/twitter/callback"
|
||||
clientID: 'CONSUMER_KEY',
|
||||
clientSecret: 'CONSUMER_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/twitter/callback'
|
||||
},
|
||||
github: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/github/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/github/callback'
|
||||
},
|
||||
google: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/google/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/google/callback'
|
||||
},
|
||||
linkedin: {
|
||||
clientID: "API_KEY",
|
||||
clientSecret: "SECRET_KEY",
|
||||
callbackURL: "http://localhost:3000/auth/linkedin/callback"
|
||||
clientID: 'API_KEY',
|
||||
clientSecret: 'SECRET_KEY',
|
||||
callbackURL: 'http://localhost:3000/auth/linkedin/callback'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
36
config/env/production.js
vendored
36
config/env/production.js
vendored
@@ -1,33 +1,33 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
db: "mongodb://localhost/mean",
|
||||
db: 'mongodb://localhost/mean',
|
||||
app: {
|
||||
name: "MEAN - A Modern Stack - Production"
|
||||
name: 'MEAN - A Modern Stack - Production'
|
||||
},
|
||||
facebook: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/facebook/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/facebook/callback'
|
||||
},
|
||||
twitter: {
|
||||
clientID: "CONSUMER_KEY",
|
||||
clientSecret: "CONSUMER_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/twitter/callback"
|
||||
clientID: 'CONSUMER_KEY',
|
||||
clientSecret: 'CONSUMER_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/twitter/callback'
|
||||
},
|
||||
github: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/github/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/github/callback'
|
||||
},
|
||||
google: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/google/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/google/callback'
|
||||
},
|
||||
linkedin: {
|
||||
clientID: "API_KEY",
|
||||
clientSecret: "SECRET_KEY",
|
||||
callbackURL: "http://localhost:3000/auth/linkedin/callback"
|
||||
clientID: 'API_KEY',
|
||||
clientSecret: 'SECRET_KEY',
|
||||
callbackURL: 'http://localhost:3000/auth/linkedin/callback'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
30
config/env/test.js
vendored
30
config/env/test.js
vendored
@@ -1,29 +1,29 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
db: "mongodb://localhost/mean-test",
|
||||
db: 'mongodb://localhost/mean-test',
|
||||
port: 3001,
|
||||
app: {
|
||||
name: "MEAN - A Modern Stack - Test"
|
||||
name: 'MEAN - A Modern Stack - Test'
|
||||
},
|
||||
facebook: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/facebook/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/facebook/callback'
|
||||
},
|
||||
twitter: {
|
||||
clientID: "CONSUMER_KEY",
|
||||
clientSecret: "CONSUMER_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/twitter/callback"
|
||||
clientID: 'CONSUMER_KEY',
|
||||
clientSecret: 'CONSUMER_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/twitter/callback'
|
||||
},
|
||||
github: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/github/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/github/callback'
|
||||
},
|
||||
google: {
|
||||
clientID: "APP_ID",
|
||||
clientSecret: "APP_SECRET",
|
||||
callbackURL: "http://localhost:3000/auth/google/callback"
|
||||
clientID: 'APP_ID',
|
||||
clientSecret: 'APP_SECRET',
|
||||
callbackURL: 'http://localhost:3000/auth/google/callback'
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
* Module dependencies.
|
||||
*/
|
||||
var express = require('express'),
|
||||
consolidate = require('consolidate'),
|
||||
mongoStore = require('connect-mongo')(express),
|
||||
flash = require('connect-flash'),
|
||||
helpers = require('view-helpers'),
|
||||
@@ -31,12 +32,17 @@ module.exports = function(app, passport, db) {
|
||||
app.use(express.logger('dev'));
|
||||
}
|
||||
|
||||
// assign the template engine to .html files
|
||||
app.engine('html', consolidate[config.templateEngine]);
|
||||
|
||||
// set .html as the default extension
|
||||
app.set('view engine', 'html');
|
||||
|
||||
// Set views path, template engine and default layout
|
||||
app.set('views', config.root + '/app/views');
|
||||
app.set('view engine', 'jade');
|
||||
|
||||
// Enable jsonp
|
||||
app.enable("jsonp callback");
|
||||
app.enable('jsonp callback');
|
||||
|
||||
app.configure(function() {
|
||||
// The cookieParser should be above session
|
||||
@@ -68,7 +74,7 @@ module.exports = function(app, passport, db) {
|
||||
|
||||
// Routes should be at the last
|
||||
app.use(app.router);
|
||||
|
||||
|
||||
// Setting the fav icon and static folder
|
||||
app.use(express.favicon());
|
||||
app.use(express.static(config.root + '/public'));
|
||||
@@ -90,7 +96,7 @@ module.exports = function(app, passport, db) {
|
||||
});
|
||||
|
||||
// Assume 404 since no middleware responded
|
||||
app.use(function(req, res, next) {
|
||||
app.use(function(req, res) {
|
||||
res.status(404).render('404', {
|
||||
url: req.originalUrl,
|
||||
error: 'Not found'
|
||||
@@ -98,4 +104,4 @@ module.exports = function(app, passport, db) {
|
||||
});
|
||||
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
@@ -80,7 +80,7 @@ module.exports = function(grunt) {
|
||||
}
|
||||
});
|
||||
|
||||
//Load NPM tasks
|
||||
//Load NPM tasks
|
||||
grunt.loadNpmTasks('grunt-contrib-watch');
|
||||
grunt.loadNpmTasks('grunt-contrib-jshint');
|
||||
grunt.loadNpmTasks('grunt-mocha-test');
|
||||
@@ -97,4 +97,4 @@ module.exports = function(grunt) {
|
||||
|
||||
//Test task.
|
||||
grunt.registerTask('test', ['env:test', 'mochaTest', 'karma:unit']);
|
||||
};
|
||||
};
|
||||
|
||||
@@ -20,6 +20,7 @@
|
||||
"dependencies": {
|
||||
"express": "~3.4.7",
|
||||
"jade": "~1.0.2",
|
||||
"consolidate": "~0.10.0",
|
||||
"mongoose": "~3.8.3",
|
||||
"connect-mongo": "~0.4.0",
|
||||
"connect-flash": "~0.1.1",
|
||||
@@ -56,7 +57,8 @@
|
||||
"grunt-nodemon": "0.1.2",
|
||||
"grunt-contrib-watch": "~0.5.3",
|
||||
"karma-coverage": "~0.1.4",
|
||||
"karma": "~0.10.9"
|
||||
"karma": "~0.10.9",
|
||||
"swig": "~1.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"supertest": "0.8.2",
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
<section data-ng-controller="ArticlesController" data-ng-init="findOne()">
|
||||
<span>{{article.created | date:'medium'}}</span>/
|
||||
<span>{{article.created | date:'medium'}}</span> /
|
||||
<span>{{article.user.name}}</span>
|
||||
<h2>{{article.title}}</h2>
|
||||
<div data-ng-show="global.user._id == article.user._id">
|
||||
<a class="btn" href="/#!/articles/{{article._id}}/edit">
|
||||
<i class="glyphicon glyphicon-edit"></i>
|
||||
</a>
|
||||
</a>
|
||||
<a class="btn" data-ng-click="remove();">
|
||||
<i class="glyphicon glyphicon-trash"></i>
|
||||
</a>
|
||||
|
||||
Reference in New Issue
Block a user