From 1a9d391685983cb5794bd9cbcd3754d7f85d4c43 Mon Sep 17 00:00:00 2001 From: Galiant Date: Sat, 21 Apr 2018 22:51:08 +0000 Subject: [PATCH] Styling in process --- app/assets/stylesheets/application.css | 9 ++++++--- app/views/cart/createOrder.html.erb | 2 +- app/views/cart/index.html.erb | 3 +-- app/views/consoles/edit.html.erb | 8 ++++++-- app/views/consoles/index.html.erb | 11 +++++++---- app/views/consoles/new.html.erb | 5 ++++- app/views/consoles/show.html.erb | 6 +++++- app/views/devise/confirmations/new.html.erb | 6 +++++- app/views/devise/passwords/edit.html.erb | 6 +++++- app/views/devise/passwords/new.html.erb | 6 +++++- app/views/devise/registrations/edit.html.erb | 10 +++++++--- app/views/devise/unlocks/new.html.erb | 6 +++++- app/views/genres/edit.html.erb | 8 ++++++-- app/views/genres/index.html.erb | 17 ++++++++++------- app/views/genres/new.html.erb | 5 ++++- app/views/genres/show.html.erb | 8 ++++++-- app/views/items/edit.html.erb | 4 ++++ app/views/items/index.html.erb | 6 ------ app/views/items/new.html.erb | 2 +- app/views/items/search.html.erb | 4 ++-- app/views/orders/_form.html.erb | 2 +- app/views/orders/edit.html.erb | 11 +++++++++-- app/views/orders/index.html.erb | 10 ++++++---- app/views/orders/new.html.erb | 9 ++++++++- app/views/orders/show.html.erb | 2 +- app/views/static_pages/paid.html.erb | 10 ++++++++-- db/development.sqlite3 | Bin 113664 -> 131072 bytes 27 files changed, 123 insertions(+), 53 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index e253267..5aff8d7 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -302,15 +302,17 @@ h1 { margin-bottom: .8%; } -/* Orders */ +/* Orders and Consoles*/ -.orders { +.orders, +.consoles { text-align: left; margin-right: auto; margin-left: auto; } -.orders-table { +.orders-table, +.consoles-table { margin-left: auto; margin-right: auto; width: 60%; @@ -329,6 +331,7 @@ h1 { } } +/* Cart and Checkout */ #customers { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; diff --git a/app/views/cart/createOrder.html.erb b/app/views/cart/createOrder.html.erb index bb61e86..c737366 100644 --- a/app/views/cart/createOrder.html.erb +++ b/app/views/cart/createOrder.html.erb @@ -59,7 +59,7 @@ - You pay: € <%= @overall %> +

You pay: € <%= @overall %>

diff --git a/app/views/cart/index.html.erb b/app/views/cart/index.html.erb index 0a6e0b5..cc80f17 100644 --- a/app/views/cart/index.html.erb +++ b/app/views/cart/index.html.erb @@ -38,9 +38,8 @@ - Grand Total: <%= number_to_currency(total, :unit => "€") %> +

Grand Total: <%= number_to_currency(total, :unit => "€") %>

- diff --git a/app/views/consoles/edit.html.erb b/app/views/consoles/edit.html.erb index b64d0f6..19c15cb 100644 --- a/app/views/consoles/edit.html.erb +++ b/app/views/consoles/edit.html.erb @@ -1,6 +1,10 @@

Editing Console

+
+ <%= render 'form', console: @console %> -<%= link_to 'Show', @console %> | -<%= link_to 'Back', consoles_path %> +<%= link_to 'Show', @console, :class => "button", :role => "button" %> +<%= link_to 'Back', consoles_path, :class => "button", :role => "button" %> + +
diff --git a/app/views/consoles/index.html.erb b/app/views/consoles/index.html.erb index e3cc228..c128902 100644 --- a/app/views/consoles/index.html.erb +++ b/app/views/consoles/index.html.erb @@ -1,8 +1,10 @@

<%= notice %>

+
+

Consoles

- +
@@ -23,9 +25,10 @@ <% end %> + + +
Title<%= link_to 'Destroy', console, :class => "button", :role => "button", method: :delete, data: { confirm: 'Are you sure?' } %>
<%= link_to 'New Console', new_console_path, :class => "button", :role => "button" %>
-
- -<%= link_to 'New Console', new_console_path, :class => "button", :role => "button" %> +
\ No newline at end of file diff --git a/app/views/consoles/new.html.erb b/app/views/consoles/new.html.erb index 9b39214..cfd3e0d 100644 --- a/app/views/consoles/new.html.erb +++ b/app/views/consoles/new.html.erb @@ -1,9 +1,12 @@

New Console

-
+
<%= render 'form', console: @console %> <%= link_to 'Back', consoles_path, :class => "button", :role => "button" %> +
+
+
diff --git a/app/views/consoles/show.html.erb b/app/views/consoles/show.html.erb index d10051d..3a1b0f2 100644 --- a/app/views/consoles/show.html.erb +++ b/app/views/consoles/show.html.erb @@ -1,5 +1,7 @@

<%= notice %>

+
+

Title: <%= @console.title %> @@ -15,5 +17,7 @@ <%= @console.image %>

-<%= link_to 'Edit', edit_console_path(@console), :class => "button", :role => "button" %> | +<%= link_to 'Edit', edit_console_path(@console), :class => "button", :role => "button" %> <%= link_to 'Back', consoles_path, :class => "button", :role => "button" %> + +
\ No newline at end of file diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index 2dc668f..e5a2406 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,3 +1,5 @@ +
+

Resend confirmation instructions

<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> @@ -9,8 +11,10 @@
- <%= f.submit "Resend confirmation instructions" %> + <%= f.submit "Resend confirmation instructions", :class => "button", :role => "button" %>
<% end %> <%= render "devise/shared/links" %> + +
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb index 6a796b0..6c5d8db 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,3 +1,5 @@ +
+

Change your password

<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> @@ -18,8 +20,10 @@
- <%= f.submit "Change my password" %> + <%= f.submit "Change my password", :class => "button", :role => "button" %>
<% end %> <%= render "devise/shared/links" %> + + diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 3d6d11a..f059d42 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,3 +1,5 @@ +
+

Forgot your password?

<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> @@ -9,8 +11,10 @@
- <%= f.submit "Send me reset password instructions" %> + <%= f.submit "Send me reset password instructions", :class => "button", :role => "button" %>
<% end %> <%= render "devise/shared/links" %> + + diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index 1e66f3d..f08fe51 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,3 +1,5 @@ +
+

Edit <%= resource_name.to_s.humanize %>

<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> @@ -32,12 +34,14 @@
- <%= f.submit "Update" %> + <%= f.submit "Update", :class => "button", :role => "button" %>
<% end %>

Cancel my account

-

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>

+

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :class => "button", :role => "button", data: { confirm: "Are you sure?" }, method: :delete %>

+ +<%= link_to "Back", :back, :class => "button", :role => "button" %> -<%= link_to "Back", :back %> + diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb index 16586bc..5744f88 100644 --- a/app/views/devise/unlocks/new.html.erb +++ b/app/views/devise/unlocks/new.html.erb @@ -1,3 +1,5 @@ +
+

Resend unlock instructions

<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> @@ -9,8 +11,10 @@
- <%= f.submit "Resend unlock instructions" %> + <%= f.submit "Resend unlock instructions", :class => "button", :role => "button" %>
<% end %> <%= render "devise/shared/links" %> + + diff --git a/app/views/genres/edit.html.erb b/app/views/genres/edit.html.erb index 55dc02f..0d7679a 100644 --- a/app/views/genres/edit.html.erb +++ b/app/views/genres/edit.html.erb @@ -1,6 +1,10 @@

Editing Genre

+
+ <%= render 'form', genre: @genre %> -<%= link_to 'Show', @genre %> | -<%= link_to 'Back', genres_path %> +<%= link_to 'Show', @genre, :class => "button", :role => "button" %> +<%= link_to 'Back', genres_path, :class => "button", :role => "button" %> + +
diff --git a/app/views/genres/index.html.erb b/app/views/genres/index.html.erb index 18ca735..be28c2a 100644 --- a/app/views/genres/index.html.erb +++ b/app/views/genres/index.html.erb @@ -1,8 +1,10 @@

<%= notice %>

+
+

Genres

- +
@@ -18,14 +20,15 @@ - - - + + + <% end %> + + +
Title<%= genre.title %> <%= genre.description %> <%= genre.image %><%= link_to 'Show', genre %><%= link_to 'Edit', edit_genre_path(genre) %><%= link_to 'Destroy', genre, method: :delete, data: { confirm: 'Are you sure?' } %><%= link_to 'Show', genre, :class => "button", :role => "button" %><%= link_to 'Edit', edit_genre_path(genre), :class => "button", :role => "button" %><%= link_to 'Destroy', genre, :class => "button", :role => "button", method: :delete, data: { confirm: 'Are you sure?' } %>
<%= link_to 'New Genre', new_genre_path, :class => "button", :role => "button" %>
-
- -<%= link_to 'New Genre', new_genre_path %> +
\ No newline at end of file diff --git a/app/views/genres/new.html.erb b/app/views/genres/new.html.erb index b2fe242..fa2f859 100644 --- a/app/views/genres/new.html.erb +++ b/app/views/genres/new.html.erb @@ -1,9 +1,12 @@

New Genre

-
+
<%= render 'form', genre: @genre %> <%= link_to 'Back', genres_path, :class =>"button", :role=>"button" %> +
+
+
\ No newline at end of file diff --git a/app/views/genres/show.html.erb b/app/views/genres/show.html.erb index 03cec2e..c93f72c 100644 --- a/app/views/genres/show.html.erb +++ b/app/views/genres/show.html.erb @@ -1,5 +1,7 @@

<%= notice %>

+
+

Title: <%= @genre.title %> @@ -15,5 +17,7 @@ <%= @genre.image %>

-<%= link_to 'Edit', edit_genre_path(@genre) %> | -<%= link_to 'Back', genres_path %> +<%= link_to 'Edit', edit_genre_path(@genre), :class => "button", :role => "button" %> +<%= link_to 'Back', genres_path, :class => "button", :role => "button" %> + +
\ No newline at end of file diff --git a/app/views/items/edit.html.erb b/app/views/items/edit.html.erb index ba45241..bcef268 100644 --- a/app/views/items/edit.html.erb +++ b/app/views/items/edit.html.erb @@ -1,6 +1,10 @@

Editing Item

+
+ <%= render 'form', item: @item %> <%= link_to 'Details', @item, :class => "button", :role => "button" %> <%= link_to 'Back', items_path, :class => "button", :role => "button" %> + +
\ No newline at end of file diff --git a/app/views/items/index.html.erb b/app/views/items/index.html.erb index 730e7be..3d2b92b 100644 --- a/app/views/items/index.html.erb +++ b/app/views/items/index.html.erb @@ -39,11 +39,5 @@

<% end %> - - - -
- - diff --git a/app/views/items/new.html.erb b/app/views/items/new.html.erb index 94fbd44..4a94d80 100644 --- a/app/views/items/new.html.erb +++ b/app/views/items/new.html.erb @@ -1,6 +1,6 @@

New Item

-
+
<%= render 'form', item: @item %> diff --git a/app/views/items/search.html.erb b/app/views/items/search.html.erb index 37fddd2..4727a87 100644 --- a/app/views/items/search.html.erb +++ b/app/views/items/search.html.erb @@ -25,11 +25,11 @@

<%= item.description %>

-

<%= item.price %>

+

€ <%= item.price %>

Add to cart - <%= link_to 'Show', item, :class => "button", :role => "button" %> + <%= link_to 'Details', item, :class => "button", :role => "button" %> <% if user_signed_in? %> <%= link_to 'Edit', edit_item_path(item), :class => "button", :role => "button" %> diff --git a/app/views/orders/_form.html.erb b/app/views/orders/_form.html.erb index 3208a67..f988494 100644 --- a/app/views/orders/_form.html.erb +++ b/app/views/orders/_form.html.erb @@ -27,6 +27,6 @@

- <%= form.submit %> + <%= form.submit :class => "button", :role => "button"%>
<% end %> diff --git a/app/views/orders/edit.html.erb b/app/views/orders/edit.html.erb index e23883c..d324fed 100644 --- a/app/views/orders/edit.html.erb +++ b/app/views/orders/edit.html.erb @@ -1,6 +1,13 @@ +
+

Editing Order

<%= render 'form', order: @order %> -<%= link_to 'Show', @order %> | -<%= link_to 'Back', orders_path %> +<%= link_to 'Show', @order, :class => "button", :role => "button" %> +<%= link_to 'Back', orders_path, :class => "button", :role => "button" %> + +
+
+ +
\ No newline at end of file diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb index b48ea5d..7657e26 100644 --- a/app/views/orders/index.html.erb +++ b/app/views/orders/index.html.erb @@ -8,7 +8,7 @@ Order date - User + User id Status @@ -18,7 +18,7 @@ <% @orders.each do |order| %> <%= order.order_date %> - <%= order.user %> + <%= order.user.id %> <%= order.status %> <% if user_signed_in? %> @@ -36,11 +36,13 @@ <% end %> <% end %> + + <%= link_to 'New Order', new_order_path, :class => "button new-order", :role => "button" %> +
- -<%= link_to 'New Order', new_order_path, :class => "button new-order", :role => "button" %> +
\ No newline at end of file diff --git a/app/views/orders/new.html.erb b/app/views/orders/new.html.erb index d4e1de2..c111058 100644 --- a/app/views/orders/new.html.erb +++ b/app/views/orders/new.html.erb @@ -1,5 +1,12 @@ +
+

New Order

<%= render 'form', order: @order %> -<%= link_to 'Back', orders_path %> +<%= link_to 'Back', orders_path, :class => "button", :role => "button" %> + +
+
+ +
\ No newline at end of file diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb index 79ee07c..9ec508f 100644 --- a/app/views/orders/show.html.erb +++ b/app/views/orders/show.html.erb @@ -17,7 +17,7 @@ <%= @order.order_date %> - <%= @order.user %> + <%= @order.user.id %> <%= @order.status %> diff --git a/app/views/static_pages/paid.html.erb b/app/views/static_pages/paid.html.erb index b51acf3..3ff2d8f 100644 --- a/app/views/static_pages/paid.html.erb +++ b/app/views/static_pages/paid.html.erb @@ -1,5 +1,11 @@ -
+
+
+ <%= image_tag("Site/game-land-logo.png") %> -

Thank you

+

Thank you for shopping!

+
+ +

You want to buy more

+
\ No newline at end of file diff --git a/db/development.sqlite3 b/db/development.sqlite3 index c093c0ad6bae716a7aca6c1fb99110b62516d710..0a45831a55fa8545b1221bdf9d7192718bc9d389 100644 GIT binary patch delta 2539 zcmZ{l+iP4^6vofqXOc;Str`WTnPg@%tq*~o?#tQdrU+AWnaMpF6)g-#NTS6gjY+C) zt(`ms#1}7&kfIiBi=={3(t)IkzKJjX4Hd+{pl?2iy7t~Db$Tun@QWM#kR!c<+;?V_CC^&aW>luAkdnT-m7I`l)xe_b4OOJ4NhM zj20LRmPYyP}^y!l|c{CL}S<`B18UU^eI6S>a|1h-t92%AS78W3g)>Qi3; z?PT-smE18&4DX<>*LrUC_hOf6K9G?&_tv(}Cdn*3^>!cpS$!I$(%lVOGEXDz-{W0;6JN*Ia1(!mKgQd*fiL3=cn!aUm*6=+pvlG@+;DXkmwlV4uh->ft-J-wg2T*hgrit&FnWH74R}%!t?kn zei={U3O<8hzz!yO5TC&P_*vWo0T$4_j9;oLos&8+t8_+caat)b5h_e7osgOzS2`xO zzpAt%wQp4Eh}7J$(xKM+%}*~KF>e^%#+YH=KIqP&9kT>+v+(;W${HN?mdl4tre1-v z!1e<|c7DmD!5%$FoCe&rd?BdK_X{X zR5J)LxMlmycD>BZ;_AY=)wd2G`)CFCnV0U=bAUga$S0mf8K*u^<*N!os2}4$bPn!+ zjY|2ux7QIGI@tIQy@o|DvD)?+rRmQ8J(R&{_@LuQ^eak1I6??F5uqFvVk8XF7psHg z6oflWq&qsqs18w0Mo{YdP9j1%N1>&i=#K368T==_LnqN47~QW>X|p67UHyN0!ZwP4 zQOg#-&&AHg>u9h6`+?|-4h#^BJPRD#Vh$&i)CZDB#|~_6dBm|PNoj3Z;kr&_VG%oM zsGFr#FDCO@z=g#ju`g2iy27D?NBM0|y^x4+!05v|g{kAzP2uYbMqDS}3VE+`>iI;z z#1o4X&U`-!-++#fH5 zI?gEkJn~OWE{;P-&vRAJvz?5viR~xs4?sw#_3!QmLStcweC$#3B%#ZG{Iz`O=n&&N z1W!gV*p=}R5&=%@pWRJ_Cc+Gbcm`-VCoZ?s9i3q^+%Cxo__`!{nv|ouF%^a=MjoZ7 z+NC0P5N(bQF&&0TMtFq88mbY>Q6Xl+5Cf4A`lY6hO`_dsb99K=a3qouup(n4p%K#2 iBQY0-C`Cf(#pM#%k?D>OQ43EZ8R5aMj(!gfSI&Rskq+Dd delta 389 zcmZo@;Ar^4HbIJw;V}aPL;gesJ0^z58xy>x1*Q4enH3rHi&9dHGD}i(i=7wmkq$KF zF)}c;&^0j8H8NB%G_x``wlXl%votp}G%!b#F|snW&@(qMH#0Js{4vLoA4#>5nWgb$ z$J|6yQ8YcqAU#Hg#ug@Ks4_-|R;I>!mPY30W)?uxR44z*mEnV!2-ab0Y_?e~@17zL z6Z1EqKNvEYe=~pEtT^E^^JD`SF+NWbpqK|27m$=@j-Sjv#eB0Oiz4&n_~}bIoS3$O zbmULwnb86i)nwYdbCx$NvollCWcCH^K#?bmn~N6pS59YCVD#GVEyEbbtQ^b8&fv%> z?dS+|rJ;p_p^=q|rIoRXo)IuK%*>}Bk!RGJenp;9Xqy5fON|ga!(9gEh0H2U%bBzo UPcw!x+?}k*a(w&UIgHBk0PkL7*#H0l