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

Fix front ui #1011

Merged
merged 17 commits into from
Sep 11, 2019
Merged

Fix front ui #1011

merged 17 commits into from
Sep 11, 2019

Conversation

sashadev-sky
Copy link
Member

@sashadev-sky sashadev-sky commented Sep 11, 2019

Fixes #1012 (<=== Add issue number here)

The login view was missing in the public lab icon, and github icon:
image

Re-implemented it and DRYed up code by using the _login_form partial instead of rewriting the UI logic.
image

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/mapknitter-reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@codeclimate
Copy link

codeclimate bot commented Sep 11, 2019

Code Climate has analyzed commit ed655e4 and detected 0 issues on this pull request.

View more on Code Climate.

@codecov
Copy link

codecov bot commented Sep 11, 2019

Codecov Report

Merging #1011 into main will decrease coverage by 0.36%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##            main    #1011      +/-   ##
=========================================
- Coverage   73.7%   73.34%   -0.37%     
=========================================
  Files         40       40              
  Lines       1388     1388              
=========================================
- Hits        1023     1018       -5     
- Misses       365      370       +5
Impacted Files Coverage Δ
lib/exporter.rb 91.92% <0%> (-2.25%) ⬇️

@sashadev-sky
Copy link
Member Author

@publiclab/mapknitter-reviewers

@cesswairimu
Copy link
Collaborator

Wow! This look amazing, love the new fonts and designs ❤️ 🎉 🎉. Maybe we should keep the publiclab icon. What do you think?

@jywarren
Copy link
Member

Hi! This looks good, just re-using the already working code from the upper-right navbar dropdown. Super! Merging this now as I believe this resolves #1010 too?

@jywarren jywarren merged commit fc4a042 into publiclab:main Sep 11, 2019
@jywarren
Copy link
Member

Thank you Sasha!!!

(Had trouble sleeping? wow, late night critical fixes FTW! 🙌 )

@sashadev-sky sashadev-sky deleted the fix-front-ui branch September 12, 2019 01:01
</form>
<br><br>
<p>We strongly prefer that you should
<%= render partial: "layouts/login_form" %>
OR <a href="http://publiclab.org/signup">sign up for a Public Lab account</a>
Copy link
Contributor

Choose a reason for hiding this comment

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

Hi @sashadev-sky I think this line can be removed now.

chen-robert pushed a commit to chen-robert/mapknitter that referenced this pull request Dec 5, 2019
* h

* h

* updates

* fix front-ui
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Front-ui missing PL icon
4 participants