diff --git a/Gemfile b/Gemfile index a8f01c243328c7c64daf13caa91786817660cc24..9cd940303826ab5c89b1c1e92e471d919f45e3d3 100644 --- a/Gemfile +++ b/Gemfile @@ -27,6 +27,13 @@ gem "stimulus-rails" # Build JSON APIs with ease [https://github.com/rails/jbuilder] gem "jbuilder" +gem "devise" + +gem 'bootstrap', '~> 5.1.3' + +gem 'jquery-rails' + +gem 'turbolinks' # Use Redis adapter to run Action Cable in production # gem "redis", "~> 4.0" diff --git a/Gemfile.lock b/Gemfile.lock index a1c9429102f30720ba8fdb224be546cb4809d1f0..c9ae1ddceba6286dc620825ef0ca58e6192cd19f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,9 +68,16 @@ GEM tzinfo (~> 2.0) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + autoprefixer-rails (10.4.2.0) + execjs (~> 2) + bcrypt (3.1.17) bindex (0.8.1) bootsnap (1.11.1) msgpack (~> 1.2) + bootstrap (5.1.3) + autoprefixer-rails (>= 9.1.0) + popper_js (>= 2.9.3, < 3) + sassc-rails (>= 2.0.0) builder (3.2.4) capybara (3.36.0) addressable @@ -87,8 +94,16 @@ GEM debug (1.4.0) irb (>= 1.3.6) reline (>= 0.2.7) + devise (4.8.1) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) digest (3.1.0) erubi (1.10.0) + execjs (2.8.1) + ffi (1.15.5) globalid (1.0.0) activesupport (>= 5.0) i18n (1.10.0) @@ -103,6 +118,10 @@ GEM jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) + jquery-rails (4.4.0) + rails-dom-testing (>= 1, < 3) + railties (>= 4.2.0) + thor (>= 0.14, < 2.0) loofah (2.15.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -133,6 +152,8 @@ GEM nio4r (2.5.8) nokogiri (1.13.3-x86_64-linux) racc (~> 1.4) + orm_adapter (0.5.0) + popper_js (2.9.3) public_suffix (4.0.6) puma (5.6.2) nio4r (~> 2.0) @@ -170,8 +191,19 @@ GEM regexp_parser (2.2.1) reline (0.3.1) io-console (~> 0.5) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) rexml (3.2.5) rubyzip (2.3.2) + sassc (2.4.0) + ffi (~> 1.9) + sassc-rails (2.1.2) + railties (>= 4.0.0) + sassc (>= 2.0) + sprockets (> 3.0) + sprockets-rails + tilt selenium-webdriver (4.1.0) childprocess (>= 0.5, < 5.0) rexml (~> 3.2, >= 3.2.5) @@ -187,12 +219,18 @@ GEM railties (>= 6.0.0) strscan (3.0.1) thor (1.2.1) + tilt (2.0.10) timeout (0.2.0) turbo-rails (1.0.1) actionpack (>= 6.0.0) railties (>= 6.0.0) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) + warden (1.2.9) + rack (>= 2.0.9) web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -214,10 +252,13 @@ PLATFORMS DEPENDENCIES bootsnap + bootstrap (~> 5.1.3) capybara debug + devise importmap-rails jbuilder + jquery-rails mysql2 (~> 0.5.3) puma (~> 5.0) rails (~> 7.0.2, >= 7.0.2.3) @@ -225,6 +266,7 @@ DEPENDENCIES sprockets-rails stimulus-rails turbo-rails + turbolinks tzinfo-data web-console webdrivers diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 79% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index 288b9ab7182c015d9c381e27708895c22dfd9a0a..b4bdcd8c4082840a3092a86776ea6f1aa3bec5d5 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -13,3 +13,18 @@ *= require_tree . *= require_self */ + @import "bootstrap"; + +.title{ + font-size: 2rem; + font-weight: 300; +} + +.paragraph { + font-size: 1.5rem; + font-weight: 300; +} + +.background { + background-color:aquamarine; +} diff --git a/app/assets/stylesheets/user.scss b/app/assets/stylesheets/user.scss new file mode 100644 index 0000000000000000000000000000000000000000..9d3936a97936ee61dc4f6b63de53a7e92f49a340 --- /dev/null +++ b/app/assets/stylesheets/user.scss @@ -0,0 +1,10 @@ +.text-box { + border-radius: 25px; + background-color: greenyellow; + margin: 20px; + padding: 20px; +} + +.margin_top { + margin-top: 10px; +} \ No newline at end of file diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d12ab4dfe301535a973e2607fad4efc9d0d..4f6975b4d8eff9c111a4d31ed3ac2ae24d39b851 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,12 @@ class ApplicationController < ActionController::Base + + before_action :configure_permitted_parameters, if: :devise_controller? + + protected + + def configure_permitted_parameters + attributes = [:firstname, :lastname, :username] + devise_parameter_sanitizer.permit(:sign_up, keys: attributes) + devise_parameter_sanitizer.permit(:account_update, keys: attributes) + end end diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..76fd66c2464241cbbfa79ad0ff5fdd009c122999 --- /dev/null +++ b/app/controllers/home_controller.rb @@ -0,0 +1,4 @@ +class HomeController < ApplicationController + def home + end +end \ No newline at end of file diff --git a/app/controllers/user/confirmations_controller.rb b/app/controllers/user/confirmations_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..e37cc10c3b00a8c562844ca54b1f1b16ce56fe52 --- /dev/null +++ b/app/controllers/user/confirmations_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class User::ConfirmationsController < Devise::ConfirmationsController + # GET /resource/confirmation/new + # def new + # super + # end + + # POST /resource/confirmation + # def create + # super + # end + + # GET /resource/confirmation?confirmation_token=abcdef + # def show + # super + # end + + # protected + + # The path used after resending confirmation instructions. + # def after_resending_confirmation_instructions_path_for(resource_name) + # super(resource_name) + # end + + # The path used after confirmation. + # def after_confirmation_path_for(resource_name, resource) + # super(resource_name, resource) + # end +end diff --git a/app/controllers/user/omniauth_callbacks_controller.rb b/app/controllers/user/omniauth_callbacks_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..21aad21ff6236401275e56b155a86c512f7f7be7 --- /dev/null +++ b/app/controllers/user/omniauth_callbacks_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class User::OmniauthCallbacksController < Devise::OmniauthCallbacksController + # You should configure your model like this: + # devise :omniauthable, omniauth_providers: [:twitter] + + # You should also create an action method in this controller like this: + # def twitter + # end + + # More info at: + # https://github.com/heartcombo/devise#omniauth + + # GET|POST /resource/auth/twitter + # def passthru + # super + # end + + # GET|POST /users/auth/twitter/callback + # def failure + # super + # end + + # protected + + # The path used when OmniAuth fails + # def after_omniauth_failure_path_for(scope) + # super(scope) + # end +end diff --git a/app/controllers/user/passwords_controller.rb b/app/controllers/user/passwords_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..5951f5b327f844afc9ca6a24cd6f84d50485ff7f --- /dev/null +++ b/app/controllers/user/passwords_controller.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +class User::PasswordsController < Devise::PasswordsController + # GET /resource/password/new + # def new + # super + # end + + # POST /resource/password + # def create + # super + # end + + # GET /resource/password/edit?reset_password_token=abcdef + # def edit + # super + # end + + # PUT /resource/password + # def update + # super + # end + + # protected + + # def after_resetting_password_path_for(resource) + # super(resource) + # end + + # The path used after sending reset password instructions + # def after_sending_reset_password_instructions_path_for(resource_name) + # super(resource_name) + # end +end diff --git a/app/controllers/user/registrations_controller.rb b/app/controllers/user/registrations_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..f32fa1596ae24805a15825914a4d15cbee979a3e --- /dev/null +++ b/app/controllers/user/registrations_controller.rb @@ -0,0 +1,62 @@ +# frozen_string_literal: true + +class User::RegistrationsController < Devise::RegistrationsController + before_action :configure_sign_up_params, only: [:create] + before_action :configure_account_update_params, only: [:update] + + # GET /resource/sign_up + # def new + # super + # end + + # POST /resource + def create + super + end + + # GET /resource/edit + # def edit + # super + # end + + # PUT /resource + # def update + # super + # end + + # DELETE /resource + # def destroy + # super + # end + + # GET /resource/cancel + # Forces the session data which is usually expired after sign + # in to be expired now. This is useful if the user wants to + # cancel oauth signing in/up in the middle of the process, + # removing all OAuth session data. + # def cancel + # super + # end + + # protected + + # If you have extra params to permit, append them to the sanitizer. + def configure_sign_up_params + devise_parameter_sanitizer.permit(:sign_up, keys: [:firstname, :lastname, :username]) + end + + # If you have extra params to permit, append them to the sanitizer. + def configure_account_update_params + devise_parameter_sanitizer.permit(:account_update, keys: [:firstname, :lastname, :username]) + end + + # The path used after sign up. + # def after_sign_up_path_for(resource) + # super(resource) + # end + + # The path used after sign up for inactive accounts. + # def after_inactive_sign_up_path_for(resource) + # super(resource) + # end +end diff --git a/app/controllers/user/sessions_controller.rb b/app/controllers/user/sessions_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..be4b5692c26a687c1122da6e274c21cad322f5fe --- /dev/null +++ b/app/controllers/user/sessions_controller.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +class User::SessionsController < Devise::SessionsController + # before_action :configure_sign_in_params, only: [:create] + + # GET /resource/sign_in + # def new + # super + # end + + # POST /resource/sign_in + # def create + # super + # end + + # DELETE /resource/sign_out + # def destroy + # super + # end + + # protected + + # If you have extra params to permit, append them to the sanitizer. + # def configure_sign_in_params + # devise_parameter_sanitizer.permit(:sign_in, keys: [:attribute]) + # end +end diff --git a/app/controllers/user/unlocks_controller.rb b/app/controllers/user/unlocks_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..05191c4eb341f58398b731a654a258b9ebedd4ca --- /dev/null +++ b/app/controllers/user/unlocks_controller.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +class User::UnlocksController < Devise::UnlocksController + # GET /resource/unlock/new + # def new + # super + # end + + # POST /resource/unlock + # def create + # super + # end + + # GET /resource/unlock?unlock_token=abcdef + # def show + # super + # end + + # protected + + # The path used after sending unlock password instructions + # def after_sending_unlock_instructions_path_for(resource) + # super(resource) + # end + + # The path used after unlocking the resource + # def after_unlock_path_for(resource) + # super(resource) + # end +end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000000000000000000000000000000000000..9e87af36e1cb608e66f0d93e615d9b54b6f94c87 --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,70 @@ +class UsersController < ApplicationController + before_action :set_user, only: %i[ show edit update destroy ] + + # GET /users or /users.json + def index + @users = User.all + end + + # GET /users/1 or /users/1.json + def show + end + + # GET /users/new + def new + @user = User.new + end + + # GET /users/1/edit + def edit + end + + # POST /users or /users.json + def create + @user = User.new(user_params) + + respond_to do |format| + if @user.save + format.html { redirect_to user_url(@user), notice: "User was successfully created." } + format.json { render :show, status: :created, location: @user } + else + format.html { render :new, status: :unprocessable_entity } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end + end + + # PATCH/PUT /users/1 or /users/1.json + def update + respond_to do |format| + if @user.update(user_params) + format.html { redirect_to user_url(@user), notice: "User was successfully updated." } + format.json { render :show, status: :ok, location: @user } + else + format.html { render :edit, status: :unprocessable_entity } + format.json { render json: @user.errors, status: :unprocessable_entity } + end + end + end + + # DELETE /users/1 or /users/1.json + def destroy + @user.destroy + + respond_to do |format| + format.html { redirect_to users_url, notice: "User was successfully destroyed." } + format.json { head :no_content } + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_user + @user = User.find(params[:id]) + end + + # Only allow a list of trusted parameters through. + def user_params + params.require(:user).permit(:username, :firstname, :lastname, :email) + end +end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb new file mode 100644 index 0000000000000000000000000000000000000000..2310a240d78bd6361668625f782ada9d71cdd6c5 --- /dev/null +++ b/app/helpers/users_helper.rb @@ -0,0 +1,2 @@ +module UsersHelper +end diff --git a/app/javascript/application.js b/app/javascript/application.js index 0d7b49404c35d6a69db67a6050d83927ef46f320..c59f547d2f18d652d4fc237db1f866b2fe2212e7 100644 --- a/app/javascript/application.js +++ b/app/javascript/application.js @@ -1,3 +1,5 @@ // Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails +//= require jquery +//= require jquery_ujs import "@hotwired/turbo-rails" import "controllers" diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000000000000000000000000000000000..47567994e9c124940a403b36e6813f0097f614f5 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,6 @@ +class User < ApplicationRecord + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :validatable +end diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..b12dd0cbeb01b541fee181ba59c10e6e64cffad4 --- /dev/null +++ b/app/views/devise/confirmations/new.html.erb @@ -0,0 +1,16 @@ +<h2>Resend confirmation instructions</h2> + +<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + + <div class="field"> + <%= f.label :email %><br /> + <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> + </div> + + <div class="actions"> + <%= f.submit "Resend confirmation instructions" %> + </div> +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..dc55f64f69e2541d12e6ffd6e3f4a413e8b828b2 --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +<p>Welcome <%= @email %>!</p> + +<p>You can confirm your account email through the link below:</p> + +<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p> diff --git a/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..32f4ba8038d81c16f86eab2262a761f56ef656c9 --- /dev/null +++ b/app/views/devise/mailer/email_changed.html.erb @@ -0,0 +1,7 @@ +<p>Hello <%= @email %>!</p> + +<% if @resource.try(:unconfirmed_email?) %> + <p>We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.</p> +<% else %> + <p>We're contacting you to notify you that your email has been changed to <%= @resource.email %>.</p> +<% end %> diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..b41daf476a35f81702a954445f624b98e15b54f1 --- /dev/null +++ b/app/views/devise/mailer/password_change.html.erb @@ -0,0 +1,3 @@ +<p>Hello <%= @resource.email %>!</p> + +<p>We're contacting you to notify you that your password has been changed.</p> diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..f667dc12fe34929983021920c39f4ca061c4fd4f --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +<p>Hello <%= @resource.email %>!</p> + +<p>Someone has requested a link to change your password. You can do this through the link below.</p> + +<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p> + +<p>If you didn't request this, please ignore this email.</p> +<p>Your password won't change until you access the link above and create a new one.</p> diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..41e148bf2ac2d8b3f108e15c45f8a2e75fb0b07e --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +<p>Hello <%= @resource.email %>!</p> + +<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p> + +<p>Click the link below to unlock your account:</p> + +<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p> diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..5fbb9ff0a79a26d84fe8e7a53656ad728ae4c54d --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,25 @@ +<h2>Change your password</h2> + +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + <%= f.hidden_field :reset_password_token %> + + <div class="field"> + <%= f.label :password, "New password" %><br /> + <% if @minimum_password_length %> + <em>(<%= @minimum_password_length %> characters minimum)</em><br /> + <% end %> + <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %> + </div> + + <div class="field"> + <%= f.label :password_confirmation, "Confirm new password" %><br /> + <%= f.password_field :password_confirmation, autocomplete: "new-password" %> + </div> + + <div class="actions"> + <%= f.submit "Change my password" %> + </div> +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..9b486b81b931dfc8de6f010e9736c8a506dd60bf --- /dev/null +++ b/app/views/devise/passwords/new.html.erb @@ -0,0 +1,16 @@ +<h2>Forgot your password?</h2> + +<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + + <div class="field"> + <%= f.label :email %><br /> + <%= f.email_field :email, autofocus: true, autocomplete: "email" %> + </div> + + <div class="actions"> + <%= f.submit "Send me reset password instructions" %> + </div> +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..7b88dcf95e85307f81941fa5bbd98afb6c6c48fb --- /dev/null +++ b/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,53 @@ +<%= link_to "Back", :back, class: "btn btn-success" %> +<div class="row"> + <div class="col-md-4 offset-md-2 text-box"> + <h2 class="text-center">Edit <%= resource_name.to_s.humanize %></h2> + + <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + <div class="paragraph"> + <div class="field row", style="margin-top: 10px;"> + <%= f.label :email, class: "col-sm-4 text-sm-end"%> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class:"col-sm-7" %> + </div> + + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> + <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div> + <% end %> + + <div class="field row", style="margin-top: 10px;"> + <%= f.label :password, class: "col-sm-4 text-sm-end" %> + <div class="col-sm-7"> + <div class="row"> + <%= f.password_field :password, autocomplete: "new-password", class: "col" %> + </div> + <% if @minimum_password_length %> + <em class="row"><%= @minimum_password_length %> characters minimum</em> + <% end %> + </div> + </div> + + <div class="field row", style="margin-top: 10px;"> + <%= f.label :password_confirmation, class: "col-sm-4 text-sm-end"%><br /> + <%= f.password_field :password_confirmation, autocomplete: "new-password", class:"col-sm-7" %> + </div> + + <div class="field row", style="margin-top: 10px;" > + <%= f.label :current_password, class: "col-sm-4 text-sm-end" %> + <%= f.password_field :current_password, autocomplete: "current-password", class:"col-sm-7" %> + </div> + </div> + <div class="actions text-center"> + <%= f.submit "Update", class: "btn btn-info text-center margin_top" %> + </div> + <% end %> + </div> + <div class="col-md-4 text-box paragraph text-center"> + <h2>Cancel my account</h2> + + <p>If you want to delete your account click the button below</p> + + <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete, class:"btn btn-danger" %> + + </div> +</div> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..b740465aad803eaffda5d6fc68cde2bb5e228e02 --- /dev/null +++ b/app/views/devise/registrations/new.html.erb @@ -0,0 +1,52 @@ +<div class="row"> + <div class="col-md-6 offset-md-3 text-box"> + <h2 class="text-center">Sign up</h2> + + <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + <div class="paragraph"> + <div class="field row", style="margin-top: 10px;"> + <%= f.label :username, class: "col-sm-4 text-sm-end" %><br /> + <%= f.text_field :username, autofocus: true, autocomplete: "username", class:"col-sm-7" %> + </div> + + <div class="field row", style="margin-top: 10px;"> + <%= f.label :firstname, class: "col-sm-4 text-sm-end" %><br /> + <%= f.text_field :firstname, autofocus: true, autocomplete: "firstname", class:"col-sm-7" %> + </div> + + <div class="field row", style="margin-top: 10px;"> + <%= f.label :lastname, class: "col-sm-4 text-sm-end" %><br /> + <%= f.text_field :lastname, autofocus: true, autocomplete: "lastname", class:"col-sm-7" %> + </div> + + <div class="field row", style="margin-top: 10px;"> + <%= f.label :email, class: "col-sm-4 text-sm-end" %><br /> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class:"col-sm-7" %> + </div> + + <div class="field row", style="margin-top: 10px;"> + <%= f.label :password, class: "col-sm-4 text-sm-end" %> + <div class="col-sm-7"> + <div class="row"> + <%= f.password_field :password, autocomplete: "new-password", class:"col" %> + </div> + <% if @minimum_password_length %> + <em>(<%= @minimum_password_length %> characters minimum)</em> + <% end %> + </div> + </div> + + <div class="field row", style="margin-top: 10px;"> + <%= f.label :password_confirmation, class: "col-sm-4 text-sm-end" %><br /> + <%= f.password_field :password_confirmation, autocomplete: "new-password", class:"col-sm-7" %> + </div> + + <div class="actions text-center"> + <%= f.submit "Sign up", class: "btn btn-info text-center margin_top" %> + </div> + </div> + <% end %> + </div> +</div> + <%= render "devise/shared/links" %> diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..48445874b1bc947ddb3ea61d98aa288ac7babbc3 --- /dev/null +++ b/app/views/devise/sessions/new.html.erb @@ -0,0 +1,34 @@ + +<div class="row pt-5 main-row"> + <div class="col-sm-4 offset-sm-4 text-box"> + <h2 class="text-center">Log in</h2> + + <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> + <div class="paragraph"> + <div class="field row", style="margin-top: 10px;"> + <%= f.label :email, class: "col-sm-4 text-sm-end"%><br /> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class:"col-sm-7" %> + </div> + + <div class="field row", style="margin-top: 10px;"> + <%= f.label :password, class: "col-sm-4 text-sm-end" %><br /> + <%= f.password_field :password, autocomplete: "current-password", class:"col-sm-7" %> + </div> + + <% if devise_mapping.rememberable? %> + <div class="field row"> + <div class="col-sm-7 offset-sm-4" + <%= f.check_box :remember_me %> + <%= f.label :remember_me %> + </div> + </div> + <% end %> + + <div class="actions text-center"> + <%= f.submit "Log in", class: "btn btn-info text-center margin_top" %> + </div> + </div> + <% end %> + </div> +</div> + <%= render "devise/shared/links" %> diff --git a/app/views/devise/shared/_error_messages.html.erb b/app/views/devise/shared/_error_messages.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..ba7ab887013255a06523bdee4d19189cb5b59b3c --- /dev/null +++ b/app/views/devise/shared/_error_messages.html.erb @@ -0,0 +1,15 @@ +<% if resource.errors.any? %> + <div id="error_explanation"> + <h2> + <%= I18n.t("errors.messages.not_saved", + count: resource.errors.count, + resource: resource.class.model_name.human.downcase) + %> + </h2> + <ul> + <% resource.errors.full_messages.each do |message| %> + <li><%= message %></li> + <% end %> + </ul> + </div> +<% end %> diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..96a9412417bf51257684ada2d9410c4e98e857ff --- /dev/null +++ b/app/views/devise/shared/_links.html.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Log in", new_session_path(resource_name) %><br /> +<% end %> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %><br /> +<% end %> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %><br /> +<% end %> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br /> +<% end %> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br /> +<% end %> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), method: :post %><br /> + <% end %> +<% end %> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..ffc34de8d154c48c5d6769a9805781cadf629918 --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,16 @@ +<h2>Resend unlock instructions</h2> + +<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> + + <div class="field"> + <%= f.label :email %><br /> + <%= f.email_field :email, autofocus: true, autocomplete: "email" %> + </div> + + <div class="actions"> + <%= f.submit "Resend unlock instructions" %> + </div> +<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/home/home.html.erb b/app/views/home/home.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..9139d15a10ffa0f4bb4157120f84acc47633c1b1 --- /dev/null +++ b/app/views/home/home.html.erb @@ -0,0 +1,23 @@ +<!DOCTYPE html> +<html> + <head> + <title>Calendar</title> + <meta name="viewport" content="width=device-width,initial-scale=1"> + <%= csrf_meta_tags %> + <%= csp_meta_tag %> + + <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + <%= javascript_importmap_tags %> + </head> + + <body> + <%= yield %> + <% if current_user %> + <%= link_to "View Profile", user_path(current_user.id) , method: :get, class: 'btn btn-info btn-md' %> + <%= link_to "Logout, #{current_user.firstname}?", destroy_user_session_path, method: :delete, class: 'btn btn-warning btn-md' %> + <% else %> + <%= link_to "Login", new_user_session_path, class: 'btn btn-info btn-md' %> + <%= link_to "Sign up", new_user_registration_path, class: 'btn btn-info btn-md' %> + <% end %> + </body> +</html> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2ff41f43f87582b0f7e21b67cc0607a333a68b0b..1093341149564274b713c158d5930b10a75bae33 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,5 +12,7 @@ <body> <%= yield %> + <p class="notice"><%= notice %></p> + <p class="alert"><%= alert %></p> </body> </html> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb new file mode 100644 index 0000000000000000000000000000000000000000..ca931c33b68eecff2609080b32ebb0f564f71740 --- /dev/null +++ b/app/views/users/show.html.erb @@ -0,0 +1,46 @@ +<%= link_to "Back", :back, class: "btn btn-success" %> +<div class="row pt-5 main-row"> + <div class="container p-5"> + <div class="row"> + <h1 class="display-2 text-center black col"><small class="text-muted">Your Profile</small></h1> + </div> + <div class = "row pt-5"> + <div class="col-lg-6 offset-lg-3 pt-4 text-box"> + <div class="row"> + <h1 class="text-center title">Your Details</h3> + <hr> + </div> + <div class="row"> + <div class="col-md-3 pt-2"> + <label class="form-label paragraph">Name:</label> + </div> + <div class="col-md-6 pt-2"> + <p class="paragraph"><%=current_user.firstname %> <%=current_user.lastname %></p> + </div> + </div> + <div class="row"> + <div class="col-md-3 pt-2"> + <label class="form-label paragraph">Username:</label> + </div> + <div class="col-md-6 pt-2"> + <p class="paragraph"><%=current_user.username %></p> + </div> + </div> + <div class="row"> + <div class="col-md-3 pt-2"> + <label class="form-label paragraph">Email:</label> + </div> + <div class="col-md-6 pt-2"> + <p class="paragraph"><%=current_user.email %></p> + </div> + </div> + <div class="row"> + <div class="col-sm-4 offset-md-4 text-center"> + <%= link_to 'Change Profile Information', url="/users/edit", class: "btn btn-info btn-md" %> + </div> + </div> + </div> + + </div> + +</div> diff --git a/config/environments/development.rb b/config/environments/development.rb index 8500f459a88e53326371bb4539b381b209e48c01..5396cf6ead5a787dd59728345f9ba0e1493e18ba 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -41,6 +41,7 @@ Rails.application.configure do config.action_mailer.perform_caching = false + config.action_mailer.default_url_options = {host: 'localhost', port: 3000} # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000000000000000000000000000000000000..9d30af066a23936faf4a8d43aaa1bbb27ff3ec53 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,311 @@ +# frozen_string_literal: true + +# Assuming you have not yet modified this file, each configuration option below +# is set to its default value. Note that some are commented out while others +# are not: uncommented lines are intended to protect your configuration from +# breaking changes in upgrades (i.e., in the event that future versions of +# Devise change the default values for those options). +# +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # Devise will use the `secret_key_base` as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = 'b6e7b0cbcdaadcdb3cec245948922d7f4141e61cdd9728dbb915211d4833544cef6c8d9ce16f43836ddc691e87cbfc8348008923170a85713ddea735fbc6f027' + + # ==> Controller configuration + # Configure the parent class to the devise controllers. + # config.parent_controller = 'DeviseController' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # Configure the parent class responsible to send e-mails. + # config.parent_mailer = 'ActionMailer::Base' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [:email] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. + # For API-only applications to support authentication "out-of-the-box", you will likely want to + # enable this with :database unless you are using a custom strategy. + # The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # When false, Devise will not attempt to reload routes on eager load. + # This can reduce the time taken to boot the app but if your application + # requires the Devise mappings to be loaded during boot time the application + # won't boot properly. + # config.reload_routes = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 12. If + # using other algorithms, it sets how many times you want the password to be hashed. + # The number of stretches used for generating the hashed password are stored + # with the hashed password. This allows you to change the stretches without + # invalidating existing passwords. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # algorithm), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 12 + + # Set up a pepper to generate the hashed password. + # config.pepper = 'e694da185d9b3dea263c23431ce6112160fdf6150fe3e7a9c05318624a37d027aa8ef3c4751bbe572c92827760743c879bcca9117ef6edaeb031100fac722ffd' + + # Send a notification to the original email when the user's email is changed. + # config.send_email_changed_notification = false + + # Send a notification email when the user's password is changed. + # config.send_password_change_notification = false + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. + # You can also set it to nil, which will allow the user to access the website + # without confirming their account. + # Default is 0.days, meaning the user cannot access the website without + # confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [:email] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 6..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [:email] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [:email] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another hashing or encryption algorithm besides bcrypt (default). + # You can use :sha1, :sha512 or algorithms from others authentication tools as + # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20 + # for default behavior) and :restful_authentication_sha1 (then you should set + # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' + + # ==> Turbolinks configuration + # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly: + # + # ActiveSupport.on_load(:devise_failure_app) do + # include Turbolinks::Controller + # end + + # ==> Configuration for :registerable + + # When set to false, does not sign a user in automatically after their password is + # changed. Defaults to true, so a user is signed in automatically after changing a password. + # config.sign_in_after_change_password = true +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000000000000000000000000000000000000..260e1c4ba6039a255c7858d049efd734a6200e4b --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,65 @@ +# Additional translations at https://github.com/heartcombo/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + email_changed: + subject: "Email Changed" + password_change: + subject: "Password Changed" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirmation link to confirm your new email address." + updated: "Your account has been updated successfully." + updated_but_not_signed_in: "Your account has been updated successfully, but since your password was changed, you need to sign in again." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/routes.rb b/config/routes.rb index 262ffd54723e5cce68e9e6375fb29e045521f2b1..d535904c62985d71c6ced5fa228f028d45862ef9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,13 @@ Rails.application.routes.draw do + devise_for :users + resources :users # Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html # Defines the root path route ("/") # root "articles#index" + + root 'home#home' + + get 'user', to: 'user#show' + end diff --git a/db/migrate/20220403154425_create_users.rb b/db/migrate/20220403154425_create_users.rb new file mode 100644 index 0000000000000000000000000000000000000000..504b2a0cc320f555ca9d356b9d0cb959c71f7fee --- /dev/null +++ b/db/migrate/20220403154425_create_users.rb @@ -0,0 +1,11 @@ +class CreateUsers < ActiveRecord::Migration[7.0] + def change + create_table :users do |t| + t.string :username + t.string :firstname + t.string :lastname + + t.timestamps + end + end +end diff --git a/db/migrate/20220403154638_add_devise_to_users.rb b/db/migrate/20220403154638_add_devise_to_users.rb new file mode 100644 index 0000000000000000000000000000000000000000..98ed9dcd8a2c706ed501b51fd15e77ce2ba6b224 --- /dev/null +++ b/db/migrate/20220403154638_add_devise_to_users.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +class AddDeviseToUsers < ActiveRecord::Migration[7.0] + def self.up + change_table :users do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + # t.integer :sign_in_count, default: 0, null: false + # t.datetime :current_sign_in_at + # t.datetime :last_sign_in_at + # t.string :current_sign_in_ip + # t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + # Uncomment below if timestamps were not included in your original model. + # t.timestamps null: false + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end + + def self.down + # By default, we don't want to make any assumption about how to roll back a migration when your + # model already existed. Please edit below which fields you would like to remove in this migration. + raise ActiveRecord::IrreversibleMigration + end +end diff --git a/db/schema.rb b/db/schema.rb index a3b049516796cf8bde6b389c5df4e10bbef091b2..9036c391e076e97640cb69fd9eac381936256d67 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,5 +10,20 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 0) do +ActiveRecord::Schema[7.0].define(version: 2022_04_03_154638) do + create_table "users", charset: "utf8", force: :cascade do |t| + t.string "username" + t.string "firstname" + t.string "lastname" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + end + end diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb new file mode 100644 index 0000000000000000000000000000000000000000..2ff71e90b044836d7cb65ebd7296c38f9a132ea4 --- /dev/null +++ b/test/controllers/users_controller_test.rb @@ -0,0 +1,48 @@ +require "test_helper" + +class UsersControllerTest < ActionDispatch::IntegrationTest + setup do + @user = users(:one) + end + + test "should get index" do + get users_url + assert_response :success + end + + test "should get new" do + get new_user_url + assert_response :success + end + + test "should create user" do + assert_difference("User.count") do + post users_url, params: { user: { email: @user.email, firstname: @user.firstname, lastname: @user.lastname, username: @user.username } } + end + + assert_redirected_to user_url(User.last) + end + + test "should show user" do + get user_url(@user) + assert_response :success + end + + test "should get edit" do + get edit_user_url(@user) + assert_response :success + end + + test "should update user" do + patch user_url(@user), params: { user: { email: @user.email, firstname: @user.firstname, lastname: @user.lastname, username: @user.username } } + assert_redirected_to user_url(@user) + end + + test "should destroy user" do + assert_difference("User.count", -1) do + delete user_url(@user) + end + + assert_redirected_to users_url + end +end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000000000000000000000000000000000..fa223025ac21ac44bebb0f9f18def77aebb7c4d1 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,13 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + username: MyString + firstname: MyString + lastname: MyString + email: MyString + +two: + username: MyString + firstname: MyString + lastname: MyString + email: MyString diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000000000000000000000000000000000..5c07f49007780e5ba8a4db0686f8da8d89cdd045 --- /dev/null +++ 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 diff --git a/test/system/users_test.rb b/test/system/users_test.rb new file mode 100644 index 0000000000000000000000000000000000000000..95a8ea7da0cb9949123ae944ed4d34e21b4248a8 --- /dev/null +++ b/test/system/users_test.rb @@ -0,0 +1,47 @@ +require "application_system_test_case" + +class UsersTest < ApplicationSystemTestCase + setup do + @user = users(:one) + end + + test "visiting the index" do + visit users_url + assert_selector "h1", text: "Users" + end + + test "should create user" do + visit users_url + click_on "New user" + + fill_in "Email", with: @user.email + fill_in "Firstname", with: @user.firstname + fill_in "Lastname", with: @user.lastname + fill_in "Username", with: @user.username + click_on "Create User" + + assert_text "User was successfully created" + click_on "Back" + end + + test "should update User" do + visit user_url(@user) + click_on "Edit this user", match: :first + + fill_in "Email", with: @user.email + fill_in "Firstname", with: @user.firstname + fill_in "Lastname", with: @user.lastname + fill_in "Username", with: @user.username + click_on "Update User" + + assert_text "User was successfully updated" + click_on "Back" + end + + test "should destroy User" do + visit user_url(@user) + click_on "Destroy this user", match: :first + + assert_text "User was successfully destroyed" + end +end