diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..ee01959 --- /dev/null +++ b/.env.example @@ -0,0 +1,2 @@ +export GRUMP_MONGO="mongodb://user_name:group@xxxxxx.mongolab.com:51863/grumpjs" +export GRUMP_GITHUB_API_SECRET="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" diff --git a/.gitignore b/.gitignore index 1d65972..712ff20 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ build/Release node_modules ENV_VAR +.env diff --git a/package.json b/package.json index 5dd882c..4c1a95a 100644 --- a/package.json +++ b/package.json @@ -3,24 +3,32 @@ "version": "0.0.0", "private": true, "scripts": { - "start": "DEBUG=grump:* nodemon ./server/bin/www", - "test": "grunt test", + "start": ". ./.env && DEBUG=grump:* nodemon ./server/bin/www", + "test": "npx grunt test", "testserver": "DEBUG=grump:* node ./server/bin/www & sleep 1; ./node_modules/.bin/mocha -R nyan specs/server/*.js; pkill -n node;" }, "dependencies": { + "angular": "^1.7.9", + "angular-markdown-directive": "^0.3.1", + "angular-mocks": "^1.7.9", + "angular-route": "^1.7.9", + "angular-sanitize": "^1.7.9", "body-parser": "~1.13.2", + "bootstrap": "^4.4.1", "cookie-parser": "~1.3.5", - "debug": "~2.2.0", + "debug": "^2.2.0", "express": "~4.13.1", "github": "^0.2.4", "grunt": "^0.4.5", "jade": "~1.11.0", + "jquery": "^3.5.0", "mongodb": "^2.0.43", "mongoose": "^4.1.8", "mongoose-ttl": "0.0.3", "morgan": "~1.6.1", "request": "^2.64.0", - "serve-favicon": "~2.3.0" + "serve-favicon": "~2.3.0", + "showdown": "^1.9.1" }, "devDependencies": { "bower": "^1.5.3", @@ -41,12 +49,13 @@ "karma-mocha-reporter": "^1.1.1", "karma-nested-reporter": "^0.1.1", "karma-nyan-reporter": "0.0.43", - "karma-phantomjs-launcher": "^0.1.4", + "karma-phantomjs-launcher": "^1.0.4", "karma-sinon": "^1.0.4", "karma-sinon-chai": "^1.1.0", "karma-spec-reporter": "0.0.20", "karma-unicorn-reporter": "^0.1.4", "mocha": "^1.20.1", + "phantomjs": "^2.1.7", "request": "^2.64.0", "sinon": "^1.17.1", "sinon-as-promised": "^4.0.0", diff --git a/server/client/app/upload/upload.html b/server/client/app/upload/upload.html index 475ba08..4a28839 100644 --- a/server/client/app/upload/upload.html +++ b/server/client/app/upload/upload.html @@ -19,7 +19,7 @@ - +
diff --git a/server/client/index.html b/server/client/index.html index d86def4..65b5bd8 100755 --- a/server/client/index.html +++ b/server/client/index.html @@ -9,7 +9,7 @@ Grump - The Script Loader Extraordinare - + @@ -36,19 +36,19 @@ @@ -62,13 +62,13 @@
- - - - - - - + + + + + + + diff --git a/server/client/styles/modern-business.css b/server/client/styles/modern-business.css index 4810985..6fa96ba 100755 --- a/server/client/styles/modern-business.css +++ b/server/client/styles/modern-business.css @@ -86,8 +86,18 @@ body a:focus { color: #458588; } -.icon-bar { - color: #ebdbb2; +button.navbar-toggle { + background-color: #504945; + border-color: #504945; +} + +.navbar-inverse .navbar-toggle .icon-bar { + background-color: #ebdbb2; + margin-bottom: 5px; + display: block; + width: 22px; + height: 2px; + border-radius: 1px; } #grumpOwner { @@ -131,7 +141,15 @@ body a:focus { .btn-default { background-color: #bdae93; + border-style: none; } + +.btn-default:hover, +.btn-default:focus { + background-color: #a89984; + border-style: none; +} + .img-portfolio { margin-bottom: 30px; } @@ -192,4 +210,4 @@ footer { header.carousel .carousel { height: 70%; } -} \ No newline at end of file +} diff --git a/server/routes/auth.js b/server/routes/auth.js index 93dde2e..adb7a1c 100644 --- a/server/routes/auth.js +++ b/server/routes/auth.js @@ -42,7 +42,7 @@ router.get('/signin', function(req, res, next) { //save the user to the database and send back a token user.save(function(err){ if(err) { res.send(err); } - else res.redirect('/#/access_token=' + token); + else res.redirect('/#!/access_token=' + token); }); }); }); diff --git a/server/routes/library.js b/server/routes/library.js index 7f5c00b..6fb8491 100644 --- a/server/routes/library.js +++ b/server/routes/library.js @@ -8,8 +8,6 @@ router.get('/', function(req, res, next) { var grump = req.params.grump; Package.find({}, function (err, result) { - console.log("Hi!"); - // console.log(JSON.stringify(result)); if (err) { console.log(err); } if (result.length === 0) { res.sendStatus(404);