Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to bootstrap 4 #461

Closed
wants to merge 20 commits into from
Closed

Upgrade to bootstrap 4 #461

wants to merge 20 commits into from

Conversation

stefannibrasil
Copy link
Contributor

@stefannibrasil stefannibrasil commented Mar 29, 2019 •
edited
Loading

Fixes #377

Hi all, I have some questions:

  • Why do we have two bower.json files? I wasn't sure which one to use, so I updated both of them.
  • In order to make Bootstrap 4 work, I had to install the popper_js gem and update jquery-ui version.
  • @icarito after I rebased my branch with some of your work from Docker improve rebased #450 the map on /maps/some-map-title wasn't working... It only worked after I re-added 3 dependencies that you had removed:
 # javascripts/application.js
 //= require leaflet-easybutton/src/easy-button.js
 //= require leaflet-google/index.js

and

  # javascripts/maps.js
  //= require seiyria-bootstrap-slider/dist/bootstrap-slider.min.js

@icarito Did you manage to make the maps be shown without those 3 dependencies?

A little more about this PR: I just updated some of the components that were broken from switching to Bootstrap 4, especially because we will soon update the UI.

Please let me know if I did those version updates correctly, this was my first time doing something like this! :)
Appreciate any help here, I think I didn't forget anything here :shipit:

Moved to #480
@jywarren @gauravano @sashadev-sky (any more others I should mention here?)

@icarito
Copy link
Member

icarito commented Mar 29, 2019 via email

@icarito
Copy link
Member

icarito commented Mar 29, 2019

Actually I had tried this in order to set us up with a staging environment like we have for plots2 - in #429 and related issues we had a lot of moving around of dependency installation and I thought I'd put it all back, thanks for catching it!

I have here to share with you that our staging instances should be functional (currently we have an empty database but I'll copy database from production).

http://mapknitter-unstable.laboratoriopublico.org/ (built from unstable branch)
http://mapknitter-stable.laboratoriopublico.org/ (built from main branch)

@stefannibrasil @sashadev-sky @jywarren I hope it will be useful!

@sashadev-sky
Copy link
Member

@icarito Thank you!!!

@stefannibrasil
Copy link
Contributor Author

stefannibrasil commented Mar 29, 2019 •
edited
Loading

oh, don't worry, just wanted to double check, @icarito :)

that's awesome! I tried finding how to push to the staging branch, just run git push stable? Thanks!

@icarito
Copy link
Member

icarito commented Mar 30, 2019 via email

@jywarren
Copy link
Member

jywarren commented Apr 2, 2019

I believe data was copied in over the weekend! @stefannibrasil did it work to push this up?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@stefannibrasil @icarito @sashadev-sky @jywarren @grvsachdeva