Resolve merging conflict

.github/pull_request_template.md

@@ -0,0 +1,21 @@
+<!-- Link to issue on project board -->
+
+Issue Link: [ISSUE](ISSUE LINK HERE)
+
+## Description
+<!-- Describe the changes you are making. What problem are you trying to solve? -->
+<!-- Screenshots are always helpful! -->
+
+## Type of Change:
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Maintenance or Refactor (non-breaking change which does not affect existing functionality)
+
+## Checklist
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+- [ ] I tested my changes locally
+- [ ] I added tests to cover new functionality
+- [ ] All new and existing tests are passing (`bundle exec rspec`)
+- [ ] I updated my branch with master so that they can be merged easily

.gitignore

@@ -4,6 +4,8 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile '~/.gitignore_global'
 
+.env
+
 # Ignore bundler config.
 /.bundle
 

Gemfile

@@ -5,8 +5,8 @@ ruby '3.0.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
 gem 'rails', '~> 6.1.4', '>= 6.1.4.4'
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3', '~> 1.4'
+# Use pg as the database for Active Record
+gem 'pg', '~> 1.3', '>= 1.3.5'
 # Use Puma as the app server
 gem 'puma', '~> 5.0'
 # Use SCSS for stylesheets
@@ -28,6 +28,8 @@ gem 'jbuilder', '~> 2.7'
 # Reduces boot times through caching; required in config/boot.rb
 gem 'bootsnap', '>= 1.4.4', require: false
 
+gem 'dotenv-rails'
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
@@ -54,3 +56,7 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+group :production do
+  gem 'exception_notification'
+end

Gemfile.lock

@@ -79,8 +79,16 @@ GEM
     childprocess (4.1.0)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
+    dotenv (2.8.1)
+    dotenv-rails (2.8.1)
+      dotenv (= 2.8.1)
+      railties (>= 3.2)
     erubi (1.10.0)
+    exception_notification (4.5.0)
+      actionmailer (>= 5.2, < 8)
+      activesupport (>= 5.2, < 8)
     ffi (1.15.5)
+    ffi (1.15.5-x64-mingw32)
     globalid (1.0.0)
       activesupport (>= 5.0)
     i18n (1.10.0)
@@ -103,8 +111,14 @@ GEM
     minitest (5.15.0)
     msgpack (1.4.5)
     nio4r (2.5.8)
+    nokogiri (1.13.1-x64-mingw32)
+      racc (~> 1.4)
     nokogiri (1.13.1-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.13.1-x86_64-linux)
+      racc (~> 1.4)
+    pg (1.3.5)
+    pg (1.3.5-x64-mingw32)
     public_suffix (4.0.6)
     puma (5.6.2)
       nio4r (~> 2.0)
@@ -153,6 +167,8 @@ GEM
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
       ffi (~> 1.9)
+    sassc (2.4.0-x64-mingw32)
+      ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)
@@ -172,14 +188,15 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
     thor (1.2.1)
     tilt (2.0.10)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2022.1)
+      tzinfo (>= 1.0.0)
     web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -202,21 +219,25 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
+  x64-mingw32
   x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   bootsnap (>= 1.4.4)
   byebug
   capybara (>= 3.26)
+  dotenv-rails
+  exception_notification
   jbuilder (~> 2.7)
   listen (~> 3.3)
+  pg (~> 1.3, >= 1.3.5)
   puma (~> 5.0)
   rack-mini-profiler (~> 2.0)
   rails (~> 6.1.4, >= 6.1.4.4)
   sass-rails (>= 6)
   selenium-webdriver
   spring
-  sqlite3 (~> 1.4)
   turbolinks (~> 5)
   tzinfo-data
   web-console (>= 4.1.0)
@@ -227,4 +248,4 @@ RUBY VERSION
    ruby 3.0.1p64
 
 BUNDLED WITH
-   2.2.33
+   2.3.10

app/assets/stylesheets/application.css

@@ -17,9 +17,9 @@
 
  .jumbo-background {
    /* opacity: 0.5; */
-   filter: grayscale(100%);
-   background-image: url('girl.jpg');
-   background-size: 850px;
+   /* filter: grayscale(100%); */
+   background-image: url('girl4.jpg');
+   background-size: 1450px;
    border-radius: 10%
 
 
@@ -33,8 +33,8 @@
     src: url('Disturbed.otf');
  }
 
- table, h1 {
+ h1 {
    font-family: 'Disturbed.otf';
-   color: blue;
+   color: brown;
 
  }

app/assets/stylesheets/morecss.scss

@@ -1,6 +1,7 @@
 
 
 .navbar {
+  background-color: #f7635e;
   position: relative;
   min-height: 10px;
   margin-bottom: -5px;
@@ -26,13 +27,14 @@
 
 .button {
   position: relative;
-  // background-color: grey;
+  background-color: #F0F8FF;
   border: none;
-  color: grey;
+  // font
+  color: black;
   padding: 1px 2px;
   box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2), 0 6px 20px 0 rgba(0,0,0,0.19);
   border-radius: 10%;
-  border: 2px solid blue;
+  // border: 2px solid blue;
   text-align: center;
   transition-duration: 0.4s;
   text-decoration: none;
@@ -44,7 +46,7 @@
 
 .button:after {
   content: "";
-  background: #f1f1f1;
+  background: #f#F0F8FF;
   display: block;
   position: absolute;
   padding-top: 300%;
@@ -63,32 +65,27 @@
 }
 
 .button:hover {
-  background-color: blue; /* Green */
+  background-color: #e4b7b7; /* Green */
   color: white;
 }
 
 body {
   // grey
-  background-color: blue;
+  background-color: white;
   // font
-  color: blue;
+  color: #3d0c02;
   margin: 33px;
-
-  background-image: linear-gradient(rgba(255,255,255,.9), rgba(255,255,255,0.5)),  url("searching.jpg");
-
+  background-image: url("searching5.jpg");
   background-size: cover;
-
-  // opacity: 0.3;
-
 }
 
 body, p, ol, ul, td {
   font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px; }
+  font-size: 18px;
+  line-height: 30px; }
 
   img {
-    filter: grayscale(100%);
+    // filter: grayscale(100%);
   }
 
   pre {
@@ -101,11 +98,11 @@ body, p, ol, ul, td {
       color: blue; }
 
       a:visited {
-        color: blue; }
+        color: #1e90ff; }
 
         a:hover {
           color: white;
-          background-color: blue; }
+          background-color: #1e90ff; }
 
           th {
             padding-bottom: 5px; }