From 64109cdfd3abeb7917ebcc7dcd800ef257b4cd59 Mon Sep 17 00:00:00 2001
From: sto <puz.github.sto.happiness841@passmail.net>
Date: Sat, 15 Mar 2025 09:26:03 +0100
Subject: [PATCH] Improve forms

---
 app/controllers/contests_controller.rb    |  2 +-
 app/views/contests/_form.html.slim        |  6 +++---
 app/views/layouts/authenticated.html.slim |  8 ++++----
 app/views/users/_form.html.slim           | 20 +++++++++++++-------
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/controllers/contests_controller.rb b/app/controllers/contests_controller.rb
index f9f1c14..b7ac8ad 100644
--- a/app/controllers/contests_controller.rb
+++ b/app/controllers/contests_controller.rb
@@ -12,7 +12,7 @@ class ContestsController < ApplicationController
 
   def new
     @contest = Contest.new
-    @title = "Create a new jigsaw puzzle competition"
+    @title = "New jigsaw puzzle competition"
   end
 
   def create
diff --git a/app/views/contests/_form.html.slim b/app/views/contests/_form.html.slim
index 4e6cc02..20ec444 100644
--- a/app/views/contests/_form.html.slim
+++ b/app/views/contests/_form.html.slim
@@ -1,8 +1,8 @@
 = form_with model: contest do |form|
   .row
-    .col.g-3
-      .form-floating.mt-5
+    .col
+      .form-floating
         = form.text_field :name, autocomplete: "off", class: "form-control"
         = form.label :name, class: "required"
   div.mt-3
-    = form.submit
\ No newline at end of file
+    = form.submit "Create", class: "btn btn-primary"
\ No newline at end of file
diff --git a/app/views/layouts/authenticated.html.slim b/app/views/layouts/authenticated.html.slim
index cb47eff..2035392 100644
--- a/app/views/layouts/authenticated.html.slim
+++ b/app/views/layouts/authenticated.html.slim
@@ -4,13 +4,13 @@ html
 
   body
     .container.mt-5
-      .float-end.ms-3
-        = button_to "Log out", session_path, method: :delete
       .float-end.mt-1.ms-3
+        = button_to "Log out", session_path, method: :delete
+      .float-end.mt-2.ms-3
         = link_to "Settings", user_path(@current_user)
-      .float-end.mt-1
+      .float-end.mt-2
         = link_to "Home", contests_path
 
-      h1 = @title
+      h1.mb-4 = @title
 
       = yield
\ No newline at end of file
diff --git a/app/views/users/_form.html.slim b/app/views/users/_form.html.slim
index cff2b58..d9e149b 100644
--- a/app/views/users/_form.html.slim
+++ b/app/views/users/_form.html.slim
@@ -1,9 +1,15 @@
 = form_with model: user do |form|
+  .row.mb-3
+    .col
+      .input-group
+        .input-group-text @
+        .form-floating
+          = form.text_field :username, autocomplete: "off", class: "form-control"
+          = form.label :username, class: "required"
+  .row.mb-3
+    .col
+      .form-floating
+        = form.text_field :email_address, autocomplete: "off", class: "form-control", type: "email"
+        = form.label :email_address, class: "required"
   div
-    = form.label :username
-    = form.text_field :username
-  div
-    = form.label :email_address
-    = form.text_field :email_address
-  div
-    = form.submit
\ No newline at end of file
+    = form.submit "Save", class: "btn btn-primary"
\ No newline at end of file