From 6653bbf2e9f24b34a0ff37dfb02568bfd97c379d Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 22 Jan 2021 18:53:17 +0100 Subject: [PATCH 01/39] Add workaround for flash message issue --- app/views/layouts/_flash_messages.html.erb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/_flash_messages.html.erb b/app/views/layouts/_flash_messages.html.erb index 03ab968..dec5660 100644 --- a/app/views/layouts/_flash_messages.html.erb +++ b/app/views/layouts/_flash_messages.html.erb @@ -1,12 +1,17 @@ <% flash.each do |level, log| %>
- <% if !log[:heading].nil? %> -

<%= log[:heading] %>

+ <% if log.is_a? String %> +
  • <%= log %>
    • <% end %> - <% log[:messages].each do |message| %> - + <% if !log.is_a? String %> + <% if !log[:heading].nil? %> +

    <%= log[:heading] %>

    + <% end %> + <% log[:messages].each do |message| %> + + <% end %> <% end %>
    <% end %> From 0f0c4369a514806aaa8c92ed9837a2fc76c87a2f Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 22 Jan 2021 19:37:41 +0100 Subject: [PATCH 02/39] First draft search engine --- app/controllers/users_controller.rb | 25 +++++++++++++++++++++---- config/routes.rb | 1 + 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index dd557b1..a714499 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,3 +1,5 @@ +require 'set' + class UsersController < ApplicationController include SocialAccountsHelper before_action :authorize, except: %i[show index search] @@ -42,10 +44,25 @@ def add_contact end def search - @users = User.search(params[:search]).where.not(id: current_user.id) - @users_to_add = @users.reject do |user| - current_user.sent_contact_request?(user) - end + use_wildcards = true + @users_to_add = Set[] + @contacts = Set[] + if current_user and params[:search] and use_wildcards + patterns = params[:search].split() + @user = User.find(current_user.id) + for pattern in patterns do + @contacts.merge(@user.contacts.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").to_set) + @users_to_add.merge(User.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").where.not(id: current_user.id).to_set) + @users_to_add - @contacts + if current_user and params[:search] and !use_wildcards + patterns = params[:search].split() + @user = User.find(current_user.id) + for pattern in patterns do + @contacts = @user.contacts.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").to_set + @users_to_add = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").where.not(id: current_user.id).to_set + @users_to_add - @contacts + if !current_user and params[:search] + @users_to_add = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}") end private diff --git a/config/routes.rb b/config/routes.rb index 9c33f84..36829a1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ devise_for :users # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html root to: 'home#dashboard' + get 'search', to: 'users#search' resources :users, only: %i[show edit update index] do patch 'status', to: 'users#update_status', as: 'update_status', on: :member From c10eb208faa78c102cc5354357637fd029cf18ab Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 22 Jan 2021 19:50:22 +0100 Subject: [PATCH 03/39] Adjust code --- app/controllers/users_controller.rb | 19 ++++++++++++------- app/views/users/search.html.erb | 13 ++++++++++--- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a714499..861ed02 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -45,24 +45,29 @@ def add_contact def search use_wildcards = true - @users_to_add = Set[] + @users = Set[] @contacts = Set[] - if current_user and params[:search] and use_wildcards + if current_user and params[:search] and use_wildcards patterns = params[:search].split() @user = User.find(current_user.id) for pattern in patterns do @contacts.merge(@user.contacts.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").to_set) - @users_to_add.merge(User.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").where.not(id: current_user.id).to_set) - @users_to_add - @contacts + @users.merge(User.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").where.not(id: current_user.id).to_set) + end + @users - @contacts + end if current_user and params[:search] and !use_wildcards patterns = params[:search].split() @user = User.find(current_user.id) for pattern in patterns do @contacts = @user.contacts.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").to_set - @users_to_add = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").where.not(id: current_user.id).to_set - @users_to_add - @contacts + @users = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").where.not(id: current_user.id).to_set + end + @users - @contacts + end if !current_user and params[:search] - @users_to_add = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}") + @users = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}") + end end private diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index 8a618e0..abf20c4 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -25,15 +25,22 @@ + <% @contacts.each do |user| %> + + <%= user.username%> + <%= user.firstname%> + <%= user.lastname%> + <%= user.email %> + + <% end %> + <% @users.each do |user| %> <%= user.username%> <%= user.firstname%> <%= user.lastname%> <%= user.email %> - <% if @users_to_add.include? user %> - <%= button_to '+', user_contact_requests_path(user), method: :post, id: user.id %> - <% end %> + <%= button_to '+', user_contact_requests_path(user), method: :post, id: user.id %> <% end %> From 64ce24c4a03732ea37d3b4cbf175b97c248f9e10 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 22 Jan 2021 19:54:05 +0100 Subject: [PATCH 04/39] Use wildcards in pulic search --- app/controllers/users_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 861ed02..0c80de8 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -44,7 +44,7 @@ def add_contact end def search - use_wildcards = true + use_wildcards = false @users = Set[] @contacts = Set[] if current_user and params[:search] and use_wildcards @@ -65,7 +65,10 @@ def search end @users - @contacts end - if !current_user and params[:search] + if !current_user and params[:search] and use_wildcards + @users = User.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}") + end + if !current_user and params[:search] and !use_wildcards @users = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}") end end From 9b8fed810d7bd3bd09aff27c0cffbebda55fa65f Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 22 Jan 2021 21:48:37 +0100 Subject: [PATCH 05/39] Refactor code --- app/controllers/users_controller.rb | 23 +++++++++-------------- app/helpers/users_helper.rb | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0c80de8..6e784a4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2,8 +2,9 @@ class UsersController < ApplicationController include SocialAccountsHelper + include UsersHelper before_action :authorize, except: %i[show index search] - helper_method :generate_link, :supported_social_networks + helper_method :generate_link, :supported_social_networks, :search_record def show @user = User.find(params[:id]) @@ -47,29 +48,23 @@ def search use_wildcards = false @users = Set[] @contacts = Set[] - if current_user and params[:search] and use_wildcards - patterns = params[:search].split() + if current_user and params[:search] and use_wildcards @user = User.find(current_user.id) - for pattern in patterns do - @contacts.merge(@user.contacts.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").to_set) - @users.merge(User.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").where.not(id: current_user.id).to_set) - end + @users = search_record(params[:search], User) + @contacts = search_record(params[:search], @user.contacts) @users - @contacts end if current_user and params[:search] and !use_wildcards - patterns = params[:search].split() @user = User.find(current_user.id) - for pattern in patterns do - @contacts = @user.contacts.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").to_set - @users = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").where.not(id: current_user.id).to_set - end + @users = search_record(params[:search], User, false) + @contacts = search_record(params[:search], @user.contacts, false) @users - @contacts end if !current_user and params[:search] and use_wildcards - @users = User.where('firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}") + @users = search_record(params[:search], User) end if !current_user and params[:search] and !use_wildcards - @users = User.where('firstname = ? OR lastname = ? OR username = ? OR email = ?', "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}") + @users = search_record(params[:search], User, false) end end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 2310a24..809f3ca 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,2 +1,20 @@ +require 'set' + module UsersHelper + def search_record(pattern, record, use_wildcard = true) + patterns = params[:search].split() + matches = Set[] + if use_wildcard + query = 'firstname = ? OR lastname = ? OR username = ? OR email = ?' + for pattern in patterns do + matches.merge(record.where(query, "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").to_set) + end + return matches + end + query = 'firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?' + for pattern in patterns do + matches.merge(record.where(query, "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").to_set) + end + return matches + end end From 6fec237c6e3f56fbef21b457c5bf8d83e774bdc1 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 22 Jan 2021 21:57:35 +0100 Subject: [PATCH 06/39] Add search button --- app/views/layouts/_navbar.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index a937130..5bf1992 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -18,7 +18,11 @@ <% if user_signed_in? %>
  • <%= link_to (fa_icon 'users', text: "My Contacts"), user_contacts_path(current_user), class: 'nav-link' %>
    • - <% end %> + <% end %> +
  • + <%= link_to (fa_icon 'search', text: 'Search'), "/search", class: 'nav-link' %> +
    • +
      <%# https://github.com/heartcombo/devise#controller-filters-and-helpers %> <% if user_signed_in? %> From 1b90e1524933246286eb631ede74900ffd6dbdd5 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 17:25:55 +0100 Subject: [PATCH 07/39] Simplify code --- app/controllers/users_controller.rb | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6e784a4..d82da2a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -48,23 +48,14 @@ def search use_wildcards = false @users = Set[] @contacts = Set[] - if current_user and params[:search] and use_wildcards + if current_user and params[:search] @user = User.find(current_user.id) - @users = search_record(params[:search], User) - @contacts = search_record(params[:search], @user.contacts) + @users = search_record(params[:search], User, use_wildcards) + @contacts = search_record(params[:search], @user.contacts, use_wildcards) @users - @contacts end - if current_user and params[:search] and !use_wildcards - @user = User.find(current_user.id) - @users = search_record(params[:search], User, false) - @contacts = search_record(params[:search], @user.contacts, false) - @users - @contacts - end - if !current_user and params[:search] and use_wildcards - @users = search_record(params[:search], User) - end - if !current_user and params[:search] and !use_wildcards - @users = search_record(params[:search], User, false) + if !current_user and params[:search] + @users = search_record(params[:search], User. use_wildcards) end end From efbf2452c3bc6aaafc27da91771cf64c6d010eb6 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 19:28:45 +0100 Subject: [PATCH 08/39] First draft search bar styling --- app/controllers/users_controller.rb | 2 +- app/views/users/search.html.erb | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d82da2a..1cae5f7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -45,7 +45,7 @@ def add_contact end def search - use_wildcards = false + use_wildcards = true @users = Set[] @contacts = Set[] if current_user and params[:search] diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index abf20c4..be2a7a4 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -1,17 +1,10 @@ -
      -

      <%= I18n.t('user.lists') %>

      <%# https://getbootstrap.com/docs/5.0/layout/grid/#auto-layout-columns %> - -
      -
      - <%= form_tag(search_users_path, method: "get") do %> - <%= label_tag(:search, I18n.t('user.search.for') ) %> - <%= text_field_tag :search, params[:search] %> - <%= submit_tag I18n.t('user.search.index') %> + <%= form_tag(search_users_path, method: "get", style: "display: flex; width: 100%") do %> + <%= text_field_tag :search, params[:search] , style: "flex: 5", class: "form-control mr-sm-2"%> + <%= submit_tag I18n.t('user.search.index') , style: "flex: 1", class: "btn btn-outline-secondary my-2 my-sm-0", type: "button"%> <% end %> -
      @@ -46,4 +39,4 @@
      -
      + From 5611fa2475b5f06303fab1714450236e2f347118 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 19:38:31 +0100 Subject: [PATCH 09/39] Adjust search bar styling --- app/views/users/search.html.erb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index be2a7a4..63eb54d 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -1,12 +1,13 @@ <%# https://getbootstrap.com/docs/5.0/layout/grid/#auto-layout-columns %>
      - <%= form_tag(search_users_path, method: "get", style: "display: flex; width: 100%") do %> - <%= text_field_tag :search, params[:search] , style: "flex: 5", class: "form-control mr-sm-2"%> - <%= submit_tag I18n.t('user.search.index') , style: "flex: 1", class: "btn btn-outline-secondary my-2 my-sm-0", type: "button"%> +
      + <%= form_tag(search_users_path, method: "get", style: "display: flex; width: 100%;", class: "justify-content-between") do %> + <%= text_field_tag :search, params[:search] ,placeholder: "Username, email, ...", style: "flex: 5; margin: 3px;", class: "form-control my-2 my-sm-0"%> + <%= submit_tag I18n.t('user.search.index') , style: "flex: 1; margin: 3px;", class: "btn btn-outline-secondary my-2 my-sm-0", type: "button"%> <% end %>
      - +
      From b1d12aaec4424c0225560ec189233ccdf4ddf7f6 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 19:49:50 +0100 Subject: [PATCH 10/39] Seperate style from element --- app/views/users/search.html.erb | 102 +++++++++++++++++++------------- 1 file changed, 61 insertions(+), 41 deletions(-) diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index 63eb54d..4f7c02c 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -1,43 +1,63 @@ + - <%# https://getbootstrap.com/docs/5.0/layout/grid/#auto-layout-columns %> -
      -
      - <%= form_tag(search_users_path, method: "get", style: "display: flex; width: 100%;", class: "justify-content-between") do %> - <%= text_field_tag :search, params[:search] ,placeholder: "Username, email, ...", style: "flex: 5; margin: 3px;", class: "form-control my-2 my-sm-0"%> - <%= submit_tag I18n.t('user.search.index') , style: "flex: 1; margin: 3px;", class: "btn btn-outline-secondary my-2 my-sm-0", type: "button"%> - <% end %> -
      -
      -
      - - - - - - - - - - - <% @contacts.each do |user| %> - - - - - - - <% end %> - - <% @users.each do |user| %> - - - - - - - - <% end %> - - -
      <%= I18n.t('user.attributes.username') %><%= I18n.t('user.attributes.firstname')%><%= I18n.t('user.attributes.lastname')%><%= I18n.t('user.attributes.email')%>
      <%= user.username%><%= user.firstname%><%= user.lastname%><%= user.email %>
      <%= user.username%><%= user.firstname%><%= user.lastname%><%= user.email %><%= button_to '+', user_contact_requests_path(user), method: :post, id: user.id %>
      + + +
      +
      + <%= form_tag(search_users_path, method: "get", class: "form-tag justify-content-between") do %> + <%= text_field_tag :search, params[:search] ,placeholder: "Username, email, ...", class: "text-field form-control my-2 my-sm-0"%> + <%= submit_tag I18n.t('user.search.index') , class: "submit-button btn btn-outline-secondary my-2 my-sm-0", type: "button"%> + <% end %> +
      + + + + + +
      + + + + + + + + + + + + <% @contacts.each do |user| %> + + + + + + + <% end %> + + <% @users.each do |user| %> + + + + + + + + <% end %> + + +
      <%= I18n.t('user.attributes.username') %><%= I18n.t('user.attributes.firstname')%><%= I18n.t('user.attributes.lastname')%><%= I18n.t('user.attributes.email')%>
      <%= user.username%><%= user.firstname%><%= user.lastname%><%= user.email %>
      <%= user.username%><%= user.firstname%><%= user.lastname%><%= user.email %><%= button_to '+', user_contact_requests_path(user), method: :post, id: user.id %>
      From 25bbcb0789c979c39de98cc6c3ed3174eb16ddfe Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 20:38:20 +0100 Subject: [PATCH 11/39] First draft diplay users --- app/controllers/users_controller.rb | 2 +- app/helpers/users_helper.rb | 6 ++-- app/views/users/search.html.erb | 51 ++++++++++++++++++++++++----- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1cae5f7..f3e4de3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -55,7 +55,7 @@ def search @users - @contacts end if !current_user and params[:search] - @users = search_record(params[:search], User. use_wildcards) + @users = search_record(params[:search], User, use_wildcards) end end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 809f3ca..823a20e 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,10 +1,10 @@ require 'set' module UsersHelper - def search_record(pattern, record, use_wildcard = true) - patterns = params[:search].split() + def search_record(arguments, record, use_wildcard = true) + patterns = arguments.split() matches = Set[] - if use_wildcard + if !use_wildcard query = 'firstname = ? OR lastname = ? OR username = ? OR email = ?' for pattern in patterns do matches.merge(record.where(query, "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").to_set) diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index 4f7c02c..8a5d13c 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -13,22 +13,55 @@ flex: 1; margin: 3px; } + .stack { + display: flex; + flex-direction: column; + } + .stack > * + * { + margin-top: 2rem; + } + .contact { + display: flex; + border: 2px solid #D1D5DB; + border-radius: 2px; + padding: 5px; + } + .profile-image{ + padding: 2px; + flex: 1; + } + .user-info{ + flex: 4; + display: block; + } + -
      -
      - <%= form_tag(search_users_path, method: "get", class: "form-tag justify-content-between") do %> - <%= text_field_tag :search, params[:search] ,placeholder: "Username, email, ...", class: "text-field form-control my-2 my-sm-0"%> - <%= submit_tag I18n.t('user.search.index') , class: "submit-button btn btn-outline-secondary my-2 my-sm-0", type: "button"%> - <% end %> -
      +
      + <%= form_tag(search_users_path, method: "get", class: "form-tag justify-content-between") do %> + <%= text_field_tag :search, params[:search] ,placeholder: "Username, email, ...", class: "text-field form-control my-2 my-sm-0"%> + <%= submit_tag I18n.t('user.search.index') , class: "submit-button btn btn-outline-secondary my-2 my-sm-0"%> + <% end %> + <% @users.each do |user| %> +
      +
      + +
      + +
      + <% end %> +
      - + From 83c92f3c46e74f21fa20fc9afbdf860b12fc6ca9 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 21:09:06 +0100 Subject: [PATCH 12/39] Do some fancy css stuff --- app/views/users/search.html.erb | 34 +++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index 8a5d13c..8db433d 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -18,7 +18,7 @@ flex-direction: column; } .stack > * + * { - margin-top: 2rem; + margin-top: 1rem; } .contact { display: flex; @@ -28,12 +28,29 @@ } .profile-image{ padding: 2px; - flex: 1; + flex: 2; + margin-right: 8px; + object-fit: contain; + } + img { + height: 100%; + width: 100%; + } + .cover { + object-fit: cover; } .user-info{ - flex: 4; + flex: 5; display: block; } + a::after { + content: ''; + position: absolute; + top: 0; + left: 0; + bottom: 0; + right: 0; + } @@ -45,16 +62,17 @@ <% @users.each do |user| %> -
      -
      - + <% end %>
      From 27779731849854df1e1752bab9dde797f0cd91dd Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 21:31:39 +0100 Subject: [PATCH 13/39] Improve styling --- app/views/users/search.html.erb | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index 8db433d..ae8cb24 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -25,22 +25,30 @@ border: 2px solid #D1D5DB; border-radius: 2px; padding: 5px; + position: relative; } .profile-image{ padding: 2px; - flex: 2; + flex: 1; margin-right: 8px; - object-fit: contain; + padding-top: calc(.5 * 1.5rem); + padding-bottom: calc(.5 * 1.5rem); } img { - height: 100%; - width: 100%; + height: 75px; + width: 75px; } + @media screen and (max-width: 600px) { + img { + height: 100%; + width: 100%; + } + } .cover { object-fit: cover; } .user-info{ - flex: 5; + flex: 4; display: block; } a::after { @@ -51,6 +59,9 @@ bottom: 0; right: 0; } + .email { + font-style: italic; + } @@ -68,9 +79,10 @@
      <% end %> From fae5832a8592366d4548eb775122ed4c2bd4e6ec Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 22:09:33 +0100 Subject: [PATCH 14/39] Add add user button --- app/controllers/users_controller.rb | 2 +- app/views/users/search.html.erb | 63 ++++++++++++----------------- 2 files changed, 26 insertions(+), 39 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f3e4de3..e75b8ac 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -52,7 +52,7 @@ def search @user = User.find(current_user.id) @users = search_record(params[:search], User, use_wildcards) @contacts = search_record(params[:search], @user.contacts, use_wildcards) - @users - @contacts + @users = @users - @contacts end if !current_user and params[:search] @users = search_record(params[:search], User, use_wildcards) diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index ae8cb24..cd6d022 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -18,12 +18,12 @@ flex-direction: column; } .stack > * + * { - margin-top: 1rem; + margin-top: .5rem; } .contact { display: flex; - border: 2px solid #D1D5DB; - border-radius: 2px; + border: 2px solid #E5E7EB; + border-radius: 8px; padding: 5px; position: relative; } @@ -62,7 +62,11 @@ .email { font-style: italic; } - + .add_button { + flex: 1; + height: 100%; + width: 100%; + }
      @@ -72,7 +76,7 @@ <% end %> - <% @users.each do |user| %> + <% @contacts.each do |user| %> <% end %> -
      - - +<% @users.each do |user| %> + +<% end %> - + From 66cbb7a8eb66236926e21da9f8b9a169f1020248 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Sat, 23 Jan 2021 22:23:00 +0100 Subject: [PATCH 15/39] Remove user from set --- app/controllers/users_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e75b8ac..4f59718 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -53,6 +53,7 @@ def search @users = search_record(params[:search], User, use_wildcards) @contacts = search_record(params[:search], @user.contacts, use_wildcards) @users = @users - @contacts + @users = @users - Set[@user] end if !current_user and params[:search] @users = search_record(params[:search], User, use_wildcards) From 35a73073c25f28820fe78f32fe6f8ed7ebeefc7d Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 29 Jan 2021 19:46:18 +0100 Subject: [PATCH 16/39] Fix navbar bug --- app/views/layouts/_footer.html.erb | 34 ++++++++++++++++++++++++------ app/views/layouts/_navbar.html.erb | 2 +- app/views/users/search.html.erb | 3 --- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index da7a9fc..63ae6c6 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,29 +1,51 @@ + + <% if user_signed_in? %> <% end %> \ No newline at end of file diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index abe6fec..e4f2184 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -3,6 +3,6 @@
      Connection Portal
      - + <%= link_to (fa_icon 'search'), "/search", style: "color: white; padding: 10px"%> \ No newline at end of file diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index cd6d022..f6c7b0b 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -108,6 +108,3 @@ <% end %> - - - From 6c353941707b286f32949796393148b619edbeab Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 29 Jan 2021 19:49:30 +0100 Subject: [PATCH 17/39] Formatting, formatting and formatting --- app/views/layouts/_footer.html.erb | 43 +++++++++++++++++------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 63ae6c6..2fc63f6 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -17,35 +17,42 @@ <% end %> \ No newline at end of file From ca5f1f336a9401f43eb56c3aa8948b497f6059c7 Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 29 Jan 2021 20:12:42 +0100 Subject: [PATCH 18/39] Format code --- app/controllers/users_controller.rb | 15 ++++++++------- app/helpers/users_helper.rb | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e2e387d..55856e1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,7 +6,6 @@ class UsersController < ApplicationController before_action :authorize, except: %i[show index search] helper_method :generate_link, :supported_social_networks, :search_record - def show; end def edit @@ -48,21 +47,23 @@ def add_contact redirect_to root_path end + # rubocop:disable Metrics/AbcSize + # rubocop:disable Metrics/MethodLength def search use_wildcards = true @users = Set[] @contacts = Set[] - if current_user and params[:search] + if current_user && params[:search] @user = User.find(current_user.id) @users = search_record(params[:search], User, use_wildcards) @contacts = search_record(params[:search], @user.contacts, use_wildcards) - @users = @users - @contacts - @users = @users - Set[@user] - end - if !current_user and params[:search] - @users = search_record(params[:search], User, use_wildcards) + @users -= @contacts + @users -= Set[@user] end + @users = search_record(params[:search], User, use_wildcards) if !current_user && params[:search] end + # rubocop:enable Metrics/AbcSize + # rubocop:enable Metrics/MethodLength private diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 823a20e..95a8abf 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,20 +1,25 @@ require 'set' module UsersHelper + # rubocop:disable Metrics/MethodLength + # rubocop:disable Style/OptionalBooleanParameter + def search_record(arguments, record, use_wildcard = true) - patterns = arguments.split() + patterns = arguments.split matches = Set[] - if !use_wildcard + unless use_wildcard query = 'firstname = ? OR lastname = ? OR username = ? OR email = ?' - for pattern in patterns do - matches.merge(record.where(query, "#{pattern}", "#{pattern}", "#{pattern}", "#{pattern}").to_set) + patterns.each do |pattern| + matches.merge(record.where(query, pattern.to_s, pattern.to_s, pattern.to_s, pattern.to_s).to_set) end return matches end query = 'firstname LIKE ? OR lastname LIKE ? OR username LIKE ? OR email LIKE ?' - for pattern in patterns do - matches.merge(record.where(query, "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").to_set) + patterns.each do |pattern| + matches.merge(record.where(query, "%#{pattern}%", "%#{pattern}%", "%#{pattern}%", "%#{pattern}%").to_set) end - return matches + matches end + # rubocop:enable Metrics/MethodLength + # rubocop:enable Style/OptionalBooleanParameter end From 56ab0d64fcf7f71501194d4a559b11c44efd67ec Mon Sep 17 00:00:00 2001 From: Alexander-Dubrawski Date: Fri, 29 Jan 2021 21:52:56 +0100 Subject: [PATCH 19/39] Adjust styling --- app/controllers/users_controller.rb | 4 +- app/views/layouts/_navbar.html.erb | 1 + app/views/users/search.html.erb | 64 +++++++++++++++++++++-------- 3 files changed, 50 insertions(+), 19 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 55856e1..1520fb4 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,7 +6,9 @@ class UsersController < ApplicationController before_action :authorize, except: %i[show index search] helper_method :generate_link, :supported_social_networks, :search_record - def show; end + def show + @user = User.find(params[:id]) + end def edit return unless authorize_to_update! diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb index e4f2184..2e9f7b6 100644 --- a/app/views/layouts/_navbar.html.erb +++ b/app/views/layouts/_navbar.html.erb @@ -4,5 +4,6 @@
      <%= link_to (fa_icon 'search'), "/search", style: "color: white; padding: 10px"%> + <%= link_to (fa_icon 'sign-out'), destroy_user_session_path, method: :delete, class: 'nav-link' %> \ No newline at end of file diff --git a/app/views/users/search.html.erb b/app/views/users/search.html.erb index f6c7b0b..745b779 100644 --- a/app/views/users/search.html.erb +++ b/app/views/users/search.html.erb @@ -21,12 +21,22 @@ margin-top: .5rem; } .contact { - display: flex; - border: 2px solid #E5E7EB; border-radius: 8px; padding: 5px; + box-shadow: 0 3px 3px rgba(0,0,0,0.2); + } + .contact-info { + display: flex; + justify-content: center; + align-items: center; position: relative; } + .social-account-info { + margin-top: .5rem; + display: flex; + justify-content: space-around; + align-items: center; + } .profile-image{ padding: 2px; flex: 1; @@ -40,8 +50,8 @@ } @media screen and (max-width: 600px) { img { - height: 100%; - width: 100%; + height: 50px; + width: 50px; } } .cover { @@ -50,6 +60,8 @@ .user-info{ flex: 4; display: block; + line-height: 50%; + } a::after { content: ''; @@ -61,12 +73,17 @@ } .email { font-style: italic; + font-size: small; } .add_button { flex: 1; height: 100%; width: 100%; + border-radius: 99999px; + background: #343B3F; + font-size: small; } +
      @@ -77,34 +94,45 @@ <% @contacts.each do |user| %> -