merge

lailatulcoding · May 25, 2018 · 5aa5e9f · 5aa5e9f
2 parents be6ea6e + 512a580
commit 5aa5e9f
Show file tree

Hide file tree

Showing 90 changed files with 1,467 additions and 267 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Gemfile b/Gemfile
@@ -40,10 +40,10 @@ gem 'rails_admin'
 gem 'rails_admin_history_rollback'
 gem 'cloudinary'
 gem 'devise'
-gem 'devise_token_auth'
 gem 'pry-rails', '~> 0.3.4'
 gem 'audited'
 gem 'paper_trail'
+gem 'phonelib'
 
 
 group :development, :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -92,10 +92,10 @@ GEM
       rails (< 6)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.2.1)
-    dotenv-rails (2.2.1)
-      dotenv (= 2.2.1)
-      railties (>= 3.2, < 5.2)
+    dotenv (2.4.0)
+    dotenv-rails (2.4.0)
+      dotenv (= 2.4.0)
+      railties (>= 3.2, < 6.0)
     erubis (2.7.0)
     execjs (2.7.0)
     ffi (1.9.23)
@@ -170,6 +170,7 @@ GEM
       activerecord (>= 4.2, < 5.3)
       request_store (~> 1.1)
     pg (0.21.0)
+    phonelib (0.6.22)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -232,9 +233,8 @@ GEM
     remotipart (1.4.2)
     request_store (1.4.1)
       rack (>= 1.4)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
+    responders (2.1.2)
+      railties (>= 4.2.0, < 5.1)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
@@ -314,6 +314,7 @@ DEPENDENCIES
   monologue
   paper_trail
   pg (~> 0.18)
+  phonelib
   pry-rails (~> 0.3.4)
   puma (~> 3.0)
   rails (~> 5.0.0)

diff --git a/app/.DS_Store b/app/.DS_Store
diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store
diff --git a/app/assets/fonts/.DS_Store b/app/assets/fonts/.DS_Store
diff --git a/app/assets/fonts/Kalam-Bold.ttf b/app/assets/fonts/Kalam-Bold.ttf
diff --git a/app/assets/fonts/Raleway-Bold.ttf b/app/assets/fonts/Raleway-Bold.ttf
diff --git a/app/assets/fonts/Raleway-ExtraBold.ttf b/app/assets/fonts/Raleway-ExtraBold.ttf
diff --git a/app/assets/fonts/Raleway-ExtraLight.ttf b/app/assets/fonts/Raleway-ExtraLight.ttf
diff --git a/app/assets/fonts/Raleway-Heavy.ttf b/app/assets/fonts/Raleway-Heavy.ttf
diff --git a/app/assets/fonts/Raleway-Light.ttf b/app/assets/fonts/Raleway-Light.ttf
diff --git a/app/assets/fonts/Raleway-Medium.ttf b/app/assets/fonts/Raleway-Medium.ttf
diff --git a/app/assets/fonts/Raleway-Regular.ttf b/app/assets/fonts/Raleway-Regular.ttf
diff --git a/app/assets/fonts/Raleway-SemiBold.ttf b/app/assets/fonts/Raleway-SemiBold.ttf
diff --git a/app/assets/fonts/Raleway-Thin.ttf b/app/assets/fonts/Raleway-Thin.ttf
diff --git a/app/assets/fonts/Simple-Line-Icons.ttf b/app/assets/fonts/Simple-Line-Icons.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Bold.eot b/app/assets/fonts/roboto/Roboto-Bold.eot
diff --git a/app/assets/fonts/roboto/Roboto-Bold.ttf b/app/assets/fonts/roboto/Roboto-Bold.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Bold.woff b/app/assets/fonts/roboto/Roboto-Bold.woff
diff --git a/app/assets/fonts/roboto/Roboto-Bold.woff2 b/app/assets/fonts/roboto/Roboto-Bold.woff2
diff --git a/app/assets/fonts/roboto/Roboto-Light.eot b/app/assets/fonts/roboto/Roboto-Light.eot
diff --git a/app/assets/fonts/roboto/Roboto-Light.ttf b/app/assets/fonts/roboto/Roboto-Light.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Light.woff b/app/assets/fonts/roboto/Roboto-Light.woff
diff --git a/app/assets/fonts/roboto/Roboto-Light.woff2 b/app/assets/fonts/roboto/Roboto-Light.woff2
diff --git a/app/assets/fonts/roboto/Roboto-Medium.eot b/app/assets/fonts/roboto/Roboto-Medium.eot
diff --git a/app/assets/fonts/roboto/Roboto-Medium.ttf b/app/assets/fonts/roboto/Roboto-Medium.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Medium.woff b/app/assets/fonts/roboto/Roboto-Medium.woff
diff --git a/app/assets/fonts/roboto/Roboto-Medium.woff2 b/app/assets/fonts/roboto/Roboto-Medium.woff2
diff --git a/app/assets/fonts/roboto/Roboto-Regular.eot b/app/assets/fonts/roboto/Roboto-Regular.eot
diff --git a/app/assets/fonts/roboto/Roboto-Regular.ttf b/app/assets/fonts/roboto/Roboto-Regular.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Regular.woff b/app/assets/fonts/roboto/Roboto-Regular.woff
diff --git a/app/assets/fonts/roboto/Roboto-Regular.woff2 b/app/assets/fonts/roboto/Roboto-Regular.woff2
diff --git a/app/assets/fonts/roboto/Roboto-Thin.eot b/app/assets/fonts/roboto/Roboto-Thin.eot
diff --git a/app/assets/fonts/roboto/Roboto-Thin.ttf b/app/assets/fonts/roboto/Roboto-Thin.ttf
diff --git a/app/assets/fonts/roboto/Roboto-Thin.woff b/app/assets/fonts/roboto/Roboto-Thin.woff
diff --git a/app/assets/fonts/roboto/Roboto-Thin.woff2 b/app/assets/fonts/roboto/Roboto-Thin.woff2
diff --git a/app/assets/images/bg-index.jpg b/app/assets/images/bg-index.jpg
diff --git a/app/assets/images/info-icon-1.png b/app/assets/images/info-icon-1.png
diff --git a/app/assets/images/info-icon-2.png b/app/assets/images/info-icon-2.png
diff --git a/app/assets/images/info-icon-3.png b/app/assets/images/info-icon-3.png
diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,6 +13,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require turbolinks
+//= require jaralax.min
 //= require main
 //= require mdb.min
 //= require popper.min
diff --git a/app/assets/javascripts/jaralax.min.js b/app/assets/javascripts/jaralax.min.js