diff --git a/package.json b/package.json index 4ca6172..cec157e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "owl-colors", - "version": "0.0.9", + "version": "0.0.11", "description": "Get Overwatch League team colors", "main": "lib/owl-colors.js", "files": [ diff --git a/src/__tests__/index.spec.js b/src/__tests__/index.spec.js index 7a7e01c..89edb1b 100644 --- a/src/__tests__/index.spec.js +++ b/src/__tests__/index.spec.js @@ -1,10 +1,18 @@ import Joi from 'joi'; import { - mainSchema, colorSchema, colorsSchema, colorsListSchema, + mainSchema, + colorSchema, + colorsSchema, + colorsListSchema, } from './schema'; import { - getAllColors, getPrimaryColor, getSecondaryColor, getTertiaryColor, getColors, - getColorList, getTeamName, + getAllColors, + getPrimaryColor, + getSecondaryColor, + getTertiaryColor, + getColors, + getColorList, + getTeamName, } from '..'; describe('OwlColor', () => { @@ -119,7 +127,7 @@ describe('OwlColor', () => { rgb: [3, 35, 64], }, strongBlue: { - hex: '#0072ce', + hex: '#0072CE', rgb: [0, 114, 206], }, gray: { @@ -139,7 +147,7 @@ describe('OwlColor', () => { rgb: [3, 35, 64], }, strongBlue: { - hex: '#0072ce', + hex: '#0072CE', rgb: [0, 114, 206], }, gray: { diff --git a/src/colors.js b/src/colors.js index 8cdf98b..fce0e6f 100644 --- a/src/colors.js +++ b/src/colors.js @@ -1,4 +1,3 @@ - const pureWhite = { hex: '#ffffff', rgb: [255, 255, 255], @@ -23,7 +22,7 @@ const colors = { rgb: [3, 35, 64], }, strongBlue: { - hex: '#0072ce', + hex: '#0072CE', rgb: [0, 114, 206], }, gray: { @@ -91,19 +90,19 @@ const colors = { }, FLA: { fullName: 'Florida Mayhem', - primaryColor: 'yellow', - secondaryColor: 'darkRed', - tertiaryColor: 'black', + primaryColor: 'black', + secondaryColor: 'pink', + tertiaryColor: 'blue', colors: { - yellow: { - hex: '#FEDB00', - rgb: [254, 219, 0], + black: pureBlack, + pink: { + hex: '#CF4691', + rgb: [207, 70, 145], }, - darkRed: { - hex: '#AF272F', - rgb: [175, 39, 47], + blue: { + hex: '#3DB2E3', + rgb: [61, 178, 227], }, - black: pureBlack, }, }, GLA: { @@ -142,8 +141,8 @@ const colors = { }, HOU: { fullName: 'Houston Outlaws', - primaryColor: 'green', - secondaryColor: 'black', + primaryColor: 'black', + secondaryColor: 'green', tertiaryColor: 'white', colors: { green: { @@ -264,22 +263,19 @@ const colors = { }, SFS: { fullName: 'San Francisco Shock', - primaryColor: 'gray', - secondaryColor: 'orange', - tertiaryColor: 'gold', + primaryColor: 'black', + secondaryColor: 'gray', + tertiaryColor: 'orange', colors: { + black: pureBlack, gray: { - hex: '#75787B', - rgb: [117, 120, 123], + hex: '#A5ACAF', + rgb: [165, 172, 175], }, orange: { hex: '#FC4C02', rgb: [252, 76, 2], }, - gold: { - hex: '#CAB64B', - rgb: [202, 182, 75], - }, }, }, SHD: { @@ -318,19 +314,19 @@ const colors = { }, VAL: { fullName: 'Los Angeles Valiant', - primaryColor: 'darkGreen', - secondaryColor: 'black', - tertiaryColor: 'yellow', + primaryColor: 'blue', + secondaryColor: 'yellow', + tertiaryColor: 'white', colors: { - darkGreen: { - hex: '#004438', - rgb: [0, 68, 56], + blue: { + hex: '#1888C6', + rgb: [24, 136, 198], }, - black: pureBlack, yellow: { - hex: '#D9C756', - rgb: [217, 199, 86], + hex: '#FFD100', + rgb: [255, 209, 0], }, + white: pureWhite, }, }, VAN: { diff --git a/src/index.js b/src/index.js index 6825470..50bc9be 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,14 @@ import { - compose, keys, prop, propOr, path, ifElse, - isEmpty, identity, toUpper, __, + compose, + keys, + prop, + propOr, + path, + ifElse, + isEmpty, + identity, + toUpper, + __, } from 'ramda'; import OwlColors from './colors'; @@ -93,10 +101,7 @@ export const getTeamName = compose( * @returns {string[]} an array of Overwatch League team colors. */ export const getColorList = compose( - compose( - checkEmpty, - getColorKeys, - ), + compose(checkEmpty, getColorKeys), propOr({}, __, OwlColors), toUpper, );