diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..beffa30 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +indent_style = space +indent_size = 2 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.gitignore b/.gitignore index 331742c..d55c6a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ .DS_Store *.sublime-project *.sublime-workspace +.idea/* +.vscode +node_modules dump -settings.json -.idea/* \ No newline at end of file +settings-development.json +settings-production.json +npm-debug.log diff --git a/.meteor/.finished-upgraders b/.meteor/.finished-upgraders index 61ee313..aa60704 100755 --- a/.meteor/.finished-upgraders +++ b/.meteor/.finished-upgraders @@ -10,3 +10,6 @@ notices-for-facebook-graph-api-2 1.2.0-meteor-platform-split 1.2.0-cordova-changes 1.2.0-breaking-changes +1.3.0-split-minifiers-package +1.4.0-remove-old-dev-bundle-link +1.4.1-add-shell-server-package diff --git a/.meteor/.id b/.meteor/.id index 3265646..a3bba18 100644 --- a/.meteor/.id +++ b/.meteor/.id @@ -4,4 +4,4 @@ # - ensuring you don't accidentally deploy one app on top of another # - providing package authors with aggregated statistics -17x7iw3cla1ql97roxh +15l9ihseylimk15ohbaz diff --git a/.meteor/packages b/.meteor/packages index 7de177b..9ebbcd6 100755 --- a/.meteor/packages +++ b/.meteor/packages @@ -1,28 +1,28 @@ # Meteor packages used by this project, one per line. +# Check this file (and the other files in this directory) into your repository. # # 'meteor add' and 'meteor remove' will edit this file for you, # but you can also edit it by hand. -# Meteor core +meteor-base@1.0.4 # Packages every Meteor app needs to have +mobile-experience@1.0.4 # Packages for a great mobile UX +mongo@1.1.14 # The database Meteor supports right now +blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views +reactive-var@1.0.11 # Reactive variable for tracker +jquery@1.11.10 # Helpful client-side library +tracker@1.1.1 # Meteor's client-side reactive programming library -standard-minifiers -meteor-base -mobile-experience -mongo -blaze-html-templates -session -jquery -tracker -logging -reload -random -ejson -spacebars -check -accounts-base +standard-minifier-css@1.3.2 # CSS minifier run for production mode +standard-minifier-js@1.2.1 # JS minifier run for production mode +es5-shim@4.6.15 # ECMAScript 5 compatibility for older browsers. +ecmascript@0.6.1 # Enable ECMAScript2015+ syntax in app code +shell-server@0.2.1 # Server-side component of the `meteor shell` command -# Atmosphere +accounts-base@1.2.14 +check@1.2.4 +logging@1.1.16 +mdg:validated-method kadira:flow-router kadira:blaze-layout arillo:flow-router-helpers @@ -31,5 +31,6 @@ aldeed:autoform aldeed:collection2 aldeed:simple-schema alanning:roles -twbs:bootstrap -momentjs:moment \ No newline at end of file +themeteorchef:bert +fourseven:scss +fortawesome:fontawesome diff --git a/.meteor/release b/.meteor/release index 3a05e0a..61f6c67 100644 --- a/.meteor/release +++ b/.meteor/release @@ -1 +1 @@ -METEOR@1.2.1 +METEOR@1.4.2.3 diff --git a/.meteor/versions b/.meteor/versions index 2b05d37..8217c00 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -1,80 +1,96 @@ -accounts-base@1.2.2 -alanning:roles@1.2.14 -aldeed:autoform@5.7.1 -aldeed:collection2@2.5.0 -aldeed:simple-schema@1.3.3 -arillo:flow-router-helpers@0.4.5 -autoupdate@1.2.4 -babel-compiler@5.8.24_1 -babel-runtime@0.1.4 -base64@1.0.4 -binary-heap@1.0.4 -blaze@2.1.3 -blaze-html-templates@1.0.1 -blaze-tools@1.0.4 -boilerplate-generator@1.0.4 -caching-compiler@1.0.0 -caching-html-compiler@1.0.2 -callback-hook@1.0.4 -check@1.1.0 -coffeescript@1.0.11 -cosmos:browserify@0.5.1 -ddp@1.2.2 -ddp-client@1.2.1 -ddp-common@1.2.2 -ddp-rate-limiter@1.0.0 -ddp-server@1.2.2 -deps@1.0.9 -diff-sequence@1.0.1 -ecmascript@0.1.6 -ecmascript-runtime@0.2.6 -ejson@1.0.7 -fastclick@1.0.7 -geojson-utils@1.0.4 -hot-code-push@1.0.0 -html-tools@1.0.5 -htmljs@1.0.5 -http@1.1.1 -id-map@1.0.4 -jquery@1.11.4 -kadira:blaze-layout@2.2.0 -kadira:flow-router@2.7.0 -launch-screen@1.0.4 -livedata@1.0.15 -localstorage@1.0.5 -logging@1.0.8 -meteor@1.1.10 -meteor-base@1.0.1 -minifiers@1.1.7 -minimongo@1.0.10 -mobile-experience@1.0.1 -mobile-status-bar@1.0.6 +accounts-base@1.2.14 +alanning:roles@1.2.15 +aldeed:autoform@5.8.1 +aldeed:collection2@2.10.0 +aldeed:collection2-core@1.2.0 +aldeed:schema-deny@1.1.0 +aldeed:schema-index@1.1.1 +aldeed:simple-schema@1.5.3 +allow-deny@1.0.5 +arillo:flow-router-helpers@0.5.2 +autoupdate@1.3.12 +babel-compiler@6.13.0 +babel-runtime@1.0.1 +base64@1.0.10 +binary-heap@1.0.10 +blaze@2.1.9 +blaze-html-templates@1.0.5 +blaze-tools@1.0.10 +boilerplate-generator@1.0.11 +caching-compiler@1.1.9 +caching-html-compiler@1.0.7 +callback-hook@1.0.10 +check@1.2.4 +coffeescript@1.11.1_4 +ddp@1.2.5 +ddp-client@1.3.2 +ddp-common@1.2.8 +ddp-rate-limiter@1.0.6 +ddp-server@1.3.12 +deps@1.0.12 +diff-sequence@1.0.7 +ecmascript@0.6.1 +ecmascript-runtime@0.3.15 +ejson@1.0.13 +es5-shim@4.6.15 +fastclick@1.0.13 +fortawesome:fontawesome@4.6.3 +fourseven:scss@3.13.0 +geojson-utils@1.0.10 +hot-code-push@1.0.4 +html-tools@1.0.11 +htmljs@1.0.11 +http@1.2.10 +id-map@1.0.9 +jquery@1.11.10 +kadira:blaze-layout@2.3.0 +kadira:flow-router@2.12.1 +launch-screen@1.1.0 +livedata@1.0.18 +localstorage@1.0.12 +logging@1.1.16 +mdg:validated-method@1.1.0 +mdg:validation-error@0.5.1 +meteor@1.6.0 +meteor-base@1.0.4 +minifier-css@1.2.15 +minifier-js@1.2.15 +minimongo@1.0.19 +mobile-experience@1.0.4 +mobile-status-bar@1.0.13 +modules@0.7.7 +modules-runtime@0.7.7 momentjs:moment@2.10.6 -mongo@1.1.3 -mongo-id@1.0.1 -npm-mongo@1.4.39_1 -observe-sequence@1.0.7 -ordered-dict@1.0.4 -promise@0.5.1 -random@1.0.5 -rate-limit@1.0.0 -reactive-dict@1.1.3 -reactive-var@1.0.6 -reload@1.1.4 -retry@1.0.4 -routepolicy@1.0.6 -service-configuration@1.0.5 -session@1.1.1 -spacebars@1.0.7 -spacebars-compiler@1.0.7 -standard-minifiers@1.0.2 -templating@1.1.5 -templating-tools@1.0.0 -tracker@1.0.9 -twbs:bootstrap@3.3.5 -ui@1.0.8 -underscore@1.0.4 -url@1.0.5 -webapp@1.2.3 -webapp-hashing@1.0.5 +mongo@1.1.14 +mongo-id@1.0.6 +npm-mongo@2.2.11_2 +observe-sequence@1.0.14 +ordered-dict@1.0.9 +promise@0.8.8 +raix:eventemitter@0.1.3 +random@1.0.10 +rate-limit@1.0.6 +reactive-dict@1.1.8 +reactive-var@1.0.11 +reload@1.1.11 +retry@1.0.9 +routepolicy@1.0.12 +service-configuration@1.0.11 +session@1.1.7 +shell-server@0.2.1 +spacebars@1.0.13 +spacebars-compiler@1.0.13 +standard-minifier-css@1.3.2 +standard-minifier-js@1.2.1 +templating@1.2.15 +templating-compiler@1.2.15 +templating-runtime@1.2.15 +templating-tools@1.0.5 +themeteorchef:bert@2.1.1 +tracker@1.1.1 +ui@1.0.12 +underscore@1.0.10 +url@1.0.11 +webapp@1.3.12 +webapp-hashing@1.0.9 zimme:active-route@2.3.2 diff --git a/HISTORY.md b/HISTORY.md deleted file mode 100644 index c303743..0000000 --- a/HISTORY.md +++ /dev/null @@ -1,4 +0,0 @@ -# History / Changelog - -## vx.xx / xxxx-xx-xx - * Note \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..108f3d3 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Kjetil Haugland + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/NOTES.md b/NOTES.md deleted file mode 100755 index c69ed5e..0000000 --- a/NOTES.md +++ /dev/null @@ -1,12 +0,0 @@ -# Notes - -## Known bugs - * Note - - -## Todo - * Note - - -## Other - * Note \ No newline at end of file diff --git a/README.md b/README.md index 3eb1bf9..8eab3ce 100755 --- a/README.md +++ b/README.md @@ -3,12 +3,15 @@ A boilerplate for Meteor - giving you a simple and more organized way to create It comes with a complete collection sample including publications, subscriptions and CRUD functionality. Routes, views and some nice helpers are also included. -Take a look at [meteor-skeleton.meteor.com](http://meteor-skeleton.meteor.com) for a live sample. +Take a look at [meteorskeleton.herokuapp.com](https://meteorskeleton.herokuapp.com) for a demo. -![Meteor-skeleton](http://i.imgur.com/ETTVDTM.png) +![Meteor-skeleton](http://i.imgur.com/Soq1xnF.png) ## Packages used +### Atmosphere + +- blaze-html-templates - accounts-base - alanning:roles - kadira:flow-router @@ -18,51 +21,63 @@ Take a look at [meteor-skeleton.meteor.com](http://meteor-skeleton.meteor.com) f - aldeed:simple-schema - aldeed:collection2 - aldeed:autoform -- momentjs:moment -- twbs:bootstrap +- fourseven:scss +- themeteorchef:bert +- fortawesome:fontawesome + +### NPM + +- bootstrap-sass +- moment The Meteor packages 'autopublish' and 'insecure' are removed by default. +### NPM + ## Usage -1. Clone it: ```git clone https://github.com/kjetilhau/meteor-skeleton.git``` -2. ```cd meteor-skeleton``` +1. Clone it: `git clone https://github.com/kjetilhau/meteor-skeleton.git` +2. `cd meteor-skeleton` 3. Remove the .git folder -4. ```git init``` -6. ```meteor``` +4. `git init` +6. `meteor` ## Structure ``` -client/ # Client code - config/ # Configuration files - lib/ # Library files that get executed first - helpers/ # Helpers that helps you and yours - routes/ # Everything related to client-side routing - startup/ # Stuff that gets launched at client load - stylesheets/ # CSS/LESS/SCSS files - components/ # Styles for specific components - sites/ # Styles for sites and collections - subscriptions/ # Collection subscriptions that are not defined in routes - views/ # View templates - documents/ # Views related to the Documents collection - layouts/ # Layout files defined with Iron Router - pages/ # Views for static pages - shared/ # Usually templates that are shared between views -lib/ # Code shared with client and server files - collections/ # Collection files, separate files for each collection - helpers/ # Helpers that is accessible on both client and server -public/ # Public files - img/ # Static image folder - fonts/ # Static fonts folder -server/ # Server code - config/ # Server configuration files - fixtures/ # Fixtures for defining pre-loaded data - lib/ # Server-side library folder - publications/ # Collection publications, separate files for each collection - startup/ # Stuff that gets launched at server startup +client +import + api/ + documents/ + both/ + schemas/ + server/ + modules/ + startup/ + both/ + client/ + router/ + server/ + ui/ + components/ + documents/ + edit/ + index/ + documents-index-item/ + new/ + show/ + helpers/ + layouts/ + pages/ + shared/ + stylesheets/ + theme/ +public + img/ + fonts/ +server ``` ## Other great boilerplates +- [base](https://github.com/themeteorchef/base) by The Meteor Chef - [meteor-boilerplate](https://github.com/matteodem/meteor-boilerplate) by matteodem -- [Void](https://github.com/SachaG/Void) by Sacha Greif -- [meteor-boilerplate](https://github.com/BeDifferential/meteor-boilerplate) by BeDifferential +- [meteor-boilerplate](https://github.com/Differential/meteor-boilerplate) by Differential diff --git a/client/head.html b/client/head.html new file mode 100644 index 0000000..f59de57 --- /dev/null +++ b/client/head.html @@ -0,0 +1,12 @@ +
+ +{{content}}
- Back - {{/with}} - {{else}} - {{> loading}} - {{/if}} - - \ No newline at end of file diff --git a/client/views/documents/document_show.js b/client/views/documents/document_show.js deleted file mode 100755 index 4a41754..0000000 --- a/client/views/documents/document_show.js +++ /dev/null @@ -1,24 +0,0 @@ -Template.documentShow.onCreated(function() { - var self = this; - self.autorun(function () { - var documentId = FlowRouter.getParam('documentId'); - self.subscribe("document", documentId); - }); -}); - -Template.documentShow.onRendered(function() { -}); - -Template.documentShow.onDestroyed(function() { -}); - -Template.documentShow.helpers({ - document: function () { - var documentId = FlowRouter.getParam('documentId'); - var document = Documents.findOne({_id: documentId}) || {}; - return document; - } -}); - -Template.documentShow.events ({ -}); diff --git a/client/views/documents/documents_index.html b/client/views/documents/documents_index.html deleted file mode 100755 index 1ba88ab..0000000 --- a/client/views/documents/documents_index.html +++ /dev/null @@ -1,45 +0,0 @@ - - -Title | -Content | -Updated | -Created | -Actions | -
---|---|---|---|---|
{{title}} | -{{content}} | -{{showTimeAgo updatedAt}} | -{{showPrettyTimestamp createdAt}} | -- Edit - Delete - | -
No documents yet.
- {{/if}} - {{else}} - {{> loading}} - {{/if}} - -- A boilerplate for Meteor - giving you a simple and more organized way to create projects. -
-- It comes with a complete collection sample including publications, subscriptions and CRUD functionality. Routes, views and some nice helpers are also included. -
-git clone https://github.com/kjetilhau/meteor-skeleton.git
cd meteor-skeleton
git init
meteor
A boilerplate for Meteor - giving you a simple and more organized way to create projects.
-It comes with a complete collection sample including publications, subscriptions and CRUD functionality. Routes, views and some nice helpers are also included.
- -Title | +Content | +Updated | +Created | +Actions | +
---|
{{document.content}}
+
+ {{#if document.updatedAt}}
+ Updated: {{showPrettyTimestamp document.updatedAt}}
+ {{/if}}
+ Created: {{showPrettyTimestamp document.createdAt}}
+
+ A boilerplate for Meteor - giving you a simple and more organized way to create projects. +
++ It comes with a complete collection sample including publications, subscriptions and CRUD functionality. Routes, views and + some nice helpers are also included. +
+git clone https://github.com/kjetilhau/meteor-skeleton.git
cd meteor-skeleton
git init
meteor
A boilerplate for Meteor - giving you a simple and more organized way to create projects.
+It comes with a complete collection sample including publications, subscriptions and CRUD functionality. Routes, views and some nice helpers are also included.
+ +{{description}}
+ {{/if}} +`, ``, and ``.
+$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
+$font-family-base: $font-family-sans-serif !default;
+
+$font-size-base: 14px !default;
+$font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px
+$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px
+
+$font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px
+$font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px
+$font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px
+$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px
+$font-size-h5: $font-size-base !default;
+$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+$line-height-base: 1.428571429 !default; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px
+
+//** By default, this inherits from the ``.
+$headings-font-family: $font-family-base !default;
+$headings-font-weight: 500 !default;
+$headings-line-height: 1.2 !default;
+$headings-color: inherit !default;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
+//** File name for all font files.
+$icon-font-name: "glyphicons-halflings-regular" !default;
+//** Element ID within SVG icon file.
+$icon-font-svg-id: "glyphicons_halflingsregular" !default;
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+$padding-base-vertical: 8px !default;
+$padding-base-horizontal: 12px !default;
+
+$padding-large-vertical: 14px !default;
+$padding-large-horizontal: 16px !default;
+
+$padding-small-vertical: 5px !default;
+$padding-small-horizontal: 10px !default;
+
+$padding-xs-vertical: 1px !default;
+$padding-xs-horizontal: 5px !default;
+
+$line-height-large: 1.3333333 !default; // extra decimals for Win 8.1 Chrome
+$line-height-small: 1.5 !default;
+
+$border-radius-base: 4px !default;
+$border-radius-large: 6px !default;
+$border-radius-small: 3px !default;
+
+//** Global color for active items (e.g., navs or dropdowns).
+$component-active-color: #fff !default;
+//** Global background color for active items (e.g., navs or dropdowns).
+$component-active-bg: $brand-primary !default;
+
+//** Width of the `border` for generating carets that indicate dropdowns.
+$caret-width-base: 4px !default;
+//** Carets increase slightly in size for larger components.
+$caret-width-large: 5px !default;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for ``s and ` `s.
+$table-cell-padding: 8px !default;
+//** Padding for cells in `.table-condensed`.
+$table-condensed-cell-padding: 5px !default;
+
+//** Default background color used for all tables.
+$table-bg: transparent !default;
+//** Background color used for `.table-striped`.
+$table-bg-accent: #f9f9f9 !default;
+//** Background color used for `.table-hover`.
+$table-bg-hover: #f5f5f5 !default;
+$table-bg-active: $table-bg-hover !default;
+
+//** Border color for table and cell borders.
+$table-border-color: #ddd !default;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+$btn-font-weight: normal !default;
+
+$btn-default-color: $text-color !default;
+$btn-default-bg: #fff !default;
+$btn-default-border: rgba(0, 0, 0, 0.1) !default;
+
+$btn-primary-color: #fff !default;
+$btn-primary-bg: $brand-primary !default;
+$btn-primary-border: $btn-primary-bg !default;
+
+$btn-success-color: #fff !default;
+$btn-success-bg: $brand-success !default;
+$btn-success-border: $btn-success-bg !default;
+
+$btn-info-color: #fff !default;
+$btn-info-bg: $brand-info !default;
+$btn-info-border: $btn-info-bg !default;
+
+$btn-warning-color: #fff !default;
+$btn-warning-bg: $brand-warning !default;
+$btn-warning-border: $btn-warning-bg !default;
+
+$btn-danger-color: #fff !default;
+$btn-danger-bg: $brand-danger !default;
+$btn-danger-border: $btn-danger-bg !default;
+
+$btn-link-disabled-color: $gray-light !default;
+
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius-base: $border-radius-base !default;
+$btn-border-radius-large: $border-radius-large !default;
+$btn-border-radius-small: $border-radius-small !default;
+
+
+//== Forms
+//
+//##
+
+//** `` background color
+$input-bg: #fff !default;
+//** `` background color
+$input-bg-disabled: $gray-lighter !default;
+
+//** Text color for ``s
+$input-color: $text-color !default;
+//** `` border color
+$input-border: #ccc !default;
+
+// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `