diff --git a/package-lock.json b/package-lock.json index 562326f..96c9a39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -765,9 +765,9 @@ } }, "cleaner-wrasse": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/cleaner-wrasse/-/cleaner-wrasse-1.0.8.tgz", - "integrity": "sha512-1ug+1TGlw4uQaooIkIcsHoOZ4cO14dGdM+xHNUMvfsG7AsWpxF0dY5nJfxvDaZdwORxQZkWDTN/oc8hqSzqrMw==" + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/cleaner-wrasse/-/cleaner-wrasse-1.0.11.tgz", + "integrity": "sha512-MSxIikt7SurPZ+kTDidNgk4yWpoya8G9GAQdxvwmgI+ci+ISSDSSCqJvYm+TwYyQO7sEkJQ71USto3Y1RWuivQ==" }, "cli-boxes": { "version": "1.0.0", @@ -1444,12 +1444,12 @@ } }, "express-validator": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.2.0.tgz", - "integrity": "sha512-892cPistoSPzMuoG2p1W+2ZxBi0bAvPaaYgXK1E1C8/QncLo2d1HbiDDWkXUtTthjGEzEmwiELLJHu1Ez2hOEg==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.4.1.tgz", + "integrity": "sha512-9lVLCv9n735j6LjZwrINKhfv30ek1U4LVy/2jU1j4QotQ8A72Saw63wTu8/zXGZajP3scqf46PJxqquGF340Bg==", "requires": { "lodash": "^4.17.15", - "validator": "^11.1.0" + "validator": "^12.1.0" } }, "extend": { @@ -1642,9 +1642,9 @@ } }, "fraternate": { - "version": "1.3.24", - "resolved": "https://registry.npmjs.org/fraternate/-/fraternate-1.3.24.tgz", - "integrity": "sha512-a6o04+1wyrJLMP/HpvAlR+4hbQaGNknlxv1+IID3CGAyrSuUFoAuouR6QVf1ev+gU99W32TWsen/x7HxtLUIQg==" + "version": "1.3.26", + "resolved": "https://registry.npmjs.org/fraternate/-/fraternate-1.3.26.tgz", + "integrity": "sha512-sC9kzo/tGpMTx+HC7CvHp8O3nKctHLFxWL9JB3/k0EkQchTur4RcKvYzVLDf+WFlWvBX3+Ok4uDGFtYi1PsaOg==" }, "fresh": { "version": "0.5.2", @@ -2598,9 +2598,9 @@ } }, "heavylifting": { - "version": "1.2.58", - "resolved": "https://registry.npmjs.org/heavylifting/-/heavylifting-1.2.58.tgz", - "integrity": "sha512-AjyxMS6DgDkg74j3l+wcrUcUU3A0vb5pkwYY7S0XLdJMy9c2QkIRqIP0SAfvZQCGk5maF2HiIrkZ6wnhCB2ChQ==" + "version": "1.2.59", + "resolved": "https://registry.npmjs.org/heavylifting/-/heavylifting-1.2.59.tgz", + "integrity": "sha512-hAewIxSfmKFzHlP2W1f6u6aSHmqnbnLh28FViTWMSPZVPxp+ehJKZvcfs4puS/JoOweoDXVCX6L8ssvL3Sa3/g==" }, "helper-date": { "version": "1.0.1", @@ -3457,14 +3457,14 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" }, "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "version": "2.25.3", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz", + "integrity": "sha512-PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg==" }, "mongodb": { - "version": "3.5.6", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.6.tgz", - "integrity": "sha512-sh3q3GLDLT4QmoDLamxtAECwC3RGjq+oNuK1ENV8+tnipIavss6sMYt77hpygqlMOCt0Sla5cl7H4SKCVBCGEg==", + "version": "3.5.7", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.5.7.tgz", + "integrity": "sha512-lMtleRT+vIgY/JhhTn1nyGwnSMmJkJELp+4ZbrjctrnBxuLbj6rmLuJFz8W2xUzUqWmqoyVxJLYuC58ZKpcTYQ==", "requires": { "bl": "^2.2.0", "bson": "^1.1.4", @@ -3475,13 +3475,13 @@ } }, "mongoose": { - "version": "5.9.10", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.10.tgz", - "integrity": "sha512-w1HNukfJzzDLfcI1f79h2Wj4ogVbf+X8hRkyFgqlcjK7OnDlAgahjDMIsT+mCS9jKojrMhjSsZIs9FiRPkLqMg==", + "version": "5.9.13", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.9.13.tgz", + "integrity": "sha512-MsFdJAaCTVbDA3gYskUEpUN1kThL7sp4zh8N9rGt0+9vYMn28q92NLK90vGssM9qjOGWp8HqLeT1fBgfMZDnKA==", "requires": { "bson": "^1.1.4", "kareem": "2.3.1", - "mongodb": "3.5.6", + "mongodb": "3.5.7", "mongoose-legacy-pluralize": "1.0.2", "mpath": "0.7.0", "mquery": "3.2.2", @@ -5493,9 +5493,9 @@ } }, "validator": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-11.1.0.tgz", - "integrity": "sha512-qiQ5ktdO7CD6C/5/mYV4jku/7qnqzjrxb3C/Q5wR3vGGinHTgJZN/TdFT3ZX4vXhX2R1PXx42fB1cn5W+uJ4lg==" + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-12.2.0.tgz", + "integrity": "sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ==" }, "vary": { "version": "1.1.2", diff --git a/package.json b/package.json index ccb2cef..888e765 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "bcrypt-nodejs": "0.0.3", "body-parser": "^1.19.0", "braintree": "^2.22.0", - "cleaner-wrasse": "^1.0.8", + "cleaner-wrasse": "^1.0.11", "compression": "^1.7.4", "crypto": "0.0.3", "dotenv": "^2.0.0", @@ -21,9 +21,9 @@ "express-handlebars": "^3.1.0", "express-recaptcha": "^2.3.0", "express-session": "^1.17.1", - "express-validator": "^6.2.0", + "express-validator": "^6.4.1", "flash": "^1.1.0", - "fraternate": "^1.3.24", + "fraternate": "^1.3.26", "grunt": "^1.1.0", "grunt-concurrent": "^3.0.0", "grunt-nodemon": "^0.4.2", @@ -31,10 +31,10 @@ "grunt-run": "^0.8.1", "handlebars-helpers": "^0.10.0", "handlebars.moment": "^1.0.4", - "heavylifting": "^1.2.58", + "heavylifting": "^1.2.59", "method-override": "^2.3.10", - "moment": "^2.24.0", - "mongoose": "^5.9.10", + "moment": "^2.25.3", + "mongoose": "^5.9.13", "morgan": "^1.10.0", "nodemailer": "^2.7.2", "passport": "^0.3.2", diff --git a/public/homepage/css/new-age.css b/public/homepage/css/new-age.css index b8d3064..1b9da5b 100644 --- a/public/homepage/css/new-age.css +++ b/public/homepage/css/new-age.css @@ -23,7 +23,7 @@ header.masthead { padding-bottom: 100px; color: #ffffff; background: url(../img/bg-pattern.png), #000000; - background: url(../img/bg-pattern.png), linear-gradient(to left, #de6464, #8264dc); + background: url(../img/bg-pattern.png), linear-gradient(to left, black,black); } header.masthead .header-content { diff --git a/public/homepage/index.handlebars b/public/homepage/index.handlebars index c9cf817..8208943 100644 --- a/public/homepage/index.handlebars +++ b/public/homepage/index.handlebars @@ -1,10 +1,10 @@ - - - - + + + + {{siteName}} @@ -58,31 +58,67 @@

