diff --git a/app/assets/tailwind/application.css b/app/assets/tailwind/application.css index 1fd5734650..8c7ed5ee2d 100644 --- a/app/assets/tailwind/application.css +++ b/app/assets/tailwind/application.css @@ -1,5 +1,5 @@ -@import "tailwindcss"; @import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100..900;1,100..900&display=swap'); +@import "tailwindcss"; @theme { --font-roboto: "Roboto", sans-serif; diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 0000000000..2133554dcf --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,5 @@ +class PagesController < ApplicationController + layout "application" + def index + end +end diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 9785c923c0..d7e14c97ad 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -1,4 +1,5 @@ class SessionsController < ApplicationController + layout "login" allow_unauthenticated_access only: %i[ new create ] rate_limit to: 10, within: 3.minutes, only: :create, with: -> { redirect_to new_session_url, alert: "Try again later." } diff --git a/app/javascript/controllers/sidebar_controller.js b/app/javascript/controllers/sidebar_controller.js index 45a76f0666..193559ba37 100644 --- a/app/javascript/controllers/sidebar_controller.js +++ b/app/javascript/controllers/sidebar_controller.js @@ -4,6 +4,10 @@ export default class extends Controller { static targets = ["view"] toggle() { - this.viewTarget.classList.toggle("hidden") + // this.viewTarget.classList.toggle("-translate-x-full") + + // this.contentTarget.classList.toggle("ml-[257px]") + this.viewTarget.classList.toggle("w-[257px]") + this.viewTarget.classList.toggle("w-0") } } \ No newline at end of file diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb deleted file mode 100644 index 262d47987a..0000000000 --- a/app/views/application/index.html.erb +++ /dev/null @@ -1,13 +0,0 @@ - - - <%= render "components/header" %> - -
- <%= render "components/sidebar" %> - -
- <%= yield %> -
-
- - \ No newline at end of file diff --git a/app/views/components/_card.html.erb b/app/views/components/_card.html.erb new file mode 100644 index 0000000000..49998a35a5 --- /dev/null +++ b/app/views/components/_card.html.erb @@ -0,0 +1,23 @@ +
+
+
+

Nome da matéria

+

semestre

+

Professor

+
+ +
+ + + +
+
+
\ No newline at end of file diff --git a/app/views/components/_frameRoxoMenuLateral.html.erb b/app/views/components/_frameRoxoMenuLateral.html.erb index f111a5c770..19c88d5282 100644 --- a/app/views/components/_frameRoxoMenuLateral.html.erb +++ b/app/views/components/_frameRoxoMenuLateral.html.erb @@ -11,5 +11,5 @@ cursor-pointer gap-[10px] opacity-100" > - Gerenciamento + Avaliações \ No newline at end of file diff --git a/app/views/components/_header.html.erb b/app/views/components/_header.html.erb index 767fce62e3..b3305a0356 100644 --- a/app/views/components/_header.html.erb +++ b/app/views/components/_header.html.erb @@ -1,6 +1,6 @@ -
+
@@ -17,7 +17,7 @@

- Tab name + Avaliações

@@ -68,18 +68,13 @@ - - -
diff --git a/app/views/components/_sidebar.html.erb b/app/views/components/_sidebar.html.erb index 3082af0dda..fbb5fa0132 100644 --- a/app/views/components/_sidebar.html.erb +++ b/app/views/components/_sidebar.html.erb @@ -1,33 +1,9 @@ -