diff --git a/Gemfile b/Gemfile index 7f1ee55..c34bd5c 100644 --- a/Gemfile +++ b/Gemfile @@ -29,6 +29,8 @@ gem 'pg' gem 'paperclip' gem 'aws-sdk', '~> 2.3' +gem 'materialize-sass' + # Use jquery as the JavaScript library gem 'jquery-rails' # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks diff --git a/Gemfile.lock b/Gemfile.lock index e8f6709..c8674eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,6 +109,8 @@ GEM nokogiri (>= 1.5.9) mail (2.6.5) mime-types (>= 1.16, < 4) + materialize-sass (0.98.2) + sass (~> 3.3) method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) @@ -261,6 +263,7 @@ DEPENDENCIES jbuilder (~> 2.5) jquery-rails listen (~> 3.0.5) + materialize-sass paperclip pg puma (~> 3.0) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index 0ebd7fe..0000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS - * 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 - */ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss new file mode 100644 index 0000000..0b6d0b9 --- /dev/null +++ b/app/assets/stylesheets/application.scss @@ -0,0 +1,6 @@ +@import "materialize"; +@import "https://fonts.googleapis.com/icon?family=Material+Icons"; + +h1,h5 { + text-align: center; +} diff --git a/app/views/application/index.html.erb b/app/views/application/index.html.erb index 789b035..3f26ccf 100644 --- a/app/views/application/index.html.erb +++ b/app/views/application/index.html.erb @@ -1 +1,3 @@

WebShop

+ +

<%= link_to "See all Items", items_path, class: "waves-effect waves-light btn" %>

diff --git a/app/views/items/index.html.erb b/app/views/items/index.html.erb index 7320753..1961e5e 100644 --- a/app/views/items/index.html.erb +++ b/app/views/items/index.html.erb @@ -1,17 +1,22 @@ -
-

Items

+

Items

-<% if @items.any? %> - <% @items.each do |i| %> -

<%= i.name %>

-

<%= i.description %>

- <%= image_tag i.avatar.url(:medium) %> - <% end %> - <% else %> -

No items yet!

- <% end %> - <%= link_to "Add a new Item", new_item_path %> + <% if @items.any? %> + <% @items.each do |i| %> +
+
+

<%= i.name %>

+

<%= i.description %>

+

£<%= i.price %>

+

<%= image_tag i.avatar.url(:medium), class: "responsive-img" %>

+
+ <% end %> + + <% else %> +
No items yet!
+ <% end %>
+ +

<%= link_to "Add a new Item", new_item_path, class: "waves-effect waves-light btn" %>

diff --git a/app/views/items/new.html.erb b/app/views/items/new.html.erb index a9e9211..5b06268 100644 --- a/app/views/items/new.html.erb +++ b/app/views/items/new.html.erb @@ -1,10 +1,11 @@

Adding Items

- +
<%= form_for(@item, html: {multipart: true}) do |f| %> Name: <%= f.text_field :name %> Description: <%= f.text_field :description %> Price: <%= f.number_field :price %> <%= f.label :avatar %> <%= f.file_field :avatar %> -

<%= f.submit %>

+

<%= f.submit(class: "waves-effect waves-light btn") %> <% end %> +

