diff --git a/.vscode/settings.json b/.vscode/settings.json index f32706f..7b71f6f 100755 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -39,7 +39,7 @@ "editor.formatOnSave": true }, "[ruby]": { - "editor.defaultFormatter": "firstdraft.vscode-rufo", + "editor.defaultFormatter": "mbessey.vscode-rufo", "editor.formatOnSave": true }, "vscode-erb-beautify.keepBlankLines": 1, diff --git a/Gemfile b/Gemfile index 3d7ed82..4f63932 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '3.0.3' gem "grade_runner", github: "firstdraft/grade_runner" +gem 'devise' +gem 'faker' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' gem 'rails', '~> 6.1.3', '>= 6.1.3.1' diff --git a/Gemfile.lock b/Gemfile.lock index fe0ec3b..4cec850 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -90,6 +90,7 @@ GEM ast (2.4.2) awesome_print (1.9.2) backport (1.2.0) + bcrypt (3.1.18) benchmark (0.2.0) better_errors (2.9.1) coderay (>= 1.0.0) @@ -130,6 +131,12 @@ GEM rexml crass (1.0.6) debug_inspector (1.1.0) + devise (4.9.2) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0) + responders + warden (~> 1.2.3) diff-lcs (1.5.0) diffy (3.4.2) e2mmap (0.1.0) @@ -139,6 +146,8 @@ GEM factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) + faker (3.2.0) + i18n (>= 1.8.11, < 2) faraday (2.7.4) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) @@ -193,6 +202,7 @@ GEM faraday (>= 1, < 3) sawyer (~> 0.9) oj (3.10.18) + orm_adapter (0.5.0) parallel (1.22.1) parser (3.1.1.0) ast (~> 2.4.1) @@ -256,6 +266,9 @@ GEM ffi (~> 1.0) rchardet (1.8.0) regexp_parser (2.2.1) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) reverse_markdown (2.1.1) nokogiri rexml (3.2.5) @@ -375,6 +388,8 @@ GEM tzinfo (>= 1.0.0) unicode-display_width (2.1.0) uniform_notifier (1.16.0) + warden (1.2.9) + rack (>= 2.0.9) web-console (4.2.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -417,7 +432,9 @@ DEPENDENCIES byebug capybara (>= 3.26) carrierwave + devise factory_bot_rails + faker grade_runner! htmlbeautifier jbuilder (~> 2.7) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d1..02f001f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,4 @@ class ApplicationController < ActionController::Base + before_action :authenticate_user! + end diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb new file mode 100644 index 0000000..44c3585 --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,98 @@ +class TasksController < ApplicationController + before_action :set_task, only: %i[ show edit update destroy move] + + # GET /tasks or /tasks.json + def index + @tasks = Task.all + end + + + def move + if @task.not_started? + @task.in_progress! + elsif @task.in_progress? + @task.completed! + else + @task.in_progress! + end + + respond_to do |format| + format.html { redirect_to tasks_url, notice: "Task updated!" } + format.js + end + end + + + + + # GET /tasks/1 or /tasks/1.json + def show + end + + # GET /tasks/new + def new + @task = Task.new + end + + # GET /tasks/1/edit + def edit + respond_to do |format| + format.html + format.js + end + end + + # POST /tasks or /tasks.json + def create + @task = current_user.tasks.build(task_params) + + respond_to do |format| + if @task.save + format.html { redirect_to task_url(@task), notice: "Task was successfully created." } + format.json { render :show, status: :created, location: @task } + format.js + else + format.html { render :new, status: :unprocessable_entity } + format.json { render json: @task.errors, status: :unprocessable_entity } + format.js + end + end + end + + # PATCH/PUT /tasks/1 or /tasks/1.json + def update + respond_to do |format| + if @task.update(task_params) + format.html { redirect_to task_url(@task), notice: "Task was successfully updated." } + format.json { render :show, status: :ok, location: @task } + format.js + else + format.html { render :edit, status: :unprocessable_entity } + format.json { render json: @task.errors, status: :unprocessable_entity } + format.js + end + end + end + + # DELETE /tasks/1 or /tasks/1.json + def destroy + @task.destroy + + respond_to do |format| + format.html { redirect_to tasks_url, notice: "Task was successfully destroyed." } + format.json { head :no_content } + format.js + end + end + + private + # Use callbacks to share common setup or constraints between actions. + def set_task + @task = Task.find(params[:id]) + end + + # Only allow a list of trusted parameters through. + def task_params + params.require(:task).permit(:content, :status) + end +end diff --git a/app/helpers/tasks_helper.rb b/app/helpers/tasks_helper.rb new file mode 100644 index 0000000..ce894d0 --- /dev/null +++ b/app/helpers/tasks_helper.rb @@ -0,0 +1,2 @@ +module TasksHelper +end diff --git a/app/models/task.rb b/app/models/task.rb new file mode 100644 index 0000000..4bf9538 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,12 @@ +class Task < ApplicationRecord + + belongs_to :user + + validates :content, presence: true + + enum status: { + not_started: "not_started", + in_progress: "in_progress", + completed: "completed" + } +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000..3147fa7 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,8 @@ +class User < ApplicationRecord + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :validatable + + has_many :tasks +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9917f83..634dafc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,16 +1,24 @@ - Vanilla Rails + + Tasks - UJS Practice <%= csrf_meta_tags %> <%= csp_meta_tag %> + <%= render "shared/cdn_assets" %> + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - <%= yield %> + <%= render "shared/navbar" %> +
+ <%= render "shared/flash" %> + + <%= yield %> +
diff --git a/app/views/shared/_cdn_assets.html.erb b/app/views/shared/_cdn_assets.html.erb new file mode 100644 index 0000000..1b22769 --- /dev/null +++ b/app/views/shared/_cdn_assets.html.erb @@ -0,0 +1,5 @@ + + + + + diff --git a/app/views/shared/_flash.html.erb b/app/views/shared/_flash.html.erb new file mode 100644 index 0000000..876fa28 --- /dev/null +++ b/app/views/shared/_flash.html.erb @@ -0,0 +1,11 @@ +<% if notice.present? %> +
+ + <%= notice %> +
+<% end %> +<% if alert.present? %> + +<% end %> diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb new file mode 100644 index 0000000..4dc182a --- /dev/null +++ b/app/views/shared/_navbar.html.erb @@ -0,0 +1,27 @@ + diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 0000000..290c266 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,27 @@ +
  • + + <%= form_with(model: task, local: false) do |form| %> + <% if task.errors.any? %> +
    +

    <%= pluralize(task.errors.count, "error") %> prohibited this task from being saved:

    + + +
    + <% end %> + +
    + <%= form.label :content, class: "visually-hidden" %> + <%= form.text_field :content, class: "form-control", style: "height: 80px;" %> +
    + +
    +
    + <%= form.submit class: "btn btn-outline-primary" %> +
    +
    + <% end %> +
    • diff --git a/app/views/tasks/_task.html.erb b/app/views/tasks/_task.html.erb new file mode 100644 index 0000000..6d35a37 --- /dev/null +++ b/app/views/tasks/_task.html.erb @@ -0,0 +1,38 @@ +
  • +
    + <%= task.content %> +
    + +
    +
    +
    + <%= link_to move_task_path(task), class: "btn btn-link", method: :patch, remote: true do %> + <% if task.not_started? %> + + <% elsif task.in_progress? %> + + <% else %> + + <% end %> + + <% end %> +
    +
    + +
    +
    + <%= link_to edit_task_path(task), remote: true, class: "btn btn-link" do %> + + <% end %> +
    +
    + +
    +
    + <%= link_to task, method: :delete, remote: true, class: "btn btn-link" do %> + + <% end %> +
    +
    +
    +
    • diff --git a/app/views/tasks/_task.json.jbuilder b/app/views/tasks/_task.json.jbuilder new file mode 100644 index 0000000..2caa774 --- /dev/null +++ b/app/views/tasks/_task.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! task, :id, :content, :created_at, :updated_at +json.url task_url(task, format: :json) diff --git a/app/views/tasks/create.js.erb b/app/views/tasks/create.js.erb new file mode 100644 index 0000000..4b77b42 --- /dev/null +++ b/app/views/tasks/create.js.erb @@ -0,0 +1,6 @@ +var new_task = $("<%= j(render @task) %>"); +new_task.hide(); +$("#form_task").before(new_task); +new_task.slideDown(); +$("#form_task").after(new_task); +$("#form_task #task_content").val(""); diff --git a/app/views/tasks/destroy.js.erb b/app/views/tasks/destroy.js.erb new file mode 100644 index 0000000..e37616e --- /dev/null +++ b/app/views/tasks/destroy.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id @task %>").fadeOut(); diff --git a/app/views/tasks/edit.js.erb b/app/views/tasks/edit.js.erb new file mode 100644 index 0000000..50f083e --- /dev/null +++ b/app/views/tasks/edit.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id @task %>").replaceWith("<%= j(render "tasks/form", task: @task)%>"); diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 0000000..cb8aecd --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,35 @@ +
    +
    +
    +
    +
    + Not yet started +
    +
      + <%= render "tasks/form", task: current_user.tasks.build %> + <%= render current_user.tasks.not_started.order(created_at: :asc) %> +
    +
    +
    +
    +
    +
    + In progess +
    +
      + <%= render current_user.tasks.in_progress.order(updated_at: :desc) %> +
    +
    +
    +
    +
    +
    + Completed +
    +
      + <%= render current_user.tasks.completed.order(updated_at: :desc) %> +
    +
    +
    +
    +
    diff --git a/app/views/tasks/index.json.jbuilder b/app/views/tasks/index.json.jbuilder new file mode 100644 index 0000000..7481994 --- /dev/null +++ b/app/views/tasks/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @tasks, partial: "tasks/task", as: :task diff --git a/app/views/tasks/move.js.erb b/app/views/tasks/move.js.erb new file mode 100644 index 0000000..e0ce471 --- /dev/null +++ b/app/views/tasks/move.js.erb @@ -0,0 +1,3 @@ +$("#<%= dom_id @task %>").remove(); +var updated_task = $("<%= j(render @task) %>"); +$("#<%= @task.status %>_list").prepend(updated_task); diff --git a/app/views/tasks/show.json.jbuilder b/app/views/tasks/show.json.jbuilder new file mode 100644 index 0000000..fd8232f --- /dev/null +++ b/app/views/tasks/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "tasks/task", task: @task diff --git a/app/views/tasks/update.js.erb b/app/views/tasks/update.js.erb new file mode 100644 index 0000000..c613862 --- /dev/null +++ b/app/views/tasks/update.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id @task, :form %>").replaceWith("<%= j(render @task)%>"); diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..41fee65 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,313 @@ +# 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 = 'd01cacf1a27dcc447bd8174aa650be0dfab6738f91fc2bb1224c8d8f22f575653fd3cc64424ecd86bc73884ee35f8dcf401999825cce5bbf73d7312baf2753ee' + + # ==> 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 = 'addff6e0c167b8b7250f1463c6f40dfd3ba3bc049c590304ad081c208f57867a739105111aa840d6c92ebe81a41b3c071b7ecd2416d65733cd4b6771999a0d4c' + + # 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, :turbo_stream] + + # 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' + + # ==> Hotwire/Turbo configuration + # When using Devise with Hotwire/Turbo, the http status for error responses + # and some redirects must match the following. The default in Devise for existing + # apps is `200 OK` and `302 Found respectively`, but new apps are generated with + # these new defaults that match Hotwire/Turbo behavior. + # Note: These might become the new default in future versions of Devise. + config.responder.error_status = :unprocessable_entity + config.responder.redirect_status = :see_other + + # ==> 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 0000000..260e1c4 --- /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 c06383a..8323dca 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,14 @@ Rails.application.routes.draw do + + + root 'tasks#index' + + resources :tasks do + patch "move", on: :member + end + + + + devise_for :users # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end diff --git a/db/migrate/20230508031604_devise_create_users.rb b/db/migrate/20230508031604_devise_create_users.rb new file mode 100644 index 0000000..cc0991d --- /dev/null +++ b/db/migrate/20230508031604_devise_create_users.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +class DeviseCreateUsers < ActiveRecord::Migration[6.1] + def change + create_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 + + + 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 +end diff --git a/db/migrate/20230508032459_create_tasks.rb b/db/migrate/20230508032459_create_tasks.rb new file mode 100644 index 0000000..d7436ad --- /dev/null +++ b/db/migrate/20230508032459_create_tasks.rb @@ -0,0 +1,11 @@ +class CreateTasks < ActiveRecord::Migration[6.1] + def change + create_table :tasks do |t| + t.text :content + t.string :status + t.belongs_to :user, null: false, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/migrate/20230508035311_update_tasks_columns.rb b/db/migrate/20230508035311_update_tasks_columns.rb new file mode 100644 index 0000000..3939f2a --- /dev/null +++ b/db/migrate/20230508035311_update_tasks_columns.rb @@ -0,0 +1,7 @@ +class UpdateTasksColumns < ActiveRecord::Migration[6.1] + def change + change_column_null :tasks, :content, false + change_column_null :tasks, :status, false + change_column_default :tasks, :status, "not_started" + end +end diff --git a/db/schema.rb b/db/schema.rb index 4603022..5ba3ba6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,31 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 2023_05_08_035311) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + create_table "tasks", force: :cascade do |t| + t.text "content", null: false + t.string "status", default: "not_started", null: false + t.bigint "user_id", null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["user_id"], name: "index_tasks_on_user_id" + end + + create_table "users", force: :cascade do |t| + 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.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + 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 + + add_foreign_key "tasks", "users" end diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake new file mode 100644 index 0000000..591e468 --- /dev/null +++ b/lib/tasks/dev.rake @@ -0,0 +1,21 @@ +namespace :dev do + desc "Generates sample data" + task :generate => :environment do + + # Create user + user = User.find_or_create_by(email: 'alice@example.com') do |u| + u.password = 'password' + end + + user.tasks.destroy_all + + # Create tasks + 20.times do + user.tasks.create( + content: Faker::Hacker.say_something_smart, + status: Task.statuses.keys.sample + ) + end + puts "Created #{Task.count} tasks" + end +end diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb new file mode 100644 index 0000000..a60bf23 --- /dev/null +++ b/test/controllers/tasks_controller_test.rb @@ -0,0 +1,48 @@ +require "test_helper" + +class TasksControllerTest < ActionDispatch::IntegrationTest + setup do + @task = tasks(:one) + end + + test "should get index" do + get tasks_url + assert_response :success + end + + test "should get new" do + get new_task_url + assert_response :success + end + + test "should create task" do + assert_difference('Task.count') do + post tasks_url, params: { task: { content: @task.content } } + end + + assert_redirected_to task_url(Task.last) + end + + test "should show task" do + get task_url(@task) + assert_response :success + end + + test "should get edit" do + get edit_task_url(@task) + assert_response :success + end + + test "should update task" do + patch task_url(@task), params: { task: { content: @task.content } } + assert_redirected_to task_url(@task) + end + + test "should destroy task" do + assert_difference('Task.count', -1) do + delete task_url(@task) + end + + assert_redirected_to tasks_url + end +end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml new file mode 100644 index 0000000..37793a4 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,7 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + content: MyText + +two: + content: MyText diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000..5181636 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/models/task_test.rb b/test/models/task_test.rb new file mode 100644 index 0000000..29982eb --- /dev/null +++ b/test/models/task_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +class TaskTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000..5c07f49 --- /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/tasks_test.rb b/test/system/tasks_test.rb new file mode 100644 index 0000000..06aa71b --- /dev/null +++ b/test/system/tasks_test.rb @@ -0,0 +1,43 @@ +require "application_system_test_case" + +class TasksTest < ApplicationSystemTestCase + setup do + @task = tasks(:one) + end + + test "visiting the index" do + visit tasks_url + assert_selector "h1", text: "Tasks" + end + + test "creating a Task" do + visit tasks_url + click_on "New Task" + + fill_in "Content", with: @task.content + click_on "Create Task" + + assert_text "Task was successfully created" + click_on "Back" + end + + test "updating a Task" do + visit tasks_url + click_on "Edit", match: :first + + fill_in "Content", with: @task.content + click_on "Update Task" + + assert_text "Task was successfully updated" + click_on "Back" + end + + test "destroying a Task" do + visit tasks_url + page.accept_confirm do + click_on "Destroy", match: :first + end + + assert_text "Task was successfully destroyed" + end +end