Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Feature/mobile #38

Merged
merged 37 commits into from
Aug 12, 2019
Merged

Feature/mobile #38

merged 37 commits into from
Aug 12, 2019

Conversation

mluena
Copy link
Collaborator

@mluena mluena commented Aug 7, 2019

No description provided.

@davidsingal
Copy link
Contributor

@mluena please could you add some comments about your progress?

@mluena
Copy link
Collaborator Author

mluena commented Aug 8, 2019

Layout it´s done (I still need to implement functionality to check if we are in mobile or not). I am currently working on map view.

@davidsingal
Copy link
Contributor

I have the next error, I know the branch is still on WIP.

@import '../../../../styles/vars';
^
      File to import not found or unreadable: ../../../../styles/vars

@@ -103,6 +109,7 @@ class Widget extends PureComponent {
isActive={isActive}
onClick={this.activeToggleHandler}
>
{console.log(isActive)}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should not be commited.

@@ -7,7 +7,8 @@ import Component from './component';
const mapStateToProps = state => ({
...state.map,
mapStyle: mapStyle(state),
mapboxApiAccessToken: process.env.REACT_APP_MAPBOX_ACCESS_TOKEN
mapboxApiAccessToken: process.env.REACT_APP_MAPBOX_ACCESS_TOKEN,
isCollapse: state.layers.isCollapse
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the one that exists in layers store is isCollapsed, the first time is set to flase but trigger some error...

@mluena mluena requested a review from migsar August 12, 2019 15:56
@migsar migsar merged commit df556fb into develop Aug 12, 2019
@migsar migsar deleted the feature/mobile branch August 12, 2019 17:01
migsar pushed a commit that referenced this pull request Aug 14, 2019
* feat(NA): Add redux.

* feat(NA): Add redux-first-router.

* feat(#1): Add generic MapPanel and Map components

* fix(#1): Clean and adapt map component.

* feat(#5): Add state to url.

* feat(#6): Create global settings state.

* feat(NA): Add eslit with vizzuality rules.

* fix(NA): Update eslint to 5.16.0 as required by react-scripts and replace node_path with baseUrl in jsconfig.json

* feat(NA): PT#166232015 Location Selector.

* feat(#7): PT#166232052 Dashboard.

* Added .nvmrc file

* added .editorconfig file, in order to write code in the same way

* removed eslintConfig because we already have eslintrc file

* removed peer dependency

* feat(#10): Create and connect dashboard component

* feat(#11): Create dashboard schema.

* feat(#12): Create search schema.

* chore(NA): Comment out app state to url for now.

* fix(#11): Change title to location.

* feat(#15): Service for datasets.

* feat(#16): Add layer manager.

* feat(#18): Add map navigation.

* fix(#18): Linter fixes.

* feat(#17): Create base Widget component.

* feat(#17): Add basic style to Widget component.

* feat(#17): Connect widget and dashboard state.

* added readme and env sample

* node version for heroku

* node version for heroku

* updated README with heroku deploy docs

* feat(#17): Make widget layers actionable.

* adding first styles and layout

* adding static server based on express for heroku

* styles for widget card

* feat(#17): Create base Widget component.

* feat(#17): Add basic style to Widget component.

* feat(#17): Connect widget and dashboard state.

* feat(#17): Make widget layers actionable.

* chore(NA) Disable state to url for map interaction speed.

* changed typo for widget

* add chart component

* add mangrove coverage widget]

* add mangroves base

* migrated to scss modules

* chart styles

* use sass

* net change widget

* removed no nedded dependencies

* connected with mapbox service

* connecting widgets and collapse

* basic sentence

* basic label structure

* rm react-select, not using atm

* update comments

* merging widgets

* fixed mangrove activity slug

* disabled url update

* dashboard removed

* toggle and layers

* fixed location selector

* updated styles for widget

* added OpenSans font

* map layers and styles

* changed thumbnails for basemap selector

* adding and removing layers

* added and removing layer using mapStyle object

* add and remove layer

* added favicon

* fixed templates

* connected widget data

* details and style for widgets and dashboard

* header and location selector

* location styles

* navigation using location selector

* connect current location with locations

* fixed prop types for legend

* improved performance for map

* added fly to any location

* location navigation

* disabling redux for production

* widget animation

* styles for widgets

* mangrove coverage adjustments

* micro optimization for locations sagas

* fixed fly to location

* fixed location search

* added conservation hotspots widget and disable button for widgets without layer

* added link for download raw data

* download csv

* styles for download link

* changed widget for net change

* connected data with net change widget for tanzania

* fixed mangrove net change for wordwide

* styles for select

* changed template for widgets

* added support for multiple layers

* added button for download data for net change widget

* added interactivity for net change

* fix some bugs and style improvements

* added autofocus for search input

* font size depending on title length

* added padding for fitbounds

* fixed axis y for mangrove net widget

* added transifex live code and changed typo in title

* added notranslate classnames to avoid transifex detection

* added more span for translation

* storybook config

* comments removed

* widgets stories

* basemap selector stories

* knobs added

* knobs rule added to eslint

* Select stories

* legend-item stories

* CDN global styles added to storybook config

* preview and manager head tags

* fixed dependencies conflicts

* open search modal clicking on the title

* created modal wrapper using react modal

* fixing location selector modal when current location doesnt exist

* fixing number format for charts

* storybook config addons

* button stories

* map stories

* header stories

* chart stories

* select stories

* widget stories

* global variables

* button stories

* button group

* files deleted

* button group component

* storybook dependencies and added global styles

* stoorybook provider

* modal stories

* location-modal stories

* button group stories

* map stories

* widget download data link to component

* map temp container

* spinner to stoorybook

* arrow in select + context

* arrow select

* spinner

* language-selector

* arrow select

* collapse widgets btn styles

* header elements swapped

* hotspots included in modal

* select cursor pointer

* arrow in select styled

* dropdown arrow

* open select removed

* btn styles on active bar

* option button styles

* dashboard component for scroll

* PR fixes

* PR - #31 amendments

* language select

* spinner fix

* disable options

* dates disabled styles

* CHANGELOG file

* transifex WIP

* sidebar instead dashbaord

* sticky header styles and sidebar component

* transifex index + store

* transifex WIP

* sidebar width

* changelog just for two weeks

* eslint fix

* z-index changed in location modal

* removing file

* language sagas

* language select component

* functionality to language selct

* preselected language styles

* feat(NA): Url to state feature.

* fix(NA): Fixing error when no query was present.

* feat(NA): Add delay so restoring widget isActive works.

* changelog updated

* link added to hotspot card

* refactor(NA): Change from mapbox datasets to api (#43)

* changed locations

* locations integration from api

* adde data for dashboards, widgets and layers

* locations with geom

* using data instead fetch

* connected data

* changes

* coverage

* mangrove data

* connected widgets

* widget api fix

* mangrove coverage integrated

* mangrove coverage migrated

* fix(NA): Change Back to worldwide id from global to worldwide.

* Feature/mobile (#38)

* react responsive and main layout

* view map btn component

* media queries and mobile view styles

* media queries adjusted in header

* mobile condition to redux, btn and header styles adapted

* action bar in header

* hotspots widget mobile

* typo error

* indentation

* background, widgets arrow

* desktop styles fixed

* view map btn and active layers

* desktop layout component

* mobile layout component

* layers collapsed in map view

* mediaqueries added

* unused dependencies removed

* mediaqueries fix

* map btn functionality

* legend collapse

* import styles using SASS_PATH

* legend item back

* map legend

* conflict and legend styles

* PR changes

* modal styles

* PR - changes

* Fix/fixed header (#45)

* react responsive and main layout

* view map btn component

* media queries and mobile view styles

* media queries adjusted in header

* mobile condition to redux, btn and header styles adapted

* action bar in header

* hotspots widget mobile

* typo error

* indentation

* background, widgets arrow

* desktop styles fixed

* view map btn and active layers

* desktop layout component

* mobile layout component

* layers collapsed in map view

* mediaqueries added

* unused dependencies removed

* mediaqueries fix

* map btn functionality

* legend collapse

* import styles using SASS_PATH

* legend item back

* map legend

* conflict and legend styles

* PR changes

* modal styles

* PR - changes

* header and modal fix

* Fix/fixed header (#46)

* react responsive and main layout

* view map btn component

* media queries and mobile view styles

* media queries adjusted in header

* mobile condition to redux, btn and header styles adapted

* action bar in header

* hotspots widget mobile

* typo error

* indentation

* background, widgets arrow

* desktop styles fixed

* view map btn and active layers

* desktop layout component

* mobile layout component

* layers collapsed in map view

* mediaqueries added

* unused dependencies removed

* mediaqueries fix

* map btn functionality

* legend collapse

* import styles using SASS_PATH

* legend item back

* map legend

* conflict and legend styles

* PR changes

* modal styles

* PR - changes

* header and modal fix

* mobile modal btn

* Feature/widget alerts (#44)

* changed locations

* locations integration from api

* adde data for dashboards, widgets and layers

* locations with geom

* using data instead fetch

* connected data

* changes

* coverage

* mangrove data

* connected widgets

* widget api fix

* mangrove coverage integrated

* mangrove coverage migrated

* fix(NA): Change Back to worldwide id from global to worldwide.

* feat(NA): Basic layout for alerts widget.

* refactor: Refactor WidgetList and Widget to be more clear.

* fix(NA): Layer toggle was not working after API refactor.

* refactor(NA): Start refactoring chart component.

* fix(NA): Requested changes.

* widget conected (#47)

* widget conected

* net change widget data

* extra file removed
lhilarides pushed a commit to lhilarides/mangrove-atlas that referenced this pull request Nov 12, 2022
* react responsive and main layout

* view map btn component

* media queries and mobile view styles

* media queries adjusted in header

* mobile condition to redux, btn and header styles adapted

* action bar in header

* hotspots widget mobile

* typo error

* indentation

* background, widgets arrow

* desktop styles fixed

* view map btn and active layers

* desktop layout component

* mobile layout component

* layers collapsed in map view

* mediaqueries added

* unused dependencies removed

* mediaqueries fix

* map btn functionality

* legend collapse

* import styles using SASS_PATH

* legend item back

* map legend

* conflict and legend styles

* PR changes

* modal styles

* PR - changes
lhilarides pushed a commit to lhilarides/mangrove-atlas that referenced this pull request Nov 12, 2022
* feat(NA): Add redux.

* feat(NA): Add redux-first-router.

* feat(Vizzuality#1): Add generic MapPanel and Map components

* fix(Vizzuality#1): Clean and adapt map component.

* feat(Vizzuality#5): Add state to url.

* feat(Vizzuality#6): Create global settings state.

* feat(NA): Add eslit with vizzuality rules.

* fix(NA): Update eslint to 5.16.0 as required by react-scripts and replace node_path with baseUrl in jsconfig.json

* feat(NA): PT#166232015 Location Selector.

* feat(Vizzuality#7): PT#166232052 Dashboard.

* Added .nvmrc file

* added .editorconfig file, in order to write code in the same way

* removed eslintConfig because we already have eslintrc file

* removed peer dependency

* feat(Vizzuality#10): Create and connect dashboard component

* feat(Vizzuality#11): Create dashboard schema.

* feat(Vizzuality#12): Create search schema.

* chore(NA): Comment out app state to url for now.

* fix(Vizzuality#11): Change title to location.

* feat(Vizzuality#15): Service for datasets.

* feat(Vizzuality#16): Add layer manager.

* feat(Vizzuality#18): Add map navigation.

* fix(Vizzuality#18): Linter fixes.

* feat(Vizzuality#17): Create base Widget component.

* feat(Vizzuality#17): Add basic style to Widget component.

* feat(Vizzuality#17): Connect widget and dashboard state.

* added readme and env sample

* node version for heroku

* node version for heroku

* updated README with heroku deploy docs

* feat(Vizzuality#17): Make widget layers actionable.

* adding first styles and layout

* adding static server based on express for heroku

* styles for widget card

* feat(Vizzuality#17): Create base Widget component.

* feat(Vizzuality#17): Add basic style to Widget component.

* feat(Vizzuality#17): Connect widget and dashboard state.

* feat(Vizzuality#17): Make widget layers actionable.

* chore(NA) Disable state to url for map interaction speed.

* changed typo for widget

* add chart component

* add mangrove coverage widget]

* add mangroves base

* migrated to scss modules

* chart styles

* use sass

* net change widget

* removed no nedded dependencies

* connected with mapbox service

* connecting widgets and collapse

* basic sentence

* basic label structure

* rm react-select, not using atm

* update comments

* merging widgets

* fixed mangrove activity slug

* disabled url update

* dashboard removed

* toggle and layers

* fixed location selector

* updated styles for widget

* added OpenSans font

* map layers and styles

* changed thumbnails for basemap selector

* adding and removing layers

* added and removing layer using mapStyle object

* add and remove layer

* added favicon

* fixed templates

* connected widget data

* details and style for widgets and dashboard

* header and location selector

* location styles

* navigation using location selector

* connect current location with locations

* fixed prop types for legend

* improved performance for map

* added fly to any location

* location navigation

* disabling redux for production

* widget animation

* styles for widgets

* mangrove coverage adjustments

* micro optimization for locations sagas

* fixed fly to location

* fixed location search

* added conservation hotspots widget and disable button for widgets without layer

* added link for download raw data

* download csv

* styles for download link

* changed widget for net change

* connected data with net change widget for tanzania

* fixed mangrove net change for wordwide

* styles for select

* changed template for widgets

* added support for multiple layers

* added button for download data for net change widget

* added interactivity for net change

* fix some bugs and style improvements

* added autofocus for search input

* font size depending on title length

* added padding for fitbounds

* fixed axis y for mangrove net widget

* added transifex live code and changed typo in title

* added notranslate classnames to avoid transifex detection

* added more span for translation

* storybook config

* comments removed

* widgets stories

* basemap selector stories

* knobs added

* knobs rule added to eslint

* Select stories

* legend-item stories

* CDN global styles added to storybook config

* preview and manager head tags

* fixed dependencies conflicts

* open search modal clicking on the title

* created modal wrapper using react modal

* fixing location selector modal when current location doesnt exist

* fixing number format for charts

* storybook config addons

* button stories

* map stories

* header stories

* chart stories

* select stories

* widget stories

* global variables

* button stories

* button group

* files deleted

* button group component

* storybook dependencies and added global styles

* stoorybook provider

* modal stories

* location-modal stories

* button group stories

* map stories

* widget download data link to component

* map temp container

* spinner to stoorybook

* arrow in select + context

* arrow select

* spinner

* language-selector

* arrow select

* collapse widgets btn styles

* header elements swapped

* hotspots included in modal

* select cursor pointer

* arrow in select styled

* dropdown arrow

* open select removed

* btn styles on active bar

* option button styles

* dashboard component for scroll

* PR fixes

* PR - Vizzuality#31 amendments

* language select

* spinner fix

* disable options

* dates disabled styles

* CHANGELOG file

* transifex WIP

* sidebar instead dashbaord

* sticky header styles and sidebar component

* transifex index + store

* transifex WIP

* sidebar width

* changelog just for two weeks

* eslint fix

* z-index changed in location modal

* removing file

* language sagas

* language select component

* functionality to language selct

* preselected language styles

* feat(NA): Url to state feature.

* fix(NA): Fixing error when no query was present.

* feat(NA): Add delay so restoring widget isActive works.

* changelog updated

* link added to hotspot card

* refactor(NA): Change from mapbox datasets to api (Vizzuality#43)

* changed locations

* locations integration from api

* adde data for dashboards, widgets and layers

* locations with geom

* using data instead fetch

* connected data

* changes

* coverage

* mangrove data

* connected widgets

* widget api fix

* mangrove coverage integrated

* mangrove coverage migrated

* fix(NA): Change Back to worldwide id from global to worldwide.

* Feature/mobile (Vizzuality#38)

* react responsive and main layout

* view map btn component

* media queries and mobile view styles

* media queries adjusted in header

* mobile condition to redux, btn and header styles adapted

* action bar in header

* hotspots widget mobile

* typo error

* indentation

* background, widgets arrow

* desktop styles fixed

* view map btn and active layers

* desktop layout component

* mobile layout component

* layers collapsed in map view

* mediaqueries added

* unused dependencies removed

* mediaqueries fix

* map btn functionality

* legend collapse

* import styles using SASS_PATH

* legend item back

* map legend

* conflict and legend styles

* PR changes

* modal styles

* PR - changes

* Fix/fixed header (Vizzuality#45)

* react responsive and main layout

* view map btn component

* media queries and mobile view styles

* media queries adjusted in header

* mobile condition to redux, btn and header styles adapted

* action bar in header

* hotspots widget mobile

* typo error

* indentation

* background, widgets arrow

* desktop styles fixed

* view map btn and active layers

* desktop layout component

* mobile layout component

* layers collapsed in map view

* mediaqueries added

* unused dependencies removed

* mediaqueries fix

* map btn functionality

* legend collapse

* import styles using SASS_PATH

* legend item back

* map legend

* conflict and legend styles

* PR changes

* modal styles

* PR - changes

* header and modal fix

* Fix/fixed header (Vizzuality#46)

* react responsive and main layout

* view map btn component

* media queries and mobile view styles

* media queries adjusted in header

* mobile condition to redux, btn and header styles adapted

* action bar in header

* hotspots widget mobile

* typo error

* indentation

* background, widgets arrow

* desktop styles fixed

* view map btn and active layers

* desktop layout component

* mobile layout component

* layers collapsed in map view

* mediaqueries added

* unused dependencies removed

* mediaqueries fix

* map btn functionality

* legend collapse

* import styles using SASS_PATH

* legend item back

* map legend

* conflict and legend styles

* PR changes

* modal styles

* PR - changes

* header and modal fix

* mobile modal btn

* Feature/widget alerts (Vizzuality#44)

* changed locations

* locations integration from api

* adde data for dashboards, widgets and layers

* locations with geom

* using data instead fetch

* connected data

* changes

* coverage

* mangrove data

* connected widgets

* widget api fix

* mangrove coverage integrated

* mangrove coverage migrated

* fix(NA): Change Back to worldwide id from global to worldwide.

* feat(NA): Basic layout for alerts widget.

* refactor: Refactor WidgetList and Widget to be more clear.

* fix(NA): Layer toggle was not working after API refactor.

* refactor(NA): Start refactoring chart component.

* fix(NA): Requested changes.

* widget conected (Vizzuality#47)

* widget conected

* net change widget data

* extra file removed
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants