Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export GRUMP_MONGO="mongodb://user_name:group@xxxxxx.mongolab.com:51863/grumpjs"
export GRUMP_GITHUB_API_SECRET="xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ build/Release
node_modules

ENV_VAR
.env
19 changes: 14 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion server/client/app/upload/upload.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<label class="control-label" for="grumpName">
Grump Command Name
</label>
<input class='taskinput form-control' type='text' ng-pattern='/^[a-zA-Z0-9]*$/' ng-model="doc.defaultCommand" placeholder="Command to be invoked in grump." id='grumpName' required>
<input class='taskinput form-control' type='text' ng-pattern='/^[a-zA-Z0-9]*$/' ng-model="doc.defaultCommand" placeholder="Command to be invoked in grump." required>
</div>

<div class="form-group">
Expand Down
26 changes: 13 additions & 13 deletions server/client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<title>Grump - The Script Loader Extraordinare</title>

<!-- Bootstrap Core CSS -->
<link rel="stylesheet" href="assets/bower_components/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="../../node_modules/bootstrap/dist/css/bootstrap.min.css">

<!-- Custom CSS -->
<link rel="stylesheet" href="styles/modern-business.css">
Expand All @@ -36,19 +36,19 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right" id="grumpBrowseLinks">
<li>
<a href='#/gettingStarted' class='link'>Getting Started</a>
<a href='#!/gettingStarted' class='link'>Getting Started</a>
</li>
<li>
<a href='#/browse' class='link'>Browse</a>
<a href='#!/browse' class='link'>Browse</a>
</li>
<li>
<a href='#/upload' class='link'>Upload</a>
<a href='#!/upload' class='link'>Upload</a>
</li>
<li>
<a href='#/signin' class='link'>Signin</a>
<a href='#!/signin' class='link'>Signin</a>
</li>
<li>
<a href='#/mygrumps' class='link'>My Grumps</a>
<a href='#!/mygrumps' class='link'>My Grumps</a>
</li>
</ul>
</div>
Expand All @@ -62,13 +62,13 @@
<div ng-view></div>

<!-- Dependencies -->
<script src="assets/bower_components/angular/angular.min.js"></script>
<script src="assets/bower_components/angular-route/angular-route.min.js"></script>
<script src="assets/bower_components/jquery/dist/jquery.min.js" type="text/javascript" ></script>
<script src="assets/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="assets/bower_components/angular-sanitize/angular-sanitize.min.js" type="text/javascript"></script>
<script src="assets/bower_components/showdown/compressed/Showdown.min.js" type="text/javascript"></script>
<script src="assets/bower_components/angular-markdown-directive/markdown.js" type="text/javascript"></script>
<script src="../../node_modules/angular/angular.min.js"></script>
<script src="../../node_modules/angular-route/angular-route.min.js"></script>
<script src="../../node_modules/jquery/dist/jquery.min.js" type="text/javascript" ></script>
<script src="../../node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../../node_modules/angular-sanitize/angular-sanitize.min.js" type="text/javascript"></script>
<script src="../../node_modules/showdown/dist/showdown.min.js" type="text/javascript"></script>
<script src="../../node_modules/angular-markdown-directive/markdown.js" type="text/javascript"></script>

<!-- App files -->
<script src="app/services/services.js"></script>
Expand Down
24 changes: 21 additions & 3 deletions server/client/styles/modern-business.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -192,4 +210,4 @@ footer {
header.carousel .carousel {
height: 70%;
}
}
}
2 changes: 1 addition & 1 deletion server/routes/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});
});
Expand Down
2 changes: 0 additions & 2 deletions server/routes/library.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down