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.

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

Upgrade app to Bootstrap 4 #480

Merged
merged 1 commit into from
Apr 4, 2019
Merged

Upgrade app to Bootstrap 4 #480

merged 1 commit into from
Apr 4, 2019

Conversation

stefannibrasil
Copy link
Contributor

Fixes #377

(sorry for the confusion, but I had a confusion with my upstream repo, so I moved everything to this new branch).
Hi all, I have some questions/notes:

  • 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;

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:

@stefannibrasil
Copy link
Contributor Author

@icarito @jywarren this is the most updated branch. I just don't know how to use the staging server yet. Thanks in advance!

@icarito
Copy link
Member

icarito commented Apr 3, 2019

Hi @stefannibrasil I apologize I had promised to document the staging instance but I ran into troubles when I copied the production data into the staging database it's not starting correctly looks like some kind of version incompatibility that I monkey-patched here https://github.com/publiclab/mapknitter/blob/main/Dockerfile#L37 in order to get us into Debian 10 cycle to use GDAL. I'll fix it tonight and leave a note for you!

@stefannibrasil
Copy link
Contributor Author

@icarito don't worry, no need to apologize, take your time! I'll record a video with the changes in the meantime. Thanks!!

@jywarren
Copy link
Member

jywarren commented Apr 4, 2019

I just reviewed the video and this is great. Once we get staging up, let's use https://lookback.io to get people's reviews on it before rolling it out? Thanks Stefanni!!!!!

@jywarren jywarren merged commit 3cabbad into publiclab:main Apr 4, 2019
@icarito
Copy link
Member

icarito commented Apr 5, 2019

Hi here's a short paragraph on how to use the unstable instance, basically like we use the same for plots.

@icarito
Copy link
Member

icarito commented Apr 5, 2019

@jywarren if you are ok to merge #462 and probably #489 then this should work for staging both main and unstable branch.

icarito pushed a commit that referenced this pull request Apr 7, 2019
chen-robert pushed a commit to chen-robert/mapknitter that referenced this pull request Dec 5, 2019
jywarren added a commit that referenced this pull request May 5, 2020
* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Loading assets in production env

* Allow uglifier to interpret ES6

* Fix start command

* Fix travis script

* Tweak travis script

* Add delay

* Revert assets changes

* Return to Mysql5.7

* Tweak travis script

* Fix make redeploy-container command

* Add db migrate and precompile step.

* Add bower install to Makefile

* Clean after docker run. Avoid one bower run.

* Changes to be able to build container in Google Cloud

* Remove spurious symlink

* Copy config examples when making build

* Export env variable name

* Tag cloud image

* Add timeout

* Push to cloud registry

* Fix jenkins build error with docker-compose tty

* Add app to container and .dockerignore all else

* Copy configuration files when deploying to GCE

* Allow copy config to container

* Time extended (for cloud build & push)

