diff --git a/app/assets/stylesheets/login.css b/app/assets/stylesheets/login.css new file mode 100644 index 0000000000..a22f4ec6bf --- /dev/null +++ b/app/assets/stylesheets/login.css @@ -0,0 +1,94 @@ +body { + background: #efefef; + margin: 0; + font-family: Arial, sans-serif; +} + +.login-container { + width: 90%; + max-width: 1100px; + height: 500px; + + margin: 40px auto; + + display: flex; + + background: white; + border-radius: 10px; + + overflow: hidden; +} + +.login-form { + flex: 1; + + display: flex; + flex-direction: column; + justify-content: center; + + padding: 50px; +} + +.login-form h1 { + text-align: center; + margin-bottom: 40px; +} + +.field { + margin-bottom: 20px; +} + +.field label { + display: block; + margin-bottom: 8px; +} + +.field input { + width: 100%; + box-sizing: border-box; + + padding: 12px; + + border: 1px solid #ccc; + border-radius: 6px; +} + +.btn-login { + width: 100%; + + padding: 12px; + + border: none; + border-radius: 6px; + + background: #2ecc71; + color: white; + + cursor: pointer; + + font-size: 16px; +} + +.btn-login:hover { + opacity: 0.9; +} + +.btn-forgot { + margin-top: 15px; +} + +.login-banner { + flex: 1; + + background: #6d1f6d; + + display: flex; + justify-content: center; + align-items: center; +} + +.login-banner h2 { + color: white; + text-align: center; + font-size: 4rem; +} \ No newline at end of file diff --git a/app/assets/stylesheets/redefinir_senha.css b/app/assets/stylesheets/redefinir_senha.css new file mode 100644 index 0000000000..893bc54580 --- /dev/null +++ b/app/assets/stylesheets/redefinir_senha.css @@ -0,0 +1,83 @@ +html, +body { + margin: 0; + padding: 0; + height: 100%; + font-family: Arial, Helvetica, sans-serif; + background-color: #f5f5f5; +} + +.password-reset-container { + height: 100vh; + + display: flex; + justify-content: center; + align-items: center; +} + +.password-reset-box { + width: 100%; + max-width: 450px; + + background: white; + + padding: 40px; + + border-radius: 10px; + + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); + + box-sizing: border-box; +} + +.password-reset-box h1 { + text-align: center; + + margin-top: 0; + margin-bottom: 30px; + + font-size: 2rem; + font-weight: normal; +} + +.field { + display: flex; + flex-direction: column; + + margin-bottom: 20px; +} + +.field label { + margin-bottom: 8px; +} + +.field input { + padding: 12px; + + border: 1px solid #d0d0d0; + border-radius: 6px; + + font-size: 1rem; + box-sizing: border-box; +} + +.btn-submit { + width: 100%; + + padding: 12px; + + border: none; + border-radius: 6px; + + background-color: #6e1f69; + color: white; + + font-size: 1rem; + font-weight: bold; + + cursor: pointer; +} + +.btn-submit:hover { + opacity: 0.9; +} \ No newline at end of file diff --git a/app/models/discente.rb b/app/models/discente.rb index d06b0b7772..d76084e48a 100644 --- a/app/models/discente.rb +++ b/app/models/discente.rb @@ -1,4 +1,4 @@ class Discente < Usuario validates :curso_id, presence: true - has_and_belongs_to_many :turmas + has_and_belongs_to_many :turmas, join_table: "discentes_turmas" end \ No newline at end of file diff --git a/app/models/docente.rb b/app/models/docente.rb index bd48475299..8c670c642b 100644 --- a/app/models/docente.rb +++ b/app/models/docente.rb @@ -1,4 +1,4 @@ class Docente < Usuario validates :formacao, presence: true - has_and_belongs_to_many :turmas + has_and_belongs_to_many :turmas, join_table: "docentes_turmas" end \ No newline at end of file diff --git a/app/models/turma.rb b/app/models/turma.rb index e189be5359..6015166c43 100644 --- a/app/models/turma.rb +++ b/app/models/turma.rb @@ -1,8 +1,8 @@ class Turma < ApplicationRecord belongs_to :disciplina has_many :formularios, dependent: :destroy - has_and_belongs_to_many :discentes - has_and_belongs_to_many :docentes + has_and_belongs_to_many :discentes, join_table: "discentes_turmas" + has_and_belongs_to_many :docentes, join_table: "docentes_turmas" validates :numero_da_turma, presence: true, uniqueness: { scope: [:semestre, :disciplina_id], diff --git a/app/views/redefinicao_senhas/new.html.erb b/app/views/redefinicao_senhas/new.html.erb index 88c31f2ef6..e7234e77f1 100644 --- a/app/views/redefinicao_senhas/new.html.erb +++ b/app/views/redefinicao_senhas/new.html.erb @@ -1,12 +1,19 @@ -