diff --git a/app/assets/images/Site/gameland.jpg b/app/assets/images/Site/gameland.jpg index b7edf3f..707da66 100644 Binary files a/app/assets/images/Site/gameland.jpg and b/app/assets/images/Site/gameland.jpg differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 55a2e42..8e3b067 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -19,4 +19,27 @@ document.addEventListener("turbolinks:load", function() { // whatever you want to make sure is loaded on each page + // Footer fix + // function to set the height on fly + function autoHeight() { + $('.mainCont').css('min-height', 0); + $('.mainCont').css('min-height', ( + $(document).height() - + $('.header').height() - + $('.foot').height() + )); + } + + // onDocumentReady function bind + $(document).ready(function() { + autoHeight(); + }); + + // onResize bind of the function + $(window).resize(function() { + autoHeight(); + }); + + // End Footer fix + }) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5aff8d7..4e07371 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -17,6 +17,7 @@ body { text-align: center; padding-left: 0; padding-right: 0; + min-height: 100%; } .button { @@ -71,31 +72,6 @@ body { width: 100%; } - -.icon { - width: 5em; - opacity: 0.5; -} - - -.icon { - width: 5em; - opacity: 0.5; -} - -.iconsdiv { - width: 23%; - text-align: center; - display: block; - background-color: transparent; - border: 1px solid transparent; - margin-right: 0; - margin-bottom: 1px; - float: left; - padding: 2em; - padding-left: 0; -} - #notice { padding-left: 2%; } @@ -121,6 +97,12 @@ body { text-align: center; } +.header ul { + list-style-type: none; + overflow: hidden; + background-color: rgba(0, 0, 0, .9); +} + .header li { float: left; } @@ -133,10 +115,15 @@ body { padding: 14px 16px; } -.header ul { - list-style-type: none; - overflow: hidden; - background-color: rgba(100, 68, 100, 0.3); +.header li a:hover { + color: rgb(222, 62, 62); +} + +.isAdminLi { + color: red; + padding-top: 13px; + font-size: 18px; + margin-left: 20px; } /* Footer */ @@ -149,8 +136,8 @@ body { -o-background-size: cover; background-size: cover; width: 100%; - margin-bottom: 0em; - overflow: auto; + overflow: hidden; + bottom: 0; } .footer-buttons { @@ -167,7 +154,7 @@ body { margin-bottom: 20px; font-size: 18px; font-weight: 700; - color: black; + color: white; } #freeIconsCredits { @@ -190,9 +177,47 @@ body { text-align: right; } +.icon { + width: 5em; + opacity: 0.9; +} + +.iconsdiv { + width: 23%; + text-align: center; + display: block; + background-color: transparent; + border: 1px solid transparent; + margin-right: 0; + margin-bottom: 1px; + float: left; + padding: 2em; + padding-left: 0; +} + +.home-catButton { + width: 25%; + margin-right: auto; + margin-left: auto; +} + +@media only screen and (max-width: 1440px) { + .icon { + padding-left: 1.5em; + } + + .iconsdiv { + width: 22%; + } +} + @media only screen and (max-width: 1024px) { + .icon { + padding-left: 3.2em; + } + .iconsdiv { - width: 21%; + width: 20%; } } @@ -253,6 +278,12 @@ h1 { display: block; } +@media only screen and (max-width: 768px) { + .item { + width: 80%; + } +} + #itemsContainer h2 { display: block; color: #555; diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb index 15df724..89f834c 100644 --- a/app/controllers/static_pages_controller.rb +++ b/app/controllers/static_pages_controller.rb @@ -12,9 +12,9 @@ def help end def paid - flash[:notice] = "transaction complete" + flash[:notice] = "Transaction successfully complete." @order = Order.last - @order.update_attribute(:status, "paid by user #{current_user.email}") + @order.update_attribute(:status, "Paid by #{current_user.email}") session[:cart] = nil end diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index dd81954..1962847 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -2,7 +2,7 @@ class UserController < ApplicationController def login session[:login] = 1 - flash[:notice] = "you are logged in" + flash[:notice] = "You are logged in!" redirect_to :controller => :items #session[:cart] = nil diff --git a/app/views/cart/createOrder.html.erb b/app/views/cart/createOrder.html.erb index c737366..094b380 100644 --- a/app/views/cart/createOrder.html.erb +++ b/app/views/cart/createOrder.html.erb @@ -55,7 +55,7 @@ <% @overall = shipping + @total %> - Shipping € 10 + Shipping € 10.00 diff --git a/app/views/cart/index.html.erb b/app/views/cart/index.html.erb index cc80f17..a15baff 100644 --- a/app/views/cart/index.html.erb +++ b/app/views/cart/index.html.erb @@ -1,9 +1,9 @@

<%= notice %>

-
+
<% if@cart.empty? %> -

Your cart is empty, please add somthing to make a purchase

+

Your cart is empty, please add somthing to make a purchase.

<% end %> diff --git a/app/views/items/_form.html.erb b/app/views/items/_form.html.erb index 63944bb..fa53113 100644 --- a/app/views/items/_form.html.erb +++ b/app/views/items/_form.html.erb @@ -16,16 +16,22 @@ <%= form.text_field :title, id: :item_title %> -
- <%= form.label :console %> + + + - + + + + +
+ <%= form.label :console %> + <%= form.select :console, ['Playstation 4', 'Xbox One', 'PC', 'Nintendo Switch'], id: :item_console %>
@@ -33,15 +39,21 @@ <%= form.text_field :brand, id: :item_brand %>
-
- <%= form.label :genre %> - + + + + +
+ <%= form.label :genre %> + <%= form.select :genre, ['Adventure', 'Racing', 'Sports', 'Action'], id: :item_console %>
diff --git a/app/views/layouts/_consoles.html.erb b/app/views/layouts/_consoles.html.erb index 778faa2..1805abf 100644 --- a/app/views/layouts/_consoles.html.erb +++ b/app/views/layouts/_consoles.html.erb @@ -2,17 +2,15 @@ <% @consoles.each do |console| %> -
-
+
<%= image_tag console.image, :class=>"icon" %> -

<%= console.title %>

+

<%= console.title %>

-
<% end %> \ No newline at end of file diff --git a/app/views/layouts/_genres.html.erb b/app/views/layouts/_genres.html.erb index 5f81e9c..2af946f 100644 --- a/app/views/layouts/_genres.html.erb +++ b/app/views/layouts/_genres.html.erb @@ -1,17 +1,11 @@ <% @genres.each do |genre| %> -
- -
- - +
<%= image_tag genre.image, :class=>"icon" %> -

<%= genre.title %>

- +

<%= genre.title %>

-
<% end %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 04bba58..0997222 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,6 +1,6 @@
- <%= image_tag("Site/game-land-logo-white.png") %> + <%= image_tag("Site/game-land-logo.png") %>
  • <%= link_to "Home", root_path %>
    • diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb index 23a774f..a068418 100644 --- a/app/views/static_pages/home.html.erb +++ b/app/views/static_pages/home.html.erb @@ -1,17 +1,16 @@ <% provide(:title, 'Home') %> - -
    + +
    + +
    <%= render 'layouts/search' %>
    -
    <%= render 'layouts/genres' %> -
    -
    <%= render 'layouts/consoles' %> -
    +
    diff --git a/db/development.sqlite3 b/db/development.sqlite3 index 98f2bc2..86b2e54 100644 Binary files a/db/development.sqlite3 and b/db/development.sqlite3 differ