From 3ddf1ba477ff20a60157933a394b19f6d7ac41e9 Mon Sep 17 00:00:00 2001 From: NadezhdaShosheva Date: Thu, 7 Dec 2023 16:35:36 +0300 Subject: [PATCH 1/5] add slim, scss files, some styles --- Gemfile | 1 + Gemfile.lock | 9 +++++ app/assets/stylesheets/application.scss | 32 ++--------------- app/assets/stylesheets/base.scss | 30 ++++++++++++++++ app/assets/stylesheets/reset.scss | 48 +++++++++++++++++++++++++ app/views/sessions/_form.html.erb | 27 -------------- app/views/sessions/_form.html.slim | 21 +++++++++++ app/views/sessions/new.html.erb | 5 --- app/views/sessions/new.html.slim | 5 +++ app/views/sessions/show.html.erb | 18 ---------- app/views/sessions/show.html.slim | 15 ++++++++ 11 files changed, 131 insertions(+), 80 deletions(-) create mode 100644 app/assets/stylesheets/base.scss create mode 100644 app/assets/stylesheets/reset.scss delete mode 100644 app/views/sessions/_form.html.erb create mode 100644 app/views/sessions/_form.html.slim delete mode 100644 app/views/sessions/new.html.erb create mode 100644 app/views/sessions/new.html.slim delete mode 100644 app/views/sessions/show.html.erb create mode 100644 app/views/sessions/show.html.slim diff --git a/Gemfile b/Gemfile index 8a834768..ec8ea481 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem "pg", "~> 1.1" gem "puma", "~> 5.0" # Use SCSS for stylesheets gem "sass-rails", ">= 6" +gem "slim-rails" # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker gem "webpacker", "~> 5.0" # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks diff --git a/Gemfile.lock b/Gemfile.lock index f1e1f7a8..a031a5bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -298,6 +298,13 @@ GEM connection_pool (>= 2.3.0) rack (>= 2.2.4) redis-client (>= 0.14.0) + slim (5.2.0) + temple (~> 0.10.0) + tilt (>= 2.1.0) + slim-rails (3.6.3) + actionpack (>= 3.1) + railties (>= 3.1) + slim (>= 3.0, < 6.0, != 5.0.0) spring (4.1.1) sprockets (4.2.1) concurrent-ruby (~> 1.0) @@ -306,6 +313,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) + temple (0.10.3) thor (1.2.2) tilt (2.3.0) timeout (0.4.0) @@ -375,6 +383,7 @@ DEPENDENCIES sass-rails (>= 6) selenium-webdriver (>= 4.0.0.rc1) sidekiq + slim-rails spring turbolinks (~> 5) tzinfo-data diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index b81139eb..dc9ddba8 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,30 +1,2 @@ -.center { - text-align: center; -} - -.record { - border: 1px solid #000000; - padding: 10px; - margin-bottom: 10px; -} - -.flash-alert { - color: red; -} - -.flash-notice { - color: green; -} - -.sort_links { - place-items: center; - display: flex; - margin-left: auto; - margin-right: auto; -} - -.link { - font-family: "Courier New"; - margin-left: auto; - margin-right: auto; -} +@import "reset"; +@import "base"; diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss new file mode 100644 index 00000000..b81139eb --- /dev/null +++ b/app/assets/stylesheets/base.scss @@ -0,0 +1,30 @@ +.center { + text-align: center; +} + +.record { + border: 1px solid #000000; + padding: 10px; + margin-bottom: 10px; +} + +.flash-alert { + color: red; +} + +.flash-notice { + color: green; +} + +.sort_links { + place-items: center; + display: flex; + margin-left: auto; + margin-right: auto; +} + +.link { + font-family: "Courier New"; + margin-left: auto; + margin-right: auto; +} diff --git a/app/assets/stylesheets/reset.scss b/app/assets/stylesheets/reset.scss new file mode 100644 index 00000000..581749b4 --- /dev/null +++ b/app/assets/stylesheets/reset.scss @@ -0,0 +1,48 @@ +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} + +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} + +body { + line-height: 1; +} + +ol, ul { + list-style: none; +} + +blockquote, q { + quotes: none; +} + +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb deleted file mode 100644 index 4a706264..00000000 --- a/app/views/sessions/_form.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -<%= form_with(model: @user, url: login_path) do |form| %> - <% if @user.errors.any? %> -
-

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

- - -
- <% end %> - -
- <%= form.label :email %> - <%= form.text_field :email %> -
- -
- <%= form.label :password %> - <%= form.text_field :password, type: :password %> -
- -
- <%= form.submit "Log in" %> -
-<% end %> diff --git a/app/views/sessions/_form.html.slim b/app/views/sessions/_form.html.slim new file mode 100644 index 00000000..37aab449 --- /dev/null +++ b/app/views/sessions/_form.html.slim @@ -0,0 +1,21 @@ += form_with(model: @user, url: login_path) do |form| + - if @user.errors.any? + #error_explanation + h2 + => pluralize(@user.errors.count, "error") + | prohibited this user from being saved: + + ul + - @user.errors.each do |error| + li = error.full_message + + .field + = form.label :email + = form.text_field :email + + .field + = form.label :password + = form.text_field :password, type: :password + + .actions + = form.submit "Log in" diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb deleted file mode 100644 index 3da971d0..00000000 --- a/app/views/sessions/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

Log in

- -<%= render 'form', user: @user %> - -<%= link_to "Back", root_path %> diff --git a/app/views/sessions/new.html.slim b/app/views/sessions/new.html.slim new file mode 100644 index 00000000..a501e0c5 --- /dev/null +++ b/app/views/sessions/new.html.slim @@ -0,0 +1,5 @@ +h1 Log in + += render 'form', user: @user + += link_to 'Back', root_path diff --git a/app/views/sessions/show.html.erb b/app/views/sessions/show.html.erb deleted file mode 100644 index 7c2f81ed..00000000 --- a/app/views/sessions/show.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -

Your profile info

- -

- First Name: - <%= current_user.first_name %> -

- -

- Last Name: - <%= current_user.last_name %> -

- -

- Email: - <%= current_user.email %> -

- -<%= link_to "Go to Projects", projects_path %> diff --git a/app/views/sessions/show.html.slim b/app/views/sessions/show.html.slim new file mode 100644 index 00000000..918762b5 --- /dev/null +++ b/app/views/sessions/show.html.slim @@ -0,0 +1,15 @@ +h1 Your profile info + +p + strong First Name: + span = current_user.first_name + +p + strong Last Name: + span = current_user.last_name + +p + strong Email: + span = current_user.email + += link_to "Go to Projects", projects_path From d02f5f18b5fbe29d57954923a946a8344503c4c6 Mon Sep 17 00:00:00 2001 From: NadezhdaShosheva Date: Mon, 11 Dec 2023 16:24:16 +0300 Subject: [PATCH 2/5] add linters, linter rules, some styles, convert erb to slim --- .scss-lint.yml | 12 +++++++ .slim-lint.yml | 36 ++++++++++++++++++++ Gemfile | 2 ++ Gemfile.lock | 12 +++++++ app/assets/stylesheets/application.scss | 2 ++ app/assets/stylesheets/header.scss | 7 ++++ app/assets/stylesheets/variables.scss | 4 +++ app/views/layouts/application.html.erb | 29 ---------------- app/views/layouts/application.html.slim | 25 ++++++++++++++ app/views/projects/show.html.erb | 45 ------------------------- app/views/projects/show.html.slim | 42 +++++++++++++++++++++++ bin/scss-lint | 29 ++++++++++++++++ bin/slim-lint | 29 ++++++++++++++++ 13 files changed, 200 insertions(+), 74 deletions(-) create mode 100644 .scss-lint.yml create mode 100644 .slim-lint.yml create mode 100644 app/assets/stylesheets/header.scss create mode 100644 app/assets/stylesheets/variables.scss delete mode 100644 app/views/layouts/application.html.erb create mode 100644 app/views/layouts/application.html.slim delete mode 100644 app/views/projects/show.html.erb create mode 100644 app/views/projects/show.html.slim create mode 100755 bin/scss-lint create mode 100755 bin/slim-lint diff --git a/.scss-lint.yml b/.scss-lint.yml new file mode 100644 index 00000000..7c4dc324 --- /dev/null +++ b/.scss-lint.yml @@ -0,0 +1,12 @@ +scss_files: 'app/assets/stylesheets/**/*.scss' + +linters: + BorderZero: + enabled: false + + Indentation: + severity: warning + width: 2 + + PropertySortOrder: + enabled: false diff --git a/.slim-lint.yml b/.slim-lint.yml new file mode 100644 index 00000000..c07642fa --- /dev/null +++ b/.slim-lint.yml @@ -0,0 +1,36 @@ +linters: + LineLength: + max: 120 + + RedundantDiv: + enabled: false + + RuboCop: + enabled: true + # These cops are incredibly noisy since the Ruby we extract from Slim + # templates isn't well-formatted, so we ignore them. + ignored_cops: + - Layout/ArgumentAlignment + - Layout/HashAlignment + - Layout/IndentationWidth + - Layout/LineLength + - Layout/TrailingEmptyLines + - Lint/BlockAlignment + - Lint/EndAlignment + - Lint/Void + - Metrics/BlockLength + - Style/AlignParameters + - Style/BlockNesting + - Style/FileName + - Style/FirstParameterIndentation + - Style/FrozenStringLiteralComment + - Style/IfUnlessModifier + - Style/IndentationConsistency + - Style/IndentationWidth + - Style/Next + - Style/TrailingBlankLines + - Style/TrailingWhitespace + - Style/WhileUntilModifier + - Style/NestedTernaryOperator + - Style/StringLiterals + - Style/QuotedSymbols diff --git a/Gemfile b/Gemfile index ec8ea481..77dbeb04 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,8 @@ gem "pg", "~> 1.1" gem "puma", "~> 5.0" # Use SCSS for stylesheets gem "sass-rails", ">= 6" +gem "scss_lint" +gem "slim_lint" gem "slim-rails" # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker gem "webpacker", "~> 5.0" diff --git a/Gemfile.lock b/Gemfile.lock index a031a5bf..88266a8a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,6 +278,11 @@ GEM ruby-next-core (0.15.3) ruby-progressbar (1.13.0) rubyzip (2.3.2) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) sassc (2.4.0) @@ -288,6 +293,8 @@ GEM sprockets (> 3.0) sprockets-rails tilt + scss_lint (0.60.0) + sass (~> 3.5, >= 3.5.5) selenium-webdriver (4.9.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) @@ -305,6 +312,9 @@ GEM actionpack (>= 3.1) railties (>= 3.1) slim (>= 3.0, < 6.0, != 5.0.0) + slim_lint (0.24.0) + rubocop (>= 1.0, < 2.0) + slim (>= 3.0, < 6.0) spring (4.1.1) sprockets (4.2.1) concurrent-ruby (~> 1.0) @@ -381,9 +391,11 @@ DEPENDENCIES rubocop-rake rubocop-thread_safety sass-rails (>= 6) + scss_lint selenium-webdriver (>= 4.0.0.rc1) sidekiq slim-rails + slim_lint spring turbolinks (~> 5) tzinfo-data diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index dc9ddba8..1a6381bc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,2 +1,4 @@ +@import "variables"; @import "reset"; @import "base"; +@import "header"; diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss new file mode 100644 index 00000000..e1c286d5 --- /dev/null +++ b/app/assets/stylesheets/header.scss @@ -0,0 +1,7 @@ +.header { + display: flex; + gap: 1rem; + justify-content: flex-end; + + padding: 2rem; +} diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss new file mode 100644 index 00000000..80d0d5d2 --- /dev/null +++ b/app/assets/stylesheets/variables.scss @@ -0,0 +1,4 @@ +$body-color: #222; +$body-bg: #f1f1f1; + +$input-bg: #fff; diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb deleted file mode 100644 index 7f62610a..00000000 --- a/app/views/layouts/application.html.erb +++ /dev/null @@ -1,29 +0,0 @@ - - - - TaskTrackerItis - - <%= csrf_meta_tags %> - <%= csp_meta_tag %> - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - -
- <% if current_user %> - <%= link_to "#{current_user.first_name} #{current_user.last_name || current_user.email}", sessions_path %> - <%= button_to "Log out", logout_path, method: :delete %> - <% else %> - <%= link_to "Log in", login_path %> - <%= link_to "Sign up", register_path %> - <% end %> -
- - <% flash.each do |type, msg| %> -
-

