Merge branch 'mainline' into dev

Merge pull request #3770 from Growstuff/CloCkWeRX-patch-1
Update garden.rb
2026-05-25 17:31:18 -04:00 · 2024-07-02 17:49:53 +09:30 · 2024-07-02 17:48:56 +09:30 · 2024-07-02 17:48:39 +09:30 · 2024-07-02 17:48:28 +09:30 · 2024-07-02 17:37:17 +09:30
30 changed files with 453 additions and 305 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -93,6 +93,8 @@ submit the change with your pull request.
 - Martina Simicic / [simicic](https://github.com/simicic)
 - Rowan Crawford / [wombleton](https://github.com/wombleton)
 - Ítalo Pires / [italopires](https://github.com/italopires)
+- Bennett Zink / [bennett-zink](https://github.com/bennett-zink)
+- Dominick Thornton / [domthor](https://github.com/domthor)

 ## Bots

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,35 +33,35 @@ GEM
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      mail (>= 2.7.1)
      net-imap
      net-pop
      net-smtp
-    actionmailer (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      mail (~> 2.5, >= 2.5.4)
      net-imap
      net-pop
      net-smtp
      rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.2)
-      actionview (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      nokogiri (>= 1.8.5)
      racc
      rack (>= 2.2.4)
@@ -69,15 +69,15 @@ GEM
      rack-test (>= 0.6.3)
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
      builder (~> 3.1)
      erubi (~> 1.11)
      rails-dom-testing (~> 2.2)
@@ -92,22 +92,22 @@ GEM
    active_utils (3.4.1)
      activesupport (>= 4.2)
      i18n
-    activejob (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
      globalid (>= 0.3.6)
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activerecord (7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      timeout (>= 0.4.0)
-    activestorage (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      marcel (~> 1.0)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.4)
      base64
      bigdecimal
      concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -122,14 +122,14 @@ GEM
    ast (2.4.2)
    autoprefixer-rails (10.4.16.0)
      execjs (~> 2)
-    axe-core-api (4.9.0)
+    axe-core-api (4.9.1)
      dumb_delegator
      virtus
-    axe-core-capybara (4.9.0)
-      axe-core-api
+    axe-core-capybara (4.9.1)
+      axe-core-api (= 4.9.1)
      dumb_delegator
-    axe-core-rspec (4.9.0)
-      axe-core-api
+    axe-core-rspec (4.9.1)
+      axe-core-api (= 4.9.1)
      dumb_delegator
      virtus
    axiom-types (0.1.1)
@@ -137,19 +137,12 @@ GEM
      ice_nine (~> 0.11.0)
      thread_safe (~> 0.3, >= 0.3.1)
    base64 (0.2.0)
-    bcrypt (3.1.19)
+    bcrypt (3.1.20)
    better_errors (2.10.1)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
      rouge (>= 1.0.0)
-    better_html (2.0.2)
-      actionview (>= 6.0)
-      activesupport (>= 6.0)
-      ast (~> 2.0)
-      erubi (~> 1.4)
-      parser (>= 2.4)
-      smart_properties
-    bigdecimal (3.1.7)
+    bigdecimal (3.1.8)
    bluecloth (2.2.0)
    bonsai-elasticsearch-rails (7.0.1)
      elasticsearch-model (< 8)
@@ -162,12 +155,12 @@ GEM
    bootstrap_form (5.4.0)
      actionpack (>= 6.1)
      activemodel (>= 6.1)
-    builder (3.2.4)
+    builder (3.3.0)
    bullet (7.1.6)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    byebug (11.1.3)
-    cancancan (3.5.0)
+    cancancan (3.6.1)
    capybara (3.40.0)
      addressable
      matrix
@@ -190,7 +183,8 @@ GEM
      image_processing (~> 1.1)
      marcel (~> 1.0.0)
      ssrf_filter (~> 1.0)
-    chartkick (5.0.6)
+    chartkick (5.0.7)
+    childprocess (5.0.0)
    codeclimate-test-reporter (1.0.9)
      simplecov (<= 0.13)
    coderay (1.1.3)
@@ -205,9 +199,10 @@ GEM
    coffee-script-source (1.12.2)
    comfy_bootstrap_form (4.0.9)
      rails (>= 5.0.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.3)
    connection_pool (2.4.1)
    crass (1.0.6)
+    csv (3.3.0)
    csv_shaper (1.3.2)
      activesupport (>= 3.0.0)
    dalli (3.2.8)
@@ -220,7 +215,7 @@ GEM
    date (3.3.4)
    descendants_tracker (0.0.4)
      thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.3)
+    devise (4.9.4)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 4.1.0)
@@ -230,9 +225,9 @@ GEM
    discard (1.3.0)
      activerecord (>= 4.2, < 8)
    docile (1.1.5)
-    dotenv (3.1.0)
-    dotenv-rails (3.1.0)
-      dotenv (= 3.1.0)
+    dotenv (3.1.2)
+    dotenv-rails (3.1.2)
+      dotenv (= 3.1.2)
      railties (>= 6.1)
    drb (2.2.1)
    dumb_delegator (1.0.0)
@@ -249,18 +244,18 @@ GEM
    elasticsearch-transport (7.0.0)
      faraday
      multi_json
-    erubi (1.12.0)
+    erubi (1.13.0)
    erubis (2.7.0)
-    excon (0.109.0)
+    excon (0.110.0)
    execjs (2.9.1)
    factory_bot (6.4.5)
      activesupport (>= 5.0.0)
    factory_bot_rails (6.4.3)
      factory_bot (~> 6.4)
      railties (>= 5.0.0)
-    faker (3.3.0)
+    faker (3.4.1)
      i18n (>= 1.8.11, < 2)
-    faraday (2.9.0)
+    faraday (2.9.2)
      faraday-net_http (>= 2.0, < 3.2)
    faraday-net_http (3.1.0)
      net-http
@@ -271,7 +266,9 @@ GEM
    friendly_id (5.5.1)
      activerecord (>= 4.0.0)
    gbifrb (0.2.0)
-    geocoder (1.8.2)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
    gibbon (1.2.1)
      httparty
      multi_json (>= 1.9.0)
@@ -295,7 +292,7 @@ GEM
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.57.0)
+    haml_lint (0.58.0)
      haml (>= 5.0)
      parallel (~> 1.10)
      rainbow
@@ -308,16 +305,15 @@ GEM
      moneta
      multi_json (>= 1.9.2)
      webrick
-    highline (2.1.0)
+    highline (3.0.1)
    httparty (0.21.0)
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
-    i18n (1.14.4)
+    i18n (1.14.5)
      concurrent-ruby (~> 1.0)
-    i18n-tasks (1.0.13)
+    i18n-tasks (1.0.14)
      activesupport (>= 4.0.2)
      ast (>= 2.1.0)
-      better_html (>= 1.0, < 3.0)
      erubi
      highline (>= 2.0.0)
      i18n
@@ -333,14 +329,14 @@ GEM
      mini_magick (>= 4.9.5, < 5)
      ruby-vips (>= 2.0.17, < 3)
    io-console (0.7.2)
-    irb (1.12.0)
-      rdoc
+    irb (1.13.2)
+      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jquery-rails (4.6.0)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.7.1)
+    json (2.7.2)
    json-schema (4.1.1)
      addressable (>= 2.8)
    jsonapi-resources (0.10.7)
@@ -352,16 +348,18 @@ GEM
    kramdown (2.4.0)
      rexml
    language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
+    launchy (3.0.0)
      addressable (~> 2.8)
+      childprocess (~> 5.0)
    leaflet-rails (1.9.4)
      actionpack (>= 4.2.0)
      railties (>= 4.2.0)
-    letter_opener (1.9.0)
-      launchy (>= 2.2, < 3)
+    letter_opener (1.10.0)
+      launchy (>= 2.2, < 4)
    listen (3.9.0)
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.6.0)
    loofah (2.22.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
@@ -387,8 +385,8 @@ GEM
      rake
    mini_magick (4.12.0)
    mini_mime (1.1.5)
-    mini_portile2 (2.8.5)
-    minitest (5.22.3)
+    mini_portile2 (2.8.7)
+    minitest (5.24.1)
    moneta (1.0.0)
    msgpack (1.7.2)
    multi_json (1.15.0)
@@ -396,23 +394,23 @@ GEM
    mutex_m (0.2.0)
    net-http (0.4.1)
      uri
-    net-imap (0.4.10)
+    net-imap (0.4.11)
      date
      net-protocol
    net-pop (0.1.2)
      net-protocol
    net-protocol (0.2.2)
      timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
      net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.3)
+    nio4r (2.7.3)
+    nokogiri (1.16.6)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.16.3-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
      racc (~> 1.4)
    oauth (0.5.6)
-    oj (3.16.3)
+    oj (3.16.4)
      bigdecimal (>= 3.0)
    omniauth (1.9.2)
      hashie (>= 3.4.6)
@@ -427,14 +425,14 @@ GEM
      omniauth-oauth (~> 1.1)
      rack
    orm_adapter (0.5.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.25.1)
+    parser (3.3.3.0)
      ast (~> 2.4.1)
      racc
    percy-capybara (5.0.0)
      capybara (>= 3)
    pg (1.5.6)
-    platform-api (3.6.0)
+    platform-api (3.7.0)
      heroics (~> 0.1.1)
      moneta (~> 1.0.0)
      rate_throttle_client (~> 0.1.0)
@@ -444,11 +442,11 @@ GEM
      method_source (~> 1.0)
    psych (5.1.2)
      stringio
-    public_suffix (5.0.4)
+    public_suffix (5.0.5)
    puma (6.4.2)
      nio4r (~> 2.0)
    query_diet (0.7.1)
-    racc (1.7.3)
+    racc (1.8.0)
    rack (2.2.9)
    rack-cors (2.0.2)
      rack (>= 2.0.0)
@@ -462,20 +460,20 @@ GEM
    rackup (1.0.0)
      rack (< 3)
      webrick
-    rails (7.1.3.2)
-      actioncable (= 7.1.3.2)
-      actionmailbox (= 7.1.3.2)
-      actionmailer (= 7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actiontext (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      bundler (>= 1.15.0)
-      railties (= 7.1.3.2)
+      railties (= 7.1.3.4)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -487,7 +485,7 @@ GEM
    rails-html-sanitizer (1.6.0)
      loofah (~> 2.21)
      nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
      i18n (>= 0.7, < 2)
      railties (>= 6.0.0, < 8)
    rails_12factor (0.0.3)
@@ -495,9 +493,9 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
      irb
      rackup (>= 1.0.0)
      rake (>= 12.2)
@@ -505,23 +503,24 @@ GEM
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
    raindrops (0.20.0)
-    rake (13.1.0)
+    rake (13.2.1)
    rate_throttle_client (0.1.2)
    rb-fsevent (0.11.2)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
-    rdoc (6.6.3.1)
+    rdoc (6.7.0)
      psych (>= 4.0.0)
-    recaptcha (5.16.0)
-    redis-client (0.20.0)
+    recaptcha (5.17.0)
+    redis-client (0.22.2)
      connection_pool
-    regexp_parser (2.9.0)
-    reline (0.4.3)
+    regexp_parser (2.9.2)
+    reline (0.5.9)
      io-console (~> 0.5)
    responders (3.1.1)
      actionpack (>= 5.2)
      railties (>= 5.2)
-    rexml (3.2.6)
+    rexml (3.3.1)
+      strscan
    rouge (4.1.2)
    rspec (3.13.0)
      rspec-core (~> 3.13.0)
@@ -533,13 +532,13 @@ GEM
      rspec-mocks (>= 2.99, < 4.0)
    rspec-core (3.13.0)
      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-rails (6.1.2)
+    rspec-rails (6.1.3)
      actionpack (>= 6.1)
      activesupport (>= 6.1)
      railties (>= 6.1)
@@ -562,7 +561,7 @@ GEM
    rswag-ui (2.13.0)
      actionpack (>= 3.1, < 7.2)
      railties (>= 3.1, < 7.2)
-    rubocop (1.62.1)
+    rubocop (1.64.1)
      json (~> 2.3)
      language_server-protocol (>= 3.17.0)
      parallel (~> 1.10)
@@ -573,21 +572,15 @@ GEM
      rubocop-ast (>= 1.31.1, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-rails (2.24.1)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-rails (2.25.1)
      activesupport (>= 4.2.0)
      rack (>= 1.1)
      rubocop (>= 1.33.0, < 2.0)
      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.27.1)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
    ruby-progressbar (1.13.0)
    ruby-units (4.0.3)
    ruby-vips (2.2.1)
@@ -606,27 +599,28 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    scout_apm (5.3.7)
+    scout_apm (5.3.8)
      parser
    searchkick (5.3.1)
      activemodel (>= 6.1)
      hashie
-    selenium-webdriver (4.19.0)
+    selenium-webdriver (4.22.0)
      base64 (~> 0.2)
+      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
      rubyzip (>= 1.2.2, < 3.0)
      websocket (~> 1.0)
-    sidekiq (7.2.2)
+    sidekiq (7.3.0)
      concurrent-ruby (< 2)
      connection_pool (>= 2.3.0)
+      logger
      rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
+      redis-client (>= 0.22.2)
    simplecov (0.13.0)
      docile (~> 1.1.0)
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
    simplecov-html (0.10.2)
-    smart_properties (1.17.0)
    sprockets (3.7.3)
      base64
      concurrent-ruby (~> 1.0)
@@ -636,17 +630,18 @@ GEM
      activesupport (>= 5.2)
      sprockets (>= 3.0.0)
    ssrf_filter (1.1.2)
-    stringio (3.1.0)
+    stringio (3.1.1)
+    strscan (3.1.0)
    sysexits (1.2.0)
    temple (0.10.3)
    terminal-table (3.0.2)
      unicode-display_width (>= 1.1.1, < 3)
-    terser (1.2.1)
+    terser (1.2.3)
      execjs (>= 0.3.0, < 3)
    thor (1.3.1)
    thread_safe (0.3.6)
    tilt (2.3.0)
-    timecop (0.9.8)
+    timecop (0.9.10)
    timeout (0.4.1)
    trollop (1.16.2)
    tzinfo (2.0.6)
@@ -676,14 +671,14 @@ GEM
    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
-    will_paginate (4.0.0)
+    will_paginate (4.0.1)
    will_paginate-bootstrap-style (0.3.0)
      will_paginate (~> 4.0, >= 4.0.0)
    xmlrpc (0.3.3)
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.16)

 PLATFORMS
  ruby
--- a/README.md
+++ b/README.md
@@ -15,6 +15,11 @@ Growstuff was founded in 2012 and has been built by dozens of
 [contributors](CONTRIBUTORS.md).  We are an inclusive, welcoming project, and
 encourage participation from people of all backgrounds and skill levels.

+## Want to contribute?
+
+Don't ask to ask, the best way to get started is to fork the project, start a codespace and get hacking.
+Dive on in and submit your PRs.
+
 ## Important links

 * [Issues](https://github.com/orgs/Growstuff/projects/1) (features we're
--- a/app/assets/javascripts/tab_navigation.js
+++ b/app/assets/javascripts/tab_navigation.js
@@ -0,0 +1,22 @@
+$(document).ready(function() {
+    var url = location.href.replace(/\/$/, '');
+
+    if (location.hash) {
+        var hash = url.split('#');
+        var triggerEl = document.querySelector('#myTab a[href="#' + hash[1] + '"]');
+        var tab = new bootstrap.Tab(triggerEl);
+        tab.show();
+        url = location.href.replace(/\/#/, '#');
+        history.replaceState(null, null, url);
+        setTimeout(function() {
+            $(window).scrollTop(0);
+        }, 20);
+    }
+
+    $('a[data-bs-toggle="tab"]').on('click', function() {
+        var newUrl;
+        var hash = $(this).attr('href');
+        newUrl = url.split('#')[0] + hash;
+        history.replaceState(null, null, newUrl);
+    });
+});
--- a/app/assets/stylesheets/overrides.scss
+++ b/app/assets/stylesheets/overrides.scss
@@ -102,16 +102,14 @@ section {
    box-shadow: 1px 3px 3px 1px darken($beige, 20%);
    cursor: pointer;
    transition:
-      0.3s transform cubic-bezier(0.155, 1.105, 0.295, 1.12),
-      0.3s box-shadow,
-      0.3s -webkit-transform cubic-bezier(0.155, 1.105, 0.295, 1.12);
+      0.1s transform cubic-bezier(0.155, 1.105, 0.295, 1.12),
+      0.1s box-shadow,
+      0.1s -webkit-transform cubic-bezier(0.155, 1.105, 0.295, 1.12);
  }

  .card:hover {
    box-shadow:
-      0 10px 20px darken($beige, 30%),
-      0 4px 8px darken($beige, 40%);
-    transform: scale(1.1);
+      1px 3px 3px 1px darken($beige, 30%);
  }
 }

@@ -148,10 +146,6 @@ section {
      color: $brown;
    }
  }
-
-  .card:hover {
-    background-color: $beige;
-  }
 }

 .img-cover,
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,6 +2,10 @@

 class ApplicationController < ActionController::Base
  protect_from_forgery
+  # Working from codespaces, we want to turn off validation
+  if Rails.env.development? && ENV['CODESPACE_NAME']
+    skip_before_action :verify_authenticity_token
+  end

  include ApplicationHelper

--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -153,5 +153,10 @@ class Ability
    can :destroy, PlantPart do |pp|
      pp.harvests.empty?
    end
+    # Admins can't delete themselves
+    cannot :destroy, Member
+    can :destroy, Member do |other_member|
+      other_member&.id != member.id
+    end
  end
 end
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -81,7 +81,7 @@ class Garden < ApplicationRecord

  # Deactivate any gardens with no active plantings
  def self.archive!(time_limit: 3.years.ago, limit: 100)
-    Garden.active.where("updated_at < ?", time_limit).order(updated_at: :asc).limit(limit).each do |active_garden|
+    Garden.active.where("gardens.updated_at < ?", time_limit).order(updated_at: :asc).limit(limit).each do |active_garden|
      unless active_garden.plantings.active.any?
        garden.active = false
        garden.save
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -9,7 +9,7 @@ class Photo < ApplicationRecord

  has_many :photo_associations, dependent: :delete_all, inverse_of: :photo

-  # This doesn't work, ActiveRecord tries to use the polymoriphinc photographable
+  # This doesn't work, ActiveRecord tries to use the polymoriphic photographable
  # relationship instead.
  # has_many :crops, through: :photo_associations, counter_cache: true
  def crops
--- a/app/views/devise/registrations/_delete.html.haml
+++ b/app/views/devise/registrations/_delete.html.haml
@@ -1,4 +1,6 @@
-= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :delete, class: 'form-horizontal' }) do |f|
+= form_for(resource, as: resource_name,
+    url: registration_path(resource_name) + '#delete',
+    html: { method: :delete, class: 'form-horizontal' }) do |f|
  %br/
  = render 'devise/shared/error_messages', resource: resource

--- a/app/views/devise/registrations/_edit_apps.html.haml
+++ b/app/views/devise/registrations/_edit_apps.html.haml
@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name,
-    url: registration_path(resource_name),
+    url: registration_path(resource_name) + '#apps',
    html: { method: :put, class: 'form-horizontal' }) do |_f|
  %br/
  = render 'devise/shared/error_messages', resource: resource
