notten13 · notten13 · Mar 11, 2023
diff --git a/Gemfile b/Gemfile
@@ -34,7 +34,7 @@ gem "jbuilder"
 # gem "kredis"
 
 # Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
-# gem "bcrypt", "~> 3.1.7"
+gem "bcrypt", "~> 3.1.7"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -68,6 +68,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    bcrypt (3.1.18)
     bindex (0.8.1)
     bootsnap (1.16.0)
       msgpack (~> 1.2)
@@ -209,6 +210,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
+  bcrypt (~> 3.1.7)
   bootsnap
   capybara
   debug

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -0,0 +1,24 @@
+class UsersController < ApplicationController
+
+  def new
+    @user = User.new
+  end
+
+  def create
+    user_params = params.require(:user).permit(
+      :username,
+      :email,
+      :password,
+      :password_confirmation
+    )
+
+    @user = User.new(user_params)
+
+    if @user.valid?
+      render 'new'
+    else
+      render 'new', status: :unprocessable_entity
+    end
+  end
+
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -0,0 +1,13 @@
+class User < ApplicationRecord
+  has_secure_password
+
+  has_secure_token :email_confirmation_token
+
+  validates :username,
+    format: { with: /\A[A-Za-z0-9_]{2,20}\z/ , message: 'should contain 2 to 20 alphanumeric characters' },
+    uniqueness: { case_sensitive: false }
+
+    validates :email,
+      format: { with: URI::MailTo::EMAIL_REGEXP },
+      uniqueness: { case_sensitive: false }
+end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,16 +1,39 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>App</title>
+    <title>
+      <% if content_for?(:page_title) %>
+        <%= yield :page_title %> | Petbook
+      <% else %>
+        Petbook
+      <% end %>
+    </title>
+
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
+
     <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
-    <%= javascript_importmap_tags %>
   </head>
 
   <body>
+    <div class="navbar">
+      <div class="container">
+        <a class="navbar-brand" href="<%= root_path %>">Petbook</a>
+
+        <ul class="navbar-nav">
+          <li class="nav-item">
+            <a class="nav-link" href="<%= new_users_path %>">Sign Up</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+
     <%= yield %>
+
+    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script>
+    <%= javascript_importmap_tags %>
   </body>
 </html>
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
@@ -0,0 +1,54 @@
+<% content_for :page_title, "Sign up" %>
+
+<div class="row">
+  <div class="col-12 col-lg-4 offset-lg-4">
+    <div class="card" style="margin-top: 50px">
+
+      <div class="card-body">
+
+        <div class="card-title">
+          <h1>Sign Up</h1>
+        </div>
+
+        <div class="card-text">
+          <% if @user.errors.any? %>
+            <div class="alert alert-danger">
+              <p>Your registration couldn't be processed:</p>
+              <ul>
+                <% @user.errors.full_messages.each do |message| %>
+                  <li><%= message %></li>
+                <% end %>
+              </ul>
+            </div>
+          <% end %>
+
+          <%= form_with model: @user do |f| %>
+            <div class="mb-3">
+              <%= f.label :username, "User name" %>
+              <%= f.text_field :username, class: 'form-control' %>
+            </div>
+
+            <div class="mb-3">
+              <%= f.label :email, "Email address" %>
+              <%= f.email_field :email, class: 'form-control' %>
+            </div>
+
+            <div class="mb-3">
+              <%= f.label :password, "Password" %>
+              <%= f.password_field :password, class: 'form-control' %>
+            </div>
+
+            <div class="mb-3">
+              <%= f.label :password_confirmation, "Confirm your password" %>
+              <%= f.password_field :password_confirmation, class: 'form-control' %>
+            </div>
+
+            <div class="mb-3">
+              <button type="submit" class="btn btn-primary">Sign Up</button>
+            </div>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -2,5 +2,7 @@
   # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html
 
   # Defines the root path route ("/")
-  # root "articles#index"
+  root "users#new"
+
+  resource :users, only: [:new, :create]
 end
diff --git a/db/migrate/20230311181749_create_users.rb b/db/migrate/20230311181749_create_users.rb
@@ -0,0 +1,16 @@
+class CreateUsers < ActiveRecord::Migration[7.0]
+  def change
+    create_table :users do |t|
+      t.string :username
+      t.string :email
+      t.string :email_confirmed, default: false
+      t.string :email_confirm_token
+      t.string :password_digest
+      t.string :first_name
+      t.string :last_name
+      t.boolean :avatar, default: false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
@@ -0,0 +1,21 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  username: MyString
+  email: MyString
+  email_confirmed: MyString
+  email_confirm_token: MyString
+  password_digest: MyString
+  first_name: MyString
+  last_name: MyString
+  avatar: false
+
+two:
+  username: MyString
+  email: MyString
+  email_confirmed: MyString
+  email_confirm_token: MyString
+  password_digest: MyString
+  first_name: MyString
+  last_name: MyString
+  avatar: false
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class UserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end