<%= msg %>

-
- <% end %> - <%= yield %> - - diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim new file mode 100644 index 00000000..f1f62c66 --- /dev/null +++ b/app/views/layouts/application.html.slim @@ -0,0 +1,25 @@ +doctype html +html + head + title Task Tracker Itis + meta name="viewport" content="width=device-width,initial-scale=1" + = csrf_meta_tags + = csp_meta_tag + + = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' + = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' + + header.header + - if current_user + = link_to "#{current_user.first_name} #{current_user.last_name || current_user.email}", sessions_path + = button_to "Log out", logout_path, method: :delete + - else + = link_to "Log in", login_path + = link_to "Sign up", register_path + + body.center + - flash.each do |type, msg| + div class='flash-#{type}' + p = msg + + = yield diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb deleted file mode 100644 index 94472545..00000000 --- a/app/views/projects/show.html.erb +++ /dev/null @@ -1,45 +0,0 @@ -

<%= @project.name %>

- -

Description: <%= @project.description %>

- -<%= link_to "New Task", new_project_task_path(@project), class: "btn btn-primary" %> -<%= link_to "Back", projects_path %> - -

Tasks for <%= @project.name %>

- -<%= link_to "Name", :sort => "name asc" %> -<%= link_to "Name reverse", project_path(@project, sort: "name desc") %> -<%= link_to "Created date", project_path(@project, sort: "created_at asc") %> -<%= link_to "Created date reverse", project_path(@project, sort: "created_at desc") %> -<%= link_to "Deadline", project_path(@project, sort: "deadline_at asc") %> -<%= link_to "Deadline reverse", project_path(@project, sort: "deadline_at desc") %> -
-
- - - - - - - - - - - - - <% @project.tasks.each do |task| %> - - - - - - - - <% end %> - -
NameDescriptionStatusDeadlineActions
<%= task.name %><%= task.description %><%= task.status ? "Completed" : "Not Completed" %><%= task.deadline_at %> - <%= link_to "Show", project_task_path(@project, task), class: "btn btn-primary btn-sm" %> - <%= link_to "Edit", edit_project_task_path(@project, task), class: "btn btn-warning btn-sm" %> - <%= link_to "Destroy", project_task_path(@project, task), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-danger btn-sm" %> -
-<%= paginate @tasks %> \ No newline at end of file diff --git a/app/views/projects/show.html.slim b/app/views/projects/show.html.slim new file mode 100644 index 00000000..5cdcfece --- /dev/null +++ b/app/views/projects/show.html.slim @@ -0,0 +1,42 @@ +h1 = @project.name + +p + strong Description: + += link_to "New Task", new_project_task_path(@project), class: "btn btn-primary" += link_to "Back", projects_path + +h2 + ' Tasks for + = @project.name + += link_to "Name", sort: "name asc" += link_to "Name reverse", project_path(@project, sort: "name desc") += link_to "Created date", project_path(@project, sort: "created_at asc") += link_to "Created date reverse", project_path(@project, sort: "created_at desc") += link_to "Deadline", project_path(@project, sort: "deadline_at asc") += link_to "Deadline reverse", project_path(@project, sort: "deadline_at desc") + +table.table + thead + tr + th Name + th Description + th Status + th Deadline + th Actions + + tbody + - @project.tasks.each do |task| + tr + td task.name + td task.description + td task.status ? "Completed" : "Not Completed" + td task.deadline_at + td + = link_to "Show", project_task_path(@project, task), class: "btn btn-primary btn-sm" + = link_to "Edit", edit_project_task_path(@project, task), class: "btn btn-warning btn-sm" + = link_to "Destroy", project_task_path(@project, task), + method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-danger btn-sm" + += paginate @tasks diff --git a/bin/scss-lint b/bin/scss-lint new file mode 100755 index 00000000..d195391b --- /dev/null +++ b/bin/scss-lint @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'scss-lint' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +bundle_binstub = File.expand_path("../bundle", __FILE__) + +if File.file?(bundle_binstub) + if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ + load(bundle_binstub) + else + abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. +Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") + end +end + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("scss_lint", "scss-lint") diff --git a/bin/slim-lint b/bin/slim-lint new file mode 100755 index 00000000..bec53d41 --- /dev/null +++ b/bin/slim-lint @@ -0,0 +1,29 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'slim-lint' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "pathname" +ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", + Pathname.new(__FILE__).realpath) + +bundle_binstub = File.expand_path("../bundle", __FILE__) + +if File.file?(bundle_binstub) + if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ + load(bundle_binstub) + else + abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. +Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") + end +end + +require "rubygems" +require "bundler/setup" + +load Gem.bin_path("slim_lint", "slim-lint") From 54d3e476862a27b2a2920cd360c73a4df23aec7b Mon Sep 17 00:00:00 2001 From: NadezhdaShosheva Date: Mon, 11 Dec 2023 16:36:35 +0300 Subject: [PATCH 3/5] add some styles, fix linters --- .github/workflows/main.yml | 8 +++- app/assets/stylesheets/_variables.scss | 6 +++ app/assets/stylesheets/application.scss | 8 ++-- app/assets/stylesheets/base.scss | 18 ++----- app/assets/stylesheets/reset.scss | 64 +++++++++++-------------- app/assets/stylesheets/variables.scss | 4 -- app/views/tasks/index.html.erb | 2 +- 7 files changed, 49 insertions(+), 61 deletions(-) create mode 100644 app/assets/stylesheets/_variables.scss delete mode 100644 app/assets/stylesheets/variables.scss diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8693b440..237c2da0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,6 @@ --- name: main -on: +on: push: branches: [ "master" ] pull_request: @@ -35,6 +35,12 @@ jobs: - name: Run rubocop run: bin/rubocop + - name: Run slim linter + run: bin/slim-lint app/views + + - name: Run scss linter + run: bin/scss-lint app/assets/stylesheets + - name: Run tests run: bin/rspec ... diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss new file mode 100644 index 00000000..86d6a948 --- /dev/null +++ b/app/assets/stylesheets/_variables.scss @@ -0,0 +1,6 @@ +$black: #222; +$white: #fff; +$red: #f00; +$green: #008000; + +$body-bg: #f1f1f1; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1a6381bc..97654545 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,4 +1,4 @@ -@import "variables"; -@import "reset"; -@import "base"; -@import "header"; +@import 'variables'; +@import 'reset'; +@import 'base'; +@import 'header'; diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss index b81139eb..05362d08 100644 --- a/app/assets/stylesheets/base.scss +++ b/app/assets/stylesheets/base.scss @@ -1,30 +1,18 @@ -.center { - text-align: center; -} - -.record { - border: 1px solid #000000; - padding: 10px; - margin-bottom: 10px; -} - .flash-alert { - color: red; + color: $red; } .flash-notice { - color: green; + color: $green; } -.sort_links { - place-items: center; +.sort-links { display: flex; margin-left: auto; margin-right: auto; } .link { - font-family: "Courier New"; margin-left: auto; margin-right: auto; } diff --git a/app/assets/stylesheets/reset.scss b/app/assets/stylesheets/reset.scss index 581749b4..d04e713a 100644 --- a/app/assets/stylesheets/reset.scss +++ b/app/assets/stylesheets/reset.scss @@ -1,48 +1,40 @@ -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -b, u, i, center, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td, -article, aside, canvas, details, embed, -figure, figcaption, footer, header, hgroup, -menu, nav, output, ruby, section, summary, -time, mark, audio, video { - margin: 0; - padding: 0; - border: 0; - font-size: 100%; - font: inherit; - vertical-align: baseline; -} - -article, aside, details, figcaption, figure, -footer, header, hgroup, menu, nav, section { - display: block; +* { + box-sizing: border-box; } +html, body { - line-height: 1; + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font-family: Trebuchet MS,Lucida Grande,Lucida Sans Unicode,Lucida Sans,Tahoma,sans-serif; + vertical-align: baseline; } -ol, ul { - list-style: none; +footer, +header, +menu, +nav, +section { + display: block; } -blockquote, q { - quotes: none; +body { + line-height: 1; } -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; +ol, +ul { + list-style: none; } -table { - border-collapse: collapse; - border-spacing: 0; +blockquote, +q { + quotes: none; + + &::before, + &::after { + content: ''; + } } diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss deleted file mode 100644 index 80d0d5d2..00000000 --- a/app/assets/stylesheets/variables.scss +++ /dev/null @@ -1,4 +0,0 @@ -$body-color: #222; -$body-bg: #f1f1f1; - -$input-bg: #fff; diff --git a/app/views/tasks/index.html.erb b/app/views/tasks/index.html.erb index 4f336b59..eb3784c9 100644 --- a/app/views/tasks/index.html.erb +++ b/app/views/tasks/index.html.erb @@ -2,7 +2,7 @@ <%= link_to "NEW TASK", new_project_task_path(@project) %> -
+

