Prechádzať zdrojové kódy

Add random color to user

sbkwgh 8 rokov pred
rodič
commit
bc1a741841
4 zmenil súbory, kde vykonal 14 pridanie a 3 odobranie
  1. 3 3
      models/thread.js
  2. 8 0
      models/user.js
  3. 1 0
      package.json
  4. 2 0
      test/user.js

+ 3 - 3
models/thread.js

@@ -21,15 +21,15 @@ module.exports = (sequelize, DataTypes) => {
 				let models = sequelize.models
 
 				return [
-					{ model: models.User, attributes: ['username', 'createdAt', 'updatedAt', 'id'] }, 
+					{ model: models.User, attributes: ['username', 'createdAt', 'color', 'updatedAt', 'id'] }, 
 					models.Category,
 					{ 
 						model: models.Post, 
 						include: [
-							{ model: models.User, attributes: ['username', 'createdAt', 'id'] }, 
+							{ model: models.User, attributes: ['username', 'createdAt', 'id', 'color'] }, 
 							{
 								model: models.Post, as: 'Replies', include:
-								[{ model: models.User, attributes: ['username', 'id'] }]	
+								[{ model: models.User, attributes: ['username', 'id', 'color'] }]	
 							}
 						]
 					}

+ 8 - 0
models/user.js

@@ -1,9 +1,17 @@
+let randomColor = require('randomcolor')
+
 module.exports = (sequelize, DataTypes) => {
 	let User = sequelize.define('User', {
 		username: {
 			type: DataTypes.STRING,
 			unique: true
 		},
+		color: {
+			type: DataTypes.STRING,
+			defaultValue () {
+				return randomColor()
+			}
+		},
 		hash: DataTypes.STRING,
 		admin: {
 			type: DataTypes.BOOLEAN,

+ 1 - 0
package.json

@@ -17,6 +17,7 @@
     "express-session": "^1.15.1",
     "marked": "^0.3.6",
     "mysql": "^2.13.0",
+    "randomcolor": "^0.4.4",
     "sequelize": "^3.30.0",
     "sequelize-cli": "^2.5.1",
     "slug": "^0.9.1"

+ 2 - 0
test/user.js

@@ -39,6 +39,8 @@ describe('User', () => {
 					res.should.be.json
 					res.body.should.have.property('username', 'username')
 					res.body.should.have.property('hash')
+					res.body.should.have.property('color')
+					res.body.color.should.not.be.null
 					
 					done()
 				})