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

Removing Compass, Fixing Windows Errors, Removing Makefile, Tiding Code

Browse Source
This commit is contained in:
Amos Haviv
2013-09-12 20:44:10 +03:00
parent 33a3073865
commit 1fbd2452aa
12 changed files with 119 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.bowerrc
View File

@@ -1,4 +0,0 @@
{
"directory": "public/lib",
"json": "bower.json"
}

18
Makefile
View File

@@ -1,18 +0,0 @@
REPORTER = spec
NODEARGS =
test:
@if [ ! -n "$(NODE_ENV)" ]; then NODE_ENV=test NODE_PATH=lib ./node_modules/grunt-nodemon/node_modules/.bin/nodemon -x ./node_modules/.bin/mocha -R $(REPORTER) -t 15000 --recursive test $(NODEARGS); else NODE_PATH=lib ./node_modules/.bin/mocha -R $(REPORTER) -t 15000 --recursive test $(NODEARGS); fi
start:
@if [ ! -n "$(NODE_ENV)" ]; then NODE_ENV=development NODE_PATH=lib ./node_modules/grunt-nodemon/node_modules/.bin/nodemon server.js $(NODEARGS) ; else NODE_PATH=lib ./node_modules/.bin/foreman start; fi
mocha:
NODE_PATH=lib ./node_modules/.bin/mocha -R $(REPORTER) -t 15000 --recursive test $(NODEARGS)
repl:
@NODE_ENV=development NODE_PATH=lib node --debug $(NODEARGS)
webtest:
@NODE_ENV=test NODE_PATH=lib ./node_modules/.bin/web-mocha test $(NODEARGS)
.PHONY: jshint test repl webtest mocha

7
README.md
View File

