Katievalet

.gitattributes

@@ -8,3 +8,6 @@ yarn.lock linguist-generated
 
 # Mark any vendored files as having been vendored.
 vendor/* linguist-vendored
+
+Gemfile merge=ours
+Gemfile.lock merge=ours

.gitignore

@@ -37,4 +37,14 @@
 .tool-versions
 
 # Ignore ENV variable file
-.env
+.env
+
+# Ignore Gemfiles
+Gemfile
+Gemfile.lock
+
+# ignore emacs backup files
+*~
+\#*\#
+.idea
+

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.exclude": {
+        "**/.git": false
+    }
+}

Gemfile

@@ -34,19 +34,22 @@ gem "jbuilder"
 gem "redis", "~> 4.0"
 
 # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
-# gem "kredis"
+gem "kredis"
 
 # Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
-# gem "bcrypt", "~> 3.1.7"
+gem "bcrypt", "~> 3.1.7"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
 
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", require: false
 
+# Boostrap
+gem 'bootstrap', '~> 4.1.1'
+
 # Use Sass to process CSS
-# gem "sassc-rails"
+gem "sass-rails", '~> 5.0'
 
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 # gem "image_processing", "~> 1.2"
@@ -83,3 +86,7 @@ gem 'dotenv-rails'
 # gem 'paperclip
 # gem 'uniquify'
 # gem 'will_paginate'
+
+gem "nio4r", "~> 2.5"
+
+gem 'geocoder', '~> 1.3', '>= 1.3.7'