<%= link_to "Name", :sort => "name asc"%>

<%= link_to "Name reverse", :sort => "name desc"%>

<%= link_to "Created_at", :sort => "id asc"%>

From 1671c1623458c88183a1d76523cabe18abd07f59 Mon Sep 17 00:00:00 2001 From: NadezhdaShosheva Date: Mon, 11 Dec 2023 17:33:52 +0300 Subject: [PATCH 4/5] some styles --- app/assets/stylesheets/_variables.scss | 3 +- app/assets/stylesheets/application.scss | 8 +++++ app/assets/stylesheets/base.scss | 27 +++++++++++++-- app/assets/stylesheets/form.scss | 15 +++++++++ app/assets/stylesheets/header.scss | 3 ++ app/javascript/packs/application.js | 2 ++ app/views/layouts/application.html.slim | 21 ++++++------ app/views/projects/_form.html.erb | 29 ---------------- app/views/projects/_form.html.slim | 23 +++++++++++++ app/views/projects/edit.html.erb | 3 -- app/views/projects/edit.html.slim | 3 ++ app/views/projects/index.html.erb | 21 ------------ app/views/projects/index.html.slim | 33 ++++++++++++++++++ app/views/projects/new.html.erb | 3 -- app/views/projects/new.html.slim | 3 ++ app/views/projects/show.html.slim | 45 ++++++++++++++----------- app/views/sessions/_form.html.slim | 12 +++---- app/views/sessions/new.html.slim | 3 +- package.json | 2 ++ yarn.lock | 10 ++++++ 20 files changed, 173 insertions(+), 96 deletions(-) create mode 100644 app/assets/stylesheets/form.scss delete mode 100644 app/views/projects/_form.html.erb create mode 100644 app/views/projects/_form.html.slim delete mode 100644 app/views/projects/edit.html.erb create mode 100644 app/views/projects/edit.html.slim delete mode 100644 app/views/projects/index.html.erb create mode 100644 app/views/projects/index.html.slim delete mode 100644 app/views/projects/new.html.erb create mode 100644 app/views/projects/new.html.slim diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/_variables.scss index 86d6a948..0febcab2 100644 --- a/app/assets/stylesheets/_variables.scss +++ b/app/assets/stylesheets/_variables.scss @@ -2,5 +2,6 @@ $black: #222; $white: #fff; $red: #f00; $green: #008000; +$grey: #ccc; -$body-bg: #f1f1f1; +$header-bg: #f1f1f1; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 97654545..3216ebd4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,4 +1,12 @@ + + +// Bootstrap +@import 'bootstrap/scss/bootstrap'; + @import 'variables'; @import 'reset'; + +// Custom styles @import 'base'; @import 'header'; +@import 'form'; diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss index 05362d08..7a476704 100644 --- a/app/assets/stylesheets/base.scss +++ b/app/assets/stylesheets/base.scss @@ -8,11 +8,34 @@ .sort-links { display: flex; - margin-left: auto; - margin-right: auto; + gap: 1rem; + justify-content: flex-end; + margin: 1rem 0; + + font-size: .75rem; } .link { margin-left: auto; margin-right: auto; } + +.content { + width: 100%; + padding: 1rem 2rem; +} + +.title { + display: flex; + justify-content: space-between; + align-items: center; + gap: 1rem; +} + +.table-actions { + display: flex; + justify-content: end; + flex-wrap: wrap; + gap: 1rem; + width: 100%; +} diff --git a/app/assets/stylesheets/form.scss b/app/assets/stylesheets/form.scss new file mode 100644 index 00000000..8b451e36 --- /dev/null +++ b/app/assets/stylesheets/form.scss @@ -0,0 +1,15 @@ +.form { + display: flex; + flex-direction: column; + gap: 1rem; + max-width: 40rem; + + &__field { + width: 100%; + } + + &__actions { + display: flex; + justify-content: end; + } +} diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/header.scss index e1c286d5..a9957c3d 100644 --- a/app/assets/stylesheets/header.scss +++ b/app/assets/stylesheets/header.scss @@ -2,6 +2,9 @@ display: flex; gap: 1rem; justify-content: flex-end; + align-items: center; padding: 2rem; + background: $header-bg; + border-bottom: 1px solid $grey; } diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index f710851a..908aeac8 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -8,6 +8,8 @@ import Turbolinks from "turbolinks" import * as ActiveStorage from "@rails/activestorage" import "channels" +import "bootstrap" + Rails.start() Turbolinks.start() ActiveStorage.start() diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index f1f62c66..5a3b1d55 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -9,17 +9,18 @@ html = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' - header.header - - if current_user - = link_to "#{current_user.first_name} #{current_user.last_name || current_user.email}", sessions_path - = button_to "Log out", logout_path, method: :delete - - else - = link_to "Log in", login_path - = link_to "Sign up", register_path - - body.center + body - flash.each do |type, msg| div class='flash-#{type}' p = msg - = yield + header.header + - if current_user + = link_to "#{current_user.first_name} #{current_user.last_name || current_user.email}", sessions_path + = button_to "Log out", logout_path, method: :delete, class: "btn btn-secondary" + - else + = link_to "Log in", login_path + = link_to "Sign up", register_path + + main.content + = yield diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb deleted file mode 100644 index 3142463b..00000000 --- a/app/views/projects/_form.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -<%= form_with(model: project) do |form| %> - <% if project.errors.any? %> -