@@ -7,9 +7,6 @@ MEAN is a boilerplate that provides a nice starting point for [MongoDB](http://w
* MongoDB - Download and Install [MongoDB](http://www.mongodb.org/downloads) - Make sure it's running on the default port (27017).
### Optional
* Ruby - Download and Install [Ruby](http://www.ruby-lang.org/).
* Ruby Gems - Download and Install [Ruby Gems](http://rubygems.org).
* Compass - an open-source CSS Authoring Framework, install via [Ruby Gems](http://rubygems.org).
* Grunt - Download and Install [Grunt](http://gruntjs.com).
## Additional Packages
@@ -93,9 +90,9 @@ If you are using node instead of grunt, it is very similar:
## More Information
* Visit our [Ninja's Zone](http://www.meanleanstartupmachine.com/) for extended support.
* Contact Amos Haviv on any issue via [E-Mail](mailto:mail@amoshaviv.com), [Facebook](http://www.facebook.com/amoshaviv), or [Twitter](http://www.twitter.com/amoshaviv).
* Visit us at [Linnovate.net](http://www.linnovate.net/).
* Contact amos on any issue via [E-Mail](mailto:mail@amoshaviv.com), [Facebook](http://www.facebook.com/amoshaviv), or [Twitter](http://www.twitter.com/amoshaviv).
* Visit our [Ninja's Zone](http://www.meanleanstartupmachine.com/) for extended support.
## Credits
Inspired by the great work of [Madhusudhan Srinivasa](https://github.com/madhums/)

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

@@ -1,13 +1,16 @@
script(type='text/javascript', src='lib/jquery/jquery.min.js')
script(type='text/javascript', src='lib/jquery/jquery.js')
//Bootstrap
script(type='text/javascript', src='lib/bootstrap/js/bootstrap.js')
//AngularJS
script(type='text/javascript', src='lib/angular/angular.min.js')
script(type='text/javascript', src='lib/angular-cookies/angular-cookies.min.js')
script(type='text/javascript', src='lib/angular-resource/angular-resource.min.js')
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')
//Angular UI
script(type='text/javascript', src='lib/angular-bootstrap/ui-bootstrap-tpls.min.js')
script(type='text/javascript', src='lib/angular-ui-utils/modules/route/route.js')
script(type='text/javascript', src='lib/angular-bootstrap/ui-bootstrap-tpls.js')
script(type='text/javascript', src='lib/angular-ui-utils/modules/route.js')
//Application Init
script(type='text/javascript', src='js/app.js')

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

@@ -19,8 +19,8 @@ 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/docs/assets/css/bootstrap-responsive.css')
link(rel='stylesheet', href='lib/bootstrap/css/bootstrap.css')
link(rel='stylesheet', href='lib/bootstrap/css/bootstrap-responsive.css')
link(rel='stylesheet', href='css/common.css')
link(rel='stylesheet', href='css/views/articles.css')

40
bower.json
View File

@@ -1,18 +1,24 @@
{
"name": "angularJS-IL",
"version": "1.0.0",
"dependencies": {
"bootstrap": "2.3.2",
"angular": "~1.0.6",
"angular-resource": "~1.0.6",
"angular-cookies": "~1.0.6",
"angular-bootstrap": "~0.4.0",
"angular-ui-utils": "0.0.4",
"json3": "~3.2.4",
"jquery": "~1.9.1"
},
"devDependencies": {
"angular-mocks": "~1.0.5",
"angular-scenario": "~1.0.5"
}
}
"name": "mean",
"version": "1.0.0",
"dependencies": {
"bootstrap": "2.3.2",
"angular": "~1.0.6",
"angular-resource": "~1.0.6",
"angular-cookies": "~1.0.6",
"angular-bootstrap": "~0.4.0",
"angular-ui-utils": "0.0.4",
"json3": "~3.2.4",
"jquery": "~1.9.1"
},
"exportsOverride": {
"bootstrap": {
"css": "docs/assets/css/bootstrap*.css",
"js": "docs/assets/js/bootstrap.js",
"img": "docs/assets/img/glyphicons-halflings*.png"
},
"angular-ui-utils": {
"modules": "modules/route/route.js"
}
}
}

75
gruntfile.js
View File

@@ -9,44 +9,28 @@ module.exports = function(grunt) {
livereload: true,
},
},
js: {
files: ['public/js/**', 'app/**/*.js'],
tasks: ['jshint'],
options: {
livereload: true,
},
},
html: {
files: ['public/views/**'],
options: {
livereload: true,
},
},
js: {
files: ['public/js/**'],
options: {
livereload: true,
},
},
css: {
files: ['public/sass/**'],
tasks: ['compass'],
files: ['public/css/**'],
options: {
livereload: true,
force: true
livereload: true
}
}
},
jshint: {
all: ['gruntfile.js', 'public/js/**/*.js', 'test/**/*.js', 'app/**/*.js']
},
compass: { //Task
dist: { //Target
options: { //Target options
sassDir: 'public/sass',
cssDir: 'public/css',
environment: 'production'
}
},
dev: { //Another target
options: {
sassDir: 'public/sass',
cssDir: 'public/css'
}
}
all: ['gruntfile.js', 'public/js/**/*.js', 'test/**/*.js', 'app/**/*.js']
},
nodemon: {
dev: {
@@ -63,33 +47,50 @@ module.exports = function(grunt) {
},
cwd: __dirname
}
},
exec: {
options: {
exec: 'less'
}
}
},
concurrent: {
target: {
tasks: ['nodemon', 'watch'],
tasks: ['nodemon', 'watch'],
options: {
logConcurrentOutput: true
}
},
mochaTest: {
options: {
reporter: 'spec'
},
src: ['test/**/*.js']
},
bower: {
install: {
options: {
logConcurrentOutput: true
targetDir: './public/lib',
layout: 'byComponent',
install: true,
verbose: true,
cleanBowerDir: true
}
}
}
});
//Load NPM tasks
grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-mocha-test');
grunt.loadNpmTasks('grunt-nodemon');
grunt.loadNpmTasks('grunt-concurrent');
grunt.loadNpmTasks('grunt-bower-task');
//Making grunt default to force in order not to break the project.
grunt.option('force', true);
//Default task(s).
grunt.registerTask('default', ['jshint', 'compass', 'concurrent:target']);
};
grunt.registerTask('default', ['jshint', 'concurrent']);
//Test task.
grunt.registerTask('test', ['mochaTest']);
//Bower task.
grunt.registerTask('install', ['bower']);
};

28
package.json
View File

@@ -1,17 +1,17 @@
{
"name": "mean",
"description": "Mongo",
"description": "MEAN - A Modern Stack: MongoDB, ExpressJS, AngularJS, NodeJS. (BONUS: Passport User Support).",
"version": "1.0.0",
"private": false,
"author": "MEAN - A Modern Stack: MongoDB, ExpressJS, AngularJS, NodeJS. (BONUS: Passport User Support).",
"author": "Amos Haviv",
"engines": {
"node": "0.10.x",
"npm": "1.2.x"
},
"scripts": {
"start": "make start",
"test": "make test",
"postinstall": "node_modules/bower/bin/bower install"
"start": "node node_modules/grunt-cli/bin/grunt",
"test": "node node_modules/grunt-cli/bin/grunt test",
"postinstall": "node node_modules/grunt-cli/bin/grunt install"
},
"dependencies": {
"express": "latest",
@@ -29,20 +29,18 @@
"async": "latest",
"view-helpers": "latest",
"mean-logger": "latest",
"bower": "latest",
"forever": "latest",
"foreman": "0.0.25"
"grunt": "latest",
"grunt-cli": "latest",
"grunt-bower-task": "latest"
},
"devDependencies": {
"supertest": "latest",
"should": "latest",
"mocha": "latest",
"web-mocha": "0.0.10",
"grunt": "~0.4.1",
"grunt-contrib-compass": "~0.3.0",
"grunt-contrib-watch": "~0.4.4",
"grunt-contrib-jshint": "~0.6.0",
"grunt-nodemon": "0.0.8",
"grunt-concurrent": "~0.3.0"
"grunt-contrib-watch": "latest",
"grunt-contrib-jshint": "latest",
"grunt-nodemon": "latest",
"grunt-concurrent": "latest",
"grunt-mocha-test": "latest"
}
}

26
public/css/common.css
View File

@@ -1 +1,25 @@
.navbar .nav>li>a.brand{padding-left:20px;margin-left:0}.content{margin-top:50px;width:100%}footer{position:fixed;left:0px;bottom:0px;height:30px;width:100%;background:#ddd;-webkit-box-shadow:0 8px 6px 6px black;-moz-box-shadow:0 8px 6px 6px black;box-shadow:0 8px 6px 6px black}footer p{padding:5px 0 12px 10px}
.navbar .nav>li>a.brand {
padding-left:20px;
margin-left:0
}
.content {
margin-top:50px;
width:100%
}
footer {
position:fixed;
left:0px;
bottom:0px;
height:30px;
width:100%;
background:#ddd;
-webkit-box-shadow:0 8px 6px 6px black;
-moz-box-shadow:0 8px 6px 6px black;
box-shadow:0 8px 6px 6px black
}
footer p {
padding:5px 0 12px 10px
}

8
public/css/views/articles.css
View File

@@ -1 +1,7 @@
h1{text-align:center}ul.articles li:not(:last-child){border-bottom:1px solid #ccc}
h1 {
text-align:center
}
ul.articles li:not(:last-child) {
border-bottom:1px solid #ccc
}

24
public/sass/common.scss
View File

@@ -1,24 +0,0 @@
.navbar .nav> li > a.brand {
padding-left: 20px;
margin-left: 0;
}
.content {
margin-top: 50px;
width: 100%;
}
footer {
position:fixed;
left:0px;
bottom:0px;
height:30px;
width:100%;
background:#ddd;
-webkit-box-shadow: 0 8px 6px 6px black;
-moz-box-shadow: 0 8px 6px 6px black;
box-shadow: 0 8px 6px 6px black;
}
footer p{
padding: 5px 0 12px 10px;
}

9
public/sass/views/articles.scss
View File

@@ -1,9 +0,0 @@
h1 {
text-align: center;
}
ul.articles {
li:not(:last-child) {
border-bottom: 1px solid #ccc;
}
}