From ba0c290edc148a41d78dbbedcf3cd18dee16bac2 Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Tue, 12 Nov 2019 07:25:45 -0700 Subject: [PATCH 1/7] Change new adoption routes to default - Instead of /new/adocao now is just /adocao #40 --- app/javascript/components/App.js | 2 +- app/views/home/index.html.erb | 4 ++-- app/views/layouts/application.html.erb | 4 ++-- app/views/layouts/new_front_end.html.erb | 4 ++-- config/routes.rb | 1 - 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/javascript/components/App.js b/app/javascript/components/App.js index 6fdd0534..acd0630f 100644 --- a/app/javascript/components/App.js +++ b/app/javascript/components/App.js @@ -28,7 +28,7 @@ class App extends React.Component { }/> }/> - }/> + }/> diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 0185cb38..82a17702 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -13,7 +13,7 @@
Adote um amiguinho

Acesse a área de adoções para encontrar um amiguinho para adoção agora mesmo.

- Ver Pets + Ver Pets
@@ -30,5 +30,5 @@
-

Consulte as ONGs cadastradas para fazer uma doação ou visite nossa galeria de amiguinhos disponíveis para adoção.

+

Consulte as ONGs cadastradas para fazer uma doação ou visite nossa galeria de amiguinhos disponíveis para adoção.

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 180b831a..efb627ed 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -25,8 +25,8 @@
  • ONGS
    • -
  • - ADOTE +
  • "> + ADOTE
      • diff --git a/app/views/layouts/new_front_end.html.erb b/app/views/layouts/new_front_end.html.erb index a0027783..9d3a5043 100644 --- a/app/views/layouts/new_front_end.html.erb +++ b/app/views/layouts/new_front_end.html.erb @@ -27,8 +27,8 @@
    • ONGS
      • -
    • - ADOTE +
    • "> + ADOTE
      diff --git a/config/routes.rb b/config/routes.rb index ab747fec..ae7e087b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,7 +5,6 @@ get 'home/index' localized do - resources :adoption, only: %i[index show edit new] resources :ngos, only: %i[index show] namespace :ngo_area do From 12c1a52aa1a2c648995da16e728aa7a6ca8efd7c Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Thu, 14 Nov 2019 07:25:35 -0700 Subject: [PATCH 2/7] Disable adoption button for those who already registered interest #40 --- .../AdoptionButton/AdoptionButton.jsx | 8 +++++++- .../AdoptionButton/AdoptionButton.sass | 14 ++++++++++++++ .../containers/AdoptionCard/AdoptionCard.jsx | 3 +-- .../containers/AdoptionList/AdoptionList.jsx | 18 ++++++++---------- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/app/javascript/containers/AdoptionCard/AdoptionButton/AdoptionButton.jsx b/app/javascript/containers/AdoptionCard/AdoptionButton/AdoptionButton.jsx index 4296a4d3..88ad9097 100644 --- a/app/javascript/containers/AdoptionCard/AdoptionButton/AdoptionButton.jsx +++ b/app/javascript/containers/AdoptionCard/AdoptionButton/AdoptionButton.jsx @@ -2,8 +2,14 @@ import React from 'react'; import styles from './AdoptionButton.sass'; const AdoptionButton = (props) => { + const buttonStyle = props.userRegisteredInterest ? styles.AdoptionButtonDisable : styles.AdoptionButton; + return ( - + ); }; diff --git a/app/javascript/containers/AdoptionCard/AdoptionButton/AdoptionButton.sass b/app/javascript/containers/AdoptionCard/AdoptionButton/AdoptionButton.sass index 5baf0d01..acf6786e 100644 --- a/app/javascript/containers/AdoptionCard/AdoptionButton/AdoptionButton.sass +++ b/app/javascript/containers/AdoptionCard/AdoptionButton/AdoptionButton.sass @@ -14,3 +14,17 @@ .AdoptionButton:hover background-color: #7DA570 + +.AdoptionButtonDisable + text-transform: uppercase + border: 0 + font-family: Roboto, sans-serif + font-style: normal + font-weight: 500 + font-size: 15px + line-height: 10px + color: #FFFFFF + width: 85px + height: 35px + background: lightgrey + border-radius: 22px diff --git a/app/javascript/containers/AdoptionCard/AdoptionCard.jsx b/app/javascript/containers/AdoptionCard/AdoptionCard.jsx index 8ecb6b91..0d44be36 100644 --- a/app/javascript/containers/AdoptionCard/AdoptionCard.jsx +++ b/app/javascript/containers/AdoptionCard/AdoptionCard.jsx @@ -61,9 +61,8 @@ const AdoptionCard = (props) => {
      - {/*{ TODO: implement behaviour of button when user is not logged in }*/}
      - +
      diff --git a/app/javascript/containers/AdoptionList/AdoptionList.jsx b/app/javascript/containers/AdoptionList/AdoptionList.jsx index a69c1991..29aa429f 100644 --- a/app/javascript/containers/AdoptionList/AdoptionList.jsx +++ b/app/javascript/containers/AdoptionList/AdoptionList.jsx @@ -1,5 +1,4 @@ import React from "react" -import SimpleHeaderText from "../../components/SimpleHeaderText/SimpleHeaderText"; import styles from './AdoptionList.sass' import AdoptionCard from "../AdoptionCard/AdoptionCard"; import {createStructuredSelector} from "reselect"; @@ -10,10 +9,13 @@ import SimpleModal from "../../components/SimpleModal/SimpleModal"; const GET_ADOPTION_REQUEST = 'GET_ADOPTION_REQUEST'; const GET_ADOPTION_SUCCESS = 'GET_ADOPTION_SUCCESS'; -function fetchPetsForAdoption() { +function fetchPetsForAdoption(userEmail) { return dispatch => { dispatch({type: GET_ADOPTION_REQUEST}); - return fetch(`../v1/pets_for_adoption.json`) + + const params = userEmail ? "user_email=" + userEmail : null; + + return fetch(`../v1/pets_for_adoption.json?` + params) .then(response => response.json()) .then(json => dispatch(fetchPetsForAdoptionSuccess(json))) .catch(error => console.log(error)); @@ -33,8 +35,8 @@ class AdoptionList extends React.Component { }; componentWillMount() { - const {fetchPetsForAdoption} = this.props; - fetchPetsForAdoption(); + const {fetchPetsForAdoption, userEmail} = this.props; + fetchPetsForAdoption(userEmail); } addAdoptionInterestHandler = (userEmail, petId) => { @@ -74,6 +76,7 @@ class AdoptionList extends React.Component { sex={pet.sex} ngo={pet.ngo} user={this.props.userEmail} + userRegisteredInterest={pet.user_registered_interest} modalOpen={() => this.addAdoptionInterestHandler(this.props.userEmail, pet.id)} />; }) @@ -99,11 +102,6 @@ class AdoptionList extends React.Component { } - {/**/} - {/**/}
      {pets && this.petList(pets)} {/* Trick to align last row of cards with flexbox */} From 45e59252e1695deb16cbfa168e2bec552934f7b8 Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Thu, 14 Nov 2019 07:29:41 -0700 Subject: [PATCH 3/7] Update adoption request text #40 --- app/javascript/containers/AdoptionList/AdoptionList.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/containers/AdoptionList/AdoptionList.jsx b/app/javascript/containers/AdoptionList/AdoptionList.jsx index 29aa429f..8bc0b8c1 100644 --- a/app/javascript/containers/AdoptionList/AdoptionList.jsx +++ b/app/javascript/containers/AdoptionList/AdoptionList.jsx @@ -93,7 +93,7 @@ class AdoptionList extends React.Component { > {userEmail ?
      -

      Você está a uma pata mais próxima de adotar o seu animalzinho. A ONG está sabendo do seu interesse e entrará em contato quando tiver mais informações.

      +

      Você está a poucas patas de me adotar. A ONG acabou de saber sobre o seu interesse e entrará em contato em breve. PS: Mal posso esperar por esse momento :)

      :
      From 10976f42906f39085d0f998b469613cd1febf216 Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Thu, 14 Nov 2019 08:04:11 -0700 Subject: [PATCH 4/7] Fix to register interest for more then one pet #40 --- app/lib/register_adoption_interest.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/register_adoption_interest.rb b/app/lib/register_adoption_interest.rb index ad2aa0ce..ac50f79c 100644 --- a/app/lib/register_adoption_interest.rb +++ b/app/lib/register_adoption_interest.rb @@ -1,6 +1,6 @@ class RegisterAdoptionInterest def save!(user_email, pet_id) user = User.find_by!(email: user_email) - AdoptionInterest.first_or_create!(user_id: user.id, pet_id: pet_id) + AdoptionInterest.find_or_create_by!(user_id: user.id, pet_id: pet_id) end end From b52e490cb2bc90a930cdbce643a0aab424a4b138 Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Fri, 15 Nov 2019 07:17:29 -0700 Subject: [PATCH 5/7] Update state after register adoption interest #40 --- .../containers/AdoptionList/AdoptionList.jsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/javascript/containers/AdoptionList/AdoptionList.jsx b/app/javascript/containers/AdoptionList/AdoptionList.jsx index 8bc0b8c1..57282b5a 100644 --- a/app/javascript/containers/AdoptionList/AdoptionList.jsx +++ b/app/javascript/containers/AdoptionList/AdoptionList.jsx @@ -39,9 +39,9 @@ class AdoptionList extends React.Component { fetchPetsForAdoption(userEmail); } - addAdoptionInterestHandler = (userEmail, petId) => { + addAdoptionInterestHandler = (userEmail, pet) => { if (userEmail) { - let body = JSON.stringify({register_interest: {user_email: userEmail, pet_id: petId}}); + let body = JSON.stringify({register_interest: {user_email: userEmail, pet_id: pet.id}}); fetch(`../v1/pets_for_adoption/register_interest`, { method: "POST", @@ -50,7 +50,10 @@ class AdoptionList extends React.Component { }, body: body, }) - .then(response => console.log(response.json())) + .then(response => { + console.log(response.json()); + this.props.fetchPetsForAdoption(userEmail); + }) .catch(function (error) { // TODO: handle error console.log(error); @@ -77,7 +80,7 @@ class AdoptionList extends React.Component { ngo={pet.ngo} user={this.props.userEmail} userRegisteredInterest={pet.user_registered_interest} - modalOpen={() => this.addAdoptionInterestHandler(this.props.userEmail, pet.id)} + modalOpen={() => this.addAdoptionInterestHandler(this.props.userEmail, pet)} />; }) }; From 18d39852b371448ae242ad632203a045ebe53614 Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Fri, 15 Nov 2019 07:19:31 -0700 Subject: [PATCH 6/7] Remove not used component #40 --- .../SimpleCircularButton.jsx | 10 ---------- .../SimpleCircularButton.sass | 18 ------------------ 2 files changed, 28 deletions(-) delete mode 100644 app/javascript/components/SimpleCircularButton/SimpleCircularButton.jsx delete mode 100644 app/javascript/components/SimpleCircularButton/SimpleCircularButton.sass diff --git a/app/javascript/components/SimpleCircularButton/SimpleCircularButton.jsx b/app/javascript/components/SimpleCircularButton/SimpleCircularButton.jsx deleted file mode 100644 index 97a0256e..00000000 --- a/app/javascript/components/SimpleCircularButton/SimpleCircularButton.jsx +++ /dev/null @@ -1,10 +0,0 @@ -import React from 'react'; -import styles from './SimpleCircularButton.sass'; - -const SimpleCircularButton = (props) => { - return ( - - ); -}; - -export default SimpleCircularButton; diff --git a/app/javascript/components/SimpleCircularButton/SimpleCircularButton.sass b/app/javascript/components/SimpleCircularButton/SimpleCircularButton.sass deleted file mode 100644 index d289180e..00000000 --- a/app/javascript/components/SimpleCircularButton/SimpleCircularButton.sass +++ /dev/null @@ -1,18 +0,0 @@ -.SimpleCircularButton - width: 240px - height: 50px - border-radius: 29px - background-color: #83be7d - font-family: Roboto, sans-serif - font-size: 16px - font-weight: normal - font-style: normal - font-stretch: normal - line-height: normal - letter-spacing: normal - color: #ffffff - text-transform: uppercase - border: 0 - -.SimpleCircularButton:hover - background-color: #68af60 From 32ebe384941f05b3f59844fd234d1bfa203c1fe4 Mon Sep 17 00:00:00 2001 From: Caroline Salib Date: Fri, 15 Nov 2019 07:24:44 -0700 Subject: [PATCH 7/7] Remove hello world code from react and rails app #40 --- app/controllers/v1/things_controller.rb | 10 ----- app/javascript/components/App.js | 2 - app/javascript/components/HelloWorld.js | 59 ------------------------- app/javascript/configureStore.js | 7 +-- app/javascript/packs/hello_react.jsx | 26 ----------- config/routes.rb | 1 - 6 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 app/controllers/v1/things_controller.rb delete mode 100644 app/javascript/components/HelloWorld.js delete mode 100644 app/javascript/packs/hello_react.jsx diff --git a/app/controllers/v1/things_controller.rb b/app/controllers/v1/things_controller.rb deleted file mode 100644 index e59dba49..00000000 --- a/app/controllers/v1/things_controller.rb +++ /dev/null @@ -1,10 +0,0 @@ -class V1::ThingsController < ApplicationController - def index - render json: { - things: [ - { name: 'some-thing', guid: 'hasidhasuihduasihduasdhas' }, - { name: 'some-thing-2', guid: 'hasidhasuihduasihduasdhas' }, - ] - }.to_json - end -end diff --git a/app/javascript/components/App.js b/app/javascript/components/App.js index acd0630f..ec1becfb 100644 --- a/app/javascript/components/App.js +++ b/app/javascript/components/App.js @@ -1,5 +1,4 @@ import React from "react" -import HelloWorld from "./HelloWorld"; import {BrowserRouter, Switch, Route} from "react-router-dom"; import {Provider} from 'react-redux'; import configureStore from '../configureStore'; @@ -25,7 +24,6 @@ class App extends React.Component { ("Home!")}/> - }/> }/> }/> diff --git a/app/javascript/components/HelloWorld.js b/app/javascript/components/HelloWorld.js deleted file mode 100644 index a9ada161..00000000 --- a/app/javascript/components/HelloWorld.js +++ /dev/null @@ -1,59 +0,0 @@ -import React from "react" -import PropTypes from "prop-types" -import { connect } from 'react-redux'; -import { createStructuredSelector } from 'reselect'; - -const GET_THINGS_REQUEST = 'GET_THINGS_REQUEST'; -const GET_THINGS_SUCCESS = 'GET_THINGS_SUCCESS'; - -function getThings() { - console.log('getThings() Action!!') - return dispatch => { - dispatch({type: GET_THINGS_REQUEST}); - return fetch(`v1/things.json`) - .then(response => response.json()) - .then(json => dispatch(getThingsSuccess(json))) - .catch(error => console.log(error)); - } -} - -export function getThingsSuccess(json) { - return { - type: GET_THINGS_SUCCESS, - json - }; -}; - -class HelloWorld extends React.Component { - render () { - const { things } = this.props; - const thingsList = things.map((thing, index) => { - return
    • {thing.name} {thing.guid}
      • - }); - - return ( - - Greeting: {this.props.greeting} - - -
      -
        { thingsList }
      -       - ); - } -} - -const structuredSelector = createStructuredSelector({ - things: state => state.things, -}); - -const mapDispatchToProps = { getThings }; - -export default connect(structuredSelector, mapDispatchToProps)(HelloWorld); - -// -// HelloWorld.propTypes = { -// greeting: PropTypes.string -// }; -// -// export default HelloWorld diff --git a/app/javascript/configureStore.js b/app/javascript/configureStore.js index ef4b89bd..446b7e98 100644 --- a/app/javascript/configureStore.js +++ b/app/javascript/configureStore.js @@ -2,15 +2,10 @@ import { createStore, applyMiddleware } from 'redux'; import thunk from 'redux-thunk'; import { composeWithDevTools } from 'redux-devtools-extension'; -const initialState = { - things: [ - ] -}; +const initialState = { }; function rootReducer(state, action) { switch (action.type) { - case "GET_THINGS_SUCCESS": - return { things: action.json.things }; case "GET_NGOS_SUCCESS": return { ngos: action.json.ngos }; case "GET_NGO_SUCCESS": diff --git a/app/javascript/packs/hello_react.jsx b/app/javascript/packs/hello_react.jsx deleted file mode 100644 index 772fc97e..00000000 --- a/app/javascript/packs/hello_react.jsx +++ /dev/null @@ -1,26 +0,0 @@ -// Run this example by adding <%= javascript_pack_tag 'hello_react' %> to the head of your layout file, -// like app/views/layouts/application.html.erb. All it does is render
      Hello React
      at the bottom -// of the page. - -import React from 'react' -import ReactDOM from 'react-dom' -import PropTypes from 'prop-types' - -const Hello = props => ( -
      Hello {props.name}!
      -) - -Hello.defaultProps = { - name: 'David' -} - -Hello.propTypes = { - name: PropTypes.string -} - -document.addEventListener('DOMContentLoaded', () => { - ReactDOM.render( - , - document.body.appendChild(document.createElement('div')), - ) -}) diff --git a/config/routes.rb b/config/routes.rb index ae7e087b..651bfe5e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,7 +15,6 @@ end namespace :v1, defaults: { format: 'json' } do - get 'things', to: 'things#index' get 'ngos', to: 'ngos#index' get 'ngo_cities', to: 'ngos#cities' get 'ngo/:id', to: 'ngos#show'