-

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

- -
    - <% project.errors.each do |error| %> -
  • <%= error.full_message %>
    • - <% end %> -
-
- <% end %> - -
- <%= form.label :name %> - <%= form.text_field :name %> -
- -
- <%= form.label :description %> - <%= form.text_area :description %> -
- -
- <%= form.submit %> -
-<% end %> - -<%= link_to "Back", projects_path %> diff --git a/app/views/projects/_form.html.slim b/app/views/projects/_form.html.slim new file mode 100644 index 00000000..1ddb98fe --- /dev/null +++ b/app/views/projects/_form.html.slim @@ -0,0 +1,23 @@ += form_with(model: project, html: { class: "form" }) do |form| + - if project.errors.any? + #error_explanation + h2 + => pluralize(project.errors.count, "error") + | prohibited this project from being saved: + + ul + - project.errors.each do |error| + li = error.full_message + + .form__field + = form.label :name, class: "form-label" + = form.text_field :name, class: "form-control" + + .form__field + = form.label :description, class: "form-label" + = form.text_area :description, class: "form-control" + + .form__actions + = form.submit "Save", class: "btn btn-primary" + += link_to "Back", projects_path diff --git a/app/views/projects/edit.html.erb b/app/views/projects/edit.html.erb deleted file mode 100644 index 4a5f68bc..00000000 --- a/app/views/projects/edit.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -

Edit project

- -<%= render 'form', project: @project %> diff --git a/app/views/projects/edit.html.slim b/app/views/projects/edit.html.slim new file mode 100644 index 00000000..c3e4cd35 --- /dev/null +++ b/app/views/projects/edit.html.slim @@ -0,0 +1,3 @@ +h1 Edit project + += render 'form', project: @project diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb deleted file mode 100644 index 824df7e1..00000000 --- a/app/views/projects/index.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -

Hello world

- -

<%= link_to "New Project", new_project_path %>

- -<%= link_to "Name", :sort => "name asc"%> -<%= link_to "Name reverse", :sort => "name desc"%> -<%= link_to "Description", :sort => "description asc" %> -<%= link_to "Description reverse", :sort => "description desc" %> -
-
- -<% @projects.each do |project| %> -
-

<%= project.id %>. <%= link_to project.name, project_tasks_path(project) %>

-

<%= project.description %>

-

<%= link_to "Edit", edit_project_path(project) %>

-

<%= button_to "Destroy", project, method: :delete, data: {confirm: "Are you sure?"} %>

-
-<% end %> - -<%= paginate @projects %> diff --git a/app/views/projects/index.html.slim b/app/views/projects/index.html.slim new file mode 100644 index 00000000..731a84e1 --- /dev/null +++ b/app/views/projects/index.html.slim @@ -0,0 +1,33 @@ +h2.title + span Projects Page + = link_to "New Project", new_project_path, class: "btn btn-primary" + +.sort-links + = link_to "Name", sort: "name asc" + = link_to "Name reverse", sort: "name desc" + = link_to "Description", sort: "description asc" + = link_to "Description reverse", sort: "description desc" + +table.table.table-striped.align-middle + thead + tr + th Name + th Description + th.text-end Actions + tbody + - @projects.each do |project| + tr + td + => project.id + ' . + = link_to project.name, project_tasks_path(project) + td + = project.description + + td + .table-actions + = link_to "Edit", edit_project_path(project), class: "btn btn-warning btn-sm" + = button_to "Destroy", project, method: :delete, + data: { confirm: "Are you sure?" }, class: "btn btn-danger btn-sm" + += paginate @projects diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb deleted file mode 100644 index 5a94b6ac..00000000 --- a/app/views/projects/new.html.erb +++ /dev/null @@ -1,3 +0,0 @@ -

NEW project

