From d69a3edb264cc9b299e5b64d15671a54f18e87a8 Mon Sep 17 00:00:00 2001 From: Andre Emiliano Date: Fri, 16 Apr 2021 16:04:26 +0000 Subject: [PATCH] Added validation when registering and updated bloggrid --- src/components/dogcard.js | 2 +- src/components/doggrid.js | 12 ++--- src/components/home.js | 4 +- src/components/{bloggrid.js => homegrid.js} | 4 +- src/components/register.js | 20 ++++++- src/data/README.md | 5 -- src/data/posts.json | 58 --------------------- src/data/postsList.json | 57 -------------------- src/data/user.json | 10 ---- 9 files changed, 29 insertions(+), 143 deletions(-) rename src/components/{bloggrid.js => homegrid.js} (93%) delete mode 100644 src/data/README.md delete mode 100644 src/data/posts.json delete mode 100644 src/data/postsList.json delete mode 100644 src/data/user.json diff --git a/src/components/dogcard.js b/src/components/dogcard.js index 635ecb9..c39c6d9 100644 --- a/src/components/dogcard.js +++ b/src/components/dogcard.js @@ -27,7 +27,7 @@ class DogCard extends React.Component { hoverable={true} actions={[ , + handleToggle={this.toggleLike} id={dogID}/> ]}> diff --git a/src/components/doggrid.js b/src/components/doggrid.js index 16ff66b..e54f379 100644 --- a/src/components/doggrid.js +++ b/src/components/doggrid.js @@ -8,21 +8,21 @@ const grid = ( <> - + } hoverable> - + }> - + }> @@ -31,21 +31,21 @@ const grid = (   - + }> - + }> - + }> diff --git a/src/components/home.js b/src/components/home.js index 9f37705..6b97493 100644 --- a/src/components/home.js +++ b/src/components/home.js @@ -1,6 +1,6 @@ import React from 'react'; import { PageHeader, Input } from 'antd'; -import BlogGrid from './bloggrid'; +import HomeGrid from './homegrid'; const { Search } = Input; @@ -18,7 +18,7 @@ function Home(props) { title="Dog Shelter" subTitle="Welcome to the website where you will find your new friend!"/> - + ); } diff --git a/src/components/bloggrid.js b/src/components/homegrid.js similarity index 93% rename from src/components/bloggrid.js rename to src/components/homegrid.js index 71ce074..e23c456 100644 --- a/src/components/bloggrid.js +++ b/src/components/homegrid.js @@ -3,7 +3,7 @@ import { Col, Row } from 'antd'; import dogCard from './dogcard'; import { status, json } from '../utilities/requestHandlers'; -class BlogGrid extends React.Component { +class HomeGrid extends React.Component { constructor(props) { super(props); @@ -43,4 +43,4 @@ class BlogGrid extends React.Component { } } -export default BlogGrid; +export default HomeGrid; diff --git a/src/components/register.js b/src/components/register.js index 5e96d73..7b3e433 100644 --- a/src/components/register.js +++ b/src/components/register.js @@ -18,7 +18,15 @@ const emailRules = [ ]; const passwordRules = [ - { required: true, message: 'Please input your password!' } + { required: true, message: 'Please input your password!' }, + ({ getFieldValue }) => ({ + validator(rule, value) { + if (!value.length || getFieldValue('password').length >= 6 ) { + return Promise.resolve(); + } + return Promise.reject('Password must contain 6 or more characters'); + } + }) ]; const confirmRules = [ @@ -35,7 +43,15 @@ const confirmRules = [ ]; const usernameRules = [ - { required: true, message: 'Please input your username!', whitespace: true } + { required: true, message: 'Please input your username!', whitespace: true }, + ({ getFieldValue }) => ({ + validator(rule, value) { + if (!value.length || getFieldValue('username').length >= 3 ) { + return Promise.resolve(); + } + return Promise.reject('Username must contain 3 or more characters'); + } + }) ] /** diff --git a/src/data/README.md b/src/data/README.md deleted file mode 100644 index 8ab9990..0000000 --- a/src/data/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Data Folder - -Note that this is used for static data just for the purposes of demonstration. - -When the SPA is connected to the API there will be no need for hard-coded data and this folder can be removed. diff --git a/src/data/posts.json b/src/data/posts.json deleted file mode 100644 index 2a1a14c..0000000 --- a/src/data/posts.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "1": { - "id": 1, - "title": "Article 1", - "allText": "Morbi vehicula augue mi, sed vestibulum turpis tempor vitae. Sed vitae tortor non eros suscipit rutrum ut nec nunc. Duis sed enim et lacus finibus dictum. Nulla lacinia euismod est. Mauris gravida gravida magna, a faucibus arcu vestibulum id. Donec id massa ut mauris mollis sodales. Aenean eget nisl urna. Donec risus orci, pharetra vel placerat nec, gravida at lacus.\nIn hac habitasse platea dictumst. Phasellus viverra nisl vitae iaculis commodo. Phasellus commodo massa eu est tincidunt posuere. Nullam pellentesque lacinia pharetra.", - "imgURL": "https://picsum.photos/id/1044/400", - "likes": 14, - "liked": true - }, - "2": { - "id": 2, - "title": "Article 2", - "allText": "Morbi vehicula augue mi, sed vestibulum turpis tempor vitae. Sed vitae tortor non eros suscipit rutrum ut nec nunc. Duis sed enim et lacus finibus dictum. Nulla lacinia euismod est. Mauris gravida gravida magna, a faucibus arcu vestibulum id. Donec id massa ut mauris mollis sodales. Aenean eget nisl urna. Donec risus orci, pharetra vel placerat nec, gravida at lacus.\nIn hac habitasse platea dictumst. Phasellus viverra nisl vitae iaculis commodo. Phasellus commodo massa eu est tincidunt posuere. Nullam pellentesque lacinia pharetra.", - "imgURL": "https://picsum.photos/id/1045/400", - "likes": 5, - "liked": false - }, - "3": { - "id": 3, - "title": "Article 3", - "allText": "Morbi vehicula augue mi, sed vestibulum turpis tempor vitae. Sed vitae tortor non eros suscipit rutrum ut nec nunc. Duis sed enim et lacus finibus dictum. Nulla lacinia euismod est. Mauris gravida gravida magna, a faucibus arcu vestibulum id. Donec id massa ut mauris mollis sodales. Aenean eget nisl urna. Donec risus orci, pharetra vel placerat nec, gravida at lacus.\nIn hac habitasse platea dictumst. Phasellus viverra nisl vitae iaculis commodo. Phasellus commodo massa eu est tincidunt posuere. Nullam pellentesque lacinia pharetra.", - "imgURL": "https://picsum.photos/id/1051/400", - "likes": 7, - "liked": false - }, - "4": { - "id": 4, - "title": "Article 4", - "allText": "Morbi vehicula augue mi, sed vestibulum turpis tempor vitae. Sed vitae tortor non eros suscipit rutrum ut nec nunc. Duis sed enim et lacus finibus dictum. Nulla lacinia euismod est. Mauris gravida gravida magna, a faucibus arcu vestibulum id. Donec id massa ut mauris mollis sodales. Aenean eget nisl urna. Donec risus orci, pharetra vel placerat nec, gravida at lacus.\nIn hac habitasse platea dictumst. Phasellus viverra nisl vitae iaculis commodo. Phasellus commodo massa eu est tincidunt posuere. Nullam pellentesque lacinia pharetra.", - "imgURL": "https://picsum.photos/id/1047/400", - "likes": 14, - "liked": true - }, - "5": { - "id": 5, - "title": "Article 5", - "allText": "Morbi vehicula augue mi, sed vestibulum turpis tempor vitae. Sed vitae tortor non eros suscipit rutrum ut nec nunc. Duis sed enim et lacus finibus dictum. Nulla lacinia euismod est. Mauris gravida gravida magna, a faucibus arcu vestibulum id. Donec id massa ut mauris mollis sodales. Aenean eget nisl urna. Donec risus orci, pharetra vel placerat nec, gravida at lacus.\nIn hac habitasse platea dictumst. Phasellus viverra nisl vitae iaculis commodo. Phasellus commodo massa eu est tincidunt posuere. Nullam pellentesque lacinia pharetra.", - "imgURL": "https://picsum.photos/id/1048/400", - "likes": 5, - "liked": false - }, - "6": { - "id": 6, - "title": "Article 6", - "allText": "Morbi vehicula augue mi, sed vestibulum turpis tempor vitae. Sed vitae tortor non eros suscipit rutrum ut nec nunc. Duis sed enim et lacus finibus dictum. Nulla lacinia euismod est. Mauris gravida gravida magna, a faucibus arcu vestibulum id. Donec id massa ut mauris mollis sodales. Aenean eget nisl urna. Donec risus orci, pharetra vel placerat nec, gravida at lacus.\nIn hac habitasse platea dictumst. Phasellus viverra nisl vitae iaculis commodo. Phasellus commodo massa eu est tincidunt posuere. Nullam pellentesque lacinia pharetra.", - "imgURL": "https://picsum.photos/id/1049/400", - "likes": 7, - "liked": false - }, - "7": { - "id": 7, - "title": "Article 7", - "allText": "Morbi vehicula augue mi, sed vestibulum turpis tempor vitae. Sed vitae tortor non eros suscipit rutrum ut nec nunc. Duis sed enim et lacus finibus dictum. Nulla lacinia euismod est. Mauris gravida gravida magna, a faucibus arcu vestibulum id. Donec id massa ut mauris mollis sodales. Aenean eget nisl urna. Donec risus orci, pharetra vel placerat nec, gravida at lacus.\nIn hac habitasse platea dictumst. Phasellus viverra nisl vitae iaculis commodo. Phasellus commodo massa eu est tincidunt posuere. Nullam pellentesque lacinia pharetra.", - "imgURL": "https://picsum.photos/id/1050/400", - "likes": 14, - "liked": false - } -} diff --git a/src/data/postsList.json b/src/data/postsList.json deleted file mode 100644 index a5813c2..0000000 --- a/src/data/postsList.json +++ /dev/null @@ -1,57 +0,0 @@ -[{ - "id": 1, - "title": "post 1", - "summary": "some desription about the article", - "imgURL": "https://picsum.photos/id/1044/400", - "likes": 14, - "liked": true - }, - { - "id": 2, - "title": "article 2", - "summary": "some desription about the article", - "imgURL": "https://picsum.photos/id/1045/400", - "likes": 5, - "liked": false - }, - { - "id": 3, - "title": "article 3", - "summary": "some desription about the article", - "imgURL": "https://picsum.photos/id/1051/400", - "likes": 7, - "liked": false - }, - { - "id": 4, - "title": "article 4", - "summary": "some desription about the article", - "imgURL": "https://picsum.photos/id/1047/400", - "likes": 14, - "liked": true - }, - { - "id": 5, - "title": "article 5", - "summary": "some desription about the article", - "imgURL": "https://picsum.photos/id/1048/400", - "likes": 5, - "liked": false - }, - { - "id": 6, - "title": "article 6", - "summary": "some desription about the article", - "imgURL": "https://picsum.photos/id/1049/400", - "likes": 7, - "liked": false - }, - { - "id": 7, - "title": "article 7", - "summary": "some desription about the article", - "imgURL": "https://picsum.photos/id/1050/400", - "likes": 14, - "liked": false - } -] diff --git a/src/data/user.json b/src/data/user.json deleted file mode 100644 index bfac9c9..0000000 --- a/src/data/user.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "ID": 1, - "role": "user", - "firstName": "Joe", - "lastName": "Bloggs", - "username": "theusername", - "about": "I am a test user of this system.", - "email": "joebloggs@example.com", - "avatarURL": "https://www.gravatar.com/avatar/?d=robohash" -}