From 86726ce47ed02d19cf5bc956ff6e26877a0a045e Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 19:45:40 +0000 Subject: [PATCH 01/29] Devise installed --- Gemfile | 2 + Gemfile.lock | 14 ++ config/initializers/devise.rb | 311 ++++++++++++++++++++++++++++++++++ config/locales/devise.en.yml | 65 +++++++ db/schema.rb | 18 ++ 5 files changed, 410 insertions(+) create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/schema.rb diff --git a/Gemfile b/Gemfile index 64dae54..4064bfa 100644 --- a/Gemfile +++ b/Gemfile @@ -3,6 +3,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '3.0.3' +gem 'devise' + # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main' gem 'rails', '~> 6.1.3', '>= 6.1.3.1' # Use postgresql as the database for Active Record diff --git a/Gemfile.lock b/Gemfile.lock index dc44cfd..9566ded 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,6 +81,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) @@ -111,6 +112,12 @@ GEM concurrent-ruby (1.1.10) crass (1.0.6) debug_inspector (1.1.0) + devise (4.8.1) + 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) @@ -155,6 +162,7 @@ GEM racc (~> 1.4) nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) + orm_adapter (0.5.0) parallel (1.22.1) parser (3.1.1.0) ast (~> 2.4.1) @@ -218,6 +226,9 @@ GEM ffi (~> 1.0) rchardet (1.8.0) regexp_parser (2.2.1) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) reverse_markdown (2.1.1) nokogiri rexml (3.2.5) @@ -307,6 +318,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) @@ -344,6 +357,7 @@ DEPENDENCIES bullet byebug capybara (>= 3.26) + devise htmlbeautifier jbuilder (~> 2.7) listen (~> 3.3) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..0a45e00 --- /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 = 'da34a12db46e98139d84b2d895ee0b8f52622fb034cd53d152c784429ad3a013b54b4634d77529e80ca3d9e6fd8cea260432f5e5375b28c3f3acbc3aadf36513' + + # ==> 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 = '3fc17a1372649c60c620240f4df2128c3ee9c0c91ed0cafed6cbc56e3040465555e5095c7314556727f6b3c97c354d44536110aeba408f800bd25b13526d23e8' + + # 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 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/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..4603022 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,18 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `bin/rails +# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 0) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + +end From 3d70d8dc7280824f575dda5ffc2e71e088f5210c Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 19:47:17 +0000 Subject: [PATCH 02/29] users device --- app/models/user.rb | 6 +++ config/routes.rb | 1 + .../20230119194659_devise_create_users.rb | 44 +++++++++++++++++++ db/schema.rb | 14 +++++- test/fixtures/users.yml | 11 +++++ test/models/user_test.rb | 7 +++ 6 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 app/models/user.rb create mode 100644 db/migrate/20230119194659_devise_create_users.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000..4756799 --- /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/config/routes.rb b/config/routes.rb index c06383a..54b04d7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,4 @@ Rails.application.routes.draw do + 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/20230119194659_devise_create_users.rb b/db/migrate/20230119194659_devise_create_users.rb new file mode 100644 index 0000000..cc0991d --- /dev/null +++ b/db/migrate/20230119194659_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/schema.rb b/db/schema.rb index 4603022..ad759fc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,9 +10,21 @@ # # 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_01_19_194659) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + 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 + end 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/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 From bc29b74f55ba6c1d2f6b8a324d825c960770c5bb Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 19:52:06 +0000 Subject: [PATCH 03/29] Task and migration --- app/assets/stylesheets/scaffolds.scss | 65 +++++++++++++++++++++ app/assets/stylesheets/tasks.scss | 3 + app/controllers/tasks_controller.rb | 70 +++++++++++++++++++++++ app/helpers/tasks_helper.rb | 2 + app/models/task.rb | 2 + app/views/tasks/_form.html.erb | 32 +++++++++++ app/views/tasks/_task.json.jbuilder | 2 + app/views/tasks/edit.html.erb | 6 ++ app/views/tasks/index.html.erb | 31 ++++++++++ app/views/tasks/index.json.jbuilder | 1 + app/views/tasks/new.html.erb | 5 ++ app/views/tasks/show.html.erb | 19 ++++++ app/views/tasks/show.json.jbuilder | 1 + config/routes.rb | 3 + db/migrate/20230119195124_create_tasks.rb | 11 ++++ db/schema.rb | 10 +++- test/controllers/tasks_controller_test.rb | 48 ++++++++++++++++ test/fixtures/tasks.yml | 11 ++++ test/models/task_test.rb | 7 +++ test/system/tasks_test.rb | 47 +++++++++++++++ 20 files changed, 375 insertions(+), 1 deletion(-) create mode 100644 app/assets/stylesheets/scaffolds.scss create mode 100644 app/assets/stylesheets/tasks.scss create mode 100644 app/controllers/tasks_controller.rb create mode 100644 app/helpers/tasks_helper.rb create mode 100644 app/models/task.rb create mode 100644 app/views/tasks/_form.html.erb create mode 100644 app/views/tasks/_task.json.jbuilder create mode 100644 app/views/tasks/edit.html.erb create mode 100644 app/views/tasks/index.html.erb create mode 100644 app/views/tasks/index.json.jbuilder create mode 100644 app/views/tasks/new.html.erb create mode 100644 app/views/tasks/show.html.erb create mode 100644 app/views/tasks/show.json.jbuilder create mode 100644 db/migrate/20230119195124_create_tasks.rb create mode 100644 test/controllers/tasks_controller_test.rb create mode 100644 test/fixtures/tasks.yml create mode 100644 test/models/task_test.rb create mode 100644 test/system/tasks_test.rb diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss new file mode 100644 index 0000000..bb2597f --- /dev/null +++ b/app/assets/stylesheets/scaffolds.scss @@ -0,0 +1,65 @@ +body { + background-color: #fff; + color: #333; + margin: 33px; } + +body, p, ol, ul, td { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 13px; + line-height: 18px; } + +pre { + background-color: #eee; + padding: 10px; + font-size: 11px; } + +a { + color: #000; } + +a:visited { + color: #666; } + +a:hover { + color: #fff; + background-color: #000; } + +th { + padding-bottom: 5px; } + +td { + padding: 0 5px 7px; } + +div.field, +div.actions { + margin-bottom: 10px; } + +#notice { + color: green; } + +.field_with_errors { + padding: 2px; + background-color: red; + display: table; } + +#error_explanation { + width: 450px; + border: 2px solid red; + padding: 7px 7px 0; + margin-bottom: 20px; + background-color: #f0f0f0; } + +#error_explanation h2 { + text-align: left; + font-weight: bold; + padding: 5px 5px 5px 15px; + font-size: 12px; + margin: -7px -7px 0; + background-color: #c00; + color: #fff; } + +#error_explanation ul li { + font-size: 12px; + list-style: square; } + +label { + display: block; } diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss new file mode 100644 index 0000000..44f19ff --- /dev/null +++ b/app/assets/stylesheets/tasks.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the tasks controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: https://sass-lang.com/ diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb new file mode 100644 index 0000000..27ff216 --- /dev/null +++ b/app/controllers/tasks_controller.rb @@ -0,0 +1,70 @@ +class TasksController < ApplicationController + before_action :set_task, only: %i[ show edit update destroy ] + + # GET /tasks or /tasks.json + def index + @tasks = Task.all + 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 + end + + # POST /tasks or /tasks.json + def create + @task = Task.new(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 } + else + format.html { render :new, status: :unprocessable_entity } + format.json { render json: @task.errors, status: :unprocessable_entity } + 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 } + else + format.html { render :edit, status: :unprocessable_entity } + format.json { render json: @task.errors, status: :unprocessable_entity } + 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 } + 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, :user, :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..3c23424 --- /dev/null +++ b/app/models/task.rb @@ -0,0 +1,2 @@ +class Task < ApplicationRecord +end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb new file mode 100644 index 0000000..b494c62 --- /dev/null +++ b/app/views/tasks/_form.html.erb @@ -0,0 +1,32 @@ +<%= form_with(model: task) do |form| %> + <% if task.errors.any? %> +
+

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

