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

🌸 DesignLibrary: Layout is responsible for.... Layout... #2281

Merged
merged 1 commit into from
Mar 7, 2024
Merged

🌸 DesignLibrary: Layout is responsible for.... Layout... #2281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions app/furniture/journal/journals/_journal.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<section class="max-w-3xl mx-auto">
<%= render Journal::NewEntryButtonComponent.new(journal: journal) %>

<div class="flex flex-wrap">
<%- @pagy, @entries = pagy(policy_scope(journal.entries.recent)) %>
<%= render Journal::NewEntryButtonComponent.new(journal: journal) %>

<%= render Journal::EntryComponent.with_collection(@entries) %>
</div>
<div class="flex flex-wrap">
<%- @pagy, @entries = pagy(policy_scope(journal.entries.recent)) %>

<%== pagy_nav(@pagy) %>
<%= render Journal::EntryComponent.with_collection(@entries) %>
</div>

<%= render Journal::NewEntryButtonComponent.new(journal: journal) %>
</section>
<%== pagy_nav(@pagy) %>

<%= render Journal::NewEntryButtonComponent.new(journal: journal) %>
37 changes: 18 additions & 19 deletions app/furniture/layouts/marketplace.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
<%- content_for :content do %>
<div class="flex flex-col content-between justify-end mx-auto max-w-7xl sm:px-6 lg:px-8">
<div class="grow mx-auto w-full">
<%= turbo_frame_tag(marketplace, data: { turbo_action: :advance }) do %>
<%- if policy(marketplace).edit? %>
<%= render Marketplace::ManagementComponent.new(marketplace: marketplace) do %>
<%= yield %>
<%- end %>
<%- else %>
<section>
<header>
<h2>
<%= t('.header', space: marketplace.space.name, room: marketplace.room.name) %>
</h2>
</header>
<div>
<%= yield %>
</div>
</section>
<div class="grow mx-auto w-full">
<%= turbo_frame_tag(marketplace, data: { turbo_action: :advance }) do %>
<%- if policy(marketplace).edit? %>
<%= render Marketplace::ManagementComponent.new(marketplace: marketplace) do %>
<%= yield %>
<%- end %>
<%- else %>
<section>
<header>
<h2>
<%= t('.header', space: marketplace.space.name, room: marketplace.room.name) %>
</h2>
</header>
<div>
<%= yield %>
</div>
</section>
<%- end %>
<%- end %>
</div>
<%- end %>
</div>

<%= render template: "layouts/application" %>
7 changes: 3 additions & 4 deletions app/furniture/marketplace/orders/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<%- breadcrumb :marketplace_orders, marketplace %>
<%- @pagy, @records = pagy(orders.paid) %>
<div class="mx-auto w-full max-w-prose">
<%= render @records %>
<%== pagy_nav(@pagy) if @pagy.pages > 1 %>
</div>

<%= render @records %>
<%== pagy_nav(@pagy) if @pagy.pages > 1 %>
5 changes: 2 additions & 3 deletions app/furniture/marketplace/orders/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<%- breadcrumb :marketplace_order, order%>
<div class="mx-auto w-full max-w-prose">
<%= render order %>
</div>

<%= render order %>
4 changes: 1 addition & 3 deletions app/views/authenticated_sessions/new.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
<div class="md:w-4/12 sm:w-auto m-auto mt-8">
<%= render partial: 'form', locals: { authenticated_session: authenticated_session } %>
</div>
<%= render partial: 'form', locals: { authenticated_session: authenticated_session } %>
3 changes: 2 additions & 1 deletion app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
<body>
<%= render 'layouts/header' %>

<main id="<%= current_space.present? ? dom_id(current_space) : nil %>" class="gap-3">
<main id="<%= current_space.present? ? dom_id(current_space) : nil %>"
class="gap-3 flex flex-col content-between mx-auto w-full max-w-7xl sm:px-6 lg:px-8">
<%= content_for?(:content) ? yield(:content) : yield %>
</main>

Expand Down
22 changes: 11 additions & 11 deletions app/views/neighborhoods/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<%- @pagy, @records = pagy(policy_scope(neighborhood.spaces)) %>

<section class="max-w-3xl mx-auto">
<div class="mt-3 grid grid-cols-1 gap-5 sm:gap-6 sm:grid-cols-2 lg:grid-cols-4">
<%= render @records %>
</div>

<%== pagy_nav(@pagy) %>
<div class="grid grid-cols-1 gap-5 sm:gap-6 sm:grid-cols-2 lg:grid-cols-4">
<%= render @records %>
</div>

<%== pagy_nav(@pagy) %>

<%- if policy(Space).new? %>
<div class="text-center w-full">
<%= link_to "Add a Space",[:new, :space] %>
</div>
<%- end %>

<%- if policy(Space).new? %>
<div class="text-center w-full">
<%= link_to "Add a Space",[:new, :space] %>
</div>
<%- end %>
</section>

<%- if !neighborhood.email_configured? %>
<p>It looks like you haven't configured Convene to send email. Check the <code>.env.example</code> file for variables named with <code>SMTP</code> and make sure each is set with your email providers configuration.</p>
Expand Down
11 changes: 5 additions & 6 deletions app/views/rooms/_room.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<%- if room.hero_image&.upload.present? %>
<%= image_tag room.hero_image&.upload&.variant(resize_to_fill: Media::FULL_WIDTH_SHORT), class: "w-full" %>
<%- end %>
<div class="flex flex-col content-between justify-end mx-auto max-w-7xl sm:px-6 lg:px-8">
<div class="grow mx-auto w-full">
<section id="furnitures">
<%= render room.gizmos.rank(:slot) %>
</section>
</div>

<div class="grow mx-auto w-full">
<section id="furnitures">
<%= render room.gizmos.rank(:slot) %>
</section>
</div>
2 changes: 1 addition & 1 deletion app/views/space/agreements/_agreement.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= render CardComponent.new(dom_id: dom_id(agreement), classes: "mx-auto mt-2 max-w-prose w-full") do %>
<%= render CardComponent.new(dom_id: dom_id(agreement)) do %>
<h2><%= agreement.name %></h2>

<div>
Expand Down
Loading