Merge branch 'fix/devise-authentication' of github.com:emmvs/five_things into fix/devise-authentication

Author: brunotho

Gemfile

@@ -33,7 +33,7 @@ gem 'sassc-rails' # Use SCSS for stylesheets
 # Devise for authentication
 gem 'devise', '~> 4.8'
 
-#OAauth Providers
+# OAauth Providers
 gem 'omniauth-google-oauth2'
 gem 'omniauth-rails_csrf_protection'
 
@@ -71,16 +71,15 @@ group :development, :test do
 end
 
 group :development do
-  gem 'web-console' # Rails console for the browser
   gem 'annotate' # Annotate models with schema
+  gem 'web-console' # Rails console for the browser
   # gem 'spring' # Speeds up development by keeping app running in the background
   # gem 'rack-mini-profiler' # Displays speed badge for performance profiling
 end
 
 group :test do
   gem 'capybara' # Capybara for integration testing
   gem 'selenium-webdriver' # WebDriver for browsers
-  gem 'webdrivers' # Auto-updates webdrivers
 end
 
 # Optional gems for specific features

Gemfile.lock

@@ -332,7 +332,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.6)
+    rexml (3.4.1)
     rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
     rspec-expectations (3.12.3)
@@ -369,7 +369,7 @@ GEM
       faraday-multipart (>= 1)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
+    rubyzip (2.4.1)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
@@ -378,7 +378,9 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.16.0)
+    selenium-webdriver (4.32.0)
+      base64 (~> 0.2)
+      logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -420,11 +422,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webdrivers (5.2.0)
-      nokogiri (~> 1.6)
-      rubyzip (>= 1.3.0)
-      selenium-webdriver (~> 4.0)
-    websocket (1.2.10)
+    websocket (1.2.11)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -479,7 +477,6 @@ DEPENDENCIES
   stimulus-rails
   turbo-rails
   web-console
-  webdrivers
 
 RUBY VERSION
    ruby 3.1.2p20

app/assets/stylesheets/components/_calendar.scss

@@ -30,7 +30,6 @@
     padding: 1px;
     position: relative;
     height: 40px !important;
-    width: 40px !important;
     border-radius: $border-radius !important;
   }
 
@@ -40,6 +39,11 @@
     color: darken($soft-purple, 50%);
   }
 
+  .day.has-many-emojis .calendar-day-link {
+    z-index: 1;
+    font-weight: calc(var(--bs-body-font-weight) * 1.1);
+  }
+
   .calendar-day-link:hover {
     background-color: #f0f0f0;
     border-radius: 50%;
@@ -65,11 +69,15 @@
     --bs-table-bg-type: none;
   }
 
-  .event-indicator {
+  .emoji-grid {
+    display: grid;
+    aspect-ratio: 1 / 1;
     position: absolute;
-    z-index: 1;
-    right: -5px;
-    top: -4px;
-    font-size: 1.1em;
+    pointer-events: none;
+  }
+
+  .emoji {
+    position: relative;
+    line-height: 1;
   }
 }

app/assets/stylesheets/components/_navbar.scss

@@ -70,14 +70,14 @@
   border-bottom-right-radius: 50px;
 }
 
-/* Mobile */
+/* Desktop */
 @media screen and (min-width: 768px) {
   .bottom-navbar {
     display: none !important;
   }
 }
 
-/* Desktop */
+/* Mobile */
 @media screen and (max-width: 767px) {
   .bottom-navbar {
     display: flex;

app/controllers/dashboards_controller.rb

@@ -42,9 +42,9 @@ def daily_quote_cache_key
 
   def set_happy_things
     friend_ids = current_user.friends_and_friends_who_added_me_ids
-    user_ids = friend_ids + [current_user.id]
+    @user_ids = [current_user.id] + friend_ids
 
-    @happy_things_of_you_and_friends = HappyThing.where(user_id: user_ids).order(created_at: :desc)
+    @happy_things_of_you_and_friends = HappyThing.where(user_id: @user_ids).order(created_at: :desc)
     fetch_happy_things_by_time(friend_ids)
   end
 

app/helpers/dashboard_helper.rb

@@ -67,4 +67,35 @@ def moon_phase_emojis
       full_moon: '🌕'
     }
   end
+
+  # Calender
+  def calculate_grid_size(number_of_emojis)
+    return 2 if number_of_emojis == 1
+
+    Math.sqrt(number_of_emojis).ceil
+  end
+
+  def calculate_emoji_size(number_of_emojis)
+    grid_size = calculate_grid_size(number_of_emojis)
+    case grid_size
+    when 2 then 1.1
+    when 3 then 0.8
+    when 4 then 0.5
+    else
+      raise "Failure in calculate_emoji_size: number_of_emojis = #{number_of_emojis}, grid_size = #{grid_size}"
+    end
+  end
+
+  def calculate_emoji_position(tile_number, number_of_emojis)
+    return '0px, 0px' if number_of_emojis > 4
+
+    case tile_number
+    when 1 then '-4px, -5px'
+    when 2 then '4px, -5px'
+    when 3 then '-4px, 5px'
+    when 4 then '4px, 5px'
+    else
+      raise "Failure in calculate_emoji_position: number_of_emojis = #{number_of_emojis}, tile_number = #{tile_number}"
+    end
+  end
 end

app/models/happy_thing.rb

@@ -23,8 +23,7 @@ class HappyThing < ApplicationRecord
 
   belongs_to :user
   belongs_to :category
-  has_many :likes
-  has_many :comments
+  has_many :comments, dependent: :destroy
   has_many :happy_thing_user_shares, dependent: :destroy
   has_many :shared_users, through: :happy_thing_user_shares, source: :friend
   has_many :happy_thing_group_shares, dependent: :destroy

app/models/like.rb

@@ -61,18 +61,17 @@ class User < ApplicationRecord # rubocop:disable Metrics/ClassLength
 
   before_validation :normalize_email
 
-  has_many :happy_things
-  has_many :comments
-  has_many :likes
+  has_many :happy_things, dependent: :destroy
+  has_many :comments, dependent: :destroy
   has_many :groups, dependent: :destroy
   has_many :happy_thing_user_shares, foreign_key: :friend_id, dependent: :destroy
   has_many :received_happy_things, through: :happy_thing_user_shares, source: :happy_thing
-  has_many :group_memberships, foreign_key: :friend_id
+  has_many :group_memberships, foreign_key: :friend_id, dependent: :destroy
   has_many :groups_as_member, through: :group_memberships, source: :group
 
   # Friendships
-  has_many :friendships
-  has_many :received_friend_requests, class_name: 'Friendship', foreign_key: 'friend_id'
+  has_many :friendships, dependent: :destroy
+  has_many :received_friend_requests, class_name: 'Friendship', foreign_key: 'friend_id', dependent: :destroy
   has_many :friends, -> { where(friendships: { accepted: true }) }, through: :friendships, source: :friend
   has_many :friends_who_added_me, lambda {
                                     where(friendships: { accepted: true })

app/models/user.rb

@@ -0,0 +1,33 @@
+<div class="d-flex justify-content-center align-items-center">
+  <div id="calendar" class="mb-2 my-3">
+    <%= month_calendar(events: @happy_things_of_you_and_friends, param_name: :date) do |date, happy_things_bubbles| %>
+      <% unique_users = happy_things_bubbles.map(&:user).uniq %>
+      <% unique_users_sorted = unique_users.sort_by { |user| @user_ids.index(user.id) } %>
+      <% number_of_emojis = unique_users.length %>
+      <div class="day d-flex justify-content-center align-items-center <%= 'has-many-emojis' if number_of_emojis > 4 %>">
+        <% if happy_things_bubbles.any? %>
+          <div 
+            class="emoji-grid"
+            style="
+                grid-template-columns: repeat(<%= calculate_grid_size(number_of_emojis) %>, 1fr);
+                grid-template-rows: repeat(<%= calculate_grid_size(number_of_emojis) %>, 1fr);
+            ">
+            <% unique_users_sorted.each_with_index do |user, index| %>
+              <div 
+                class="emoji" 
+                style="
+                    font-size: <%= calculate_emoji_size(number_of_emojis) %>em;
+                    transform: translate(<%= calculate_emoji_position(index + 1, number_of_emojis) %>);
+              ">
+                <%= user.emoji %>
+            </div>
+            <% end %>
+          </div>
+        <% end %>
+        <%= link_to happy_things_by_date_path(date: date.strftime('%Y-%m-%d')), class: 'calendar-day-link' do %>
+          <%= date.day %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>