+ +
    + <% task.errors.each do |error| %> +
  • <%= error.full_message %>
  • + <% end %> +
+
+ <% end %> + +
+ <%= form.label :content %> + <%= form.text_area :content %> +
+ +
+ <%= form.label :user %> + <%= form.text_field :user %> +
+ +
+ <%= form.label :status %> + <%= form.text_field :status %> +
+ +
+ <%= form.submit %> +
+<% end %> diff --git a/app/views/tasks/_task.json.jbuilder b/app/views/tasks/_task.json.jbuilder new file mode 100644 index 0000000..4338704 --- /dev/null +++ b/app/views/tasks/_task.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! task, :id, :content, :user, :status, :created_at, :updated_at +json.url task_url(task, format: :json) diff --git a/app/views/tasks/edit.html.erb b/app/views/tasks/edit.html.erb new file mode 100644 index 0000000..7b088fb --- /dev/null +++ b/app/views/tasks/edit.html.erb @@ -0,0 +1,6 @@ +

Editing Task

+ +<%= render 'form', task: @task %> + +<%= link_to 'Show', @task %> | +<%= link_to 'Back', tasks_path %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb new file mode 100644 index 0000000..6d63038 --- /dev/null +++ b/app/views/tasks/index.html.erb @@ -0,0 +1,31 @@ +

<%= notice %>

+ +

Tasks

+ + + + + + + + + + + + + <% @tasks.each do |task| %> + + + + + + + + + <% end %> + +
ContentUserStatus
<%= task.content %><%= task.user %><%= task.status %><%= link_to 'Show', task %><%= link_to 'Edit', edit_task_path(task) %><%= link_to 'Destroy', task, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Task', new_task_path %> 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/new.html.erb b/app/views/tasks/new.html.erb new file mode 100644 index 0000000..3b6b4ba --- /dev/null +++ b/app/views/tasks/new.html.erb @@ -0,0 +1,5 @@ +

New Task

+ +<%= render 'form', task: @task %> + +<%= link_to 'Back', tasks_path %> diff --git a/app/views/tasks/show.html.erb b/app/views/tasks/show.html.erb new file mode 100644 index 0000000..5c578a5 --- /dev/null +++ b/app/views/tasks/show.html.erb @@ -0,0 +1,19 @@ +

<%= notice %>

+ +

+ Content: + <%= @task.content %> +

+ +

+ User: + <%= @task.user %> +

+ +

+ Status: + <%= @task.status %> +