--- a/app/views/devise/registrations/_edit_email.html.haml
+++ b/app/views/devise/registrations/_edit_email.html.haml
@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name,
-    url: registration_path(resource_name),
+    url: registration_path(resource_name) + '#email',
    html: { method: :put, class: 'form-horizontal' }) do |f|
  %br/
  = render 'devise/shared/error_messages', resource: resource
--- a/app/views/devise/registrations/_edit_password.html.haml
+++ b/app/views/devise/registrations/_edit_password.html.haml
@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name,
-    url: registration_path(resource_name),
+    url: registration_path(resource_name) + '#password',
    html: { method: :put, class: 'form-horizontal' }) do |f|
  %br/
  = render 'devise/shared/error_messages', resource: resource
--- a/app/views/devise/registrations/_edit_profile.html.haml
+++ b/app/views/devise/registrations/_edit_profile.html.haml
@@ -1,5 +1,5 @@
 = form_for(resource, as: resource_name,
-    url: registration_path(resource_name),
+    url: registration_path(resource_name) + '#profile',
    html: { method: :put, class: 'form-horizontal' }) do |f|
  %br/
  = render 'devise/shared/error_messages', resource: resource
--- a/app/views/harvests/index.html.haml
+++ b/app/views/harvests/index.html.haml
@@ -28,6 +28,8 @@
    %section
      %h2= title('harvests', @owner, @crop, @planting)
      = will_paginate @harvests
+      - if @harvests.blank?
+        %p No harvests recorded yet
      .index-cards
        - @harvests.each do |h|
          = render 'harvests/card', harvest: h
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -10,7 +10,7 @@
    .col
      %p
        - if current_member.plantings.active.any?
-          = link_to member_path(current_member), class: 'btn btn-dark' do
+          = link_to member_path(current_member, anchor: "#content"), class: 'btn btn-dark' do
            = planting_icon
            Track my plantings
      %p
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -1,4 +1,4 @@
-%nav.navbar.navbar-expand-lg.navbar-dark.bg-dark.justify-content-between
+%nav.navbar.navbar-expand-lg.navbar-dark.bg-dark.justify-content-between.sticky-top
  .nav
    %a.navbar-brand{ href: root_path }
      = image_tag("pear.png", class: 'logo', alt: 'Growstuff brand logo (drawing of a pear)')
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,7 @@
 %html{ lang: "en", prefix: "og: https://ogp.me/ns#" }
  = yield :scripts
  = render "layouts/head"
-  %body
+  %body.d-flex.flex-column.vh-100
    = query_diet_widget if Rails.env.development?
    .sr-only= link_to t(".skip"), "#skipnav"
    = render "layouts/header"
@@ -25,7 +25,7 @@
        = render "shared/flash_messages", flash: flash
        %main= yield

-    %footer.page-footer.font-small.bg-dark.pt-4= render "layouts/footer"
+    %footer.page-footer.font-small.bg-dark.pt-4.mt-auto= render "layouts/footer"
    /
      Javascripts
      \==================================================
--- a/app/views/members/_bio.html.haml
+++ b/app/views/members/_bio.html.haml
@@ -1,7 +1,11 @@
 %h2 All about #{member.login_name}
+%p
+  %small
+    %a{href: "#content"}
+      Skip to main content
 - if member.bio.blank?
  - if can? :edit, member
-    = link_to "Add a bio to complete your profile.", edit_member_path(member)
+    = link_to "Add a bio to complete your profile.", edit_member_registration_path
  - else
    #{member.login_name} hasn't written a bio yet.
 - else
--- a/app/views/members/_full_summary.html.haml
+++ b/app/views/members/_full_summary.html.haml
@@ -1,46 +0,0 @@
- if @harvesting.size.positive?
-  %section.harvests
-    %h2 Ready to harvest
-    .index-cards
-      - @harvesting.each do |planting|
-        = render 'plantings/thumbnail', planting: planting
-
- if @others.size.positive?
-  %section.planting-progress
-    %h2 Progress report
-    %p Still growing and not ready for harvesting.
-    .list-group
-      - @others.each do |planting|
-        .list-group-item
-          %span= render 'plantings/tiny', planting: planting
-          %span= render 'plantings/progress', planting: planting
- if @late.size.positive?
-  %section.late
-    %h2 Late
-    %p
-      These plantings are at the end of their lifecycle.
-      - if member_signed_in? && @member == current_member
-        %strong When you have removed the planting from your garden, mark the planting as finished in Growstuff.
-    .index-cards
-      - @late.each do |planting|
-        = render 'plantings/thumbnail', planting: planting
- if @super_late.any?
-  %section.superlate
-    %h2 Super late
-    %p
-      We suspect the following plantings finished long ago and no longer need tracking.
-      - if member_signed_in? && current_member == @member
-        %strong You can mark these plantings as finished to stop tracking.
-    %ul
-      - @super_late.each do |planting|
-        %li
-          = link_to planting.crop_name, planting_url(slug: planting.slug)
-          planted on #{planting.planted_at.to_date}
-
- if @harvests.any?
-  %section.havests
-    %h2 Recent Harvests
-    .index-cards
-      - @harvests.each do |harvest|
-        = render 'harvests/thumbnail', harvest: harvest
-
--- a/app/views/members/_stats.html.haml
+++ b/app/views/members/_stats.html.haml
@@ -1,45 +1,33 @@
 .card-body
-  %h3 Activity
-%ul.list-group.list-group-flush
-  %li.list-group-item
+  %h3 
+    Stats
+  .label.d-md-none{type: "button", :data => { :bs_toggle => "collapse", :bs_target => "#stats-collapse"}}
+    %a
+      Show/Hide
+
+.collapse.d-md-block#stats-collapse
+  %ul.list-group.list-group-flush
    - if member.gardens.present?
-      = link_to localize_plural(member.gardens, Garden), member_gardens_path(member)
-    - else
-      0 gardens
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.gardens, Garden), member_gardens_path(member)
    - if member.plantings.present?
-      = link_to localize_plural(member.plantings, Planting), member_plantings_path(member)
-    - else
-      0 plantings
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.plantings, Planting), member_plantings_path(member)
    - if member.harvests.present?
-      = link_to localize_plural(member.harvests, Harvest), member_harvests_path(member)
-    - else
-      0 harvests
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.harvests, Harvest), member_harvests_path(member)
    - if member.seeds.present?
-      = link_to localize_plural(member.seeds, Seed), member_seeds_path(member)
-    - else
-      0 seeds
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.seeds, Seed), member_seeds_path(member)
    - if member.posts.present?
-      = link_to localize_plural(member.posts, Post), member_posts_path(member)
-    - else
-      0 posts
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.posts, Post), member_posts_path(member)
    - if member.activities.present?
-      = link_to localize_plural(member.plantings, Activity), member_activities_path(member)
-    - else
-      0 activities
-
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.plantings, Activity), member_activities_path(member)
    - if member.followed.present?
-      = link_to localize_plural(member.followed, Follow), member_follows_path(member)
-    - else
-      0 following
-
-  %li.list-group-item
+      %li.list-group-item
+        = link_to localize_plural(member.followed, Follow), member_follows_path(member)
    - if member.followers.present?
-      = link_to pluralize(member.followers.size, "follower"), member_followers_path(member)
-    - else
-      0 followers
+      %li.list-group-item
+        = link_to pluralize(member.followers.size, "follower"), member_followers_path(member)
--- a/app/views/members/show.html.haml
+++ b/app/views/members/show.html.haml
@@ -21,9 +21,10 @@
        .row
          .col= render "bio", member: @member
          .col= render "avatar", member: @member
-        %p
-          - @member.roles.each do |role|
-            %span.badge.badge-info= role.name.titleize
+        - if @member.roles.any?
+          %p
+            - @member.roles.each do |role|
+              %span.badge.badge-info= role.name.titleize
        - if @member.location.present?
          %p.badge.badge-location{ title: @member.location }
            = icon 'fas', 'map-marker'
@@ -31,9 +32,10 @@
        %p
          %strong Member since
          = @member.created_at.to_fs(:date)
-        %p
-          %strong Last Login
-          = @member.last_sign_in_at
+        - if @member.last_sign_in_at
+          %p
+            %strong Last Login
+            = @member.last_sign_in_at

        - if can? :update, @member
          = link_to edit_member_registration_path, class: 'btn btn-block' do
@@ -59,24 +61,71 @@
        = render "contact", member: @member, twitter_auth: @twitter_auth,
                                              flickr_auth: @flickr_auth

-  .col-md-10
-    %section= render "map", member: @member
-    = render 'members/full_summary', member: @member
-    %section.activity
-      %h2 Activity
-      .list-group
-        - @activity.each do |event|
-          .list-group-item.list-group-item-action.flex-column.align-items-start{:href => "#!"}
-            .d-flex.w-100.justify-content-between
-              %h5
-                = icon_for_model(event.event_type)
-                = event_description(event)
-                = render 'timeline/photos', photo: resolve_model(event) if event.event_type == 'photo'
-              %small
-              - if event.event_at.present?
-                - if event.event_at.kind_of?(Date)
-                  #{distance_of_time_in_words(event.event_at, Time.zone.now.to_date)} ago
-                - else
-                  #{time_ago_in_words(event.event_at)} ago
-              - else
-                unknown date
+  .col-md-10#content
+    .row
+      %section.order-3.order-md-1.col-12= render "map", member: @member
+      - if @harvesting.size.positive?
+        %section.harvests.order-2.order-md-1
+          %h2 Ready to harvest
+          .index-cards
+            - @harvesting.each do |planting|
+              = render 'plantings/thumbnail', planting: planting
+
+      - if @others.size.positive?
+        %section.planting-progress.order-2.order-md-1.col-12
+          %h2 Progress report
+          %p Still growing and not ready for harvesting.
+          .list-group
+            - @others.each do |planting|
+              .list-group-item
+                %span= render 'plantings/tiny', planting: planting
+                %span= render 'plantings/progress', planting: planting
+      - if @late.size.positive?
+        %section.late.order-2.order-md-1.col-12
+          %h2 Late
+          %p
+            These plantings are at the end of their lifecycle.
+            - if member_signed_in? && @member == current_member
+              %strong When you have removed the planting from your garden, mark the planting as finished in Growstuff.
+          .index-cards
+            - @late.each do |planting|
+              = render 'plantings/thumbnail', planting: planting
+      - if @super_late.any?
+        %section.superlate.order-2.order-md-1.col-12
+          %h2 Super late
+          %p
+            We suspect the following plantings finished long ago and no longer need tracking.
+            - if member_signed_in? && current_member == @member
+              %strong You can mark these plantings as finished to stop tracking.
+          %ul
+            - @super_late.each do |planting|
+              %li
+                = link_to planting.crop_name, planting_url(slug: planting.slug)
+                planted on #{planting.planted_at.to_date}
+
+      - if @harvests.any?
+        %section.havests.order-2.order-md-1.col-12
+          %h2 Recent Harvests
+          .index-cards
+            - @harvests.each do |harvest|
+              = render 'harvests/thumbnail', harvest: harvest
+
+      - if @activity.any?
+        %section.activity.order-2.order-md-1.col-12
+          %h2 Activity
+          .list-group
+            - @activity.each do |event|
+              .list-group-item.list-group-item-action.flex-column.align-items-start{:href => "#!"}
+                .d-flex.w-100.justify-content-between
+                  %h5.col-md-11.col-xs-10.text-truncate
+                    = icon_for_model(event.event_type)
+                    = event_description(event)
+                    = render 'timeline/photos', photo: resolve_model(event) if event.event_type == 'photo'
+                  %small.col-md-1.col-xs-2.text-right
+                    - if event.event_at.present?
+                      - if event.event_at.kind_of?(Date)
+                        #{distance_of_time_in_words(event.event_at, Time.zone.now.to_date)} ago
+                      - else
+                        #{time_ago_in_words(event.event_at)} ago
+                    - else
+                      unknown date
--- a/app/views/plantings/index.html.haml
+++ b/app/views/plantings/index.html.haml
@@ -39,6 +39,8 @@
    %section
      %h2= title('plantings', @owner, @crop, @planting)
      = will_paginate @plantings
+      - if @plantings.blank?
+        %p No plantings recorded yet
      .index-cards
        - @plantings.each do |p|
          = render 'plantings/card', planting: p
--- a/app/views/seeds/_modal.html.haml
+++ b/app/views/seeds/_modal.html.haml
@@ -16,11 +16,11 @@
        %hr/
        %p Yes, I would be willing trade these from #{current_member.location}

-        .btn-group{"aria-label" => "trade to", role: "group"}
-          - Seed::TRADABLE_TO_VALUES.each do |t|
+        .btn-group.d-grid.flex-column{"aria-label" => "trade to", role: "group"}
+          - Seed::TRADABLE_TO_VALUES.reverse.each do |t|
            - unless t == 'nowhere'
-              = button_to seeds_path(seed: {crop_id: seed.crop_id, tradable_to: t}), method: :post, class: 'btn' do
-                %h3= t
+              = button_to seeds_path(seed: {crop_id: seed.crop_id, tradable_to: t}), method: :post, class: 'btn col-12' do
+                = t

        %hr/
        %p
--- a/app/views/seeds/index.html.haml
+++ b/app/views/seeds/index.html.haml
@@ -35,7 +35,8 @@
    %section
      %h2= title('seeds', @owner, @crop, @planting)
      = will_paginate @seeds
-
+      - if @seeds.blank?
+        %p No seeds recorded yet
      .index-cards
        - @seeds.each do |s|
          = render 'seeds/card', seed: s
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -67,7 +67,11 @@ Rails.application.configure do
  config.action_mailer.delivery_method = :letter_opener

  config.host = 'localhost:3000'
-  config.hosts << ".preview.app.github.dev"
+  if ENV['CODESPACE_NAME']
+    config.host = "#{ENV['CODESPACE_NAME']}-3000.app.github.dev:443"
+    config.hosts << ".preview.app.github.dev"
+    config.hosts << ".app.github.dev"
+  end
  config.analytics_code = ''

  config.action_controller.action_on_unpermitted_parameters = :raise
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -44,6 +44,7 @@ def load_roles
 end

 def load_test_users
+  require "faker"
  puts "Loading test users..."

  # Open suburb csv
@@ -80,24 +81,114 @@ def load_test_users
    end

    # Create a planting by the member
-    Planting.create(
-      owner_id:     @user.id,
-      garden_id:    @user.gardens.first.id,
-      planted_at:   Time.zone.today,
-      crop_id:      Crop.find(i % Crop.all.size + 1).id,
-      sunniness:    select_random_item(Planting::SUNNINESS_VALUES),
-      planted_from: select_random_item(Planting::PLANTED_FROM_VALUES)
-    )
+    10.times do |n|
+      planting = Planting.create!(
+        owner_id:     @user.id,
+        garden_id:    @user.gardens.first.id,
+        planted_at:   (n * 7).days.ago,
+        crop_id:      Crop.find((i + n) % Crop.all.size + 1).id,
+        sunniness:    select_random_item(Planting::SUNNINESS_VALUES),
+        planted_from: select_random_item(Planting::PLANTED_FROM_VALUES)
+      )
+      photo = Photo.create!(
+        owner:         @user,
+        source:        'flickr',
+        source_id:     1,
+        title:         Faker::Movies::HarryPotter.quote,
+        license_name:  "CC-BY",
+        license_url:   "http://example.com/license.html",
+        thumbnail_url: "https://picsum.photos/200?planting-#{planting.id}",
+        fullsize_url:  "https://picsum.photos/600?planting-#{planting.id}",
+        link_url:      Faker::Internet.url
+      )
+      planting.photos << photo
+    end

    # Create an activity by the member
-    Activity.create(
-      owner_id:     @user.id,
-      garden_id:    @user.gardens.first.id,
-      due_date:   Time.zone.today,
-      name: "Remove all weeds",
-      category: "Weeding",
-      description: "Get rid of the invasive grass, again"
+    3.times do |_n|
+      Activity.create!(
+        owner_id:    @user.id,
+        garden_id:   @user.gardens.first.id,
+        due_date:    Time.zone.today,
+        name:        Faker::Book.title,
+        category:    "Weeding",
+        description: Faker::Lorem.paragraphs.join("\n")
+      )
+    end
+
+    # Create a post by the member
+    post = Post.create!(
+      author_id: @user.id,
+      subject:   Faker::Book.title,
+      body:      Faker::Lorem.paragraphs.join("\n")
    )
+    photo = Photo.create!(
+      owner:         @user,
+      source:        'flickr',
+      source_id:     1,
+      title:         Faker::Movies::HarryPotter.quote,
+      license_name:  "CC-BY",
+      license_url:   "http://example.com/license.html",
+      thumbnail_url: "https://picsum.photos/200?post-#{post.id}",
+      fullsize_url:  "https://picsum.photos/600?post-#{post.id}",
+      link_url:      Faker::Internet.url
+    )
+    post.photos << photo
+
+    2.times do
+      harvest = Harvest.create!(
+        crop:            @user.plantings.last.crop,
+        planting:        @user.plantings.last,
+        plant_part:      select_random_item(PlantPart.all.to_a),
+        owner:           @user,
+        harvested_at:    1.day.ago,
+        quantity:        "3",
+        unit:            "individual",
+        weight_quantity: 6,
+        weight_unit:     "kg",
+        description:     Faker::Book.title
+      )
+
+      photo = Photo.create!(
+        owner:         @user,
+        source:        'flickr',
+        source_id:     1,
+        title:         Faker::Movies::HarryPotter.quote,
+        license_name:  "CC-BY",
+        license_url:   "http://example.com/license.html",
+        thumbnail_url: "https://picsum.photos/200?harvest-#{harvest.id}",
+        fullsize_url:  "https://picsum.photos/600?harvest-#{harvest.id}",
+        link_url:      Faker::Internet.url
+      )
+      harvest.photos << photo
+    end
+
+    5.times do
+      seed = Seed.create!(
+        owner:           @user,
+        crop:            @user.plantings.first.crop,
+        description:     Faker::Book.title,
+        quantity:        Faker::Number.number(digits: 3),
+        tradable_to:     select_random_item(Seed::TRADABLE_TO_VALUES),
+        organic:         select_random_item(Seed::ORGANIC_VALUES),
+        gmo:             select_random_item(['certified GMO-free', 'non-certified GMO-free', 'GMO', 'unknown']), # Strangely, this doesn't want to work as Seed:GMO_VALUES
+        heirloom:        select_random_item(Seed::HEIRLOOM_VALUES),
+        parent_planting: @user.plantings.first
+      )
+
+      photo = Photo.create!(
+        owner:         @user,
+        source:        'flickr',
+        source_id:     1,
+        title:         Faker::Movies::HarryPotter.quote,
+        license_name:  "CC-BY",
+        license_url:   "http://example.com/license.html",
+        thumbnail_url: "https://picsum.photos/200?seed-#{seed.id}",
+        fullsize_url:  "https://picsum.photos/600?seed-#{seed.id}",
+        link_url:      Faker::Internet.url
+      )
+      seed.photos << photo
+    end
  end

  puts "Finished loading test users"
--- a/spec/features/members/profile_spec.rb
+++ b/spec/features/members/profile_spec.rb
@@ -54,11 +54,11 @@ describe "member profile", :js do
    context "activity stats" do
      it "with no activity" do
        visit member_path(member)
-        expect(page).to have_content "Activity"
-        expect(page).to have_content "0 plantings"
-        expect(page).to have_content "0 harvests"
-        expect(page).to have_content "0 seeds"
-        expect(page).to have_content "0 posts"
+        expect(page).to have_content "Stats"
+        expect(page).not_to have_content "0 plantings"
+        expect(page).not_to have_content "0 harvests"
+        expect(page).not_to have_content "0 seeds"
+        expect(page).not_to have_content "0 posts"
      end

      context "with some activity" do
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -118,4 +118,28 @@ describe Ability do
      end
    end
  end
+
+
+  context 'members' do
+    context 'ordinary member' do
+      it "can't manage members" do
+        ability.should_not be_able_to(:destroy, Member)
+      end
+    end
+
+    context 'admin' do
+      let(:role) { FactoryBot.create(:admin) }
+
+      before do
+        member.roles << role
+      end
+
+      it "can manage members" do
+        ability.should be_able_to(:destroy, FactoryBot.create(:member))
+      end
+      it "cannot delete themselves" do
+        ability.should_not be_able_to(:destroy, member)
+      end
+    end
+  end
 end
--- a/yarn.lock
+++ b/yarn.lock
@@ -292,11 +292,11 @@ brace-expansion@^1.1.7:
    concat-map "0.0.1"

 braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
  dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"

 buffer-crc32@~0.2.3:
  version "0.2.13"
@@ -767,10 +767,10 @@ file-entry-cache@^5.0.1:
  dependencies:
    flat-cache "^2.0.1"

-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
  dependencies:
    to-regex-range "^5.0.1"

@@ -1693,9 +1693,9 @@ write@1.0.3:
    mkdirp "^0.5.1"

 ws@^8.0.0:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==

 y18n@^4.0.0:
  version "4.0.3"