add message model and remove inheritance relationship

sjfox26 · Apr 4, 2018 · 5c2b3df · 5c2b3df
1 parent 6b19300
commit 5c2b3df
Show file tree

Hide file tree

Showing 9 changed files with 270 additions and 97 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss
@@ -14,7 +14,6 @@ $gray-medium-light: #eaeaea;
 }
 
 /* GLOBAL STYLES */
-
 body {
  padding-top: 60px;
  font-family:"Trebuchet MS";
@@ -29,7 +28,7 @@ header {
 }
 
 #navbar_container{
- background-color: #4a5980;
+ background-color: #284980;
 }
 
 #logo {
@@ -99,6 +98,37 @@ header {
  font-size: 1.0em;
 }
 
+/* FOOTER STYLES */
+
+footer {
+ position: fixed;
+ bottom: 0; /*https://stackoverflow.com/questions/19330611/fixed-footer-in-bootstrap*/
+ margin-top: 45px;
+ padding-top: 5px;
+ border-top: 1px solid #eaeaea;
+ color: #777;
+}
+
+footer a {
+ color: #555;
+ font-size: 1.1em;
+}
+
+footer a:hover {
+ color: #222;
+}
+
+footer ul {
+ float: right;
+ list-style: none;
+}
+
+footer ul li {
+ float: left;
+ margin-left: 15px;
+}
+
+
 /* HOME STYLES */
 .front_page_container{
  padding-left: 0;
@@ -355,3 +385,9 @@ h3{
  text-align: center;
  margin-top: 10px;
 }
+
+/* GALLERY STYLES */
+
+.gallery_page_container, .row {
+ padding-top: 20px;
+}
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -0,0 +1,2 @@
+class Message
+end
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -0,0 +1,10 @@
+<footer class="footer col-md-12">
+ <nav>
+ <ul>
+ <li><%= link_to "Gallery", '/gallery' %></li>
+ <li><%= link_to "Testimonials", '#' %></li>
+ <li><%= link_to "About", '/about' %></li>
+ <li><%= link_to "Contact", '/contact' %></li>
+ </ul>
+ </nav>
+</footer>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -20,9 +20,9 @@
 
  <div class="collapse navbar-collapse" id="menuContent">
  <ul class="nav navbar-nav navbar-right">
- <li class="nav-item"><%= link_to("Gallery", '#', class: "nav-link")%></li>
+ <li class="nav-item"><%= link_to("Gallery", gallery_path, class: "nav-link")%></li>
  <li class="nav-item"><%= link_to("Testimonials", '#', class: "nav-link")%></li>
- <li class="nav-item"><%= link_to("About", '#', class: "nav-link")%></li>
+ <li class="nav-item"><%= link_to("About", about_path, class: "nav-link")%></li>
  <li class="nav-item"><%= link_to("Contact", '#', class: "nav-link anchor")%></li>
  </ul><!--nav navbar-nav navbar-right-->
  </div><!--collapse navbar-collapse-->

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -21,6 +21,7 @@
  <% end %>
  <%= yield %>
  <%= debug(params) if Rails.env.development? %>
+ <%= render 'layouts/footer' %>
  </div>
  </body>
 </html>
diff --git a/app/views/static_pages/gallery.html.erb b/app/views/static_pages/gallery.html.erb
@@ -1 +1,77 @@
-<h1>StaticPages#gallery</h1>
+<div class="gallery_page_container" style="margin-top:0px;">
+ <% if false %>
+ <div class="company_name">
+ <h2>Fox Decorating</h2>
+ </div>
+ <% end %>
+
+ <div class="row">
+ <div class="col-sm-4">
+ <div class="thumbnail">
+ <a href="tom_work1.jpg">
+ <%= image_tag("tom_work1.jpg", alt: "Room") %>
+ <div class="caption">
+ <p>Lorem ipsum...</p>
+ </div>
+ </a>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="thumbnail">
+ <a href="tom_work1.jpg">
+ <%= image_tag("tom_work2.jpg", alt: "Room") %>
+ <div class="caption">
+ <p>Lorem ipsum...</p>
+ </div>
+ </a>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="thumbnail">
+ <a href="tom_work1.jpg">
+ <%= image_tag("tom_work5.jpg", alt: "Room") %>
+ <div class="caption">
+ <p>Lorem ipsum...</p>
+ </div>
+ </a>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-sm-4">
+ <div class="thumbnail">
+ <a href="tom_work1.jpg">
+ <%= image_tag("tom_work4.jpg", alt: "Room") %>
+ <div class="caption">
+ <p>Lorem ipsum...</p>
+ </div>
+ </a>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="thumbnail">
+ <a href="tom_work1.jpg">
+ <%= image_tag("tom_work3.jpg", alt: "Room") %>
+ <div class="caption">
+ <p>Lorem ipsum...</p>
+ </div>
+ </a>
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <div class="thumbnail">
+ <a href="tom_work1.jpg">
+ <%= image_tag("tom_work34.jpg", alt: "Room") %>
+ <div class="caption">
+ <p>Lorem ipsum...</p>
+ </div>
+ </a>
+ </div>
+ </div>
+ </div>
+
+</div>
+
+<!--
+https://www.w3schools.com/bootstrap/bootstrap_images.asp-->
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -13,6 +13,7 @@
  <div class="content_container container">
 
  <div class="row">
+
  <div class="about_us_container col-sm-7 align-items-center">
  <div id="about_us">
  <h3>Serving Chicagoland Since 1986</h3>
@@ -35,6 +36,7 @@
  </div>
  </div>
  </div>
+
  </div>
 
  <div class="about_tom_container col-12">

diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Message, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end