resolve conflicts

Author: abronkema

.github/CODEOWNERS

@@ -1 +1 @@
-* @cattywampus @abronkema @yarmiganosca
+* @cattywampus @abronkema @yarmiganosca @pollygee

Gemfile

@@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.3'
 # Use postgresql as the database for Active Record
 gem 'pg', '>= 0.18', '< 2.0'
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 4.1'
 # Use SCSS for stylesheets
 gem 'sassc-rails', '~> 2.1'
 # Use Uglifier as compressor for JavaScript assets

Gemfile.lock

@@ -148,7 +148,8 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (3.1.1)
-    puma (3.12.1)
+    puma (4.2.1)
+      nio4r (~> 2.0)
     pundit (2.0.1)
       activesupport (>= 3.0.0)
     rack (2.0.7)
@@ -265,7 +266,7 @@ DEPENDENCIES
   mini_magick (~> 4.8)
   pg (>= 0.18, < 2.0)
   pry-byebug
-  puma (~> 3.11)
+  puma (~> 4.1)
   pundit
   rails (~> 5.2.3)
   rolify

README.md

@@ -83,23 +83,17 @@ device available in those moments.
 
 ### Ruby Version
 
-This app uses Ruby version 2.6.3 and Rails version 5.2.3
+This app uses Ruby version 2.6.3, Rails version 5.2.3, and PostgreSQL 11.4
 
 ### Setup
 
 - Clone the repo
-- run `bundle install`
-- run `rails db:create`
-- run `rake:db:migrate`
-
-### Seed the database
-
-From the root of the app, run bundle exec rails `db:seed`. This will create some initial data to use while testing the app and developing new features.
+- run `bin/setup`
 
 ### Install ImageMagick
 
 ImageMagick is needed for the pages with images of carriers
-run`brew install imagemagick`
+run `brew install imagemagick`
 
 ### Start the app
 

app/assets/stylesheets/application.scss

@@ -21,10 +21,10 @@
 # Then, remove all the *= require and *= require_tree statements from the Sass file. Instead, use @import to import Sass files.
 # Do not use *= require in Sass or your other stylesheets will not be able to access the Bootstrap mixins and variables.
 */
-$bw-color-purple: #A36EB9;
-$bw-color-dark-purple: #7A7289;
-$bw-color-slate: #84A5C6;
-$bw-color-blue: #73C3FE;
+$bw-color-purple: #a36eb9;
+$bw-color-dark-purple: #7a7289;
+$bw-color-slate: #84a5c6;
+$bw-color-blue: #73c3fe;
 $bw-color-darkest-purple: #808808;
 
 // Custom bootstrap variables must be set or imported *before* bootstrap.
@@ -33,31 +33,70 @@ $navbar-brand-padding-y: 8px;
 
 @import "bootstrap";
 
-.navbar-brand img {height: 84px}
-.nav-icon img {width: 50px}
-.nav-icon {height: 100px; width: 100px; font-size: 12px}
-.nav-link {text-align: center}
-.background-purple {background-color: $bw-color-purple}
-.background-dark-purple {background-color: $bw-color-dark-purple}
-.background-slate {background-color: $bw-color-slate}
-.background-blue {background-color: $bw-color-blue}
-.background-darkest-purple {background-color: $bw-color-darkest-purple}
-.navbar-text .pull-right {position: fixed}
+.navbar-brand img {
+  height: 84px;
+}
+.nav-icon {
+  height: 100px;
+  width: 100px;
+  font-size: 12px;
+}
+.nav-link {
+  text-align: center;
+}
+.background-purple {
+  background-color: $bw-color-purple;
+}
+.background-dark-purple {
+  background-color: $bw-color-dark-purple;
+}
+.background-slate {
+  background-color: $bw-color-slate;
+}
+.background-blue {
+  background-color: $bw-color-blue;
+}
+.background-darkest-purple {
+  background-color: $bw-color-darkest-purple;
+}
+.navbar-text .pull-right {
+  position: fixed;
+}
+
+.nav-item {
+  display: flex;
+  align-items: center;
+}
 
+.nav-first img {
+  width: 6.4em;
+}
+.nav-second img {
+  width: 5.5em;
+}
+.nav-third {
+  width: 9em;
+  img {
+    width: 5.1em;
+  }
+}
+.nav-fourth img {
+  width: 6.2em;
+}
 #outer-container {
-	display: table;
-	width: 100%;
-	height: 100%;
+  display: table;
+  width: 100%;
+  height: 100%;
 }
 
 #sidebar {