+ +<%= link_to 'Edit', edit_task_path(@task) %> | +<%= link_to 'Back', tasks_path %> 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/config/routes.rb b/config/routes.rb index 54b04d7..9890682 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,7 @@ Rails.application.routes.draw do + resources :tasks + root 'task#index' + 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/20230119195124_create_tasks.rb b/db/migrate/20230119195124_create_tasks.rb new file mode 100644 index 0000000..2010512 --- /dev/null +++ b/db/migrate/20230119195124_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 :user, null: false, foreign_key: true + t.string :status + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index ad759fc..ef06cee 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,11 +10,19 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_01_19_194659) do +ActiveRecord::Schema.define(version: 2023_01_19_195124) 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" + t.string "user", null: false + t.string "status" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + create_table "users", force: :cascade do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false diff --git a/test/controllers/tasks_controller_test.rb b/test/controllers/tasks_controller_test.rb new file mode 100644 index 0000000..3fc31c6 --- /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, status: @task.status, user: @task.user } } + 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, status: @task.status, user: @task.user } } + 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..c8ee7a2 --- /dev/null +++ b/test/fixtures/tasks.yml @@ -0,0 +1,11 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + content: MyText + user: MyString + status: MyString + +two: + content: MyText + user: MyString + status: MyString 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/system/tasks_test.rb b/test/system/tasks_test.rb new file mode 100644 index 0000000..8377e95 --- /dev/null +++ b/test/system/tasks_test.rb @@ -0,0 +1,47 @@ +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 + fill_in "Status", with: @task.status + fill_in "User", with: @task.user + 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 + fill_in "Status", with: @task.status + fill_in "User", with: @task.user + 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 From 342c4c8fb16d19fa65c1c151ad45908b7fa3e880 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 20:01:08 +0000 Subject: [PATCH 04/29] new branch --- Gemfile | 2 ++ app/models/task.rb | 9 +++++++++ app/models/user.rb | 3 +++ db/migrate/20230119195124_create_tasks.rb | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 4064bfa..96bf366 100644 --- a/Gemfile +++ b/Gemfile @@ -44,6 +44,8 @@ group :development do gem 'listen', '~> 3.3' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' + + gem "annotate" end group :test do diff --git a/app/models/task.rb b/app/models/task.rb index 3c23424..13317cb 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,2 +1,11 @@ class Task < ApplicationRecord + belongs_to :user + + validates :content, presence: true + + enum status: { + not_yet_started: "not_yet_started", + in_progress: "in_progress", + completed: "completed" + } end diff --git a/app/models/user.rb b/app/models/user.rb index 4756799..196c63f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -3,4 +3,7 @@ class User < ApplicationRecord # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable + + + has_many :tasks, dependent: :destroy end diff --git a/db/migrate/20230119195124_create_tasks.rb b/db/migrate/20230119195124_create_tasks.rb index 2010512..17dd63d 100644 --- a/db/migrate/20230119195124_create_tasks.rb +++ b/db/migrate/20230119195124_create_tasks.rb @@ -1,9 +1,9 @@ class CreateTasks < ActiveRecord::Migration[6.1] def change create_table :tasks do |t| - t.text :content + t.text :content, null: false t.string :user, null: false, foreign_key: true - t.string :status + t.string :status, default: "not_yet_started", null: false t.timestamps end From e603a1132b64c110b5b0bafcf3973284b65fc43e Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 20:02:49 +0000 Subject: [PATCH 05/29] new tasks --- db/schema.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index ef06cee..8beb823 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -16,9 +16,9 @@ enable_extension "plpgsql" create_table "tasks", force: :cascade do |t| - t.text "content" + t.text "content", null: false t.string "user", null: false - t.string "status" + t.string "status", default: "not_yet_started", null: false t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false end From 1c4ab5d591e06ccba563f65b8fcf7afd4c9cabd8 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 20:17:40 +0000 Subject: [PATCH 06/29] annotate --- app/models/task.rb | 11 ++++++ app/models/user.rb | 18 +++++++++ lib/tasks/auto_annotate_models.rake | 59 +++++++++++++++++++++++++++++ test/fixtures/tasks.yml | 12 +++++- test/fixtures/users.yml | 19 +++++++++- test/models/task_test.rb | 11 ++++++ test/models/user_test.rb | 18 +++++++++ 7 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 lib/tasks/auto_annotate_models.rake diff --git a/app/models/task.rb b/app/models/task.rb index 13317cb..7809943 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -1,3 +1,14 @@ +# == Schema Information +# +# Table name: tasks +# +# id :bigint not null, primary key +# content :text not null +# status :string default("not_yet_started"), not null +# user :string not null +# created_at :datetime not null +# updated_at :datetime not null +# class Task < ApplicationRecord belongs_to :user diff --git a/app/models/user.rb b/app/models/user.rb index 196c63f..135df77 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,21 @@ +# == Schema Information +# +# Table name: users +# +# id :bigint not null, primary key +# email :string default(""), not null +# encrypted_password :string default(""), not null +# remember_created_at :datetime +# reset_password_sent_at :datetime +# reset_password_token :string +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_users_on_email (email) UNIQUE +# index_users_on_reset_password_token (reset_password_token) UNIQUE +# class User < ApplicationRecord # Include default devise modules. Others available are: # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable diff --git a/lib/tasks/auto_annotate_models.rake b/lib/tasks/auto_annotate_models.rake new file mode 100644 index 0000000..e96283e --- /dev/null +++ b/lib/tasks/auto_annotate_models.rake @@ -0,0 +1,59 @@ +# NOTE: only doing this in development as some production environments (Heroku) +# NOTE: are sensitive to local FS writes, and besides -- it's just not proper +# NOTE: to have a dev-mode tool do its thing in production. +if Rails.env.development? + require 'annotate' + task :set_annotation_options do + # You can override any of these by setting an environment variable of the + # same name. + Annotate.set_defaults( + 'active_admin' => 'false', + 'additional_file_patterns' => [], + 'routes' => 'false', + 'models' => 'true', + 'position_in_routes' => 'before', + 'position_in_class' => 'before', + 'position_in_test' => 'before', + 'position_in_fixture' => 'before', + 'position_in_factory' => 'before', + 'position_in_serializer' => 'before', + 'show_foreign_keys' => 'true', + 'show_complete_foreign_keys' => 'false', + 'show_indexes' => 'true', + 'simple_indexes' => 'false', + 'model_dir' => 'app/models', + 'root_dir' => '', + 'include_version' => 'false', + 'require' => '', + 'exclude_tests' => 'false', + 'exclude_fixtures' => 'false', + 'exclude_factories' => 'false', + 'exclude_serializers' => 'false', + 'exclude_scaffolds' => 'true', + 'exclude_controllers' => 'true', + 'exclude_helpers' => 'true', + 'exclude_sti_subclasses' => 'false', + 'ignore_model_sub_dir' => 'false', + 'ignore_columns' => nil, + 'ignore_routes' => nil, + 'ignore_unknown_models' => 'false', + 'hide_limit_column_types' => 'integer,bigint,boolean', + 'hide_default_column_types' => 'json,jsonb,hstore', + 'skip_on_db_migrate' => 'false', + 'format_bare' => 'true', + 'format_rdoc' => 'false', + 'format_yard' => 'false', + 'format_markdown' => 'false', + 'sort' => 'false', + 'force' => 'false', + 'frozen' => 'false', + 'classified_sort' => 'true', + 'trace' => 'false', + 'wrapper_open' => nil, + 'wrapper_close' => nil, + 'with_comment' => 'true' + ) + end + + Annotate.load_tasks +end diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml index c8ee7a2..3951bf0 100644 --- a/test/fixtures/tasks.yml +++ b/test/fixtures/tasks.yml @@ -1,4 +1,14 @@ -# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +# == Schema Information +# +# Table name: tasks +# +# id :bigint not null, primary key +# content :text not null +# status :string default("not_yet_started"), not null +# user :string not null +# created_at :datetime not null +# updated_at :datetime not null +# one: content: MyText diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 5181636..d1e27e0 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -1,4 +1,21 @@ -# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html +# == Schema Information +# +# Table name: users +# +# id :bigint not null, primary key +# email :string default(""), not null +# encrypted_password :string default(""), not null +# remember_created_at :datetime +# reset_password_sent_at :datetime +# reset_password_token :string +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_users_on_email (email) UNIQUE +# index_users_on_reset_password_token (reset_password_token) UNIQUE +# # 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 diff --git a/test/models/task_test.rb b/test/models/task_test.rb index 29982eb..bd190af 100644 --- a/test/models/task_test.rb +++ b/test/models/task_test.rb @@ -1,3 +1,14 @@ +# == Schema Information +# +# Table name: tasks +# +# id :bigint not null, primary key +# content :text not null +# status :string default("not_yet_started"), not null +# user :string not null +# created_at :datetime not null +# updated_at :datetime not null +# require "test_helper" class TaskTest < ActiveSupport::TestCase diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 5c07f49..8ded342 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,3 +1,21 @@ +# == Schema Information +# +# Table name: users +# +# id :bigint not null, primary key +# email :string default(""), not null +# encrypted_password :string default(""), not null +# remember_created_at :datetime +# reset_password_sent_at :datetime +# reset_password_token :string +# created_at :datetime not null +# updated_at :datetime not null +# +# Indexes +# +# index_users_on_email (email) UNIQUE +# index_users_on_reset_password_token (reset_password_token) UNIQUE +# require "test_helper" class UserTest < ActiveSupport::TestCase From 20ae35cb6b00ef3d38f96d3bb5123aed7e667776 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 20:19:03 +0000 Subject: [PATCH 07/29] base working --- config/routes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index 9890682..539edca 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do resources :tasks - root 'task#index' + root 'tasks#index' devise_for :users # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html From 00576f9557819861865ff739c38642751b1be728 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 20:45:58 +0000 Subject: [PATCH 08/29] starting building sample data --- Gemfile | 1 + Gemfile.lock | 5 +++-- lib/tasks/dev.rake | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 lib/tasks/dev.rake diff --git a/Gemfile b/Gemfile index 96bf366..0a90819 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '3.0.3' 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 9566ded..2a53427 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -122,6 +122,8 @@ GEM diffy (3.4.2) e2mmap (0.1.0) erubi (1.11.0) + faker (3.1.0) + i18n (>= 1.8.11, < 2) ffi (1.15.5) git (1.12.0) addressable (~> 2.8) @@ -160,8 +162,6 @@ GEM nokogiri (1.13.9) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.13.9-x86_64-darwin) - racc (~> 1.4) orm_adapter (0.5.0) parallel (1.22.1) parser (3.1.1.0) @@ -358,6 +358,7 @@ DEPENDENCIES byebug capybara (>= 3.26) devise + faker htmlbeautifier jbuilder (~> 2.7) listen (~> 3.3) diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake new file mode 100644 index 0000000..f56903c --- /dev/null +++ b/lib/tasks/dev.rake @@ -0,0 +1,3 @@ +task :sample_data do + p "Creating sample data" +end From 92111e8267fde3113b09070256cde4688fe8523b Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 20:54:37 +0000 Subject: [PATCH 09/29] still working on sample data --- lib/tasks/dev.rake | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index f56903c..7e17a1b 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -1,3 +1,27 @@ task :sample_data do p "Creating sample data" + + if Rails.env.development? + #Task.destroy_all + #User.destroy_all + end + + + usernames = Array.new{Faker::Name.first_name} + 3.times do + this_name = Faker::Name.first_name + usernames << this_name + end + usernames << "alice" + usernames << "bob" + usernames.each do |username| + last_name = Faker::Name.last_name + User.create( + email: "#{username}@example.com", + password: "password" + ) + end + p "#{User.count} users have been created." + + end From 80204b1ab8912369c4e72ea32d32d7dc7d89a7a4 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 21:14:52 +0000 Subject: [PATCH 10/29] updating Users before sample data --- app/controllers/application_controller.rb | 1 + app/controllers/users_controller.rb | 6 ++++++ app/models/task.rb | 10 +++++++++- db/migrate/20230119195124_create_tasks.rb | 2 +- db/migrate/20230119211337_ad_username_to_users.rb | 5 +++++ db/schema.rb | 4 +++- lib/tasks/dev.rake | 8 +++++--- test/fixtures/tasks.yml | 10 +++++++++- test/models/task_test.rb | 10 +++++++++- 9 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 app/controllers/users_controller.rb create mode 100644 db/migrate/20230119211337_ad_username_to_users.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d1..6b4dcfa 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,3 @@ class ApplicationController < ActionController::Base + before_action :authenticate_user! end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000..b9a50f6 --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,6 @@ +class UsersController < ApplicationController + def show + @user = User.find_by!(username: params.fetch(:username)) + end + +end diff --git a/app/models/task.rb b/app/models/task.rb index 7809943..54727f4 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -5,9 +5,17 @@ # id :bigint not null, primary key # content :text not null # status :string default("not_yet_started"), not null -# user :string not null # created_at :datetime not null # updated_at :datetime not null +# user_id :bigint not null +# +# Indexes +# +# index_tasks_on_user_id (user_id) +# +# Foreign Keys +# +# fk_rails_... (user_id => users.id) # class Task < ApplicationRecord belongs_to :user diff --git a/db/migrate/20230119195124_create_tasks.rb b/db/migrate/20230119195124_create_tasks.rb index 17dd63d..8bde837 100644 --- a/db/migrate/20230119195124_create_tasks.rb +++ b/db/migrate/20230119195124_create_tasks.rb @@ -2,7 +2,7 @@ class CreateTasks < ActiveRecord::Migration[6.1] def change create_table :tasks do |t| t.text :content, null: false - t.string :user, null: false, foreign_key: true + t.belongs_to :user, null: false, foreign_key: true t.string :status, default: "not_yet_started", null: false t.timestamps diff --git a/db/migrate/20230119211337_ad_username_to_users.rb b/db/migrate/20230119211337_ad_username_to_users.rb new file mode 100644 index 0000000..2f7b23a --- /dev/null +++ b/db/migrate/20230119211337_ad_username_to_users.rb @@ -0,0 +1,5 @@ +class AdUsernameToUsers < ActiveRecord::Migration[6.1] + def change + add_column :users, :username, :citext + end +end diff --git a/db/schema.rb b/db/schema.rb index 8beb823..07b6dcf 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -17,10 +17,11 @@ create_table "tasks", force: :cascade do |t| t.text "content", null: false - t.string "user", null: false + t.bigint "user_id", null: false t.string "status", default: "not_yet_started", 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| @@ -35,4 +36,5 @@ 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 index 7e17a1b..19b83dd 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -1,9 +1,9 @@ -task :sample_data do +task sample_data: :environment do p "Creating sample data" if Rails.env.development? - #Task.destroy_all - #User.destroy_all + Task.destroy_all + User.destroy_all end @@ -14,6 +14,8 @@ task :sample_data do end usernames << "alice" usernames << "bob" + p "List made" + usernames.each do |username| last_name = Faker::Name.last_name User.create( diff --git a/test/fixtures/tasks.yml b/test/fixtures/tasks.yml index 3951bf0..8614863 100644 --- a/test/fixtures/tasks.yml +++ b/test/fixtures/tasks.yml @@ -5,9 +5,17 @@ # id :bigint not null, primary key # content :text not null # status :string default("not_yet_started"), not null -# user :string not null # created_at :datetime not null # updated_at :datetime not null +# user_id :bigint not null +# +# Indexes +# +# index_tasks_on_user_id (user_id) +# +# Foreign Keys +# +# fk_rails_... (user_id => users.id) # one: diff --git a/test/models/task_test.rb b/test/models/task_test.rb index bd190af..9d33ebd 100644 --- a/test/models/task_test.rb +++ b/test/models/task_test.rb @@ -5,9 +5,17 @@ # id :bigint not null, primary key # content :text not null # status :string default("not_yet_started"), not null -# user :string not null # created_at :datetime not null # updated_at :datetime not null +# user_id :bigint not null +# +# Indexes +# +# index_tasks_on_user_id (user_id) +# +# Foreign Keys +# +# fk_rails_... (user_id => users.id) # require "test_helper" From 7dce00967c89ece656decb7ed1ee850fbe5dfdb9 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 21:18:20 +0000 Subject: [PATCH 11/29] First sample data created --- app/models/user.rb | 1 + db/migrate/20230119211337_ad_username_to_users.rb | 2 +- db/schema.rb | 3 ++- lib/tasks/dev.rake | 8 ++++---- test/fixtures/users.yml | 1 + test/models/user_test.rb | 1 + 6 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 135df77..6a3a867 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -8,6 +8,7 @@ # remember_created_at :datetime # reset_password_sent_at :datetime # reset_password_token :string +# username :string # created_at :datetime not null # updated_at :datetime not null # diff --git a/db/migrate/20230119211337_ad_username_to_users.rb b/db/migrate/20230119211337_ad_username_to_users.rb index 2f7b23a..e572804 100644 --- a/db/migrate/20230119211337_ad_username_to_users.rb +++ b/db/migrate/20230119211337_ad_username_to_users.rb @@ -1,5 +1,5 @@ class AdUsernameToUsers < ActiveRecord::Migration[6.1] def change - add_column :users, :username, :citext + add_column :users, :username, :string end end diff --git a/db/schema.rb b/db/schema.rb index 07b6dcf..05a334a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_01_19_195124) do +ActiveRecord::Schema.define(version: 2023_01_19_211337) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -32,6 +32,7 @@ t.datetime "remember_created_at" t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false + t.string "username" 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 diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index 19b83dd..5cc187c 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -2,7 +2,7 @@ task sample_data: :environment do p "Creating sample data" if Rails.env.development? - Task.destroy_all + #Task.destroy_all User.destroy_all end @@ -16,10 +16,10 @@ task sample_data: :environment do usernames << "bob" p "List made" - usernames.each do |username| - last_name = Faker::Name.last_name + usernames.each do |this_username| User.create( - email: "#{username}@example.com", + email: "#{this_username}@example.com", + username: this_username, password: "password" ) end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index d1e27e0..aa62919 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -8,6 +8,7 @@ # remember_created_at :datetime # reset_password_sent_at :datetime # reset_password_token :string +# username :string # created_at :datetime not null # updated_at :datetime not null # diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 8ded342..9c4e278 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -8,6 +8,7 @@ # remember_created_at :datetime # reset_password_sent_at :datetime # reset_password_token :string +# username :string # created_at :datetime not null # updated_at :datetime not null # From e9e82d793fb7f03da301fe9cc65c6621968ea331 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 21:24:10 +0000 Subject: [PATCH 12/29] Sample Data --- lib/tasks/dev.rake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index 5cc187c..bf5b2d5 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -25,5 +25,18 @@ task sample_data: :environment do end p "#{User.count} users have been created." + all_users = User.all + #Tasks + all_users.each do |user| + 5.times do + Task.create( + user_id: user.id, + content: Faker::TvShows::GameOfThrones.quote, + status: "not_yet_started" + ) + end + end + + p "#{Task.count} tasks have been created." end From bca9e4acd42d95421b56d7a83d05de73e8143a82 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Thu, 19 Jan 2023 21:35:55 +0000 Subject: [PATCH 13/29] adding boostrap general stuff --- app/views/layouts/application.html.erb | 24 +++++++++++++++++-- app/views/shared/_cdn_assets.html.erb | 14 +++++++++++ app/views/shared/_flash_messages.html.erb | 8 +++++++ app/views/shared/_navbar.html.erb | 29 +++++++++++++++++++++++ app/views/tasks/index.html.erb | 2 +- 5 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 app/views/shared/_cdn_assets.html.erb create mode 100644 app/views/shared/_flash_messages.html.erb create mode 100644 app/views/shared/_navbar.html.erb diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9917f83..cd63194 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,16 +1,36 @@ - Vanilla Rails + + AC Tasks <%= csrf_meta_tags %> <%= csp_meta_tag %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + + <%= render "shared/cdn_assets" %> - <%= yield %> + <%=render "shared/navbar"%> + +
+
+
+ <% if notice.present?%> + <%=render "shared/flash", message: notice, css_class: "success" %> + <% end %> + + <% if alert.present?%> + <%=render "shared/flash", message: alert, css_class: "danger" %> + <% end %> + + <%= 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..df8fb2e --- /dev/null +++ b/app/views/shared/_cdn_assets.html.erb @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/app/views/shared/_flash_messages.html.erb b/app/views/shared/_flash_messages.html.erb new file mode 100644 index 0000000..7c4d47a --- /dev/null +++ b/app/views/shared/_flash_messages.html.erb @@ -0,0 +1,8 @@ +
+
+ +
+
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb new file mode 100644 index 0000000..d498449 --- /dev/null +++ b/app/views/shared/_navbar.html.erb @@ -0,0 +1,29 @@ + diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 6d63038..39ac525 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -16,7 +16,7 @@ <% @tasks.each do |task| %> <%= task.content %> - <%= task.user %> + <%= task.user.username %> <%= task.status %> <%= link_to 'Show', task %> <%= link_to 'Edit', edit_task_path(task) %> From 4620efe471af936f5903edaec64dfdff2e2ced37 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 19:08:51 +0000 Subject: [PATCH 14/29] reviewing from example --- app/assets/stylesheets/scaffolds.scss | 65 -------------------------- app/assets/stylesheets/tasks.scss | 3 -- app/views/layouts/application.html.erb | 4 +- app/views/tasks/_card.html.erb | 1 + app/views/tasks/_form.html.erb | 4 +- app/views/tasks/index.html.erb | 20 +++++++- config/routes.rb | 4 +- 7 files changed, 27 insertions(+), 74 deletions(-) delete mode 100644 app/assets/stylesheets/scaffolds.scss delete mode 100644 app/assets/stylesheets/tasks.scss create mode 100644 app/views/tasks/_card.html.erb diff --git a/app/assets/stylesheets/scaffolds.scss b/app/assets/stylesheets/scaffolds.scss deleted file mode 100644 index bb2597f..0000000 --- a/app/assets/stylesheets/scaffolds.scss +++ /dev/null @@ -1,65 +0,0 @@ -body { - background-color: #fff; - color: #333; - margin: 33px; } - -body, p, ol, ul, td { - font-family: verdana, arial, helvetica, sans-serif; - font-size: 13px; - line-height: 18px; } - -pre { - background-color: #eee; - padding: 10px; - font-size: 11px; } - -a { - color: #000; } - -a:visited { - color: #666; } - -a:hover { - color: #fff; - background-color: #000; } - -th { - padding-bottom: 5px; } - -td { - padding: 0 5px 7px; } - -div.field, -div.actions { - margin-bottom: 10px; } - -#notice { - color: green; } - -.field_with_errors { - padding: 2px; - background-color: red; - display: table; } - -#error_explanation { - width: 450px; - border: 2px solid red; - padding: 7px 7px 0; - margin-bottom: 20px; - background-color: #f0f0f0; } - -#error_explanation h2 { - text-align: left; - font-weight: bold; - padding: 5px 5px 5px 15px; - font-size: 12px; - margin: -7px -7px 0; - background-color: #c00; - color: #fff; } - -#error_explanation ul li { - font-size: 12px; - list-style: square; } - -label { - display: block; } diff --git a/app/assets/stylesheets/tasks.scss b/app/assets/stylesheets/tasks.scss deleted file mode 100644 index 44f19ff..0000000 --- a/app/assets/stylesheets/tasks.scss +++ /dev/null @@ -1,3 +0,0 @@ -// Place all the styles related to the tasks controller here. -// They will automatically be included in application.css. -// You can use Sass (SCSS) here: https://sass-lang.com/ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index cd63194..a7389d1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -20,11 +20,11 @@
<% if notice.present?%> - <%=render "shared/flash", message: notice, css_class: "success" %> + <%=render "shared/flash_messages", message: notice, css_class: "success" %> <% end %> <% if alert.present?%> - <%=render "shared/flash", message: alert, css_class: "danger" %> + <%=render "shared/flash_messages", message: alert, css_class: "danger" %> <% end %> <%= yield %> diff --git a/app/views/tasks/_card.html.erb b/app/views/tasks/_card.html.erb new file mode 100644 index 0000000..c1e3b52 --- /dev/null +++ b/app/views/tasks/_card.html.erb @@ -0,0 +1 @@ +HI diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index b494c62..6cfda10 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -17,8 +17,8 @@
- <%= form.label :user %> - <%= form.text_field :user %> + <%= form.label :user_id %> + <%= form.text_field :user_id %>
diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 39ac525..1639a25 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,4 +1,22 @@ -

<%= notice %>

+
+
+

Not yet started

+
+ to add +
+ +

In progress

+
+ to add +
+ +

Complete

+
+ to add +
+ +
+

Tasks

diff --git a/config/routes.rb b/config/routes.rb index 539edca..fda1449 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,9 @@ Rails.application.routes.draw do - resources :tasks root 'tasks#index' + devise_for :users + + resources :tasks # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html end From 12da256780856ab6aa95cef7ed44eb846fd858d7 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 19:16:31 +0000 Subject: [PATCH 15/29] tasks in groups --- app/views/tasks/_card.html.erb | 30 +++++++++++++++- app/views/tasks/index.html.erb | 65 ++++++++++++++-------------------- 2 files changed, 55 insertions(+), 40 deletions(-) diff --git a/app/views/tasks/_card.html.erb b/app/views/tasks/_card.html.erb index c1e3b52..2705087 100644 --- a/app/views/tasks/_card.html.erb +++ b/app/views/tasks/_card.html.erb @@ -1 +1,29 @@ -HI +

Tasks

+ + + + + + + + + + + + + <% @tasks.each do |task| %> + + + + + + + + + <% end %> + +
ContentUserStatus
<%= task.content %><%= task.user.username %><%= task.status %><%= link_to 'Show', task %><%= link_to 'Edit', edit_task_path(task) %><%= link_to 'Destroy', task, method: :delete, data: { confirm: 'Are you sure?' } %>
+ +
+ +<%= link_to 'New Task', new_task_path %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 1639a25..57d7a34 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,48 +1,35 @@
-

Not yet started

-
- to add -
- -

In progress

-
- to add -
- -

Complete

-
- to add -
+

Not yet started

+
    + <% current_user.tasks.not_yet_started.each do |task| %> +
  • + <%= task.content %> +
  • + <% end %> +
+ +

In progress

+
    + <% current_user.tasks.in_progress.each do |task| %> +
  • + <%= task.content %> +
  • + <% end %> +
+ +

Complete

+
    + <% current_user.tasks.completed.each do |task| %> +
  • + <%= task.content %> +
  • + <% end %> +
-

Tasks

- - - - - - - - - - - - - <% @tasks.each do |task| %> - - - - - - - - - <% end %> - -
ContentUserStatus
<%= task.content %><%= task.user.username %><%= task.status %><%= link_to 'Show', task %><%= link_to 'Edit', edit_task_path(task) %><%= link_to 'Destroy', task, method: :delete, data: { confirm: 'Are you sure?' } %>

From 617054f0a514227d23b7aae203a64adcfa81b41d Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 20:02:15 +0000 Subject: [PATCH 16/29] building tasks wip --- app/controllers/tasks_controller.rb | 19 ++++++++++++++++++- app/views/tasks/_card.html.erb | 3 +++ app/views/tasks/_form.html.erb | 5 ----- app/views/tasks/index.html.erb | 1 + 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 27ff216..cef5585 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,5 +1,21 @@ class TasksController < ApplicationController - before_action :set_task, only: %i[ show edit update destroy ] + before_action :set_task, only: %i[ show edit update destroy move] + + def move + if @task.not_yet_started? + @task.in_progress! + elsif @task.in_progress? + if action = back + @task.not_yet_started! + else + @task.completed! + else + @task.in_progress! + + respond_to do |format| + format.html { redirect_to task_url, notice: "Task status updated" } + end + end # GET /tasks or /tasks.json def index @@ -22,6 +38,7 @@ def edit # POST /tasks or /tasks.json def create @task = Task.new(task_params) + @comment.author = current_user respond_to do |format| if @task.save diff --git a/app/views/tasks/_card.html.erb b/app/views/tasks/_card.html.erb index 2705087..ad18a15 100644 --- a/app/views/tasks/_card.html.erb +++ b/app/views/tasks/_card.html.erb @@ -1,3 +1,6 @@ +
  • +
    <%= task.content %>
    +

    Tasks

    diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 6cfda10..44eced9 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -16,11 +16,6 @@ <%= form.text_area :content %> -
    - <%= form.label :user_id %> - <%= form.text_field :user_id %> -
    -
    <%= form.label :status %> <%= form.text_field :status %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 57d7a34..a60e30a 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -5,6 +5,7 @@ <% current_user.tasks.not_yet_started.each do |task| %>
  • <%= task.content %> +
  • <% end %> From 9a5bff2d622f4fcc3adafccb544c1d957f04b465 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 20:13:27 +0000 Subject: [PATCH 17/29] WIP tasks still --- app/controllers/tasks_controller.rb | 2 ++ app/views/tasks/_card.html.erb | 32 ----------------------------- app/views/tasks/_form.html.erb | 5 ----- app/views/tasks/_taskview.html.erb | 19 +++++++++++++++++ app/views/tasks/index.html.erb | 17 ++++++++++++--- config/routes.rb | 7 ++++--- 6 files changed, 39 insertions(+), 43 deletions(-) delete mode 100644 app/views/tasks/_card.html.erb create mode 100644 app/views/tasks/_taskview.html.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index cef5585..b7ff565 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -9,8 +9,10 @@ def move @task.not_yet_started! else @task.completed! + end else @task.in_progress! + end respond_to do |format| format.html { redirect_to task_url, notice: "Task status updated" } diff --git a/app/views/tasks/_card.html.erb b/app/views/tasks/_card.html.erb deleted file mode 100644 index ad18a15..0000000 --- a/app/views/tasks/_card.html.erb +++ /dev/null @@ -1,32 +0,0 @@ -
  • -
    <%= task.content %>
    - -

    Tasks

    - -
  • <%= link_to 'Edit', edit_task_path(task) %>
    - - - - - - - - - - - <% @tasks.each do |task| %> - - - - - - - - - <% end %> - -
    ContentUserStatus
    <%= task.content %><%= task.user.username %><%= task.status %><%= link_to 'Show', task %><%= link_to 'Edit', edit_task_path(task) %><%= link_to 'Destroy', task, method: :delete, data: { confirm: 'Are you sure?' } %>
    - -
    - -<%= link_to 'New Task', new_task_path %> diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 44eced9..7fbda19 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -16,11 +16,6 @@ <%= form.text_area :content %>
  • -
    - <%= form.label :status %> - <%= form.text_field :status %> -
    -
    <%= form.submit %>
    diff --git a/app/views/tasks/_taskview.html.erb b/app/views/tasks/_taskview.html.erb new file mode 100644 index 0000000..a368dd4 --- /dev/null +++ b/app/views/tasks/_taskview.html.erb @@ -0,0 +1,19 @@ +
  • + <%= task.content %> + +
    +
    + Mover +
    + +
    + <%= link_to 'Edit', edit_task_path(task) %> +
    + +
    + <%= link_to 'Destroy', task, method: :delete, data: { confirm: 'Are you sure?' } %> +
    + +
    + +
  • diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index a60e30a..18fdbeb 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -5,16 +5,27 @@ <% current_user.tasks.not_yet_started.each do |task| %>
  • <%= task.content %> - <%= link_to 'Edit', edit_task_path(task) %> +
    +
    + Mover +
    +
    + <%= link_to 'Edit', edit_task_path(task) %> +
    +
    + <%= link_to 'Destroy', task, method: :delete, data: { confirm: 'Are you sure?' } %> +
    +
    +
  • <% end %>

    In progress

      - <% current_user.tasks.in_progress.each do |task| %> + <% current_user.tasks.in_progress.each do |a_task| %>
    • - <%= task.content %> + <#%= render partial: "tasks/taskview", locals: { task: :a_task } %>
    • <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index fda1449..d09a28a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,9 +1,10 @@ Rails.application.routes.draw do root 'tasks#index' - devise_for :users - resources :tasks - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + resources :tasks do + patch "move", on: :member + end + end From 004b1cbd527a94cb7661026fe0a3986677fe22e9 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 20:27:16 +0000 Subject: [PATCH 18/29] Task edit and delete --- app/controllers/tasks_controller.rb | 34 ++++++++++++++++++++--------- app/views/tasks/index.html.erb | 8 +++++-- config/routes.rb | 3 ++- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index b7ff565..4bac32d 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -1,22 +1,36 @@ class TasksController < ApplicationController - before_action :set_task, only: %i[ show edit update destroy move] + before_action :set_task, only: %i[ show edit update destroy forward back] - def move + def forward if @task.not_yet_started? @task.in_progress! + text = "Task status updated" elsif @task.in_progress? - if action = back - @task.not_yet_started! - else - @task.completed! - end + @task.completed! + text = "Task status updated" + else + text = "Task already completed" + end + + respond_to do |format| + format.html { redirect_to task_url, notice: text } + end + end + + def back + if @task.not_yet_started? + text = "Task not yet in progress" + elsif @task.in_progress? + @task.not_yet_started! + text = "Task status updated" else @task.in_progress! + text = "Task status updated" end - respond_to do |format| - format.html { redirect_to task_url, notice: "Task status updated" } - end + respond_to do |format| + format.html { redirect_to task_url, notice: text} + end end # GET /tasks or /tasks.json diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 18fdbeb..365ee85 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -10,10 +10,14 @@ Mover
    - <%= link_to 'Edit', edit_task_path(task) %> + <%= link_to edit_task_path(task), class: "btn btn-outline-secondary" do %> + + <% end %>
    - <%= link_to 'Destroy', task, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to task, method: :delete, class: "btn btn-outline-secondary" do %> + + <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index d09a28a..c8b2640 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,8 @@ devise_for :users resources :tasks do - patch "move", on: :member + patch "forward", on: :member + patch "back", on: :member end end From 4328cc81e313e304e0a4f1c73a08b423e458f601 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 20:40:46 +0000 Subject: [PATCH 19/29] Task partial, missing status --- app/controllers/tasks_controller.rb | 2 +- app/views/tasks/_taskview.html.erb | 16 ++++++++------- app/views/tasks/index.html.erb | 32 +++++------------------------ 3 files changed, 15 insertions(+), 35 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 4bac32d..5606981 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -54,7 +54,7 @@ def edit # POST /tasks or /tasks.json def create @task = Task.new(task_params) - @comment.author = current_user + @task.user = current_user respond_to do |format| if @task.save diff --git a/app/views/tasks/_taskview.html.erb b/app/views/tasks/_taskview.html.erb index a368dd4..2d29585 100644 --- a/app/views/tasks/_taskview.html.erb +++ b/app/views/tasks/_taskview.html.erb @@ -1,19 +1,21 @@
  • <%= task.content %> + <%= task.status %>
    - Mover + mover
    -
    - <%= link_to 'Edit', edit_task_path(task) %> + <%= link_to edit_task_path(task), class: "btn btn-outline-secondary" do %> + + <% end %>
    -
    - <%= link_to 'Destroy', task, method: :delete, data: { confirm: 'Are you sure?' } %> + <%= link_to task, method: :delete, class: "btn btn-outline-secondary" do %> + + <% end %>
    -
    - +
  • diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 365ee85..e30dbb1 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -2,44 +2,22 @@

    Not yet started

      - <% current_user.tasks.not_yet_started.each do |task| %> -
    • - <%= task.content %> -
      -
      - Mover -
      -
      - <%= link_to edit_task_path(task), class: "btn btn-outline-secondary" do %> - - <% end %> -
      -
      - <%= link_to task, method: :delete, class: "btn btn-outline-secondary" do %> - - <% end %> -
      -
      - -
    • + <% current_user.tasks.not_yet_started.each do |a_task| %> + <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %>

    In progress

      <% current_user.tasks.in_progress.each do |a_task| %> -
    • - <#%= render partial: "tasks/taskview", locals: { task: :a_task } %> -
    • + <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %>

    Complete

      - <% current_user.tasks.completed.each do |task| %> -
    • - <%= task.content %> -
    • + <% current_user.tasks.completed.each do |a_task| %> + <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %>
    From 04db9f22cce47df1987ea231875bcc1134b71ae8 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 22:57:29 +0000 Subject: [PATCH 20/29] Task ux, working on js --- app/controllers/tasks_controller.rb | 3 +++ app/views/layouts/application.html.erb | 7 +------ app/views/shared/_cdn_assets.html.erb | 3 +-- app/views/tasks/_form.html.erb | 12 +----------- app/views/tasks/_taskview.html.erb | 26 +++++++++++++++++--------- app/views/tasks/destroy.js.erb | 1 + app/views/tasks/index.html.erb | 21 ++++++++++++++------- lib/tasks/dev.rake | 6 +++--- 8 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 app/views/tasks/destroy.js.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 5606981..e4c8239 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -87,6 +87,9 @@ def destroy respond_to do |format| format.html { redirect_to tasks_url, notice: "Task was successfully destroyed." } format.json { head :no_content } + format.js do + render template: "comments/destroy.js.erb" + end end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index a7389d1..354b1c0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,12 +13,9 @@ <%= render "shared/cdn_assets" %> - + <%=render "shared/navbar"%> -
    -
    -
    <% if notice.present?%> <%=render "shared/flash_messages", message: notice, css_class: "success" %> <% end %> @@ -28,8 +25,6 @@ <% end %> <%= yield %> -
    -
    diff --git a/app/views/shared/_cdn_assets.html.erb b/app/views/shared/_cdn_assets.html.erb index df8fb2e..e78c488 100644 --- a/app/views/shared/_cdn_assets.html.erb +++ b/app/views/shared/_cdn_assets.html.erb @@ -1,5 +1,4 @@ - - + diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 7fbda19..1a63eab 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,15 +1,5 @@ <%= form_with(model: task) do |form| %> - <% if task.errors.any? %> -
    -

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

    - -
      - <% task.errors.each do |error| %> -
    • <%= error.full_message %>
    • - <% end %> -
    -
    - <% end %> +
    <%= form.label :content %> diff --git a/app/views/tasks/_taskview.html.erb b/app/views/tasks/_taskview.html.erb index 2d29585..8727895 100644 --- a/app/views/tasks/_taskview.html.erb +++ b/app/views/tasks/_taskview.html.erb @@ -1,20 +1,28 @@
  • - <%= task.content %> - <%= task.status %> +
    + <%= task.content %> +
    - mover +
    + mover +
    - <%= link_to edit_task_path(task), class: "btn btn-outline-secondary" do %> - - <% end %> +
    + <%= link_to edit_task_path(task), class: "btn btn-outline-secondary" do %> + + <% end %> +
    - <%= link_to task, method: :delete, class: "btn btn-outline-secondary" do %> - - <% end %> +
    + <%= link_to task, method: :delete, class: "btn btn-outline-secondary", + remote: true do %> + + <% end %> +
    diff --git a/app/views/tasks/destroy.js.erb b/app/views/tasks/destroy.js.erb new file mode 100644 index 0000000..b8cbfe5 --- /dev/null +++ b/app/views/tasks/destroy.js.erb @@ -0,0 +1 @@ +console.log("bye comment!") diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index e30dbb1..a95e71d 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,19 +1,31 @@
    -
    +

    Not yet started

    +
      +
    • +
      + <%= render "form", task: @task %> +
      + + <%= link_to 'New Task', new_task_path %> +
    • <% current_user.tasks.not_yet_started.each do |a_task| %> <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %>
    - +
    + +

    In progress

      <% current_user.tasks.in_progress.each do |a_task| %> <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %>
    +
    +

    Complete

      <% current_user.tasks.completed.each do |a_task| %> @@ -23,8 +35,3 @@
    - - -
    - -<%= link_to 'New Task', new_task_path %> diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index bf5b2d5..b59149b 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -8,7 +8,7 @@ task sample_data: :environment do usernames = Array.new{Faker::Name.first_name} - 3.times do + 2.times do this_name = Faker::Name.first_name usernames << this_name end @@ -29,11 +29,11 @@ task sample_data: :environment do #Tasks all_users.each do |user| - 5.times do + 15.times do Task.create( user_id: user.id, content: Faker::TvShows::GameOfThrones.quote, - status: "not_yet_started" + status: ["not_yet_started", "in_progress","completed"].sample ) end end From 1ed07832d8e07baae34a95660516b0ee1644c607 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 23:10:08 +0000 Subject: [PATCH 21/29] destroy working --- app/controllers/tasks_controller.rb | 4 +- app/views/tasks/_form.html.erb | 2 - app/views/tasks/_taskview.html.erb | 2 +- app/views/tasks/destroy.js.erb | 2 +- app/views/tasks/index.html.erb | 61 +++++++++++++++++------------ 5 files changed, 38 insertions(+), 33 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index e4c8239..0a3af14 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -87,9 +87,7 @@ def destroy respond_to do |format| format.html { redirect_to tasks_url, notice: "Task was successfully destroyed." } format.json { head :no_content } - format.js do - render template: "comments/destroy.js.erb" - end + format.js end end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 1a63eab..3a08b7d 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,6 +1,4 @@ <%= form_with(model: task) do |form| %> - -
    <%= form.label :content %> <%= form.text_area :content %> diff --git a/app/views/tasks/_taskview.html.erb b/app/views/tasks/_taskview.html.erb index 8727895..8fc81a7 100644 --- a/app/views/tasks/_taskview.html.erb +++ b/app/views/tasks/_taskview.html.erb @@ -1,4 +1,4 @@ -
  • +
  • <%= task.content %>
    diff --git a/app/views/tasks/destroy.js.erb b/app/views/tasks/destroy.js.erb index b8cbfe5..e37616e 100644 --- a/app/views/tasks/destroy.js.erb +++ b/app/views/tasks/destroy.js.erb @@ -1 +1 @@ -console.log("bye comment!") +$("#<%= dom_id @task %>").fadeOut(); diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index a95e71d..3015a22 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,37 +1,46 @@
    -

    Not yet started

    +
    +
    + Not yet started +
    -
      -
    • -
      - <%= render "form", task: @task %> -
      - - <%= link_to 'New Task', new_task_path %> -
    • - <% current_user.tasks.not_yet_started.each do |a_task| %> - <%= render partial: "tasks/taskview", locals: { task: a_task } %> - <% end %> -
    +
      +
    • +
      + <%= render "form", task: @task %> +
      +
    • + <% current_user.tasks.not_yet_started.each do |a_task| %> + <%= render partial: "tasks/taskview", locals: { task: a_task } %> + <% end %> +
    +
    -

    In progress

    -
      - <% current_user.tasks.in_progress.each do |a_task| %> - <%= render partial: "tasks/taskview", locals: { task: a_task } %> - <% end %> -
    +
    +
    + In progress +
    +
      + <% current_user.tasks.in_progress.each do |a_task| %> + <%= render partial: "tasks/taskview", locals: { task: a_task } %> + <% end %> +
    +
    -

    Complete

    -
      - <% current_user.tasks.completed.each do |a_task| %> - <%= render partial: "tasks/taskview", locals: { task: a_task } %> - <% end %> -
    - +
    +
    + Complete +
    +
      + <% current_user.tasks.completed.each do |a_task| %> + <%= render partial: "tasks/taskview", locals: { task: a_task } %> + <% end %> +
    +
    From e16747b2d1f62ef7593c1727827481bb0827b711 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 23:13:57 +0000 Subject: [PATCH 22/29] building create --- app/controllers/tasks_controller.rb | 7 ++++--- app/views/tasks/_form.html.erb | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 0a3af14..469fad5 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -53,16 +53,17 @@ def edit # POST /tasks or /tasks.json def create - @task = Task.new(task_params) - @task.user = current_user + @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 @@ -99,6 +100,6 @@ def set_task # Only allow a list of trusted parameters through. def task_params - params.require(:task).permit(:content, :user, :status) + params.require(:task).permit(:content, :status) end end diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 3a08b7d..b017abb 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,6 +1,7 @@ +
  • <%= form_with(model: task) do |form| %>
    - <%= form.label :content %> + <%= form.label :content, class: "visually-hidden" %> <%= form.text_area :content %>
    From f91b9de8f39112692685de08dc233f3197fcc16d Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 23:21:52 +0000 Subject: [PATCH 23/29] create working --- app/views/tasks/_form.html.erb | 8 +++++--- app/views/tasks/create.js.erb | 11 +++++++++++ app/views/tasks/index.html.erb | 11 ++++++----- 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 app/views/tasks/create.js.erb diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index b017abb..552d7cb 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -2,10 +2,12 @@ <%= form_with(model: task) do |form| %>
    <%= form.label :content, class: "visually-hidden" %> - <%= form.text_area :content %> + <%= form.text_area :content, class: "form-control" %>
    -
    - <%= form.submit %> +
    +
    + <%= form.submit class: "btn btn-success" %> +
    <% end %> diff --git a/app/views/tasks/create.js.erb b/app/views/tasks/create.js.erb new file mode 100644 index 0000000..e647c84 --- /dev/null +++ b/app/views/tasks/create.js.erb @@ -0,0 +1,11 @@ +var new_task = $("<%= j(render @task) %>"); + +new_task.hide(); + +$("#form_task").before(new_task); + +new_task.slideDown(); + +$("#form_task").before(new_task); + +$("#form_task #task_content").val(""); diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 3015a22..8555d79 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -1,22 +1,21 @@
    +
    Not yet started
    -
    • - <%= render "form", task: @task %> + <%= render "tasks/form", task: current_user.tasks.build %>
    • <% current_user.tasks.not_yet_started.each do |a_task| %> <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %> -
    +
    -
    @@ -42,5 +41,7 @@ <% end %>
    -
    +
    + +
    From c25bb81957e5dcf73f72162b92ba83f93b00cfc4 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Fri, 20 Jan 2023 23:28:40 +0000 Subject: [PATCH 24/29] building edit and update --- app/controllers/tasks_controller.rb | 8 ++++++++ app/views/tasks/_form.html.erb | 3 ++- app/views/tasks/_taskview.html.erb | 2 +- app/views/tasks/edit.js.erb | 1 + app/views/tasks/update.js.erb | 1 + 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 app/views/tasks/edit.js.erb create mode 100644 app/views/tasks/update.js.erb diff --git a/app/controllers/tasks_controller.rb b/app/controllers/tasks_controller.rb index 469fad5..8f00661 100644 --- a/app/controllers/tasks_controller.rb +++ b/app/controllers/tasks_controller.rb @@ -14,6 +14,7 @@ def forward respond_to do |format| format.html { redirect_to task_url, notice: text } + format.js end end @@ -30,6 +31,7 @@ def back respond_to do |format| format.html { redirect_to task_url, notice: text} + format.js end end @@ -49,6 +51,10 @@ def new # GET /tasks/1/edit def edit + respond_to do |format| + format.html + format.js + end end # POST /tasks or /tasks.json @@ -74,9 +80,11 @@ def update 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 diff --git a/app/views/tasks/_form.html.erb b/app/views/tasks/_form.html.erb index 552d7cb..b0be3cf 100644 --- a/app/views/tasks/_form.html.erb +++ b/app/views/tasks/_form.html.erb @@ -1,5 +1,5 @@
  • -<%= form_with(model: task) do |form| %> +<%= form_with(model: task, local: false) do |form| %>
    <%= form.label :content, class: "visually-hidden" %> <%= form.text_area :content, class: "form-control" %> @@ -11,3 +11,4 @@
  • <% end %> + diff --git a/app/views/tasks/_taskview.html.erb b/app/views/tasks/_taskview.html.erb index 8fc81a7..f557a26 100644 --- a/app/views/tasks/_taskview.html.erb +++ b/app/views/tasks/_taskview.html.erb @@ -11,7 +11,7 @@
    - <%= link_to edit_task_path(task), class: "btn btn-outline-secondary" do %> + <%= link_to edit_task_path(task), class: "btn btn-outline-secondary", remote: true do %> <% end %>
    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/update.js.erb b/app/views/tasks/update.js.erb new file mode 100644 index 0000000..fea4e90 --- /dev/null +++ b/app/views/tasks/update.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id @task, :edit %>").replaceWith("<%= j(render @task)%>"); From b163ea18072abc6dfcf1cab044e064628260d788 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Sat, 21 Jan 2023 01:01:13 +0000 Subject: [PATCH 25/29] Update ok, Created just position missing --- app/views/shared/_navbar.html.erb | 2 +- app/views/tasks/create.js.erb | 2 +- app/views/tasks/update.js.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index d498449..d752334 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -1,6 +1,6 @@
    @@ -35,11 +38,11 @@
    Complete
    -
      +
    • <% current_user.tasks.completed.each do |a_task| %> <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %> -
    + From 6e494af465de6b7b2cc2900a55a1ca7d0629aa87 Mon Sep 17 00:00:00 2001 From: acuevasd Date: Tue, 24 Jan 2023 00:52:57 +0000 Subject: [PATCH 29/29] updating movements --- app/views/tasks/_taskview.html.erb | 7 ------- app/views/tasks/index.html.erb | 22 ++++++++-------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/app/views/tasks/_taskview.html.erb b/app/views/tasks/_taskview.html.erb index b8e9bb0..5b2fe03 100644 --- a/app/views/tasks/_taskview.html.erb +++ b/app/views/tasks/_taskview.html.erb @@ -20,13 +20,6 @@ btn-outline-secondary" do %> <% end %> -
    -
    - <%= link_to back_task_path(task), method: :patch, remote: true, class: "btn btn-outline-secondary" do %> - - <% end %> -
    -
    <% end %> diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index efb49fe..5fc4615 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -5,31 +5,25 @@
    Not yet started
    -
      -
    • -
      - <%= render "tasks/form", task: current_user.tasks.build %> -
      -
    • -
    • +
        + <%= render "tasks/form", task: current_user.tasks.build %> <% current_user.tasks.not_yet_started.each do |a_task| %> <%= render partial: "tasks/taskview", locals: { task: a_task } %> - <% end %> - - + <% end %>
      +
      In progress
      -
    • +
        <% current_user.tasks.in_progress.each do |a_task| %> <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %> - +
      @@ -38,11 +32,11 @@
      Complete
      -
    • +
        <% current_user.tasks.completed.each do |a_task| %> <%= render partial: "tasks/taskview", locals: { task: a_task } %> <% end %> - +