From d520e88f01b67660bad2049377716e9cd9d0983f Mon Sep 17 00:00:00 2001 From: Jade Stewart <114014697+jadekstewart3@users.noreply.github.com> Date: Mon, 25 Sep 2023 19:36:02 -0600 Subject: [PATCH] Org dashboard styling (#191) * Begin work on org dashboard styling * Continue cleaning up dashboard styling * Continue styling dashboard --- .../organizations/dashboard_controller.rb | 1 + app/views/layouts/application.html.erb | 1 + app/views/layouts/dashboard.html.erb | 580 ++++++++++++++++++ .../organizations/dashboard/index.html.erb | 21 +- 4 files changed, 600 insertions(+), 3 deletions(-) create mode 100644 app/views/layouts/dashboard.html.erb diff --git a/app/controllers/organizations/dashboard_controller.rb b/app/controllers/organizations/dashboard_controller.rb index 2a1e4c750..2359fbb4c 100644 --- a/app/controllers/organizations/dashboard_controller.rb +++ b/app/controllers/organizations/dashboard_controller.rb @@ -1,4 +1,5 @@ class Organizations::DashboardController < Organizations::BaseController + layout "dashboard" before_action :verified_staff def index diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index e99547de6..e85016aba 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -24,6 +24,7 @@ <% end%>
+ <%= yield %>
diff --git a/app/views/layouts/dashboard.html.erb b/app/views/layouts/dashboard.html.erb new file mode 100644 index 000000000..c838ba8ba --- /dev/null +++ b/app/views/layouts/dashboard.html.erb @@ -0,0 +1,580 @@ + + + <%= render "layouts/shared/head" %> + + +
+ + + + +
+
+ + +
+
+
+
+
+
+

<%= yield :header %>

+
+
+ <%= yield :button %> + +
+
+
+ + + <%= yield %> +
+
+
+ + \ No newline at end of file diff --git a/app/views/organizations/dashboard/index.html.erb b/app/views/organizations/dashboard/index.html.erb index 81932aa6c..b0d81ca40 100644 --- a/app/views/organizations/dashboard/index.html.erb +++ b/app/views/organizations/dashboard/index.html.erb @@ -1,4 +1,19 @@ -
+<%#
<%= render 'organizations/dashboard/navbar' %> - <%= yield :dashboard_content %> -
\ No newline at end of file + <%# <%= yield :dashboard_content %> +<%#
%> +<%= content_for :header do %> + Add a new dog +<% end %> + + +<%= content_for :button do %> +
+ + + + +
+ + Add a New Pet +<% end %>