UI - Navbar for MapKnitter #360

stefannibrasil · 2019-02-25T19:48:55Z

Related to #327

Hi all,
My proposal here is to change the navbar to use the same layout as Public Lab. That way, whenever we need to create a new navbar for a new project, we can follow this pattern. This also prevents having different CSS files and classes for every project, letting us focus on the project layout.

I still need to fix some small issues, like the login form and the search form.

But I have some questions that I wanted to ask before moving on:

The app is not using Bootstrap at all? I couldn't find a link to it, so I added a new one for Bootstrap 4. I may be missing something here, but it does not look like we are using Bootstrap. I am totally for using
Bootstrap 4, they have some nice cards and mobile utilities that make our work easier.
I noticed that the Resources link on the navbar was being hidden. Is it supposed to be removed from it?

Let me know your thoughts, please! @jywarren

Some screenshots: to help with the review:

Show only maps with at least one image in main listing

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

see https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant/issues/90 for the issue we encountered with `v0.7.1`

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.1 to 1.9.1. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.8.1...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.0.7 to 3.1.6. - [Release notes](https://github.com/mislav/will_paginate/releases) - [Commits](mislav/will_paginate@v3.0.7...v3.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>

* initial cleanup * export unit tests, basic * map tests * basic comment tests * cleanup * export functional tests * fixes * Update export.rb * test fixes and further cleanup * extra test * trying again * another unit test * output errors? * Update map_test.rb * Update maps.yml * Update tag_test.rb

Bumps [rake](https://github.com/ruby/rake) from 10.5.0 to 12.3.2. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](ruby/rake@v10.5.0...v12.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com>

Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com>

* tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions

Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>

* basic map unit tests * try to run entire map.run_export * parameter consolidation

* update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word

MapKnitter is currently using a totally diferent navbar from Public Lab. Making both using the same makes it easier to follow the pattern in future projects

welcome · 2019-02-25T19:48:59Z

Thanks for opening this pull request! Dangerbot will test out your code and reply in a bit with some pointers and requests.
There may be some errors, but don't worry! We're here to help! 👍🎉😄

jywarren · 2019-02-28T19:47:55Z

Hi!!! So, like in plots2, the stylesheets are included here: https://github.com/publiclab/mapknitter/blob/master/app/views/layouts/application.html.erb#L16

bootstrap is included, and we seem to be on Bootstrap 3.2 -- see:

https://github.com/publiclab/mapknitter/blob/master/app/assets/stylesheets/application.css#L12

https://github.com/publiclab/mapknitter/blob/master/bower.json#L6

We should move to Yarn, see #357 for progress on this, which should simplify things a bit.

+1 this change, the menubar would be nice if standardized here!

stefannibrasil · 2019-02-28T20:25:56Z

ahhh, thanks!!! So we are using Bootstrap 3.2.0
https://github.com/publiclab/mapknitter/blob/master/bower.json#L6

I'll update the changes then. I'm not familiar with yarn and bower, but if that will simplify, awesome! 🎉

I will try to finish today (tomorrow for sure), then I'll upload more detailed screenshots for this. Thanks for the help, @jywarren

jywarren · 2019-02-28T20:27:48Z

But we should look at upgrading to bootstrap 4!! Shouldn't be too hard compared to plots2 since this is such a simpler app!

…

On Thu, Feb 28, 2019, 3:26 PM Stefanni ***@***.***> wrote: ahhh, thanks!!! So we are using Bootstrap 3.2.0 https://github.com/publiclab/mapknitter/blob/master/bower.json#L6 I'll update the changes then. I'm not familiar with yarn and bower, but if that will simplify, awesome! :tada I will try to finish today (tomorrow for sure), then I'll upload more detailed screenshots for this. Thanks for the help, @jywarren <https://github.com/jywarren> — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#360 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ--Y_kEjZSKbvdM5LpotWTYSwoxKks5vSDtUgaJpZM4bQpbw> .

stefannibrasil · 2019-02-28T21:01:00Z

I'm totally for it! Maybe creating an issue for now? After this navbar, I can take a look.

jywarren · 2019-02-28T21:55:47Z

sounds great!

…

On Thu, Feb 28, 2019 at 4:01 PM Stefanni ***@***.***> wrote: I'm totally for it! Maybe creating an issue for now? After this navbar, I can take a look. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#360 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AABfJ1J1eDp86Nds0JVkM9MPk__c0vevks5vSEONgaJpZM4bQpbw> .

stefannibrasil · 2019-03-01T23:08:28Z

okay, I created this new issue #377 for the Bootstrap update. If you want to add it to projects page and add labels to it, it would be nice, I couldn't add any 👍

stefannibrasil · 2019-03-02T01:50:32Z

Hi @jywarren I changed the navbar to use Bootstrap 3.2.0 for now.

Here are some screenshots. One thing that I noticed was that the navbar was not using Bootstrap's collapse, so I changed that, no need for adding CSS for this behavior.

stefannibrasil · 2019-03-02T01:52:09Z

When I take screenshots the navbar gets in the middle of the map, IDK why!
Here I moved the search form to the navbar, but I left the previous one there for now.

stefannibrasil · 2019-03-02T01:52:39Z

this one looks better to see the navbar alone.

stefannibrasil · 2019-03-02T01:53:42Z

Mobile:

Opening the user dropdown:

stefannibrasil · 2019-03-02T01:54:18Z

Maps page:

stefannibrasil · 2019-03-02T01:55:38Z

Let me know what do you think! It leaves more space for adding contents later, I think :)

also, why is the CI not finishing on travis? Is it because I first opened this PR as a Draft?

jywarren · 2019-03-05T01:21:45Z

Ooh it's really nice! Is it ready for a merge? Thanks!!!

jywarren · 2019-03-05T01:21:58Z

It looks like Travis is OK now?

stefannibrasil · 2019-03-06T21:35:13Z

yeah, it's ready for a merge! Glad you liked :)
I think after I switched to normal PR travis ran as expected, so it's okay now.

After we merge this, should I start on updating Bootstrap version? Thanks ✌️

jywarren · 2019-03-06T22:14:12Z

app/assets/stylesheets/header.css.scss

-    font-family: 'Junction Light';
-  }
-
-  img.cat {


Did you find the easter egg???????

welcome · 2019-03-06T22:14:41Z

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to https://mapknitter.org in the next few days.
In the meantime, can you tell us your Twitter handle so we can thank you properly?
Now that you've completed this, you can help someone else take their first step!
See: Public Lab's coding community!

jywarren · 2019-03-06T22:14:53Z

🎉 !!!! This is awesome. Thanks @stefannibrasil -- yeah that'd be great!

* Show only maps with at least one image in main listing * Update Leaflet.DistortableImage version * Create first timers issue template.md * Create config.yml * spam links in moderation feeds * Add mapknitter to the help wanted link Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Replace the community link with the code.public link Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Update the first time only link to code.public Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Use the correct link to indicate where the code will be published Co-Authored-By: faithngetich <faithngetich188@gmail.com> * Update index.html.erb * Update bower.json * Update bower.json * Update bower.json * Peg GoogleMutant layer to v0.7.0 see https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant/issues/90 for the issue we encountered with `v0.7.1` * [Security] Bump nokogiri from 1.8.1 to 1.9.1 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.8.1 to 1.9.1. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.8.1...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump will_paginate from 3.0.7 to 3.1.6 Bumps [will_paginate](https://github.com/mislav/will_paginate) from 3.0.7 to 3.1.6. - [Release notes](https://github.com/mislav/will_paginate/releases) - [Commits](mislav/will_paginate@v3.0.7...v3.1.6) Signed-off-by: dependabot[bot] <support@dependabot.com> * Cleanup (publiclab#313) * initial cleanup * export unit tests, basic * map tests * basic comment tests * cleanup * export functional tests * fixes * Update export.rb * test fixes and further cleanup * extra test * trying again * another unit test * output errors? * Update map_test.rb * Update maps.yml * Update tag_test.rb * Bump rake from 10.5.0 to 12.3.2 (publiclab#286) Bumps [rake](https://github.com/ruby/rake) from 10.5.0 to 12.3.2. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](ruby/rake@v10.5.0...v12.3.2) Signed-off-by: dependabot[bot] <support@dependabot.com> * [Security] Bump i18n from 0.7.0 to 0.9.5 (publiclab#289) Bumps [i18n](https://github.com/svenfuchs/i18n) from 0.7.0 to 0.9.5. **This update includes security fixes.** - [Release notes](https://github.com/svenfuchs/i18n/releases) - [Changelog](https://github.com/ruby-i18n/i18n/blob/master/CHANGELOG.md) - [Commits](ruby-i18n/i18n@v0.7.0...v0.9.5) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump rdiscount from 2.1.7.1 to 2.2.0.1 (publiclab#321) Bumps [rdiscount](https://github.com/davidfstr/rdiscount) from 2.1.7.1 to 2.2.0.1. - [Release notes](https://github.com/davidfstr/rdiscount/releases) - [Changelog](https://github.com/davidfstr/rdiscount/blob/master/CHANGELOG.md) - [Commits](davidfstr/rdiscount@2.1.7.1...2.2.0.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Unit test warpable code (publiclab#331) * tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions * Bump recaptcha from 4.6.3 to 4.9.0 (publiclab#332) Bumps [recaptcha](https://github.com/ambethia/recaptcha) from 4.6.3 to 4.9.0. - [Release notes](https://github.com/ambethia/recaptcha/releases) - [Changelog](https://github.com/ambethia/recaptcha/blob/master/CHANGELOG.md) - [Commits](ambethia/recaptcha@v4.6.3...v4.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * basic map unit tests (publiclab#334) * basic map unit tests * try to run entire map.run_export * parameter consolidation * Updates to customize rails / ruby and mySQL version compatibility (publiclab#323) * update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word * Change navbar to use the same layout as Public Lab MapKnitter is currently using a totally diferent navbar from Public Lab. Making both using the same makes it easier to follow the pattern in future projects * Add Bootstrap 4 to project * Redo navbar for Bootstrap 3.2.0 version

jywarren and others added 28 commits January 16, 2019 12:43

Show only maps with at least one image in main listing

8f6b0ad

Merge pull request #299 from publiclab/1-image-maps

7874e91

Show only maps with at least one image in main listing

Update Leaflet.DistortableImage version

a5de9bd

Create first timers issue template.md

0518136

Create config.yml

5d0a8f5

spam links in moderation feeds

a681258

Add mapknitter to the help wanted link

d61c90b

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

Replace the community link with the code.public link

3ae10f4

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

Update the first time only link to code.public

4d95688

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

Use the correct link to indicate where the code will be published

7066bd0

Co-Authored-By: faithngetich <faithngetich188@gmail.com>

Update index.html.erb

a18787c

Update bower.json

623454c

Update bower.json

376512e

Update bower.json

37c87f4

Peg GoogleMutant layer to v0.7.0

dca373a

see https://gitlab.com/IvanSanchez/Leaflet.GridLayer.GoogleMutant/issues/90 for the issue we encountered with `v0.7.1`

Unit test warpable code (#331)

528b799

* tests for warpables, test to distort in ImageMagick * file existence test * make test folder * demo file and copying * delete demo image * mkdir -p * save_dimensions

basic map unit tests (#334)

b96df27

* basic map unit tests * try to run entire map.run_export * parameter consolidation

Updates to customize rails / ruby and mySQL version compatibility (#323)

1a83146

* update time fixtures and override sql primary default keys * Reset HEAD to first commit and reapply changes * Finalize comments for customizations * Changed a word

Merge branch 'main' of github.com:stefannibrasil/mapknitter into main

2a0a281

Change navbar to use the same layout as Public Lab

9936f5d

MapKnitter is currently using a totally diferent navbar from Public Lab. Making both using the same makes it easier to follow the pattern in future projects

Add Bootstrap 4 to project

4c7c955

stefannibrasil changed the title ~~New navbar~~ UI - Navbar for MapKnitter Feb 25, 2019

Redo navbar for Bootstrap 3.2.0 version

255dc7d

stefannibrasil marked this pull request as ready for review March 2, 2019 01:55

jywarren reviewed Mar 6, 2019

View reviewed changes

app/assets/stylesheets/header.css.scss

font-family: 'Junction Light';

}

img.cat {

Copy link

Member

jywarren Mar 6, 2019

Choose a reason for hiding this comment

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

Did you find the easter egg???????

jywarren merged commit 77ee135 into publiclab:main Mar 6, 2019

jywarren mentioned this pull request Mar 11, 2019

Alert improvement and adding byebug gem #383

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UI - Navbar for MapKnitter #360

UI - Navbar for MapKnitter #360

stefannibrasil commented Feb 25, 2019 •

edited

Loading

welcome bot commented Feb 25, 2019

jywarren commented Feb 28, 2019

stefannibrasil commented Feb 28, 2019 •

edited

Loading

jywarren commented Feb 28, 2019 via email

stefannibrasil commented Feb 28, 2019

jywarren commented Feb 28, 2019 via email

stefannibrasil commented Mar 1, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019 •

edited

Loading

jywarren commented Mar 5, 2019

jywarren commented Mar 5, 2019

stefannibrasil commented Mar 6, 2019

jywarren Mar 6, 2019

welcome bot commented Mar 6, 2019

jywarren commented Mar 6, 2019

UI - Navbar for MapKnitter #360

UI - Navbar for MapKnitter #360

Conversation

stefannibrasil commented Feb 25, 2019 • edited Loading

welcome bot commented Feb 25, 2019

jywarren commented Feb 28, 2019

stefannibrasil commented Feb 28, 2019 • edited Loading

jywarren commented Feb 28, 2019 via email

stefannibrasil commented Feb 28, 2019

jywarren commented Feb 28, 2019 via email

stefannibrasil commented Mar 1, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019

stefannibrasil commented Mar 2, 2019 • edited Loading

jywarren commented Mar 5, 2019

jywarren commented Mar 5, 2019

stefannibrasil commented Mar 6, 2019

jywarren Mar 6, 2019

Choose a reason for hiding this comment

welcome bot commented Mar 6, 2019

jywarren commented Mar 6, 2019

stefannibrasil commented Feb 25, 2019 •

edited

Loading

stefannibrasil commented Feb 28, 2019 •

edited

Loading

stefannibrasil commented Mar 2, 2019 •

edited

Loading