* Delete redundant index.html.erb file (#427)

* Setupcoveralls (#438)

* Add coveralls

* Fix gemfile

* Fix env variable

* Add coveralls token

* Update README.md

* Remove legacy image controller code #404 (#417)

Deleted the lines from the selection indicated in the issue.

* Change comment count on comment creation via AJAX #441 (#443)

This closes issue #441 "Change comment count on comment creation via AJAX #441" by incrementing comments-number each time a new comment is added. This would ensure that the counter indicating the number of comments is increased without needing to refresh the page.

* update syntax of active record query(license method) (#439)

Fixes #437

* Docker improve rebased (#450)

* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Loading assets in production env

* Allow uglifier to interpret ES6

* Don't dettach when building container in travis

* Fix start command

* Fix travis script

* Try to resolve travis tests invocation

* Tweak travis script

* Add delay

* Bundle install before db setup

* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Loading assets in production env

* Allow uglifier to interpret ES6

* Fix start command

* Fix travis script

* Tweak travis script

* Add delay

* Revert assets changes

* Return to Mysql5.7

* Tweak travis script

* Fix make redeploy-container command

* Add db migrate and precompile step.

* Add bower install to Makefile

* Clean after docker run. Avoid one bower run.

* updte pr template (#448)

* Bump recaptcha from 4.13.1 to 4.13.2 (#452)

Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.13.1 to 4.13.2.
- [Release notes](https://github.com/ambethia/recaptcha/releases)
- [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md)
- [Commits](ambethia/recaptcha@v4.13.1...v4.13.2)

Signed-off-by: dependabot[bot] <[email protected]>

* Restructure rake test task runner (#380)

* add a mysql setup file

* Squash commits

* Update README.md (#456)

* Change run to exec (#457)

* Bump paperclip from 4.2.4 to 4.3.7 (#285)

Bumps [paperclip](https://github.com/thoughtbot/paperclip) from 4.2.4 to 4.3.7.
- [Release notes](https://github.com/thoughtbot/paperclip/releases)
- [Changelog](https://github.com/thoughtbot/paperclip/blob/v4.3.7/NEWS)
- [Commits](thoughtbot/paperclip@v4.2.4...v4.3.7)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump test-unit from 3.3.0 to 3.3.1 (#458)

Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](test-unit/test-unit@3.3.0...3.3.1)

Signed-off-by: dependabot[bot] <[email protected]>

* Bump coveralls from 0.7.1 to 0.8.22 (#453)

Bumps [coveralls](https://coveralls.io) from 0.7.1 to 0.8.22.

Signed-off-by: dependabot[bot] <[email protected]>

* gridview aligned (#464)

* Alert improvement and adding byebug gem (#383)

* byebug gem added and alerts in separate file

* adding byebug history to gitignore

* adding timestamp to redirect

* added z-index to render login dropdown above leaflet icon

* fixed image partial rendering when no images (#423)

* fixed image partial rendering when no images.

* toggle no images <p> om upload

* fixed image partial rendering when no images.

* Bump recaptcha from 4.13.2 to 4.14.0 (#471)

Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.13.2 to 4.14.0.
- [Release notes](https://github.com/ambethia/recaptcha/releases)
- [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md)
- [Commits](ambethia/recaptcha@v4.13.2...v4.14.0)

Signed-off-by: dependabot[bot] <[email protected]>

* add a flash error when adding tags and not logged in (#473)

* Upgrade app to Bootstrap 4 (#480)

* Bootstrap 4 small button fixes (#488)

* Add tests for comments and maps (#467)

* Updated query style (#436) (#469)

* Dynamic ports (#462)

* Dynamic port in compose file

* Omit setting container name

* Add initial sql dump entry

* Avoid resetting database on build

* Shortening docker image in ~30%

* Caching bundle, gathering env variables and using newer sintax

* Creating startup script and env file

* Improving travis CI configuration

* Loading assets in production env

* Tweak travis script

* Roll back to using Debian 9 with custom built GDAL (#489)

* Switch back to Debian 9 Stretch

* Simplify docker image

* Bump Ruby to 2.4.6

* Re-add dependency

* Add dependency (zip)

* Try pip install gdal

* Install libgdal-dev

* Revert attept to use pip

* Bump ruby

* Avoid naming containers in compose file

* Avoid overwriting database on redeploy-container

* Allow to load mysql dump

* Include own GDAL packages

* Disable ipv6 to prevent error

* Add missing Amazon S3 yml to Makefile

* Document unstable instance

* Changes to be able to build container in Google Cloud

* Copy config examples when making build

* Add app to container and .dockerignore all else

* Fixed missed merge

* Add db configurability by env vars for containers

* Fix db config

* Copy configs

* Switch keyserver

* Add env vars, tweak make

* Substitute env vars parameters

* Env var control

* Show env vars

* env not ENV

* add DB_SOCKET

* Add recomended parameters

* Not deploy app engine, show cloudsql dir

* Omit list cloudsql dir

* Added correct image tag

* Add database parameters as env vars

* Support $PORT env var

* Using Node 12 and Yarn for Dockerfile.txt as well

* Changing Passenger's port on production env

* Setting local db for travis

* set .env PORT to $PORT

* Remove .env

* Compose environment variableZ fallback

* Revert all files under /app to versions in main

* Revert to main

* Delete unneeded files

* Remove extra files from rebase

* Add bundle install as build step

* Deleted not needed Dockerfile

* Missed RUN in Dockerfile

* Add precompile step

* Hardcode environment at build time

* Adding missing yaml and update bootsnap version

* Omit /app/tmp from volume

* Revert try to get precompile to work

* Clean up patch for merging

* List variables in app.yaml

* Tweak for jenkins

* Add .env for jenkins

* Fix PORT for jenkins/docker-compose

* Address PORT properly

* New form ports

* Enclose docker-compose ports in quotes

* ports yaml should be object not array

* Try different format for ports

* Try docker-compose format

* Redirect script for AppEngine

* Try to revertt to working condition for appengine

* Point PORT in Procfile

* Revert to known good config in appengine

* Tweak assets precompilation

* Restore PORT setting

* Add redirect to map /warps directory to legacy archive

* Add .env for jenkins/docker-compose

* Add hardcoded route to legacy warps

* Remove .env for appengine

* Satisfy appengine docker-compose

* Ignore app.yaml

* Ignore app.yaml secrets

* Satisfy Jenkins wihout hurting appengine hopefully

Co-authored-by: Sebastian Silva <[email protected]>
Co-authored-by: rarrunategu1 <[email protected]>
Co-authored-by: Jeffrey Warren <[email protected]>
Co-authored-by: Milo MacPhail <[email protected]>
Co-authored-by: Sonali Agrawal <[email protected]>
Co-authored-by: Ananya Agrawal <[email protected]>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Sasha Boginsky <[email protected]>
Co-authored-by: Kaustubh Nair <[email protected]>
Co-authored-by: Divya Baid <[email protected]>
Co-authored-by: Gaurav Sachdeva <[email protected]>
Co-authored-by: Govind Jeevan <[email protected]>
Co-authored-by: Cess <[email protected]>
Co-authored-by: Stefanni <[email protected]>
Co-authored-by: hc-barker <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants