From 9ad35baea97a2665c5f88aa2a44078493f8ebf0d Mon Sep 17 00:00:00 2001
From: Galiant <antonijodev@gmail.com>
Date: Sat, 21 Apr 2018 07:16:34 +0000
Subject: [PATCH 1/8] Only signed user can see view order button

---
 app/controllers/static_pages_controller.rb |   1 +
 app/views/layouts/_footer.html.erb         |   4 ++++
 app/views/layouts/_header.html.erb         |   2 +-
 app/views/static_pages/home.html.erb       |   2 --
 db/development.sqlite3                     | Bin 109568 -> 110592 bytes
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
index 69d1dba..15df724 100644
--- a/app/controllers/static_pages_controller.rb
+++ b/app/controllers/static_pages_controller.rb
@@ -31,4 +31,5 @@ def genre
      @items = Item.where("genre like ?", genreName)
     #@items= Item.all
   end
+  
 end
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 8fe3764..acf4860 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -7,6 +7,10 @@
         
         <% end %>
         
+        <% if user_signed_in? %>
          <%= link_to 'View orders', orders_path, :class => 'button', :role => 'button' %>
+        <% end %>
+         
+          <%= render 'layouts/iconscredit' %>
      
     </footer>
\ No newline at end of file
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 66955bc..921c7f6 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -4,7 +4,7 @@
       
       <ul>
         <li><%= link_to "Home", root_path %></li>
-        <li><%= link_to "Games", items_path %></li>
+        <li><%= link_to "All Games", items_path %></li>
         <li><%= link_to "About", about_path %></li>
         <li><%= link_to "Help", help_path %></li>
         <li><%= link_to "Cart", cart_path  %></li>
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
index fda3ad7..20eb57e 100644
--- a/app/views/static_pages/home.html.erb
+++ b/app/views/static_pages/home.html.erb
@@ -4,8 +4,6 @@
  
   <%= render 'layouts/genres' %>
   <%= render 'layouts/consoles' %>
-  
-  <%= render 'layouts/iconscredit' %>
     
 </div>
 
diff --git a/db/development.sqlite3 b/db/development.sqlite3
index 97109f1eb63591a5926f2775081330b2a958a395..ce7a62dad30214499b79f6335bd0e8e338d541df 100644
GIT binary patch
delta 460
zcmZp;!PfAAZGtrGd<F)FoQVqdjPo}pcuNaP@Ub&1GUgYhq!wkCq~;boY~Ca76~N)b
zz%0z9#ptqGk;ROWr!kqCpTW416{wYQa$s(#DYKD*p@pu2iLQ~Mf`Pe}p^25Lp`N*+
zrG=#>T*g4b$k@ur$jZP-&(y-)+{9?|tz3HnWc5adriPm}^KPp$OE4EsW}l+Z#9Rop
z(2|*rm6?%|Sz>be^j;2orlUY>8FD7`%&1{vItrAxV`9p--+XG86)Up?Q_E!b1@%l!
zEkN-<j9`5d4x76cRsG~)VbW({UdXJ%w46yFC@arYUnarM;K=Cf=!oV<V=H3|J)mO@
zEX<e-5;Id2k}4HSi&Kjf67x#p(-U(tlN~A(GxGEGlJj%1YqbD+5JSeqK+nL!(A3hn
qS{!6=`1W=47=w7XH86%UGCFJzYh)~CGL^v41#*h9rLmy_ZW#bn_HLK}

delta 236
zcmZp8z}9esZGtrGECvRK?1>8YjI%Z-cuNb4^RY84GUgYhq!wkCq~;deZ{8#A6~N)j
zz%0z9#pt?Ok;R;mr!k3{pTW416{wYSazJjViIIV!g|2~#u91O)k&zV$8S5Dt8<|>|
z;g*?vE7x8CMZK}P(PquO+p5gs%;l5Wr|1JMb7Y=eKE0R2j_DN8E{5#MJTq#5qOMGv
w&(1PuWwvMPn#{hS9w@@Xw7F|h)lV*FrsWLG3z=1zmIDQ6GHqWzk1>)L0E+)UQUCw|


From bdec5518b433e0fafd2fd82476a677563b9f6a61 Mon Sep 17 00:00:00 2001
From: Galiant <antonijodev@gmail.com>
Date: Sat, 21 Apr 2018 07:52:59 +0000
Subject: [PATCH 2/8] Added consoles title in navigation bar

---
 app/views/layouts/_header.html.erb      | 3 +++
 app/views/static_pages/console.html.erb | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 921c7f6..a07b41f 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -5,6 +5,9 @@
       <ul>
         <li><%= link_to "Home", root_path %></li>
         <li><%= link_to "All Games", items_path %></li>
+        <% Console.all.each do |console| %>
+        <li><a href="/console/<%= console.title %>"><%= console.title %></a></li>
+        <% end %>
         <li><%= link_to "About", about_path %></li>
         <li><%= link_to "Help", help_path %></li>
         <li><%= link_to "Cart", cart_path  %></li>
diff --git a/app/views/static_pages/console.html.erb b/app/views/static_pages/console.html.erb
index 0fa47a4..decb1d4 100644
--- a/app/views/static_pages/console.html.erb
+++ b/app/views/static_pages/console.html.erb
@@ -30,6 +30,11 @@
         <p>
           <a href = "/cart/<%= item.id %>" class = "button">Add to cart</a>
         <%= link_to 'Show', item, :class => "button", :role => "button" %>
+        
+         <% if session[:login] == 1 %> 
+        <%= link_to 'Edit', edit_item_path(item), :class => "button", :role => "button" %>
+        <%= link_to 'Destroy', item, method: :delete, data: { confirm: 'Are you sure?' }, :class => "button", :role => "button" %></td>
+        <% end %>
     
         
     </div>

From e717e3b1db6e188ae8b1380b2750057784ea93ce Mon Sep 17 00:00:00 2001
From: Galiant <antonijodev@gmail.com>
Date: Sat, 21 Apr 2018 08:05:30 +0000
Subject: [PATCH 3/8] Added currency and cosmetic show to item and categories
 page

---
 app/views/items/index.html.erb          |   8 +++-----
 app/views/static_pages/console.html.erb |   6 ++----
 db/development.sqlite3                  | Bin 110592 -> 110592 bytes
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/views/items/index.html.erb b/app/views/items/index.html.erb
index 05244a4..5b5a079 100644
--- a/app/views/items/index.html.erb
+++ b/app/views/items/index.html.erb
@@ -1,7 +1,7 @@
 <p id="notice"><%= notice %></p>
 <div id="itemsContainer">
 
-<h1>Games</h1>
+<h1>All Games</h1>
 
     <% @items.each do |item| %>
       <div class="item">
@@ -17,13 +17,11 @@
          Genre: <%= item.genre %>
         </p>
         
-        <p><%= item.description %></p>
-        
-        <p><%= item.price %></p>
+        <p>€ <%= item.price %></p>
 
         <p>
           <a href = "/cart/<%= item.id %>" class = "button">Add to cart</a>
-        <%= link_to 'Show', item, :class => "button", :role => "button" %>
+        <%= link_to 'Details', item, :class => "button", :role => "button" %>
         
         <% if session[:login] == 1 %> 
         <%= link_to 'Edit', edit_item_path(item), :class => "button", :role => "button" %>
diff --git a/app/views/static_pages/console.html.erb b/app/views/static_pages/console.html.erb
index decb1d4..8a0debb 100644
--- a/app/views/static_pages/console.html.erb
+++ b/app/views/static_pages/console.html.erb
@@ -23,13 +23,11 @@
          Genre: <%= item.genre %>
         </p>
         
-        <p><%= item.description %></p>
-        
-        <p><%= item.price %></p>
+        <p>€ <%= item.price %></p>
 
         <p>
           <a href = "/cart/<%= item.id %>" class = "button">Add to cart</a>
-        <%= link_to 'Show', item, :class => "button", :role => "button" %>
+        <%= link_to 'Details', item, :class => "button", :role => "button" %>
         
          <% if session[:login] == 1 %> 
         <%= link_to 'Edit', edit_item_path(item), :class => "button", :role => "button" %>
diff --git a/db/development.sqlite3 b/db/development.sqlite3
index ce7a62dad30214499b79f6335bd0e8e338d541df..540401cbb0bb3d76383e4899ecb13fe19c01cc24 100644
GIT binary patch
delta 83
zcmZp8z}E19ZGtr8f{8NDj0-j<xaLZ;7#SE^=o*;l8W}1WSXdbtS{a+@nHZQ^m|0F1
f$P;BXw6w6aoO~<Si3cHRVbZLTw_PKT@rEM+;yV`v

delta 73
zcmV-P0Ji^t;0A!;29O&8pOG9x0iUs8MQs5ClfZ2n8Zt03I4v+VEiy15GBY|dGCD9a
fE;TqeH#9Pn+HFFU%xwt+GBGuSC~mhXZUNXqP}UZR


From 86ccc5a61eb03933ee81ec5217831479caaf4586 Mon Sep 17 00:00:00 2001
From: Galiant <antonijodev@gmail.com>
Date: Sat, 21 Apr 2018 08:38:46 +0000
Subject: [PATCH 4/8] Added currency

---
 Gemfile                                |   4 ++
 Gemfile.lock                           |   8 +++
 app/assets/javascripts/application.js  |   7 +++
 app/assets/stylesheets/application.css |  70 +++++++++++++------------
 app/views/cart/createOrder.html.erb    |   4 +-
 db/development.sqlite3                 | Bin 110592 -> 113664 bytes
 6 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index a37c305..ca6a353 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,10 @@ gem 'rails', '~> 5.1.6'
 gem 'sqlite3'
 # Use Puma as the app server
 gem 'puma', '~> 3.7'
+# Use jQuery rails
+gem 'jquery-rails'
+# Use jQuery UI rails
+gem 'jquery-ui-rails'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets
diff --git a/Gemfile.lock b/Gemfile.lock
index 827d33b..d981cd1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,6 +79,12 @@ GEM
     jbuilder (2.7.0)
       activesupport (>= 4.2.0)
       multi_json (>= 1.2)
+    jquery-rails (4.3.3)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (6.0.1)
+      railties (>= 3.2.16)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -193,6 +199,8 @@ DEPENDENCIES
   coffee-rails (~> 4.2)
   devise (= 4.3.0)
   jbuilder (~> 2.5)
+  jquery-rails
+  jquery-ui-rails
   listen (>= 3.0.5, < 3.2)
   puma (~> 3.7)
   rails (~> 5.1.6)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 46b2035..55a2e42 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -13,3 +13,10 @@
 //= require rails-ujs
 //= require turbolinks
 //= require_tree .
+//= require jquery3
+//= require jquery_ujs
+
+document.addEventListener("turbolinks:load", function() {
+  // whatever you want to make sure is loaded on each page
+
+})
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index f9ca661..4f22e9f 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -4,8 +4,7 @@ html,
 body {
     margin: 0;
     padding: 0;
-     background-color: rgba(100, 68, 100, 0.1);
-
+    background-color: rgba(100, 68, 100, 0.1);
 }
 
 .mainCont {
@@ -30,30 +29,32 @@ body {
     min-width: 5em;
 }
 
-.icon{
-    width:5em;
+.icon {
+    width: 5em;
     opacity: 0.5;
 }
-.iconsdiv{
-      width:200px;
-      text-align:center;
-      display:block;
-      background-color: transparent;
-      border: 1px solid transparent;
-      margin-right: 10px;
-      margin-bottom: 1px;
-      float:left;
-    padding:2em;
+
+.iconsdiv {
+    width: 200px;
+    text-align: center;
+    display: block;
+    background-color: transparent;
+    border: 1px solid transparent;
+    margin-right: 10px;
+    margin-bottom: 1px;
+    float: left;
+    padding: 2em;
 
 }
-#freeIconsCredits{
-   color:grey;
-   font-size: 0.4em;
-    position:fixed;
-    width:80%;
-    left:10%;
-    bottom:1%;
-   
+
+#freeIconsCredits {
+    color: grey;
+    font-size: 0.4em;
+    position: fixed;
+    width: 80%;
+    left: 10%;
+    bottom: 1%;
+
 }
 
 /* Header */
@@ -163,34 +164,32 @@ h1 {
 
 
 #itemsContainer h2 {
-   display: block;
+    display: block;
     color: #555;
     text-align: justify;
     padding: 14px 16px;
     text-decoration: none;
     font-size: 20px
-    
 }
 
 
 .itemhols p {
-   display: block;
+    display: block;
     color: #4CAF50;
     text-align: center;
     padding: 14px 16px;
     text-decoration: none;
     font-size: 16px
-    
 }
 
 
 
 .itemholsIm {
-    width: 30%; 
-    margin-left: auto; 
-    margin-right: auto; 
+    width: 30%;
+    margin-left: auto;
+    margin-right: auto;
     display: block;
-    
+
 }
 
 
@@ -205,14 +204,19 @@ h1 {
     width: 100%;
 }
 
-#customers td, #customers th {
+#customers td,
+#customers th {
     border: 1px solid #ddd;
     padding: 8px;
 }
 
-#customers tr:nth-child(even){background-color: rgba(100, 68, 100, 0.1);}
+#customers tr:nth-child(even) {
+    background-color: rgba(100, 68, 100, 0.1);
+}
 
-#customers tr:hover {background-color:rgba(100, 68, 100, 0.3);}
+#customers tr:hover {
+    background-color: rgba(100, 68, 100, 0.3);
+}
 
 #customers th {
     padding-top: 12px;
diff --git a/app/views/cart/createOrder.html.erb b/app/views/cart/createOrder.html.erb
index 98a322a..bb61e86 100644
--- a/app/views/cart/createOrder.html.erb
+++ b/app/views/cart/createOrder.html.erb
@@ -30,7 +30,7 @@
         <tr>
             
             <% item = Orderitem.find_by_id(id) %>
-            <td><%= item.title %></td>
+            <td>Product: <%= item.title %></td>
             <td><%= item.quantity %></td>
             <td><%= number_to_currency(item.price, :unit => "€") %></td>
             <td><%= number_to_currency(item.quantity * item.price, :unit => "€") %></td>
@@ -48,7 +48,7 @@
             <tr>
             
             
-            <td colspan="4">Order Total: <%= @total %></td>
+            <td colspan="4">Order Total: € <%= @total %></td>
         </tr>
     
 <% shipping = 10 %>
diff --git a/db/development.sqlite3 b/db/development.sqlite3
index 540401cbb0bb3d76383e4899ecb13fe19c01cc24..896f9b278e13d1bdf020cf261e6d222cc5acb720 100644
GIT binary patch
delta 784
zcmZp8z}E1CZGtrGG6n{Q{D}(ojLSAAcuNaP^RY84GUgYhq!wkCq~;boZ{8#AQNb+D
z96y<TiXj_wHghU-{KiH_W+7H)Mn-07FewElB_|h7pUmOJv<+w?L;hr*8Fg$-2bgv<
zZQIzW$;6ZA1QgA61QIz8n~%=2XJvL~Dw@o`pplKKj;VsFXk+6OMzERE&LGpIoIs?c
z<K~t{4L^n08HE^_7c#3bEoahayuet<C^WJ0PkpR3JA)&mw4<YufuV)2fr+k>p@M;h
zm64^Dv9X>h5Lg&72c+huWagz~S78nm#w`;oh23~lD<dO4BSX`AV*^7R=0la38yJ|N
znU5qBD~a8FV=E(5J!3OVQzKl)LsZCH7@8Uxp_vbn0?TaIpT~Gnkc$@><cv&A3`|TL
z8-FlLG*>%vGcd}x#dESVIy$ntCFbPhmzF4)Y!=Yl$Y?K#%{UVSBVz+I+%gz8IN`BD
n3e6lyfEZaA8=~8QB!gjtGj1D9rO|AFBnLBdBXjh?LXrUh=V7dy

delta 132
zcmZqp!PfAAZGtrG0tN<#oQVqdj0-j<cuNaP@Ub&1GUgYhq!wkCq~;boY~Ca7QNb+1
zTsWD1is5EO7E9*I@zYr+mrd{EuxC07)Xb1GnP)~FP{xjF^NCqDtjrEfEtA<7Gy+Bb
iFm7&H)bNvsg-M@*c_Fh3({d(#ps+mCcKvyb7X<;tyD1<5


From 34f9ed15435d5c1a8c8a02e8c60956dda05b2e8a Mon Sep 17 00:00:00 2001
From: Galiant <antonijodev@gmail.com>
Date: Sat, 21 Apr 2018 08:47:00 +0000
Subject: [PATCH 5/8] Change layout of genre categories

---
 app/views/static_pages/genre.html.erb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/static_pages/genre.html.erb b/app/views/static_pages/genre.html.erb
index 342e956..f29f1c4 100644
--- a/app/views/static_pages/genre.html.erb
+++ b/app/views/static_pages/genre.html.erb
@@ -23,13 +23,16 @@
          Genre: <%= item.genre %>
         </p>
         
-        <p><%= item.description %></p>
-        
-        <p><%= item.price %></p>
+        <p>€ <%= item.price %></p>
 
         <p>
           <a href = "/cart/<%= item.id %>" class = "button">Add to cart</a>
-        <%= link_to 'Show', item, :class => "button", :role => "button" %>
+        <%= link_to 'Details', item, :class => "button", :role => "button" %>
+        
+        <% if session[:login] == 1 %> 
+        <%= link_to 'Edit', edit_item_path(item), :class => "button", :role => "button" %>
+        <%= link_to 'Destroy', item, method: :delete, data: { confirm: 'Are you sure?' }, :class => "button", :role => "button" %></td>
+        <% end %>
         
         
     </div>

From c28b4005892c03e646255428026f9ea0f172f9a0 Mon Sep 17 00:00:00 2001
From: Galiant <antonijodev@gmail.com>
Date: Sat, 21 Apr 2018 09:10:53 +0000
Subject: [PATCH 6/8] Added button hover effect

---
 app/assets/stylesheets/application.css  |  11 ++++++++++-
 app/views/static_pages/console.html.erb |   2 +-
 db/development.sqlite3                  | Bin 113664 -> 113664 bytes
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 4f22e9f..2d749e3 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -17,7 +17,7 @@ body {
 
 .button {
     background-color: rgba(100, 68, 100, 0.7);
-    border: none;
+    border: 1px solid white;
     color: white;
     padding: 10px 10px;
     text-align: center;
@@ -29,6 +29,15 @@ body {
     min-width: 5em;
 }
 
+.button:hover {
+    background-color: white;
+    border: 1px solid rgb(100, 68, 100);
+    color: rgb(100, 68, 100);
+    text-decoration: none;
+    min-width: 5em;
+}
+
+
 .icon {
     width: 5em;
     opacity: 0.5;
diff --git a/app/views/static_pages/console.html.erb b/app/views/static_pages/console.html.erb
index 8a0debb..c33e185 100644
--- a/app/views/static_pages/console.html.erb
+++ b/app/views/static_pages/console.html.erb
@@ -29,7 +29,7 @@
           <a href = "/cart/<%= item.id %>" class = "button">Add to cart</a>
         <%= link_to 'Details', item, :class => "button", :role => "button" %>
         
-         <% if session[:login] == 1 %> 
+        <% if session[:login] == 1 %> 
         <%= link_to 'Edit', edit_item_path(item), :class => "button", :role => "button" %>
         <%= link_to 'Destroy', item, method: :delete, data: { confirm: 'Are you sure?' }, :class => "button", :role => "button" %></td>
         <% end %>
diff --git a/db/development.sqlite3 b/db/development.sqlite3
index 896f9b278e13d1bdf020cf261e6d222cc5acb720..5d2b7342bba1a1065551eccb0576d5d3a50bd1eb 100644
GIT binary patch
delta 81
zcmZqp!PfADZGtr8@`*CejLSDBxaLZ;8W|W`=o*;l8W}1WSXh}FTbY>anOIs{T9{83
h$P;5WvoM={GuM>|B4KJ^Xl7#6td+N2E06J-F96Tc7WDuC

delta 73
zcmV-P0Ji^t_y&OZ29O&8rjZ;&0j9BFMQs5DlfZ2n88R?2I4v+VEiy46FgH3eG&(gg
fE;lhbI60HqZAFvLZ3qN7G%+)SDsHzbZUNR!WttZ0


From 19bf9133986ab840b2d5ffbc11084286d28a8e80 Mon Sep 17 00:00:00 2001
From: Galiant <antonijodev@gmail.com>
Date: Sat, 21 Apr 2018 09:36:24 +0000
Subject: [PATCH 7/8] homepage styling

---
 app/assets/stylesheets/application.css |  9 ++++-----
 app/views/layouts/_consoles.html.erb   |  7 +++----
 app/views/layouts/_genres.html.erb     |  6 ++++--
 app/views/static_pages/home.html.erb   | 17 ++++++++++-------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 2d749e3..d55e7f8 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -8,16 +8,15 @@ body {
 }
 
 .mainCont {
-    margin: auto;
+    margin-left: auto;
+    margin-right: auto;
     width: 100%;
-    border: solid 3px #b3200f;
     text-align: center;
-    padding: 10px;
 }
 
 .button {
     background-color: rgba(100, 68, 100, 0.7);
-    border: 1px solid white;
+    border: 1px solid rgba(100, 68, 100, 0.7);
     color: white;
     padding: 10px 10px;
     text-align: center;
@@ -44,7 +43,7 @@ body {
 }
 
 .iconsdiv {
-    width: 200px;
+    width: 20%;
     text-align: center;
     display: block;
     background-color: transparent;
diff --git a/app/views/layouts/_consoles.html.erb b/app/views/layouts/_consoles.html.erb
index 15ab67e..778faa2 100644
--- a/app/views/layouts/_consoles.html.erb
+++ b/app/views/layouts/_consoles.html.erb
@@ -2,7 +2,7 @@
 
 
  <% @consoles.each do |console| %>
- 
+ <div class="mainCont">
  <div class = "iconsdiv">
      
      
@@ -12,8 +12,7 @@
         <p><a href="/console/<%= console.title %>" class="button"><%= console.title %></a></p>
         
         </div>
-        
+        </div> 
     <% end %>
  
-
-     
\ No newline at end of file
+    
\ No newline at end of file
diff --git a/app/views/layouts/_genres.html.erb b/app/views/layouts/_genres.html.erb
index 658d0b5..5f81e9c 100644
--- a/app/views/layouts/_genres.html.erb
+++ b/app/views/layouts/_genres.html.erb
@@ -1,6 +1,7 @@
 
 
  <% @genres.each do |genre| %>
+ <div class="mainCont">
  
  <div class = "iconsdiv">
      
@@ -11,5 +12,6 @@
         
         
         </div>
-        
-    <% end %>
\ No newline at end of file
+ </div>
+    <% end %>
+    
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
index 20eb57e..da7d467 100644
--- a/app/views/static_pages/home.html.erb
+++ b/app/views/static_pages/home.html.erb
@@ -1,15 +1,18 @@
 <% provide(:title, 'Home') %>
 
-<div class = "maincont">
- 
+<div class="mainCont">
+ <h2>Search</h2>
+  <%= render 'layouts/search' %>
+</div>
+
+<div class="mainCont">
   <%= render 'layouts/genres' %>
-  <%= render 'layouts/consoles' %>
-    
 </div>
 
-<div class = "maincont">
- <h2>Search</h2>
-  <%= render 'layouts/search' %>
+<div class="mainCont">
+  <%= render 'layouts/consoles' %>
 </div>
 
 
+
+

From 2d6237c956c5a8147e3ea163d8b64776b8b03902 Mon Sep 17 00:00:00 2001
From: Galiant <antonijodev@gmail.com>
Date: Sat, 21 Apr 2018 11:38:47 +0000
Subject: [PATCH 8/8] Homepage styling without header, details styling

---
 app/assets/stylesheets/application.css |  80 +++++++++++++++++++------
 app/views/items/index.html.erb         |   6 +-
 app/views/items/show.html.erb          |  12 +++-
 app/views/layouts/_footer.html.erb     |  10 +++-
 app/views/layouts/_search.html.erb     |   2 +-
 app/views/static_pages/home.html.erb   |   3 +-
 db/development.sqlite3                 | Bin 113664 -> 113664 bytes
 7 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index d55e7f8..de7d286 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -1,17 +1,22 @@
 /* General */
 
+@import url('https://fonts.googleapis.com/css?family=Roboto:400,700');
+
 html,
 body {
     margin: 0;
     padding: 0;
+    font-family: 'Roboto', sans-serif;
     background-color: rgba(100, 68, 100, 0.1);
 }
 
 .mainCont {
     margin-left: auto;
     margin-right: auto;
-    width: 100%;
+    max-width: 100%;
     text-align: center;
+    padding-left: 0;
+    padding-right: 0;
 }
 
 .button {
@@ -43,26 +48,16 @@ body {
 }
 
 .iconsdiv {
-    width: 20%;
+    width: 23%;
     text-align: center;
     display: block;
     background-color: transparent;
     border: 1px solid transparent;
-    margin-right: 10px;
+    margin-right: 0;
     margin-bottom: 1px;
     float: left;
     padding: 2em;
-
-}
-
-#freeIconsCredits {
-    color: grey;
-    font-size: 0.4em;
-    position: fixed;
-    width: 80%;
-    left: 10%;
-    bottom: 1%;
-
+    padding-left: 0;
 }
 
 /* Header */
@@ -107,7 +102,7 @@ body {
 /* Footer */
 
 .foot {
-    min-height: 4em;
+    min-height: 100px;
     background: url("/assets/Site/gameland.jpg") no-repeat center center fixed;
     -webkit-background-size: cover;
     -moz-background-size: cover;
@@ -118,8 +113,59 @@ body {
     overflow: auto;
 }
 
+.footer-buttons {
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 10px;
+    text-align: center;
+}
+
+.team {
+    text-align: center;
+    padding-top: 10px;
+    width: 100%;
+    margin-bottom: 20px;
+    font-size: 18px;
+    font-weight: 700;
+    color: black;
+}
+
+#freeIconsCredits {
+    color: grey;
+    font-size: 0.4em;
+    width: 100%;
+    padding-bottom: 15px;
+}
+
+.credit {
+    text-align: center;
+}
+
+/* Home */
+
+.search {
+    padding-top: 10px;
+    margin-right: 30px;
+    margin-bottom: 30px;
+    text-align: right;
+}
+
+@media only screen and (max-width: 1024px) {
+    .iconsdiv {
+        width: 21%;
+    }
+}
 
+/* Details(Show)*/
 
+.details {
+    text-align: left;
+    padding: 2%;
+    padding-top: .5%;
+    font-size: 18px;
+}
+
+/* Games(Items)*/
 
 #itemsContainer {
     width: 100%;
@@ -134,8 +180,6 @@ h1 {
     text-decoration: none;
 }
 
-/* Item */
-
 .item {
     margin-left: auto;
     margin-right: auto;
@@ -169,8 +213,6 @@ h1 {
     display: block;
 }
 
-
-
 #itemsContainer h2 {
     display: block;
     color: #555;
diff --git a/app/views/items/index.html.erb b/app/views/items/index.html.erb
index 5b5a079..6bc9f7d 100644
--- a/app/views/items/index.html.erb
+++ b/app/views/items/index.html.erb
@@ -15,9 +15,9 @@
          Brand: <%= item.brand %>
           <br>
          Genre: <%= item.genre %>
-        </p>
-        
-        <p>€ <%= item.price %></p>
+         <br>
+         <br>
+          € <%= item.price %></p>
 
         <p>
           <a href = "/cart/<%= item.id %>" class = "button">Add to cart</a>
diff --git a/app/views/items/show.html.erb b/app/views/items/show.html.erb
index e4d1174..0c332f5 100644
--- a/app/views/items/show.html.erb
+++ b/app/views/items/show.html.erb
@@ -1,5 +1,7 @@
 <p id="notice"><%= notice %></p>
 
+<div class="mainCont details">
+
 <p>
   <strong>Title:</strong>
   <%= @item.title %>
@@ -27,7 +29,7 @@
 
 <p>
   <strong>Price:</strong>
-  <%= @item.price %>
+  € <%= @item.price %>
 </p>
 
 <p>
@@ -35,5 +37,9 @@
   <%= @item.image_url %>
 </p>
 
-<%= link_to 'Edit', edit_item_path(@item) %> |
-<%= link_to 'Back', items_path %>
+<% if session[:login] == 1 %>
+<%= link_to 'Edit', edit_item_path(@item), :class => "button", :role => "button" %>
+<% end %>
+<%= link_to 'Back', items_path, :class => "button", :role => "button" %>
+
+</div>
\ No newline at end of file
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index acf4860..2df32a8 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -1,4 +1,6 @@
     <footer class="foot">
+      
+      <div class="footer-buttons">
         
         <% if session[:login] == 1 %>
         <%= link_to 'New Item', new_item_path,:class =>"button", :role=>"button"  %>
@@ -10,7 +12,9 @@
         <% if user_signed_in? %>
          <%= link_to 'View orders', orders_path, :class => 'button', :role => 'button' %>
         <% end %>
-         
-          <%= render 'layouts/iconscredit' %>
-     
+    </div>
+    <hr>
+    <div class="team">SSWT Project - made by Isabelle Bidou, Robert Gaughan and Antonijo Galic</div>
+    <hr>
+    <div class="credit"><%= render 'layouts/iconscredit' %></div>
     </footer>
\ No newline at end of file
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index dfb9707..a2b1a8a 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,5 +1,5 @@
 <%= form_tag("/search", :method => "post") do %>
-  <%= label_tag(:q, "Search For:") %>
+  <%= label_tag(:q, "Search game:") %>
   <%= text_field_tag(:q) %>
   <%= submit_tag("Search") %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
index da7d467..23a774f 100644
--- a/app/views/static_pages/home.html.erb
+++ b/app/views/static_pages/home.html.erb
@@ -1,7 +1,6 @@
 <% provide(:title, 'Home') %>
 
-<div class="mainCont">
- <h2>Search</h2>
+<div class="mainCont search">
   <%= render 'layouts/search' %>
 </div>
 
diff --git a/db/development.sqlite3 b/db/development.sqlite3
index 5d2b7342bba1a1065551eccb0576d5d3a50bd1eb..fba0ddd8034114ea75eca9873791277a1a487e33 100644
GIT binary patch
delta 101
zcmZqp!PfADZGtr8%84@0j4L-LxaOL$8yOf{=o*;l8W}1W8d#Z_TA7;bSsIy`o0?+C
g7@6xCn*zb)o4HQ>NQ%vjOwF3L^0sT`F<$cp0E2!S!~g&Q

delta 101
zcmZqp!PfADZGtr8@`*CejLSDBxaOL$8W|W`=o*;l8W}1WSXh}FTbY>anOIs{T9~8C
m7#La^o9LMsm|2)jzM1R94_9nzU}$Dy)U1`aT`Q0AnlAu_h8oBK