Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-07-19 19:10:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VikramTiwari/mean into VikramTiwari-master

Browse Source
This commit is contained in:
Lior Kesos
2014-01-19 22:58:31 +02:00
parent 6b9826b2c4 c0de03085d
commit a5410c0fee
11 changed files with 77 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/includes/foot.jade
View File

@@ -7,7 +7,7 @@ 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/modules/route/route.js')
script(type='text/javascript', src='/lib/angular-ui-utils/ui-utils.min.js')
//Application Init
script(type='text/javascript', src='/js/app.js')

2
app/views/includes/head.jade
View File

@@ -19,7 +19,7 @@ head
meta(property='og:site_name', content='MEAN - A Modern Stack')
meta(property='fb:admins', content='APP_ADMIN')
link(rel='stylesheet', href='/lib/bootstrap/docs/assets/css/bootstrap.css')
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')

4
app/views/users/auth.jade
View File

@@ -2,7 +2,7 @@ extends ../layouts/default
block content
.row
.offset1.span5
.col-md-offset-1.col-md-5
a(href="/auth/facebook")
img(src="/img/icons/facebook.png")
a(href="/auth/github")
@@ -11,7 +11,7 @@ block content
img(src="/img/icons/twitter.png")
a(href="/auth/google")
img(src="/img/icons/google.png")
.span6
.col-md-6
if message && message.length
.fade.in.alert.alert-error
button.close(type="button", data-dismiss="alert") ×

27
app/views/users/signin.jade
View File

@@ -2,18 +2,19 @@ extends auth
block auth
form.signin.form-horizontal(action="/users/session", method="post")
.control-group
label.control-label(for='email') Email
.controls
input#email(type='text', name="email", placeholder='Email')
.form-group
label.col-md-4.control-label(for='email') Email
.col-md-8
input#email.form-control(type='text', name="email", placeholder='Email')
.control-group
label.control-label(for='password') Password
.controls
input#password(type='password', name="password", placeholder='Password')
.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-actions
button.btn.btn-primary(type='submit') Sign in
 
| or 
a.show-signup(href="/signup") Sign up
.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

43
app/views/users/signup.jade
View File

@@ -2,28 +2,29 @@ extends auth
block auth
form.signup.form-horizontal(action="/users", method="post")
.control-group
label.control-label(for='name') Full name
.controls
input#name(type='text', name="name", placeholder='Full name', value=user.name)
.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)
.control-group
label.control-label(for='email') Email
.controls
input#email(type='text', name="email", placeholder='Email', value=user.email)
.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)
.control-group
label.control-label(for='username') Username
.controls
input#username(type='text', name="username", placeholder='Username', value=user.username)
.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)
.control-group
label.control-label(for='password') Password
.controls
input#password(type='password', name="password", placeholder='Password')
.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-actions
button.btn.btn-primary(type='submit') Sign up
 
| or 
a.show-login(href="/signin") login
.form-group
.col-md-offset-4.col-md-8
button.btn.btn-primary(type='submit') Sign up
 
| or 
a.show-login(href="/signin") login

10
bower.json
View File

@@ -1,14 +1,14 @@
{
"name": "mean",
"version": "0.1.2",
"version": "0.1.3",
"dependencies": {
"angular": "latest",
"angular": "1.2.8",
"angular-resource": "latest",
"angular-cookies": "latest",
"angular-mocks": "latest",
"angular-route": "latest",
"bootstrap": "2.3.2",
"angular-bootstrap": "0.7.0",
"angular-ui-utils": "0.0.4"
"bootstrap": "3.0.3",
"angular-bootstrap": "0.10.0",
"angular-ui-utils": "0.1.0"
}
}

2
public/css/common.css
View File

@@ -4,7 +4,7 @@
}
.content {
margin-top:50px;
margin-top:70px;
width:100%
}

24
public/views/articles/create.html
View File

@@ -1,20 +1,20 @@
<section data-ng-controller="ArticlesController">
<form class="form-horizontal" data-ng-submit="create()">
<div class="control-group">
<label class="control-label" for="title">Title</label>
<div class="controls">
<input type="text" data-ng-model="title" id="title" placeholder="Title" required>
<form class="form-horizontal col-md-6" role="form" data-ng-submit="create()">
<div class="form-group">
<label for="title" class="col-md-2 control-label">Title</label>
<div class="col-md-10">
<input type="text" class="form-control" data-ng-model="title" id="title" placeholder="Title" required>
</div>
</div>
<div class="control-group">
<label class="control-label" for="content">Content</label>
<div class="controls">
<textarea data-ng-model="content" id="content" cols="30" rows="10" placeholder="Content"></textarea>
<div class="form-group">
<label for="content" class="col-md-2 control-label">Content</label>
<div class="col-md-10">
<textarea data-ng-model="content" id="content" cols="30" rows="10" placeholder="Content" class="form-control" required></textarea>
</div>
</div>
<div class="control-group">
<div class="controls">
<input type="submit" class="btn">
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<button type="submit" class="btn btn-default">Submit</button>
</div>
</div>
</form>

28
public/views/articles/edit.html
View File

@@ -1,24 +1,20 @@
<section data-ng-controller="ArticlesController" data-ng-init="findOne()">
<form class="form-horizontal" data-ng-submit="update()">
<div class="control-group">
<label class="control-label" for="title">Title</label>
<div class="controls">
<input type="text" data-ng-model="article.title" id="title" placeholder="Title" required>
</input>
<form class="form-horizontal col-md-6" role="form" data-ng-submit="update()">
<div class="form-group">
<label for="title" class="col-md-2 control-label">Title</label>
<div class="col-md-10">
<input type="text" class="form-control" data-ng-model="article.title" id="title" placeholder="Title" required>
</div>
</div>
<div class="control-group">
<label class="control-label" for="content">Content</label>
<div class="controls">
<textarea data-ng-model="article.content" id="content" cols="30" rows="10" placeholder="Content">
</textarea>
<div class="form-group">
<label for="content" class="col-md-2 control-label">Content</label>
<div class="col-md-10">
<textarea data-ng-model="article.content" id="content" cols="30" rows="10" placeholder="Content" class="form-control" required></textarea>
</div>
</div>
<div class="control-group">
<div class="controls">
<input type="submit" class="btn">
<div class="form-group">
<div class="col-md-offset-2 col-md-10">
<button type="submit" class="btn btn-default">Submit</button>
</div>
</div>
</form>

4
public/views/articles/view.html
View File

@@ -4,10 +4,10 @@
<h2>{{article.title}}</h2>
<div data-ng-show="global.user._id == article.user._id">
<a class="btn" href="/#!/articles/{{article._id}}/edit">
<i class="icon-edit"></i>
<i class="glyphicon glyphicon-edit"></i>
</a>
<a class="btn" data-ng-click="remove();">
<i class="icon-trash"></i>
<i class="glyphicon glyphicon-trash"></i>
</a>
</div>
<div>{{article.content}}</div>

10
public/views/header.html
View File

@@ -1,20 +1,20 @@
<div class="navbar-inner" data-ng-controller="HeaderController">
<ul class="nav">
<div class="" data-ng-controller="HeaderController">
<ul class="navbar-nav nav">
<li>
<a class="brand" href="/">MEAN - A Modern Stack</a>
<a class="navbar-brand" href="/">MEAN - A Modern Stack</a>
</li>
<li data-ng-repeat="item in menu" data-ng-show="global.user" ui-route="/{{item.link}}" ng-class="{active: $uiRoute}">
<a href="#!/{{item.link}}">{{item.title}}</a>
</li>
</ul>
<ul class="nav pull-right" data-ng-hide="global.authenticated">
<ul class="navbar-nav nav pull-right" data-ng-hide="global.authenticated">
<li><a href="signup">Signup</a>
</li>
<li class="divider-vertical"></li>
<li><a href="signin">Signin</a>
</li>
</ul>
<ul class="nav pull-right" data-ng-show="global.authenticated">
<ul class="navbar-nav nav pull-right" data-ng-show="global.authenticated">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
{{global.user.name}} <b class="caret"></b>