From 4315418aa1cc605cb6020c095f3f69431d07d4ff Mon Sep 17 00:00:00 2001 From: Wynne Crisman Date: Sat, 19 Nov 2016 19:39:02 -0800 Subject: [PATCH] Major changes to the structure of pages to utilize the flex layout system. --- app/initialData.js | 2 +- app/passport.js | 2 +- migrations/20160602030150-Sale.js | 2 +- models/sale.js | 6 +- models/user.js | 14 +- public/admin/Venues.html | 484 +- public/admin/categories.html | 469 +- public/admin/categories.styl | 28 + public/admin/configMenu.html | 22 + public/admin/configMenu.styl | 56 + public/admin/css/chosen.css | 447 - public/admin/css/chosen.min.css | 3 - .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 0 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 0 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 262 -> 0 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 262 -> 0 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 0 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 0 bytes .../images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_454545_256x240.png | Bin 6992 -> 0 bytes .../images/ui-icons_888888_256x240.png | Bin 6999 -> 0 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 0 bytes .../admin/css/jquery-ui-1.11.4/jquery-ui.css | 1225 --- .../css/jquery-ui-1.11.4/jquery-ui.min.css | 7 - .../jquery-ui-1.11.4/jquery-ui.structure.css | 833 -- .../jquery-ui.structure.min.css | 5 - .../css/jquery-ui-1.11.4/jquery-ui.theme.css | 410 - .../jquery-ui-1.11.4/jquery-ui.theme.min.css | 5 - public/admin/editableSelect.styl | 33 + public/admin/home.html | 0 public/admin/home.styl | 0 public/admin/index.ejs | 95 +- public/admin/items.css | 45 + public/admin/items.html | 842 +- public/admin/items.styl | 42 +- public/admin/js/Dropdown.js | 5 +- public/admin/js/EditableSelect.js | 337 + public/admin/js/chosen.jquery.js | 1269 --- public/admin/js/chosen.jquery.min.js | 2 - public/admin/js/framework_lite.js | 153 - public/admin/js/jquery.disableSelection.js | 30 + public/admin/js/jquery.editable.select.js | 272 + public/admin/js/jquery.validate.js | 1532 ---- public/admin/js/jquery.validate.min.js | 4 - public/admin/js/layout.js | 364 - public/admin/js/linkedTable.js | 6 + public/admin/js/main.js | 151 +- public/admin/js/socket.io.js | 7248 ----------------- public/admin/legal.html | 8 + public/admin/legal.styl | 55 + public/admin/main.styl | 724 +- public/admin/measures.html | 479 +- public/admin/measures.styl | 28 + public/admin/menu.html | 14 + public/admin/menu.styl | 56 + public/admin/sales.html | 559 +- public/admin/sales.styl | 31 + public/admin/subcategories.html | 549 +- public/admin/subcategories.styl | 29 + public/admin/users.html | 565 +- public/admin/users.styl | 29 + public/admin/venues.styl | 27 + public/js/layout.js | 2 +- 64 files changed, 3590 insertions(+), 16015 deletions(-) create mode 100644 public/admin/configMenu.html create mode 100644 public/admin/configMenu.styl delete mode 100644 public/admin/css/chosen.css delete mode 100644 public/admin/css/chosen.min.css delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-bg_glass_55_fbf9ee_1x400.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-bg_glass_75_dadada_1x400.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-bg_glass_75_e6e6e6_1x400.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-bg_glass_95_fef1ec_1x400.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-bg_highlight-soft_75_cccccc_1x100.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-icons_222222_256x240.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-icons_2e83ff_256x240.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-icons_454545_256x240.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-icons_888888_256x240.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/images/ui-icons_cd0a0a_256x240.png delete mode 100644 public/admin/css/jquery-ui-1.11.4/jquery-ui.css delete mode 100644 public/admin/css/jquery-ui-1.11.4/jquery-ui.min.css delete mode 100644 public/admin/css/jquery-ui-1.11.4/jquery-ui.structure.css delete mode 100644 public/admin/css/jquery-ui-1.11.4/jquery-ui.structure.min.css delete mode 100644 public/admin/css/jquery-ui-1.11.4/jquery-ui.theme.css delete mode 100644 public/admin/css/jquery-ui-1.11.4/jquery-ui.theme.min.css create mode 100644 public/admin/editableSelect.styl delete mode 100644 public/admin/home.html delete mode 100644 public/admin/home.styl create mode 100644 public/admin/js/EditableSelect.js delete mode 100644 public/admin/js/chosen.jquery.js delete mode 100644 public/admin/js/chosen.jquery.min.js delete mode 100644 public/admin/js/framework_lite.js create mode 100644 public/admin/js/jquery.disableSelection.js create mode 100644 public/admin/js/jquery.editable.select.js delete mode 100644 public/admin/js/jquery.validate.js delete mode 100644 public/admin/js/jquery.validate.min.js delete mode 100644 public/admin/js/layout.js delete mode 100644 public/admin/js/socket.io.js create mode 100644 public/admin/legal.html create mode 100644 public/admin/legal.styl create mode 100644 public/admin/menu.html create mode 100644 public/admin/menu.styl diff --git a/app/initialData.js b/app/initialData.js index 2adf344..08a58dd 100644 --- a/app/initialData.js +++ b/app/initialData.js @@ -8,7 +8,7 @@ module.exports = function(sequelize) { if(count == 0) { var basicJarIds = []; - models.User.create({login: 'wcrisman', password: models.User.generateHash('landFJ40'), admin: true}); + models.User.create({login: 'wcrisman', password: 'landFJ40', admin: true}); models.Venue.create({name: 'Boonville'}); models.Venue.create({name: 'Clement St Farmers Market in SF'}); diff --git a/app/passport.js b/app/passport.js index 04b65c8..fa945c5 100644 --- a/app/passport.js +++ b/app/passport.js @@ -76,7 +76,7 @@ module.exports = function(passport, User) { if(!user) { return done(null, false, req.flash('loginMessage', 'User not found.')); } - else if(!user.validPassword(password)) { + else if(!user.isPasswordValid(password)) { return done(null, false, req.flash('loginMessage', 'Invalid password.')); } else { diff --git a/migrations/20160602030150-Sale.js b/migrations/20160602030150-Sale.js index 227c0ef..bedf924 100644 --- a/migrations/20160602030150-Sale.js +++ b/migrations/20160602030150-Sale.js @@ -23,7 +23,7 @@ module.exports = { type: DataTypes.DECIMAL(13,4), allowNull: false }, - measure: { + measureId: { type: Sequelize.INTEGER, references: { model: 'Measure', diff --git a/models/sale.js b/models/sale.js index 8dff827..d5b64b0 100644 --- a/models/sale.js +++ b/models/sale.js @@ -29,14 +29,10 @@ module.exports = function(sequelize, DataTypes) { updatedAt: { type: DataTypes.DATE, allowNull: false - }, - deletedAt: { - type: DataTypes.DATE, - allowNull: true } }, { freezeTableName: true, // Model tableName will be the same as the model name - paranoid: true, + paranoid: false, classMethods: { associate: function(models) { Sale.belongsTo(models.Item, {as: 'item', foreignKey: {name: 'itemId', field: 'itemId'}}); diff --git a/models/user.js b/models/user.js index dfd67d9..906f592 100644 --- a/models/user.js +++ b/models/user.js @@ -14,10 +14,10 @@ module.exports = function(sequelize, DataTypes) { login: { type: DataTypes.STRING }, - password: { + password: { //Note: The salt should be stored as part of the hash. type: DataTypes.STRING, set: function(val) { - this.setDataValue('password', sequelize.models.User.generateHash(val)); + this.setDataValue('password', bcrypt.hashSync(val, bcrypt.genSaltSync(8), null)); } }, admin: { @@ -35,16 +35,8 @@ module.exports = function(sequelize, DataTypes) { freezeTableName: true, // Model tableName will be the same as the model name //paranoid: true, //Keep deleted data but flag it as deleted comment: "A system user authorized to access and manipulate the application data.", - classMethods: { - generateHash: function(password) { - return bcrypt.hashSync(password, bcrypt.genSaltSync(8), null); - } - }, instanceMethods: { - generateHash: function(password) { - return bcrypt.hashSync(password, bcrypt.genSaltSync(8), null); - }, - validPassword: function(password) { + isPasswordValid: function(password) { return bcrypt.compareSync(password, this.password); } } diff --git a/public/admin/Venues.html b/public/admin/Venues.html index 51cf856..e673010 100644 --- a/public/admin/Venues.html +++ b/public/admin/Venues.html @@ -1,13 +1,11 @@
-
+
+
+

Manage Venues

- -

Manage Venues

- -
@@ -25,238 +23,258 @@ +
- -