Skip to content

Commit

Permalink
503 org root part2 hero (#504)
Browse files Browse the repository at this point in the history
* added line in gitignore to ignore bundle folder in vendor folder. removed ui code at bottom of registration/edit page to delete account.

* added the bg-white css selector to the sections of org/root per figma file

* modified Figma link in README to point to update

* updated the figma link in README

* updated org/root hero to v2

* repaired testing for users_test on the home page

* updated user test for org home to review for the correct text

* added id attribute to section.

---------

Co-authored-by: Mason Roberts <[email protected]>
  • Loading branch information
Developer3027 and Mason Roberts authored Mar 8, 2024
1 parent 4e4ed08 commit 3aa9726
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 46 deletions.
63 changes: 18 additions & 45 deletions app/views/organizations/home/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,49 +1,22 @@
<section class="py-lg-16 py-5 my-5">
<div class="container">
<div class="row d-flex align-items-center">
<div class="col-xxl-5 col-xl-6 col-lg-6 col-12">
<div>
<h1 class="display-2 fw-bold mb-3">Rescue pets in <%= Current.organization.location.city_town %> at <u class="text-warning"><span class="text-primary"> <%= Current.organization.name %></span></u></h1>
<p class="lead mb-4">Rescue a really cute pet and be a hero</p>
<ul class="list-unstyled mb-5">
<li class="mb-2">
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="var(--geeks-success)" class="bi bi-check-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"></path>
</svg>
<span class="ms-2">Dogs are awesome</span>
</li>
<li class="mb-2">
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="var(--geeks-success)" class="bi bi-check-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"></path>
</svg>
<span class="ms-2">Cats are awesome</span>
</li>
<li class="mb-2">
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="var(--geeks-success)" class="bi bi-check-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"></path>
</svg>
<span class="ms-2">Spiders are awesome</span>
</li>
<li class="mb-2">
<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" fill="var(--geeks-success)" class="bi bi-check-circle-fill" viewBox="0 0 16 16">
<path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z"></path>
</svg>
<span class="ms-2">Red pandas are awesome</span>
</li>
</ul>
<%= link_to adoptable_pets_path, class: "btn btn-dark btn-lg" do %>
Yes! I want to adopt a pet!
<% end %>
</div>
</div>
<div class="col-xxl-5 offset-xxl-1 col-xl-6 col-lg-6 col-12 d-lg-flex justify-content-end">
<div class="mt-12 mt-lg-0 position-relative">
<div class="position-absolute top-0 start-0 translate-middle d-none d-md-block">
<%= image_tag "svg/graphics-2.svg", alt: "graphics-2" %>
<!-- HERO -->
<section id="hero">
<div class="bg-image" style="background-image: url('https://s3-alpha-sig.figma.com/img/63f3/6682/f3d01915a2694e2800941735ae233aea?Expires=1710115200&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4&Signature=NeEXnwv7fYMa0QoOK4BbY3E5pEm8wzMFUqP5EsyKHHwYhvf-beJe-IpoY3pjc0ZAQIjPRlHvNY6sLzO0tvptUfSkoYZ91tjhYoyw2YuJ18Qf2P2k8NM86NboAv6Js3Vl6Iu-2g9J7vkz~xoue6zWmaiYpvV0nAcQG-PtEWTn5IMuU60jvVhEUy3~J2W6FvC8x9T4VSkzDKj~hplKzJSQWhaW~2ou9GMdgmx0tJMffsVCG7vHmiYf1WGFcs1CRPHEBf4UYihBadnEJfDccIQ-bIL1qJU9Uv3eklX63z6PmVxyBlAZnNU0iSGi0s8LIqtTTbCl~4IAhVe~1qC4IBLCcA__'); background-position: center; background-size: cover;">
<div class="mask py-lg-16 py-5" style="background-color: rgba(255, 255, 255, 0.8);">
<div class="container">
<div class="d-flex row justify-content-center align-items-center">
<div class="d-flex justify-content-center">
<h1 class="display-2 fw-bold mb-1 text-primary "><%= Current.organization.name %></h1>
</div>
<div class="d-flex justify-content-center ">
<p class="lead mb-4 text-black text-uppercase ">Where every paw finds a home</p>
</div>
<%= image_tag "danielle_3.jpg", alt: "hero", class: "img-fluid rounded-4 w-100 position-relative" %>
<div class="position-absolute top-100 start-100 translate-middle d-none d-md-block">
<%= image_tag "svg/graphics-1.svg", alt: "graphics-1" %>
<div class="d-flex justify-content-center">
<%= link_to '#', class: "btn btn-dark btn-lg rounded-1 me-2" do %>
Volunteer
<% end %>
<%= link_to adoptable_pets_path, class: "btn btn-primary btn-lg rounded-1 ms-2" do %>
Donate
<% end %>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion test/system/users_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ class UsersTest < ApplicationSystemTestCase
refute has_button?("Sign out")
expected_path = "/" + @organization.slug + "/home"
assert has_current_path?(expected_path)
assert_text "Rescue a really cute pet and be a hero"
assert_text "WHERE EVERY PAW FINDS A HOME"
end
end

0 comments on commit 3aa9726

Please sign in to comment.