-	display: table-cell;
-	width: 15%;
-	vertical-align: top;
+  display: table-cell;
+  width: 15%;
+  vertical-align: top;
 }
 
 #content {
-	display: table-cell;
-	width: 85%;
-	vertical-align: top;
+  display: table-cell;
+  width: 85%;
+  vertical-align: top;
 }

app/channels/application_cable/channel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationCable
   class Channel < ActionCable::Channel::Base
   end

app/channels/application_cable/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   end

app/controllers/agreements_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AgreementsController < ApplicationController
   before_action :set_agreement, only: [:show, :edit, :update, :destroy]
 

app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   include Pundit
   rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized

app/controllers/carriers_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CarriersController < ApplicationController
   before_action :set_carrier, only: [:show, :edit, :update]
 

app/controllers/categories_controller.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class CategoriesController < ApplicationController
   before_action :set_category, only: [:show, :edit, :update, :destroy]
 
   # GET /categories
   # GET /categories.json
   def index
-    @categories = Category.all
+    @categories = Category.includes(:parent)
   end
 
   # GET /categories/1

app/controllers/fee_types_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FeeTypesController < ApplicationController
   before_action :set_fee_type, only: [:show, :edit, :update, :destroy]
 

app/controllers/home_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HomeController < ApplicationController
   def index
   end

app/controllers/locations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class LocationsController < ApplicationController
 
   before_action :set_location, only: [:show, :edit, :update]

app/controllers/membership_types_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MembershipTypesController < ApplicationController
   before_action :set_membership_type, only: [:show, :edit, :update, :destroy]
 

app/controllers/organizations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class OrganizationsController < ApplicationController
   before_action :set_organization, only: [:edit, :update, :destroy]
 

app/controllers/photos_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PhotosController < ApplicationController
   def destroy
     @photo = ActiveStorage::Attachment.find(params[:id])

app/controllers/signed_agreements_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SignedAgreementsController < ApplicationController
   before_action :set_agreement, only: [:new, :show]
 

app/controllers/users/registrations_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Users::RegistrationsController < Devise::RegistrationsController
 
     private

app/controllers/users_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UsersController < ApplicationController
   attr_reader :user
 

app/helpers/agreements_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module AgreementsHelper
 end

app/helpers/application_helper.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
   def flash_class(level)
     case level.to_sym
-        when :notice then "alert alert-info"
-        when :success then "alert alert-success"
-        when :error then "alert alert-error"
-        when :alert then "alert alert-error"
+      when :notice then "alert alert-info"
+      when :success then "alert alert-success"
+      when :error then "alert alert-error"
+      when :alert then "alert alert-error"
     end
   end
 end

app/helpers/fee_types_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module FeeTypesHelper
 end

app/helpers/locations_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module LocationsHelper
 end

app/helpers/membership_types_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module MembershipTypesHelper
 end

app/helpers/users_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module UsersHelper
 end

app/jobs/application_job.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
 end

app/mailers/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationMailer < ActionMailer::Base
   default from: '[email protected]'
   layout 'mailer'

app/mailers/custom_mailer.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class CustomMailer < Devise::Mailer
     helper :application # gives access to all helpers defined within `application_helper`.
     include Devise::Controllers::UrlHelpers # Optional. eg. `confirmation_url`
     default template_path: 'devise/mailer' # to make sure that your mailer uses the devise views
-end
+end

app/mailers/welcome_mailer.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class WelcomeMailer < CustomMailer
     def welcome_email(user)
       @user = user
       mail(to: @user.email, subject: 'Babywearing Account Registration')
     end
-  end
+  end

app/models/agreement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Agreement < ApplicationRecord
   has_many :signed_agreements
 

app/models/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

app/models/carrier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Carrier < ApplicationRecord
   belongs_to :location
   has_many :loans

app/models/cart.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Cart < ApplicationRecord
   belongs_to :member, class_name: "User"
   validates :member, presence: true

app/models/category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Category < ApplicationRecord
   validates :name, presence: true, uniqueness: true
 

app/models/fee_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FeeType < ApplicationRecord
   validates_presence_of :name, :amount
 end

app/models/loan.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Loan < ApplicationRecord
   belongs_to :cart
   belongs_to :carrier

app/models/location.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Location < ApplicationRecord
   has_many :carriers
   belongs_to :organization

app/models/membership_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MembershipType < ApplicationRecord
   validates :name, :fee_cents, :duration_days, :number_of_items, :description, presence: true
 end

app/models/organization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Organization < ApplicationRecord
   validates :name, presence: true
   has_many :locations