HackStoreCode · gps996 · Oct 19, 2017 · Oct 19, 2017
diff --git a/Gemfile b/Gemfile
@@ -7,12 +7,12 @@ end

 \

-gem 'bootstrap-sass', '~> 3.3.6'
+gem 'bootstrap-sass'

 gem 'simple_form'
 gem 'geocoder'
 gem 'carrierwave', '~> 1.0'
-gem 'pg'
+#gem 'pg'
 gem 'stripe'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.4'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -113,8 +113,6 @@ GEM
    nokogiri (1.8.1-x64-mingw32)
      mini_portile2 (~> 2.3.0)
    orm_adapter (0.5.0)
-    pg (0.21.0)
-    pg (0.21.0-x64-mingw32)
    public_suffix (3.0.0)
    puma (3.10.0)
    rack (2.0.3)
@@ -209,15 +207,14 @@ PLATFORMS
  x64-mingw32

 DEPENDENCIES
-  bootstrap-sass (~> 3.3.6)
+  bootstrap-sass
  byebug
  capybara (~> 2.13)
  carrierwave (~> 1.0)
  coffee-rails (~> 4.2)
  devise
  geocoder
  jbuilder (~> 2.5)
-  pg
  puma (~> 3.7)
  rails (~> 5.1.4)
  sass-rails (~> 5.0)

diff --git a/app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss
@@ -10,6 +10,9 @@
 * files in this directory. Styles in this file should be added after the last require_* statement.
 * It is generally better to create a new file per style scope.
 *
+
 *= require_tree .
 *= require_self
 */
+@import "bootstrap-sprockets";
+@import "bootstrap";
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
@@ -0,0 +1,32 @@
+<nav class="navbar navbar-inverse navbar-fixed-top">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="#">ART OnlineStore</a>
+    </div>
+    <div class="collapse navbar-collapse" id="myNavbar">
+      <ul class="nav navbar-nav">
+
+        <li class="dropdown">
+
+          <ul class="dropdown-menu">
+
+          </ul>
+        </li>
+
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+
+        <li> <%= link_to 'Gallery', products_path %></li>
+        <!-- <li><a href="#"><span class="glyphicon glyphicon-user"></span> Sign Up</a></li> -->
+
+        <li> <%= link_to 'Login', user_session_path %></li>
+        <li> <%= link_to 'Log Out', destroy_user_session_path, method: :delete %></li>
+      </ul>
+    </div>
+  </div>
+</nav>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -9,8 +9,15 @@
  </head>

  <body>
-    <%= yield %>
+    <div class="container">
+      <%= render 'layouts/navbar'%>
+      <%= yield %>
+    </div>
+
    <p class="notice"><%= notice %></p>
    <p class="alert"><%= alert %></p>
+    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
  </body>
 </html>
diff --git a/public/uploads/Ash_Tree_-_geograph.org.uk_-_590710.jpg b/public/uploads/Ash_Tree_-_geograph.org.uk_-_590710.jpg
diff --git a/.../uploads/tmp/1508451249-43112-0001-2043/Ash_Tree_-_geograph.org.uk_-_590710.jpg b/.../uploads/tmp/1508451249-43112-0001-2043/Ash_Tree_-_geograph.org.uk_-_590710.jpg