From fe23eacd9f984df9be8c7beb6160dcdccf15a9eb Mon Sep 17 00:00:00 2001 From: joeltaylor Date: Mon, 7 Dec 2015 22:15:37 -0500 Subject: [PATCH 01/19] Refactor to MVC, add MongoDB, upgrade Node I know...I commited the sin of a monster commit that changes everything. As penance, I've assigned myself a multitide of specs. --- .nvmrc | 2 +- .../components/modules/createComment.js | 13 +- .../components/modules/loadStories.js | 27 +- .../components/modules/newsletter.js | 1 + gulpfile.js | 52 -- migrations/1432062677274_initial_migration.js | 38 -- migrations/1432146794965_alter_timestamp.js | 8 - npm-shrinkwrap.json | 566 ++++++++++-------- package.json | 13 +- server/app.js | 60 +- server/config.js | 9 + server/{routes => controllers}/about.js | 0 server/controllers/admin.js | 49 ++ server/{routes => controllers}/assets.js | 0 server/{routes => controllers}/courses.js | 0 server/{routes => controllers}/feed.js | 1 - server/{routes => controllers}/feedback.js | 0 server/{routes => controllers}/guidelines.js | 0 server/controllers/index.js | 20 + server/{routes => controllers}/learn.js | 0 server/controllers/news.js | 182 ++++++ server/{routes => controllers}/notFound.js | 0 server/{routes => controllers}/resources.js | 0 server/controllers/routes.js | 39 ++ server/controllers/sessions.js | 17 + server/{routes => controllers}/styleguide.js | 0 server/controllers/users.js | 15 + server/db/schema.sql | 45 -- server/models/articles.js | 150 +++++ server/models/users.js | 41 ++ server/routes/admin.js | 76 --- server/routes/index.js | 32 - server/routes/news.js | 303 ---------- server/routes/users.js | 9 - server/services/articles.js | 95 --- server/services/authenticator.js | 80 +++ server/services/comments.js | 46 -- server/services/db.js | 34 -- server/services/dbConnection.js | 32 + server/services/mailchimpApi.js | 23 + server/services/mailer.js | 2 +- server/services/users.js | 49 -- server/views/admin/index.jade | 26 +- server/views/news/index.jade | 29 +- server/views/news/show.jade | 45 +- server/views/{news => users}/sign_in.jade | 6 +- 46 files changed, 1068 insertions(+), 1167 deletions(-) delete mode 100644 migrations/1432062677274_initial_migration.js delete mode 100644 migrations/1432146794965_alter_timestamp.js create mode 100644 server/config.js rename server/{routes => controllers}/about.js (100%) create mode 100644 server/controllers/admin.js rename server/{routes => controllers}/assets.js (100%) rename server/{routes => controllers}/courses.js (100%) rename server/{routes => controllers}/feed.js (89%) rename server/{routes => controllers}/feedback.js (100%) rename server/{routes => controllers}/guidelines.js (100%) create mode 100644 server/controllers/index.js rename server/{routes => controllers}/learn.js (100%) create mode 100644 server/controllers/news.js rename server/{routes => controllers}/notFound.js (100%) rename server/{routes => controllers}/resources.js (100%) create mode 100644 server/controllers/routes.js create mode 100644 server/controllers/sessions.js rename server/{routes => controllers}/styleguide.js (100%) create mode 100644 server/controllers/users.js delete mode 100644 server/db/schema.sql create mode 100644 server/models/articles.js create mode 100644 server/models/users.js delete mode 100644 server/routes/admin.js delete mode 100644 server/routes/index.js delete mode 100644 server/routes/news.js delete mode 100644 server/routes/users.js delete mode 100644 server/services/articles.js create mode 100644 server/services/authenticator.js delete mode 100644 server/services/comments.js delete mode 100644 server/services/db.js create mode 100644 server/services/dbConnection.js create mode 100644 server/services/mailchimpApi.js delete mode 100644 server/services/users.js rename server/views/{news => users}/sign_in.jade (76%) diff --git a/.nvmrc b/.nvmrc index 743ad4a..fae6e3d 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -iojs-v1.2.0 +4.2.1 diff --git a/client/javascripts/components/modules/createComment.js b/client/javascripts/components/modules/createComment.js index e276187..9b21b31 100644 --- a/client/javascripts/components/modules/createComment.js +++ b/client/javascripts/components/modules/createComment.js @@ -75,18 +75,17 @@ JS.Modules.CreateComment = (function() { var _buildComment = function(data) { var comment = ''; - comment+= - '
  • ' + + '
  • ' + '
    ' + '
    ' + - '' + + '' + '
    ' + '
    ' + '
    ' + '
    ' + '
    ' + - '' + data.comment.name + '' + + '' + data.doc.comments[0].user.name + '' + '' + '
    ' + '
    ' + @@ -94,9 +93,9 @@ JS.Modules.CreateComment = (function() { '
    ' + '
    ' + '
    ' + - '

    ' + data.comment.body + '

    ' + + '

    ' + data.doc.comments[0].body + '

    ' + '