diff --git a/public/system/items/avatars/000/000/004/medium/smartphones-2182838_1280.png b/public/system/items/avatars/000/000/004/medium/smartphones-2182838_1280.png new file mode 100644 index 0000000..258e7ea Binary files /dev/null and b/public/system/items/avatars/000/000/004/medium/smartphones-2182838_1280.png differ diff --git a/public/system/items/avatars/000/000/004/original/smartphones-2182838_1280.png b/public/system/items/avatars/000/000/004/original/smartphones-2182838_1280.png new file mode 100644 index 0000000..0a0de16 Binary files /dev/null and b/public/system/items/avatars/000/000/004/original/smartphones-2182838_1280.png differ diff --git a/public/system/items/avatars/000/000/005/medium/startup-593335_1920.jpg b/public/system/items/avatars/000/000/005/medium/startup-593335_1920.jpg new file mode 100644 index 0000000..12c97b5 Binary files /dev/null and b/public/system/items/avatars/000/000/005/medium/startup-593335_1920.jpg differ diff --git a/public/system/items/avatars/000/000/005/original/startup-593335_1920.jpg b/public/system/items/avatars/000/000/005/original/startup-593335_1920.jpg new file mode 100644 index 0000000..b6ce8c4 Binary files /dev/null and b/public/system/items/avatars/000/000/005/original/startup-593335_1920.jpg differ diff --git a/public/system/items/avatars/000/000/006/medium/whiteboard-849803_1920.jpg b/public/system/items/avatars/000/000/006/medium/whiteboard-849803_1920.jpg new file mode 100644 index 0000000..7854445 Binary files /dev/null and b/public/system/items/avatars/000/000/006/medium/whiteboard-849803_1920.jpg differ diff --git a/public/system/items/avatars/000/000/006/original/whiteboard-849803_1920.jpg b/public/system/items/avatars/000/000/006/original/whiteboard-849803_1920.jpg new file mode 100644 index 0000000..d5a0b54 Binary files /dev/null and b/public/system/items/avatars/000/000/006/original/whiteboard-849803_1920.jpg differ diff --git a/public/system/items/avatars/000/000/007/medium/IMG_20170521_130541_1.jpg b/public/system/items/avatars/000/000/007/medium/IMG_20170521_130541_1.jpg new file mode 100644 index 0000000..218f063 Binary files /dev/null and b/public/system/items/avatars/000/000/007/medium/IMG_20170521_130541_1.jpg differ diff --git a/public/system/items/avatars/000/000/007/original/IMG_20170521_130541_1.jpg b/public/system/items/avatars/000/000/007/original/IMG_20170521_130541_1.jpg new file mode 100644 index 0000000..bc09951 Binary files /dev/null and b/public/system/items/avatars/000/000/007/original/IMG_20170521_130541_1.jpg differ diff --git a/public/system/items/avatars/000/000/008/medium/startup-593335_1920.jpg b/public/system/items/avatars/000/000/008/medium/startup-593335_1920.jpg new file mode 100644 index 0000000..12c97b5 Binary files /dev/null and b/public/system/items/avatars/000/000/008/medium/startup-593335_1920.jpg differ diff --git a/public/system/items/avatars/000/000/008/original/startup-593335_1920.jpg b/public/system/items/avatars/000/000/008/original/startup-593335_1920.jpg new file mode 100644 index 0000000..b6ce8c4 Binary files /dev/null and b/public/system/items/avatars/000/000/008/original/startup-593335_1920.jpg differ diff --git a/public/system/items/avatars/000/000/009/medium/startup-593341_1920.jpg b/public/system/items/avatars/000/000/009/medium/startup-593341_1920.jpg new file mode 100644 index 0000000..816750c Binary files /dev/null and b/public/system/items/avatars/000/000/009/medium/startup-593341_1920.jpg differ diff --git a/public/system/items/avatars/000/000/009/original/startup-593341_1920.jpg b/public/system/items/avatars/000/000/009/original/startup-593341_1920.jpg new file mode 100644 index 0000000..d7918db Binary files /dev/null and b/public/system/items/avatars/000/000/009/original/startup-593341_1920.jpg differ diff --git a/public/system/items/avatars/000/000/010/medium/whiteboard-849803_1920.jpg b/public/system/items/avatars/000/000/010/medium/whiteboard-849803_1920.jpg new file mode 100644 index 0000000..7854445 Binary files /dev/null and b/public/system/items/avatars/000/000/010/medium/whiteboard-849803_1920.jpg differ diff --git a/public/system/items/avatars/000/000/010/original/whiteboard-849803_1920.jpg b/public/system/items/avatars/000/000/010/original/whiteboard-849803_1920.jpg new file mode 100644 index 0000000..d5a0b54 Binary files /dev/null and b/public/system/items/avatars/000/000/010/original/whiteboard-849803_1920.jpg differ