fix: change navbar logo to text and fix menu icon#11
Merged
Conversation
brunocalderon
pushed a commit
that referenced
this pull request
Oct 24, 2019
jfcampos1
added a commit
that referenced
this pull request
Oct 25, 2019
* Core/navbar (#6) * add: package font-awesome and favicon.ico * add: navbar to application * fix: payload at sign in accept (#7) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * Feat/navigation (#9) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * feat: create main views * feat: add drawer navigation and create profile view * Feat/navigation (#9) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * feat: create main views * feat: add drawer navigation and create profile view * Style/navbar (#10) * add: logos * add: logo to navbar * Style/navbar (#10) * add: logos * add: logo to navbar * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * fix: change navbar logo to text and fix menu icon (#11) * fix: change navbar logo to text and fix menu icon (#11) * Feat/Create trip search with filters (#14) * merged dev * inicial material ui styles (not finished) * fix: date and time button style * Feat/Create trip search with filters (#14) * merged dev * inicial material ui styles (not finished) * fix: date and time button style * Style signin signup 15 (#15) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * fix: change sign-in and sign-up form style * fix: change request body sign-in sign-up * fix: forms style and text language * Style signin signup 15 (#15) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * fix: change sign-in and sign-up form style * fix: change request body sign-in sign-up * fix: forms style and text language * add (action, reducer) updateUser * add (action, reducer) updateUser * Feat/19 show my trips (#16) * add: font-awesome regular icons * add: mi trips cards show * add: api call, not working yet * add: function to parse Date and Time * Feat/19 show my trips (#16) * add: font-awesome regular icons * add: mi trips cards show * add: api call, not working yet * add: function to parse Date and Time * Feat/my trips async (#17) * add: conect to api * delete: unnesary methods * Feat/my trips async (#17) * add: conect to api * delete: unnesary methods * fix: type of futureTrips * fix: type of futureTrips * Find trip (#18) * chore: initialize find trip screen and card * fix: change endopoint for sign-in sign-up, load userId into cookies * Fix: change style find trip card * fix: no stop selected show '' * feat: add actions, reduces for all trips * fix: reducers actions for find all trips * Find trip (#18) * chore: initialize find trip screen and card * fix: change endopoint for sign-in sign-up, load userId into cookies * Fix: change style find trip card * fix: no stop selected show '' * feat: add actions, reduces for all trips * fix: reducers actions for find all trips * 19 show my trip (#19) * requested card style * style requested trip * clean data * conflict * 19 show my trip (#19) * requested card style * style requested trip * clean data * conflict * added redirect sign in (#20) * added redirect sign in (#20) * fix: token in redux props * fix: token in redux props * edit: change all routes to english and define sign in as default * edit: change all routes to english and define sign in as default * add: submit with enter in sign-in/up * add: submit with enter in sign-in/up * fix: spots endpoint and user images redux * fix: spots endpoint and user images redux * edit: parse date and time * edit: parse date and time * fix: update user reducer * fix: update user reducer * fix(circleci): fixed config * fix(circleci): fixed config Run CircleCI only on master * feat: upload file function * feat: upload file function * Join trip (#22) * edit: move findMyTripsCard to other folder * add: manage sesion by localstorage * add: logout to navbar * add: redux passenger reservation trip * edit: navbar logout icon * add: submit passenger reservation * delete: Home screen * delete: console logs * Feat chose stops (#21) * feat: add stops to create trip * feat: add middle stops reducer/action and input * feat: optional middle stops view * Add: clear button on middle stop * Add: remove middle stop when clear button pressed * Add: send createTrip request with all points * Change: router paths to generic variable * Fix: Add space for go to top button * Add: redirection after create trip * edit: comment console log in updateForm * edit: create trip clear warnings * update: package-lock.json
jfcampos1
added a commit
that referenced
this pull request
Oct 25, 2019
* Core/navbar (#6) * add: package font-awesome and favicon.ico * add: navbar to application * fix: payload at sign in accept (#7) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * Feat/navigation (#9) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * feat: create main views * feat: add drawer navigation and create profile view * Feat/navigation (#9) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * feat: create main views * feat: add drawer navigation and create profile view * Style/navbar (#10) * add: logos * add: logo to navbar * Style/navbar (#10) * add: logos * add: logo to navbar * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * fix: change navbar logo to text and fix menu icon (#11) * fix: change navbar logo to text and fix menu icon (#11) * Feat/Create trip search with filters (#14) * merged dev * inicial material ui styles (not finished) * fix: date and time button style * Feat/Create trip search with filters (#14) * merged dev * inicial material ui styles (not finished) * fix: date and time button style * Style signin signup 15 (#15) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * fix: change sign-in and sign-up form style * fix: change request body sign-in sign-up * fix: forms style and text language * Style signin signup 15 (#15) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * fix: change sign-in and sign-up form style * fix: change request body sign-in sign-up * fix: forms style and text language * add (action, reducer) updateUser * add (action, reducer) updateUser * Feat/19 show my trips (#16) * add: font-awesome regular icons * add: mi trips cards show * add: api call, not working yet * add: function to parse Date and Time * Feat/19 show my trips (#16) * add: font-awesome regular icons * add: mi trips cards show * add: api call, not working yet * add: function to parse Date and Time * Feat/my trips async (#17) * add: conect to api * delete: unnesary methods * Feat/my trips async (#17) * add: conect to api * delete: unnesary methods * fix: type of futureTrips * fix: type of futureTrips * Find trip (#18) * chore: initialize find trip screen and card * fix: change endopoint for sign-in sign-up, load userId into cookies * Fix: change style find trip card * fix: no stop selected show '' * feat: add actions, reduces for all trips * fix: reducers actions for find all trips * Find trip (#18) * chore: initialize find trip screen and card * fix: change endopoint for sign-in sign-up, load userId into cookies * Fix: change style find trip card * fix: no stop selected show '' * feat: add actions, reduces for all trips * fix: reducers actions for find all trips * 19 show my trip (#19) * requested card style * style requested trip * clean data * conflict * 19 show my trip (#19) * requested card style * style requested trip * clean data * conflict * added redirect sign in (#20) * added redirect sign in (#20) * fix: token in redux props * fix: token in redux props * edit: change all routes to english and define sign in as default * edit: change all routes to english and define sign in as default * add: submit with enter in sign-in/up * add: submit with enter in sign-in/up * fix: spots endpoint and user images redux * fix: spots endpoint and user images redux * edit: parse date and time * edit: parse date and time * fix: update user reducer * fix: update user reducer * fix(circleci): fixed config * fix(circleci): fixed config Run CircleCI only on master * feat: upload file function * feat: upload file function * Join trip (#22) * edit: move findMyTripsCard to other folder * add: manage sesion by localstorage * add: logout to navbar * add: redux passenger reservation trip * edit: navbar logout icon * add: submit passenger reservation * delete: Home screen * delete: console logs * Feat chose stops (#21) * feat: add stops to create trip * feat: add middle stops reducer/action and input * feat: optional middle stops view * Add: clear button on middle stop * Add: remove middle stop when clear button pressed * Add: send createTrip request with all points * Change: router paths to generic variable * Fix: Add space for go to top button * Add: redirection after create trip * edit: comment console log in updateForm * edit: create trip clear warnings * update: package-lock.json * fix: request route path
jfcampos1
added a commit
that referenced
this pull request
Oct 26, 2019
* Core/navbar (#6) * add: package font-awesome and favicon.ico * add: navbar to application * fix: payload at sign in accept (#7) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * Feat/navigation (#9) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * feat: create main views * feat: add drawer navigation and create profile view * Feat/navigation (#9) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * feat: create main views * feat: add drawer navigation and create profile view * Style/navbar (#10) * add: logos * add: logo to navbar * Style/navbar (#10) * add: logos * add: logo to navbar * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * feat: add basic update user form with redux-form * fix: change navbar logo to text and fix menu icon (#11) * fix: change navbar logo to text and fix menu icon (#11) * Feat/Create trip search with filters (#14) * merged dev * inicial material ui styles (not finished) * fix: date and time button style * Feat/Create trip search with filters (#14) * merged dev * inicial material ui styles (not finished) * fix: date and time button style * Style signin signup 15 (#15) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * fix: change sign-in and sign-up form style * fix: change request body sign-in sign-up * fix: forms style and text language * Style signin signup 15 (#15) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * fix: change sign-in and sign-up form style * fix: change request body sign-in sign-up * fix: forms style and text language * add (action, reducer) updateUser * add (action, reducer) updateUser * Feat/19 show my trips (#16) * add: font-awesome regular icons * add: mi trips cards show * add: api call, not working yet * add: function to parse Date and Time * Feat/19 show my trips (#16) * add: font-awesome regular icons * add: mi trips cards show * add: api call, not working yet * add: function to parse Date and Time * Feat/my trips async (#17) * add: conect to api * delete: unnesary methods * Feat/my trips async (#17) * add: conect to api * delete: unnesary methods * fix: type of futureTrips * fix: type of futureTrips * Find trip (#18) * chore: initialize find trip screen and card * fix: change endopoint for sign-in sign-up, load userId into cookies * Fix: change style find trip card * fix: no stop selected show '' * feat: add actions, reduces for all trips * fix: reducers actions for find all trips * Find trip (#18) * chore: initialize find trip screen and card * fix: change endopoint for sign-in sign-up, load userId into cookies * Fix: change style find trip card * fix: no stop selected show '' * feat: add actions, reduces for all trips * fix: reducers actions for find all trips * 19 show my trip (#19) * requested card style * style requested trip * clean data * conflict * 19 show my trip (#19) * requested card style * style requested trip * clean data * conflict * added redirect sign in (#20) * added redirect sign in (#20) * fix: token in redux props * fix: token in redux props * edit: change all routes to english and define sign in as default * edit: change all routes to english and define sign in as default * add: submit with enter in sign-in/up * add: submit with enter in sign-in/up * fix: spots endpoint and user images redux * fix: spots endpoint and user images redux * edit: parse date and time * edit: parse date and time * fix: update user reducer * fix: update user reducer * fix(circleci): fixed config * fix(circleci): fixed config Run CircleCI only on master * feat: upload file function * feat: upload file function * Join trip (#22) * edit: move findMyTripsCard to other folder * add: manage sesion by localstorage * add: logout to navbar * add: redux passenger reservation trip * edit: navbar logout icon * add: submit passenger reservation * delete: Home screen * delete: console logs * Feat chose stops (#21) * feat: add stops to create trip * feat: add middle stops reducer/action and input * feat: optional middle stops view * Add: clear button on middle stop * Add: remove middle stop when clear button pressed * Add: send createTrip request with all points * Change: router paths to generic variable * Fix: Add space for go to top button * Add: redirection after create trip * edit: comment console log in updateForm * edit: create trip clear warnings * update: package-lock.json * fix: request route path * feat: create user profile view (#25) * feat: create user profile view * refator: styles * Fix/trip card (#26) * iconos de personas abajo * fix: css of mytrips * add: close drawer navbar when clocking outside * add: icon size to navbar * add: package-lock.json again * delete: not used class * 19 connect requested trip (#27) * clean console.log and redux * add: redux actions for detailtrip * edit: requestTrip to show detail * fix: add selfieLink to updateUser object * fix: remove email from updateForm * Feat/trips accepted (#28) * v1.17.3 * PassengerTrips component ready without style * PassengerTrips component ready without style * add: view layout to passenger trips * add: new route to navbar * fix: calls that fail for header * change: hardcoded token of call for user token * fix: redux reducer disapeared * fix: etd_times name change
jfcampos1
pushed a commit
that referenced
this pull request
Oct 28, 2019
jfcampos1
added a commit
that referenced
this pull request
Oct 28, 2019
* Feat/navigation (#9) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * feat: create main views * feat: add drawer navigation and create profile view * Feat/navigation (#9) * refactor: sign up screen (#8) * feat: add SignUpForm component * feat: add working sign up screen * fix: remove alias webpack * feat: add sign in screen * fix: fix payload at submit * refactor: removed submit method * fix: removed submit method * feat: create main views * feat: add drawer navigation and create profile view * Style/navbar (#10) * add: logos * add: logo to navbar * feat: add basic update user form with redux-form * fix: change navbar logo to text and fix menu icon (#11) * Feat/19 show my trips (#16) * add: font-awesome regular icons * add: mi trips cards show * add: api call, not working yet * add: function to parse Date and Time * Find trip (#18) * chore: initialize find trip screen and card * fix: change endopoint for sign-in sign-up, load userId into cookies * Fix: change style find trip card * fix: no stop selected show '' * feat: add actions, reduces for all trips * fix: reducers actions for find all trips * 19 show my trip (#19) * requested card style * style requested trip * clean data * conflict * added redirect sign in (#20) * edit: parse date and time * fix: update user reducer * Join trip (#22) * edit: move findMyTripsCard to other folder * add: manage sesion by localstorage * add: logout to navbar * add: redux passenger reservation trip * edit: navbar logout icon * add: submit passenger reservation * delete: Home screen * delete: console logs * 19 connect requested trip (#27) * clean console.log and redux * add: redux actions for detailtrip * edit: requestTrip to show detail * fix: add selfieLink to updateUser object * Feat/trips accepted (#28) * v1.17.3 * PassengerTrips component ready without style * PassengerTrips component ready without style * add: view layout to passenger trips * add: new route to navbar * fix: calls that fail for header * change: hardcoded token of call for user token * fix: redux reducer disapeared * fix: etd_times name change * fix: create trip and make reservation adding headers * fix: add dniBack, dniFront, selfie to update user action (#32)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.