Skip to content

Commit d46eae0

Browse files
author
ErikMellum
committed
Complete overhaul of folder structure and gulpfile. Nobody likes working with a hobo team.
1 parent 8c73ab0 commit d46eae0

File tree

961 files changed

+38197
-223964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

961 files changed

+38197
-223964
lines changed

Diff for: README.md

+6-8

Diff for: app/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
recipeasy_production:
2+
sudo stop recipeasyproduction
3+
sudo start --no-wait -q recipeasyproduction

Diff for: app/app.js

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
var express = require('express');
2+
var path = require('path');
3+
var favicon = require('serve-favicon');
4+
var logger = require('morgan');
5+
var cookieParser = require('cookie-parser');
6+
var bodyParser = require('body-parser');
7+
var mongoose = require('mongoose');
8+
var passport = require('passport');
9+
10+
var routes = require('./routes/index');
11+
var users = require('./routes/users');
12+
13+
var app = express();
14+
15+
16+
// view engine setup
17+
app.set('views', path.join(__dirname, 'views'));
18+
app.set('view engine', 'ejs');
19+
20+
//NOTICE: MUST CHANGE FOLLOWING LINE TO CONNECT TO A DIFFERENT DB
21+
mongoose.connect('mongodb://sandwich:[email protected]:39000/testschema');
22+
var db = mongoose.connection;
23+
24+
db.on('error', console.error.bind(console, 'MongoDB connection error:'));
25+
db.once('open', function callback () {
26+
console.log("Connected to DB!")
27+
});
28+
// uncomment after placing your favicon in /public
29+
//app.use(favicon(__dirname + '/public/favicon.ico'));
30+
app.use(logger('dev'));
31+
app.use(bodyParser.json());
32+
app.use(bodyParser.urlencoded({ extended: false }));
33+
app.use(cookieParser());
34+
app.use(express.static(path.join(__dirname, 'public')));
35+
36+
app.use('/', routes);
37+
app.use('/users', users);
38+
39+
// catch 404 and forward to error handler
40+
app.use(function(req, res, next) {
41+
var err = new Error('Not Found');
42+
err.status = 404;
43+
next(err);
44+
});
45+
46+
// error handlers
47+
48+
// development error handler
49+
// will print stacktrace
50+
if (app.get('env') === 'development') {
51+
app.use(function(err, req, res, next) {
52+
res.status(err.status || 500);
53+
res.render('error', {
54+
message: err.message,
55+
error: err
56+
});
57+
});
58+
}
59+
60+
// production error handler
61+
// no stacktraces leaked to user
62+
app.use(function(err, req, res, next) {
63+
res.status(err.status || 500);
64+
res.render('error', {
65+
message: err.message,
66+
error: {}
67+
});
68+
});
69+
70+
71+
module.exports = app;

Diff for: bin/www renamed to app/bin/www

File renamed without changes.

Diff for: app/components/coffee/script.coffee

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# Assignment:
2+
number = 42
3+
opposite = true
4+
5+
# Conditions:
6+
number = -42 if opposite
7+
8+
# Functions:
9+
square = (x) -> x * x
10+
11+
# Arrays:
12+
list = [1, 2, 3, 4, 5]
13+
14+
# Objects:
15+
math =
16+
root: Math.sqrt
17+
square: square
18+
cube: (x) -> x * square x
19+
20+
# Splats:
21+
race = (winner, runners...) ->
22+
print winner, runners
23+
24+
# Existence:
25+
alert "I knew it!" if elvis?
26+
27+
# Array comprehensions:
28+
cubes = (math.cube num for num in list)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: components/css/main.css renamed to app/components/css/main.css

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ input{
2424
transition-duration: .6s;
2525
}
2626
.searchTitle:hover{
27-
27+
2828
transform: scale(1.1);
2929
color: #68DFF0;
3030
}
31-
#searchIngredientResults{
31+
#searchIngredientResults{
3232
padding: 10px;
33-
33+
3434
margin: 0 auto;
35-
text-align: left;
35+
text-align: left;
3636
color: #333;
3737

3838
}
@@ -106,7 +106,7 @@ input{
106106

107107
.excludedIngredient:hover {
108108
background: #F0788A !important;
109-
109+
110110
}
111111

112112
.recipeResult:hover{

Diff for: app/components/css/sass.css

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/* line 3, ../sass.scss */
2+
body {
3+
background: #000 !important;
4+
}
5+
6+
/*# sourceMappingURL=sass.css.map */
7+
8+
{
9+
"version": 3,
10+
"mappings": ";AAEA,IAAK;EACD,UAAU,EAAE,eAAwB",
11+
"sources": ["../sass.scss"],
12+
"names": [],
13+
"file": "sass.css"
14+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: app/components/sass/sass.scss

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
$primaryColor: #000;
2+
3+
body {
4+
background: $primaryColor !important;
5+
}
File renamed without changes.

Diff for: app/components/scripts/script.js

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
var cubes, list, math, num, number, opposite, race, square,
2+
slice = [].slice;
3+
4+
number = 42;
5+
6+
opposite = true;
7+
8+
if (opposite) {
9+
number = -42;
10+
}
11+
12+
square = function(x) {
13+
return x * x;
14+
};
15+
16+
list = [1, 2, 3, 4, 5];
17+
18+
math = {
19+
root: Math.sqrt,
20+
square: square,
21+
cube: function(x) {
22+
return x * square(x);
23+
}
24+
};
25+
26+
race = function() {
27+
var runners, winner;
28+
winner = arguments[0], runners = 2 <= arguments.length ? slice.call(arguments, 1) : [];
29+
return print(winner, runners);
30+
};
31+
32+
if (typeof elvis !== "undefined" && elvis !== null) {
33+
alert("I knew it!");
34+
}
35+
36+
cubes = (function() {
37+
var i, len, results;
38+
results = [];
39+
for (i = 0, len = list.length; i < len; i++) {
40+
num = list[i];
41+
results.push(math.cube(num));
42+
}
43+
return results;
44+
})();
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: models/Review.js renamed to app/models/Review.js

File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: models/Unit.js renamed to app/models/Unit.js

File renamed without changes.

Diff for: models/User.js renamed to app/models/User.js

File renamed without changes.
File renamed without changes.

Diff for: app/public/javascripts/script.js

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: app/public/lib/FontAwesome.otf

91.7 KB
Binary file not shown.

Diff for: public/lib/angular-animate/README.md renamed to app/public/lib/angular-animate/README.md

+20-6

0 commit comments

Comments
 (0)