- -<%= render 'form', project: @project %> diff --git a/app/views/projects/new.html.slim b/app/views/projects/new.html.slim new file mode 100644 index 00000000..aa37bab7 --- /dev/null +++ b/app/views/projects/new.html.slim @@ -0,0 +1,3 @@ +h1 New project + += render 'form', project: @project diff --git a/app/views/projects/show.html.slim b/app/views/projects/show.html.slim index 5cdcfece..7191959d 100644 --- a/app/views/projects/show.html.slim +++ b/app/views/projects/show.html.slim @@ -1,42 +1,47 @@ -h1 = @project.name +.mb-3 + = link_to "Back", projects_path -p - strong Description: +h1.title + span = @project.name + = link_to "New Task", new_project_task_path(@project), class: "btn btn-primary" -= link_to "New Task", new_project_task_path(@project), class: "btn btn-primary" -= link_to "Back", projects_path +p + strong> Description: + = @project.description h2 ' Tasks for = @project.name -= link_to "Name", sort: "name asc" -= link_to "Name reverse", project_path(@project, sort: "name desc") -= link_to "Created date", project_path(@project, sort: "created_at asc") -= link_to "Created date reverse", project_path(@project, sort: "created_at desc") -= link_to "Deadline", project_path(@project, sort: "deadline_at asc") -= link_to "Deadline reverse", project_path(@project, sort: "deadline_at desc") +.sort-links + = link_to "Name", sort: "name asc" + = link_to "Name reverse", project_path(@project, sort: "name desc") + = link_to "Created date", project_path(@project, sort: "created_at asc") + = link_to "Created date reverse", project_path(@project, sort: "created_at desc") + = link_to "Deadline", project_path(@project, sort: "deadline_at asc") + = link_to "Deadline reverse", project_path(@project, sort: "deadline_at desc") -table.table +table.table.table-striped.align-middle thead tr th Name th Description th Status th Deadline - th Actions + th.text-end Actions tbody - @project.tasks.each do |task| tr - td task.name - td task.description - td task.status ? "Completed" : "Not Completed" - td task.deadline_at + td = task.name + td = task.description + td = task.status ? "Completed" : "Not Completed" + td = task.deadline_at td - = link_to "Show", project_task_path(@project, task), class: "btn btn-primary btn-sm" - = link_to "Edit", edit_project_task_path(@project, task), class: "btn btn-warning btn-sm" - = link_to "Destroy", project_task_path(@project, task), + .table-actions + = link_to "Show", project_task_path(@project, task), class: "btn btn-primary btn-sm" + = link_to "Edit", edit_project_task_path(@project, task), class: "btn btn-warning btn-sm" + = link_to "Destroy", project_task_path(@project, task), method: :delete, data: { confirm: 'Are you sure?' }, class: "btn btn-danger btn-sm" = paginate @tasks diff --git a/app/views/sessions/_form.html.slim b/app/views/sessions/_form.html.slim index 37aab449..09726361 100644 --- a/app/views/sessions/_form.html.slim +++ b/app/views/sessions/_form.html.slim @@ -1,21 +1,21 @@ -= form_with(model: @user, url: login_path) do |form| += form_with(model: @user, url: login_path, html: { class: "form" }) do |form| - if @user.errors.any? #error_explanation h2 => pluralize(@user.errors.count, "error") | prohibited this user from being saved: - ul + ul.form__errors - @user.errors.each do |error| li = error.full_message - .field + .form__field = form.label :email = form.text_field :email - .field + .form__field = form.label :password = form.text_field :password, type: :password - .actions - = form.submit "Log in" + .form__actions + = form.submit "Log in", class: "btn" diff --git a/app/views/sessions/new.html.slim b/app/views/sessions/new.html.slim index a501e0c5..b8f90b13 100644 --- a/app/views/sessions/new.html.slim +++ b/app/views/sessions/new.html.slim @@ -1,4 +1,5 @@ -h1 Log in +h1 + | Log in = render 'form', user: @user diff --git a/package.json b/package.json index 173afd35..f597988d 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,12 @@ "name": "task-tracker-itis", "private": true, "dependencies": { + "@popperjs/core": "^2.11.8", "@rails/actioncable": "^6.0.0", "@rails/activestorage": "^6.0.0", "@rails/ujs": "^6.0.0", "@rails/webpacker": "5.4.4", + "bootstrap": "^5.3.2", "turbolinks": "^5.2.0", "webpack": "^4.46.0", "webpack-cli": "^3.3.12" diff --git a/yarn.lock b/yarn.lock index 9086098f..23cc7d1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1031,6 +1031,11 @@ mkdirp "^1.0.4" rimraf "^3.0.2" +"@popperjs/core@^2.11.8": + version "2.11.8" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" + integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== + "@rails/actioncable@^6.0.0": version "6.1.7" resolved "https://registry.npmjs.org/@rails/actioncable/-/actioncable-6.1.7.tgz#8b4506925d3f7146a70941e4db7ce9dda99f99ae" @@ -1673,6 +1678,11 @@ boolbase@^1.0.0, boolbase@~1.0.0: resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== +bootstrap@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.2.tgz#97226583f27aae93b2b28ab23f4c114757ff16ae" + integrity sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" From 8241f7721e951e94dc645e3bcfd4736a6402dfd6 Mon Sep 17 00:00:00 2001 From: NadezhdaShosheva Date: Mon, 11 Dec 2023 18:55:17 +0300 Subject: [PATCH 5/5] some js fix --- app/assets/stylesheets/base.scss | 4 ++ app/javascript/components/script.js | 44 ++++++++++++++++++ app/javascript/packs/application.js | 8 ++++ app/views/layouts/application.html.slim | 2 +- app/views/projects/index.html.slim | 60 +++++++++++++------------ package.json | 1 + yarn.lock | 5 +++ 7 files changed, 95 insertions(+), 29 deletions(-) create mode 100644 app/javascript/components/script.js diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss index 7a476704..3114d113 100644 --- a/app/assets/stylesheets/base.scss +++ b/app/assets/stylesheets/base.scss @@ -39,3 +39,7 @@ gap: 1rem; width: 100%; } + +.cursor-pointer { + cursor: pointer; +} diff --git a/app/javascript/components/script.js b/app/javascript/components/script.js new file mode 100644 index 00000000..228047d6 --- /dev/null +++ b/app/javascript/components/script.js @@ -0,0 +1,44 @@ +import _ from 'lodash'; + +class MyFunc { + constructor($el) { + this.$el = $el; + this.list = $el.querySelector('.js-projects-list'); + this.items = this.$el.querySelectorAll('.js-item'); + + this.sortAscButton = this.$el.querySelector('.js-sort-by-title-asc'); + this.sortDescButton = this.$el.querySelector('.js-sort-by-title-desc'); + + this.formattedItems = Array.from(this.items).map((item) => ({ + id: JSON.parse(item.getAttribute('data-id')), + name: item.getAttribute('data-name'), + node: item, + })); + + this.bindEvents(this.formattedItems); + } + + bindEvents() { + this.sortAscButton.addEventListener('click', this.onSortByTitleASC); + this.sortDescButton.addEventListener('click', this.onSortByTitleDESC); + } + + onSortByTitleASC = () => { + const sorteItemsByTitle = _.orderBy(this.formattedItems, ['name'], ['asc']); + + sorteItemsByTitle.forEach((item) => this.list.appendChild(item.node)); + this.sortAscButton.classList.add('d-none'); + this.sortDescButton.classList.remove('d-none'); + } + + onSortByTitleDESC = () => { + const sorteItemsByTitle = _.orderBy(this.formattedItems, ['name'], ['desc']); + + sorteItemsByTitle.forEach((item) => this.list.appendChild(item.node)); + + this.sortDescButton.classList.add('d-none'); + this.sortAscButton.classList.remove('d-none'); + } +} + +export default MyFunc; diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index 908aeac8..6c92f38b 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -10,6 +10,14 @@ import "channels" import "bootstrap" +import MyFunc from 'components/script' + Rails.start() Turbolinks.start() ActiveStorage.start() + +window.addEventListener("load", (event) => { + Array.from(document.querySelectorAll('.js-projects')).forEach(($el) => { + new MyFunc($el); + }); +}); diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 5a3b1d55..8f63e304 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -7,7 +7,7 @@ html = csp_meta_tag = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' - = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' + = javascript_pack_tag 'application', 'data-turbolinks-track': 'reload', 'data-turbolinks-eval': 'false' body - flash.each do |type, msg| diff --git a/app/views/projects/index.html.slim b/app/views/projects/index.html.slim index 731a84e1..fe94be8f 100644 --- a/app/views/projects/index.html.slim +++ b/app/views/projects/index.html.slim @@ -1,33 +1,37 @@ -h2.title - span Projects Page - = link_to "New Project", new_project_path, class: "btn btn-primary" +.js-projects + h2.title + span Projects Page + = link_to "New Project", new_project_path, class: "btn btn-primary" -.sort-links - = link_to "Name", sort: "name asc" - = link_to "Name reverse", sort: "name desc" - = link_to "Description", sort: "description asc" - = link_to "Description reverse", sort: "description desc" + .sort-links + = link_to "Name", sort: "name asc" + = link_to "Name reverse", sort: "name desc" + = link_to "Description", sort: "description asc" + = link_to "Description reverse", sort: "description desc" -table.table.table-striped.align-middle - thead - tr - th Name - th Description - th.text-end Actions - tbody - - @projects.each do |project| + table.table.table-striped.align-middle + thead tr - td - => project.id - ' . - = link_to project.name, project_tasks_path(project) - td - = project.description + th + ' Name + span.cursor-pointer.js-sort-by-title-asc ↑ + span.cursor-pointer.js-sort-by-title-desc.d-none ↓ + th Description + th.text-end Actions + tbody.js-projects-list + - @projects.each do |project| + tr.js-item[data-id=project.id data-name="#{project.name}"] + td + => project.id + ' . + = link_to project.name, project_tasks_path(project) + td + = project.description - td - .table-actions - = link_to "Edit", edit_project_path(project), class: "btn btn-warning btn-sm" - = button_to "Destroy", project, method: :delete, - data: { confirm: "Are you sure?" }, class: "btn btn-danger btn-sm" + td + .table-actions + = link_to "Edit", edit_project_path(project), class: "btn btn-warning btn-sm" + = button_to "Destroy", project, method: :delete, + data: { confirm: "Are you sure?" }, class: "btn btn-danger btn-sm" -= paginate @projects + = paginate @projects diff --git a/package.json b/package.json index f597988d..ac00dd72 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "@rails/ujs": "^6.0.0", "@rails/webpacker": "5.4.4", "bootstrap": "^5.3.2", + "lodash": "^4.17.21", "turbolinks": "^5.2.0", "webpack": "^4.46.0", "webpack-cli": "^3.3.12" diff --git a/yarn.lock b/yarn.lock index 23cc7d1c..3fdfb222 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4241,6 +4241,11 @@ lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.5: resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== +lodash@^4.17.21: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== + loglevel@^1.6.8: version "1.8.1" resolved "https://registry.npmjs.org/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4"