A user and organization subscription management boilerplate.

Fraternate is a standalone copy of the GitHub user subscription system. - Fraternate is open-source, start by deploying as a boilerplate directly off GitHub , or use the npm module as a standalone plugin. Built with mongodB, NodeJS, expressjs and Handlebars.js and designed for flexibility.

-
- Get Started - View Users -
-
-

Don’t forget to star on GitHub!

-

- Star + Fraternate is open-source, start by deploying as a boilerplate directly off GitHub , or use the npm module as a standalone plugin. Download the Full stack boilerplate using Node.js Mongodb Express.js Handlebars.js from Github. Download

+ +
+

Don’t forget to star on GitHub!

+

+ Star +
- -
- - {{#unless user}} - {{> signuphomepage}} - {{/unless}} +
+ + {{#unless user}} + {{> signuphomepage}} + {{/unless}} +
- - -
+ +
+
+

This is a open-source boilerplate that can be downloaded from GitHub.

+ +
+ + + +
+ Wrasse Repository + + +


+
Fraternate does the user management , wrasse the issue tracking.


+ +

+
+
+
+
+
The Documentation.
-

Browse to the documentation page for details on how to run on your PC, as well as installation and web deployment options.

+

Browse to the documentation page for details on how to run on your Localhost, as well as installation and web deployment options.

Instructions
@@ -154,14 +190,7 @@

-
-
- Fraternate Repository -

- Fraternate is comprised of 2 parts; the (long term) standalone npm module, and this copy of the hosted website on GitHub. As the website and npm module are intertwined at the moment, it is best to start with a fork of the GitHub repository and figure out what you would like to keep and throw away from there. -
-
-
+
diff --git a/views/partials/javascript.handlebars b/views/partials/javascript.handlebars index 1d1e51a..6ee2cac 100644 --- a/views/partials/javascript.handlebars +++ b/views/partials/javascript.handlebars @@ -17,5 +17,5 @@ - + \ No newline at end of file