From 4c03c73a9a4f9bcd6bda8eb291a7511f5bec50f9 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Tue, 2 Jun 2020 10:56:35 +0200 Subject: [PATCH] fix: ignore package-lock.json file. --- client/.gitignore | 1 + client/src/lang/en/locale.js | 59 ++++++++++++++++++------------------ server/.gitignore | 4 ++- 3 files changed, 33 insertions(+), 31 deletions(-) diff --git a/client/.gitignore b/client/.gitignore index 4d29575de..9d9101486 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -4,6 +4,7 @@ /node_modules /.pnp .pnp.js +package-lock.json # testing /coverage diff --git a/client/src/lang/en/locale.js b/client/src/lang/en/locale.js index 132f85bb6..47ba9bba1 100644 --- a/client/src/lang/en/locale.js +++ b/client/src/lang/en/locale.js @@ -1,11 +1,10 @@ import printValue from '../printValue'; export const locale = { - mixed: { - default: "${path} is invalid", - required: "${path} is a required field ", - oneOf: "${path} must be one of the following values: ${values}", - notOneOf: "${path} must not be one of the following values: ${values}", + default: '${path} is invalid', + required: '${path} is a required field ', + oneOf: '${path} must be one of the following values: ${values}', + notOneOf: '${path} must not be one of the following values: ${values}', notType: ({ path, type, value, originalValue }) => { let isCast = originalValue != null && originalValue !== value; let msg = @@ -14,47 +13,47 @@ export const locale = { (isCast ? ` (cast from the value \`${printValue(originalValue, true)}\`).` : '.'); - + if (value === null) { msg += `\n If "null" is intended as an empty value be sure to mark the schema as \`.nullable()\``; } - + return msg; }, defined: '${path} must be defined', }, string: { - length: "${path} must be exactly ${length} characters", - min: "${path} must be at least ${min} characters", - max: "${path} must be at most ${max} characters", + length: '${path} must be exactly ${length} characters', + min: '${path} must be at least ${min} characters', + max: '${path} must be at most ${max} characters', matches: '${path} must match the following: "${regex}"', - email: "${path} must be a valid email", - url: "${path} must be a valid URL", - trim: "${path} must be a trimmed string", - lowercase: "${path} must be a lowercase string", - uppercase: "${path} must be a upper case string" + email: '${path} must be a valid email', + url: '${path} must be a valid URL', + trim: '${path} must be a trimmed string', + lowercase: '${path} must be a lowercase string', + uppercase: '${path} must be a upper case string', }, number: { - min: "${path} must be greater than or equal to ${min}", - max: "${path} must be less than or equal to ${max}", - lessThan: "${path} must be less than ${less}", - moreThan: "${path} must be greater than ${more}", - notEqual: "${path} must be not equal to ${notEqual}", - positive: "${path} must be a positive number", - negative: "${path} must be a negative number", - integer: "${path} must be an integer" + min: '${path} must be greater than or equal to ${min}', + max: '${path} must be less than or equal to ${max}', + lessThan: '${path} must be less than ${less}', + moreThan: '${path} must be greater than ${more}', + notEqual: '${path} must be not equal to ${notEqual}', + positive: '${path} must be a positive number', + negative: '${path} must be a negative number', + integer: '${path} must be an integer', }, date: { - min: "${path} field must be later than ${min}", - max: "${path} field must be at earlier than ${max}" + min: '${path} field must be later than ${min}', + max: '${path} field must be at earlier than ${max}', }, - boolean : {}, + boolean: {}, object: { noUnknown: - "${path} field cannot have keys not specified in the object shape" + '${path} field cannot have keys not specified in the object shape', }, array: { - min: "${path} field must have at least ${min} items", - max: "${path} field must have less than or equal to ${max} items" - } + min: '${path} field must have at least ${min} items', + max: '${path} field must have less than or equal to ${max} items', + }, }; diff --git a/server/.gitignore b/server/.gitignore index b094bbba5..3b32fa959 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -1,4 +1,6 @@ /node_modules/ /.env /.env.test -/storage \ No newline at end of file +/storage +package-lock.json +stdout.log \ No newline at end of file