Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make heroku friendly #5

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
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
11 changes: 11 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CONNECTION_STRNG=mongodb://localhost:27017/meanie
SECRET="REPLACE THIS WITH YOUR OWN SECRET, IT CAN BE ANY STRING"
CONTACT_EMAIL="REPLACE THIS WITH YOUR EMAIL ADDRESS"
GOOGLE_ANALYTICS_ACCOUNT="UA-XXXXXXXX-X"
DISQUS_APP=meaniedemo
APP_NAME="Meanie"
UPLOAD_IMAGES_TO_MONGO=true
DISABLE_ADS=false
CARBON_PLACEMENT=jasonwatmore
DISABLE_ANALYTICS=false
DISABLE_DISQUS=false
14 changes: 13 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,16 @@ build/Release
node_modules

# file uploads folder
client/blog/_content/uploads
client/blog/_content/uploads

.nvmrc

# processed javascript & css outputs
client/admin/_dist
client/blog/_dist

# environment variables and secrets
.env

# gulp pipeline assets
client/_dist/
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: npm start
2 changes: 1 addition & 1 deletion client/admin/_content/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ body {
}

td {
vertical-align: middle
vertical-align: middle;
}

td.action-icons {
Expand Down
Binary file modified client/admin/_content/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion client/admin/_directives/wysiwyg.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@
} else {
// regular editor
editorOptions = {
filebrowserImageUploadUrl: '/admin/upload',
removeButtons: 'About,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField,Save,CreateDiv,Language,BidiLtr,BidiRtl,Flash,Iframe,addFile,Styles',
allowedContent: true
};
if (attr.parentId) {
editorOptions.filebrowserImageUploadUrl = '/admin/upload/' + attr.parentId;
}
}

// enable ckeditor
Expand Down
1 change: 0 additions & 1 deletion client/admin/_dist/app.css

This file was deleted.

19 changes: 0 additions & 19 deletions client/admin/_dist/app.min.js

This file was deleted.

22 changes: 11 additions & 11 deletions client/admin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<link rel="icon" href="/admin/_content/images/logo.png" type="image/png" />

<!-- bootstrap -->
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" />
<link href="/_dist/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />

<!-- jquery ui -->
<link href="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css" rel="stylesheet">
<link href="/_dist/jquery-ui/themes/smoothness/jquery-ui.css" rel="stylesheet">

<!-- meanie -->
<link href="_dist/app.css" rel="stylesheet" />
Expand All @@ -27,7 +27,7 @@
<li><a href="/login" target="_self">Logout</a></li>
</ul>
<div class="logo">
<img src="/admin/_content/images/logo.png" />
<img src="/admin/_content/images/logo.png" width="50" height="50" />
MEANie
</div>
<div class="flash-message" ng-if="flash">
Expand All @@ -42,22 +42,22 @@
<footer></footer>

<!-- jquery -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
<script src="/_dist/jquery.min.js"></script>
<script src="/_dist/jquery-ui/jquery-ui.min.js"></script>

<!-- underscore -->
<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore-min.js"></script>
<script src="/_dist/underscore-min.js"></script>

<!-- moment -->
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.min.js"></script>
<script src="/_dist/moment.min.js"></script>

<!-- angular -->
<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.4.7/angular.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.15/angular-ui-router.min.js"></script>
<script src="/_dist/angular.min.js"></script>
<script src="/_dist/angular-ui-router.min.js"></script>

<!-- ckeditor -->
<script src="//cdn.ckeditor.com/4.5.7/full/ckeditor.js"></script>
<script src="//cdn.ckeditor.com/4.5.7/full/adapters/jquery.js"></script>
<script src="/_dist/ckeditor/ckeditor.js"></script>
<script src="/_dist/ckeditor/adapters/jquery.js"></script>

<!-- meanie -->
<script src="_dist/app.min.js"></script>
Expand Down
3 changes: 2 additions & 1 deletion client/admin/pages/add-edit.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ <h1>Page Details</h1>
<label for="description">Description</label>
<textarea id="description" class="form-control" ng-model="vm.page.description" rows="4"></textarea>
</div>
<p ng-if="!vm.post._id">*you must save a page before being able to upload images</p>
<div class="form-group">
<label for="body">Body</label>
<textarea class="form-control" ng-model="vm.page.body" wysiwyg></textarea>
<textarea class="form-control" ng-model="vm.page.body" wysiwyg parent-id="{{vm.page._id}}"></textarea>
</div>
<div class="checkbox">
<label>
Expand Down
3 changes: 2 additions & 1 deletion client/admin/posts/add-edit.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ <h1>Post Details</h1>
<label for="summary">Summary</label>
<textarea id="summary" class="form-control" ng-model="vm.post.summary" rows="4"></textarea>
</div>
<p ng-if="!vm.post._id">*you must save a post before being able to upload images</p>
<div class="form-group">
<label for="body">Body</label>
<textarea class="form-control" ng-model="vm.post.body" wysiwyg></textarea>
<textarea class="form-control" ng-model="vm.post.body" wysiwyg parent-id="{{vm.post._id}}"></textarea>
</div>
<div class="form-group">
<label for="title">Tags</label>
Expand Down
12 changes: 8 additions & 4 deletions client/blog/_content/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ hr {
}

.navbar-inverse {
background-color: teal;
padding-bottom: 10px;
padding-top: 10px;
}
Expand All @@ -91,7 +92,7 @@ hr {
}

.navbar-inverse .navbar-nav > li > a:hover {
color: #7b7b7b;
color: black;
}

.navbar-brand {
Expand All @@ -101,13 +102,15 @@ hr {
}

.navbar-brand img {
border-radius:50%;
border-radius: 0%;
float: left;
margin-right: 10px;
}

.navbar-brand span {
white-space:nowrap;
display:inline-block;
margin-top:5px;
float: left;
margin-top:12px;
}

@media (max-width: 767px) {
Expand All @@ -126,6 +129,7 @@ hr {

.container > .navbar-header {
margin-right:50px;
min-height: 70px;
}

.post-pager {
Expand Down
8 changes: 0 additions & 8 deletions client/blog/_content/bootstrap.css

This file was deleted.

Binary file modified client/blog/_content/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading