From 8292a24207603c1379a8ed905705bdc3016684ea Mon Sep 17 00:00:00 2001 From: xswoodsx Date: Wed, 26 Aug 2020 15:14:08 +0100 Subject: [PATCH 1/4] test1 --- src/App.js | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/App.js b/src/App.js index 479b472..454dce0 100644 --- a/src/App.js +++ b/src/App.js @@ -13,7 +13,7 @@ const personalityType = [ 'Mellow', 'Excitable', 'Skittish', - 'Needy' + 'Needy', ]; class App extends React.Component { state = { @@ -24,22 +24,22 @@ class App extends React.Component { cuteness: 7, personality: ['Short Dog Syndrome', 'Wild', 'Grumpy'], img: - 'https://cdn1-www.dogtime.com/assets/uploads/2020/01/golden-retriever-corgi-mixed-dog-breed-pictures-1.jpg' + 'https://cdn1-www.dogtime.com/assets/uploads/2020/01/golden-retriever-corgi-mixed-dog-breed-pictures-1.jpg', }, { name: 'Rebel', cuteness: 8, personality: ['Laidback', 'Mellow'], img: - 'https://s3.amazonaws.com/cdn-origin-etr.akc.org/wp-content/uploads/2017/11/12232417/Greyhound-MP.jpg' + 'https://s3.amazonaws.com/cdn-origin-etr.akc.org/wp-content/uploads/2017/11/12232417/Greyhound-MP.jpg', }, { name: 'Poppy', cuteness: 6, personality: ['Wild', 'Excitable'], img: - 'https://upload.wikimedia.org/wikipedia/commons/0/04/Labrador_Retriever_%281210559%29.jpg' - } + 'https://upload.wikimedia.org/wikipedia/commons/0/04/Labrador_Retriever_%281210559%29.jpg', + }, ], kittens: [ { @@ -47,32 +47,32 @@ class App extends React.Component { cuteness: 11, personality: ['Mellow', 'Skittish'], img: - 'https://vetstreet.brightspotcdn.com/dims4/default/4af17a9/2147483647/thumbnail/645x380/quality/90/?url=https%3A%2F%2Fvetstreet-brightspot.s3.amazonaws.com%2Fda%2F3f%2Faaaf93ab43f1aa42df7fc0c38e28%2FExotic-Shorthair-AP-1CEWS1-645sm3614.jpg' + 'https://vetstreet.brightspotcdn.com/dims4/default/4af17a9/2147483647/thumbnail/645x380/quality/90/?url=https%3A%2F%2Fvetstreet-brightspot.s3.amazonaws.com%2Fda%2F3f%2Faaaf93ab43f1aa42df7fc0c38e28%2FExotic-Shorthair-AP-1CEWS1-645sm3614.jpg', }, { name: 'Suki', cuteness: 7, personality: ['Grumpy', 'Needy'], img: - 'https://www.thesprucepets.com/thmb/zDe9ogiPL6LIBS3lyyl3bIbnTJo=/960x0/filters:no_upscale():max_bytes(150000):strip_icc()/GettyImages-584178259-5a721010119fa80037ed3cce.jpg' + 'https://www.thesprucepets.com/thmb/zDe9ogiPL6LIBS3lyyl3bIbnTJo=/960x0/filters:no_upscale():max_bytes(150000):strip_icc()/GettyImages-584178259-5a721010119fa80037ed3cce.jpg', }, { name: 'Jiji', cuteness: 10, personality: ['Mellow', 'Skittish', 'Laidback'], img: - 'https://upload.wikimedia.org/wikipedia/commons/thumb/0/0c/American_Shorthair.jpg/1200px-American_Shorthair.jpg' + 'https://upload.wikimedia.org/wikipedia/commons/thumb/0/0c/American_Shorthair.jpg/1200px-American_Shorthair.jpg', }, { name: 'Umi', cuteness: 8, personality: ['Needy', 'Skittish'], img: - 'https://www.crosscountrytrains.co.uk/media/1773/hector-redruth-train-station-cat.jpg' - } + 'https://www.crosscountrytrains.co.uk/media/1773/hector-redruth-train-station-cat.jpg', + }, ], - sortByCuteness: true, - filterByPersonality: '' + sortByCuteness: false, + filterByPersonality: '', }; render() { @@ -96,26 +96,30 @@ class App extends React.Component { ); } handleClick = () => { - this.setState(currentState => { + this.setState((currentState) => { return { showImages: !currentState.showImages }; }); }; sortByCuteness = () => { - this.setState(currentState => { + this.setState((currentState) => { return { sortByCuteness: !currentState.sortByCuteness }; }); }; - deleteSelectedPet = event => { - const puppies = this.state.puppies.filter(pups => pups.name !== event.name); - const kittens = this.state.kittens.filter(kits => kits.name !== event.name); + deleteSelectedPet = (event) => { + const puppies = this.state.puppies.filter( + (pups) => pups.name !== event.name + ); + const kittens = this.state.kittens.filter( + (kits) => kits.name !== event.name + ); this.setState({ puppies, kittens }); }; - upVoteCuteness = event => { - const puppies = this.state.puppies.map(pup => { + upVoteCuteness = (event) => { + const puppies = this.state.puppies.map((pup) => { if (pup.name === event.name) pup.cuteness++; return pup; }); - const kittens = this.state.kittens.map(kit => { + const kittens = this.state.kittens.map((kit) => { if (kit.name === event.name) kit.cuteness++; return kit; }); From 250a2b7c974d4c9f072edc6f8ee4e15ff8a0a2f3 Mon Sep 17 00:00:00 2001 From: xswoodsx Date: Wed, 26 Aug 2020 15:20:03 +0100 Subject: [PATCH 2/4] new commit to merge --- src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.js b/src/App.js index 454dce0..8531aab 100644 --- a/src/App.js +++ b/src/App.js @@ -72,7 +72,7 @@ class App extends React.Component { }, ], sortByCuteness: false, - filterByPersonality: '', + filterByPersonality: 'personality', }; render() { From 80ad365476511627997f8f34ae78a53552aaa814 Mon Sep 17 00:00:00 2001 From: xswoodsx Date: Thu, 27 Aug 2020 08:43:15 +0100 Subject: [PATCH 3/4] added comment to animal page --- src/components/Animal.ul.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/components/Animal.ul.js b/src/components/Animal.ul.js index 63b69a4..61125dd 100644 --- a/src/components/Animal.ul.js +++ b/src/components/Animal.ul.js @@ -1,20 +1,20 @@ import React from 'react'; -const AnimalList = props => { +const AnimalList = (props) => { const kittens = props.kittens; const puppies = props.puppies; const animals = kittens.concat(puppies); return (
    {animals - .sort(function(a, b) { + .sort(function (a, b) { if (props.sortByCuteness) { return a.cuteness - b.cuteness; } else if (!props.sortByCuteness) { return b.cuteness - a.cuteness; } }) - .map(type => { + .map((type) => { return (

  • @@ -31,6 +31,8 @@ const AnimalList = props => { +

    adding in a comment

    +

    adding another comment to it

    • ); })} From 447d2fdac568d6937572a11b8e72b503c05fcd01 Mon Sep 17 00:00:00 2001 From: xswoodsx Date: Fri, 25 Sep 2020 16:24:52 +0100 Subject: [PATCH 4/4] adding first commit - rebased into second commit --- src/components/Animal.ul.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Animal.ul.js b/src/components/Animal.ul.js index 61125dd..509bec9 100644 --- a/src/components/Animal.ul.js +++ b/src/components/Animal.ul.js @@ -19,7 +19,7 @@ const AnimalList = (props) => {

  • Name: {type.name} -

    Cuteness: {type.cuteness} +

    Cuteness: tester plus new line{type.cuteness}

    {props.showImages ? ( {`${type.name}