diff --git a/Gemfile b/Gemfile index fba3b4e..170b2ff 100644 --- a/Gemfile +++ b/Gemfile @@ -38,3 +38,27 @@ gem 'spring', group: :development # Use debugger # gem 'debugger', group: [:development, :test] + +#customize gem +gem 'pry', '~> 0.10.0' +gem 'simple_form', '~> 3.0.2' +gem 'bootstrap-sass', '~> 3.2.0.0' +#The bootstrap-sass-rails gem is deprecated starting with version 3.1.0.0. +#gem 'bootstrap-sass-rails', '~> 3.1.0.0' +gem 'will_paginate' , '~> 3.0' +gem 'will_paginate-bootstrap' +gem 'devise' , '~> 3.2' +gem 'carrierwave' +gem 'cocoon', '~> 1.2.6' + +group :developmet, :test do + gem 'guard-livereload' + gem 'annotate', '~> 2.6.5' + gem 'mysql2' +end + + + + + + diff --git a/Gemfile.lock b/Gemfile.lock index 53538d9..cca9cb2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,8 +27,23 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) + annotate (2.6.5) + activerecord (>= 2.3.0) + rake (>= 0.8.7) arel (5.0.1.20140414130214) + bcrypt (3.1.7) + bootstrap-sass (3.2.0.0) + sass (~> 3.2) builder (3.2.2) + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) + celluloid (0.15.2) + timers (~> 1.1.0) + cocoon (1.2.6) + coderay (1.1.0) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -36,9 +51,32 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + devise (3.2.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) + em-websocket (0.5.1) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) erubis (2.7.0) + eventmachine (1.0.3) execjs (2.2.0) + ffi (1.9.3) + formatador (0.2.5) + guard (2.6.1) + formatador (>= 0.2.4) + listen (~> 2.7) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) + guard-livereload (2.3.0) + em-websocket (~> 0.5) + guard (~> 2.0) + multi_json (~> 1.8) hike (1.2.3) + http_parser.rb (0.6.0) i18n (0.6.9) jbuilder (2.0.8) activesupport (>= 3.0.0, < 5) @@ -47,13 +85,25 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) + listen (2.7.9) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + lumberjack (1.0.9) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) + method_source (0.8.2) mime-types (1.25.1) minitest (5.3.4) multi_json (1.10.1) + mysql2 (0.3.16) + orm_adapter (0.5.0) polyglot (0.3.5) + pry (0.10.0) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) rack (1.5.2) rack-test (0.6.2) rack (>= 1.0) @@ -73,6 +123,9 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) + rb-fsevent (0.9.4) + rb-inotify (0.9.5) + ffi (>= 0.5.0) rdoc (4.1.1) json (~> 1.4) sass (3.2.19) @@ -84,6 +137,10 @@ GEM sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) + simple_form (3.0.2) + actionpack (~> 4.0) + activemodel (~> 4.0) + slop (3.5.0) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -98,6 +155,7 @@ GEM thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) + timers (1.1.0) treetop (1.4.15) polyglot polyglot (>= 0.3.1) @@ -108,18 +166,34 @@ GEM uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) + warden (1.2.3) + rack (>= 1.0) + will_paginate (3.0.7) + will_paginate-bootstrap (1.0.1) + will_paginate (>= 3.0.3) PLATFORMS ruby DEPENDENCIES + annotate (~> 2.6.5) + bootstrap-sass (~> 3.2.0.0) + carrierwave + cocoon (~> 1.2.6) coffee-rails (~> 4.0.0) + devise (~> 3.2) + guard-livereload jbuilder (~> 2.0) jquery-rails + mysql2 + pry (~> 0.10.0) rails (= 4.1.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) + simple_form (~> 3.0.2) spring sqlite3 turbolinks uglifier (>= 1.3.0) + will_paginate (~> 3.0) + will_paginate-bootstrap diff --git a/Guardfile b/Guardfile new file mode 100644 index 0000000..180e51f --- /dev/null +++ b/Guardfile @@ -0,0 +1,11 @@ +# A sample Guardfile +# More info at https://github.com/guard/guard#readme + +guard 'livereload' do + watch(%r{app/views/.+\.(erb|haml|slim)$}) + watch(%r{app/helpers/.+\.rb}) + watch(%r{public/.+\.(css|js|html)}) + watch(%r{config/locales/.+\.yml}) + # Rails Assets Pipeline + watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" } +end diff --git a/README.md b/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/javascripts/admin/jquery_customization.js.erb b/app/assets/javascripts/admin/jquery_customization.js.erb new file mode 100644 index 0000000..c768ba3 --- /dev/null +++ b/app/assets/javascripts/admin/jquery_customization.js.erb @@ -0,0 +1,9 @@ +$(document).on('ready page:load', function(){ + + + $("div.item:first-child").addClass("active"); + + //var tmpl = '
' + + +}); \ No newline at end of file diff --git a/app/assets/javascripts/admin/photos.js.coffee b/app/assets/javascripts/admin/photos.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/admin/photos.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/admin/products.js.coffee b/app/assets/javascripts/admin/products.js.coffee new file mode 100644 index 0000000..24f83d1 --- /dev/null +++ b/app/assets/javascripts/admin/products.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..4975ace 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,5 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +//= require bootstrap-sprockets +//= require cocoon diff --git a/app/assets/stylesheets/admin/photos.css.scss b/app/assets/stylesheets/admin/photos.css.scss new file mode 100644 index 0000000..e8d0809 --- /dev/null +++ b/app/assets/stylesheets/admin/photos.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin::photos controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss new file mode 100644 index 0000000..da8969d --- /dev/null +++ b/app/assets/stylesheets/admin/products.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin::products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/bootstrap_and_customization.css.scss b/app/assets/stylesheets/bootstrap_and_customization.css.scss new file mode 100644 index 0000000..9651712 --- /dev/null +++ b/app/assets/stylesheets/bootstrap_and_customization.css.scss @@ -0,0 +1,28 @@ +@import 'bootstrap'; + + + +.center { + text-align: center; +} + +/* why does this css not work? */ +.img-box img { + width: 100%; + height: 261px; +} + + +.carousel-inner .img-box img{ + width: 100%; + height: 261px; + +} + + +.form-img-box img{ + width: 40px; + height: 40px; + +} + diff --git a/app/controllers/admin/photos_controller.rb b/app/controllers/admin/photos_controller.rb new file mode 100644 index 0000000..6ed8897 --- /dev/null +++ b/app/controllers/admin/photos_controller.rb @@ -0,0 +1,31 @@ +class Admin::PhotosController < ApplicationController + + def new + #@photo = Photo.new + @product = Product.find(params[:product_id]) + @photo = @product.photos.build + end + + def create + #@photo = Photo.new(photo_params) + @product = Product.find(params[:product_id]) + @photo = @product.photos.build(photo_params) + if @photo.save + redirect_to admin_product_path(@product) + end + end + + def index + @photos = Photo.all + end + + + + private + + def photo_params + params.require(:photo).permit(:image) + end + + +end diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb new file mode 100644 index 0000000..1a84230 --- /dev/null +++ b/app/controllers/admin/products_controller.rb @@ -0,0 +1,64 @@ +class Admin::ProductsController < ApplicationController + + #the order is important, you should confirm current_user is exit brfore called admin_required + before_action :authenticate_user! + before_action :admin_required, :except => [:index] + before_action :find_product, :only => [:show, :edit, :update, :destroy] + + + def index + @products = Product.all.order("created_at DESC").paginate(:page => params[:page], :per_page=>20) + end + + def show + @photos = @product.photos + end + + def new + @product = Product.new + @product.photos.build + + end + + def create + @product = Product.new(product_params) + + if @product.save + redirect_to admin_products_path + else + render :new + end + end + + def edit + end + + def update + if @product.update(product_params) + redirect_to admin_products_path + else + render :edit + end + + end + + def destroy + if @product.destroy + redirect_to admin_products_path + end + end + + + + private + + def find_product + @product = Product.find(params[:id]) + end + + def product_params + params.require(:product).permit(:title, :description, :quantity, :photos_attributes => [:id, :image, :_destroy]) + end + + +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e..b3569b5 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,10 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + + + + def admin_required + redirect_to root_path if !current_user.admin? + end end diff --git a/app/helpers/admin/photos_helper.rb b/app/helpers/admin/photos_helper.rb new file mode 100644 index 0000000..d77b10b --- /dev/null +++ b/app/helpers/admin/photos_helper.rb @@ -0,0 +1,2 @@ +module Admin::PhotosHelper +end diff --git a/app/helpers/admin/products_helper.rb b/app/helpers/admin/products_helper.rb new file mode 100644 index 0000000..977a242 --- /dev/null +++ b/app/helpers/admin/products_helper.rb @@ -0,0 +1,2 @@ +module Admin::ProductsHelper +end diff --git a/app/models/photo.rb b/app/models/photo.rb new file mode 100644 index 0000000..a08bc39 --- /dev/null +++ b/app/models/photo.rb @@ -0,0 +1,15 @@ +# == Schema Information +# +# Table name: photos +# +# id :integer not null, primary key +# created_at :datetime +# updated_at :datetime +# image :string(255) +# product_id :integer +# + +class Photo < ActiveRecord::Base + mount_uploader :image, ImageUploader + belongs_to :product +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 0000000..bd588c4 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,17 @@ +# == Schema Information +# +# Table name: products +# +# id :integer not null, primary key +# title :string(255) +# description :text +# quantity :integer +# created_at :datetime +# updated_at :datetime +# + +class Product < ActiveRecord::Base + has_many :photos, :dependent => :delete_all + + accepts_nested_attributes_for :photos, :reject_if => :all_blank, allow_destroy: true +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000..16ef9c9 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,31 @@ +# == Schema Information +# +# Table name: users +# +# id :integer not null, primary key +# email :string(255) default(""), not null +# encrypted_password :string(255) default(""), not null +# reset_password_token :string(255) +# reset_password_sent_at :datetime +# remember_created_at :datetime +# sign_in_count :integer default(0), not null +# current_sign_in_at :datetime +# last_sign_in_at :datetime +# current_sign_in_ip :string(255) +# last_sign_in_ip :string(255) +# created_at :datetime +# updated_at :datetime +# is_admin :boolean default(FALSE) +# + +class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + + def admin? + is_admin + end + +end diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb new file mode 100644 index 0000000..2fc27d0 --- /dev/null +++ b/app/uploaders/image_uploader.rb @@ -0,0 +1,51 @@ +# encoding: utf-8 + +class ImageUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + # include CarrierWave::RMagick + # include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process :scale => [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + # version :thumb do + # process :resize_to_fit => [50, 50] + # end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + # def extension_white_list + # %w(jpg jpeg gif png) + # end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/app/views/admin/photos/_form.html.erb b/app/views/admin/photos/_form.html.erb new file mode 100644 index 0000000..a204de8 --- /dev/null +++ b/app/views/admin/photos/_form.html.erb @@ -0,0 +1,9 @@ + + + <%=f.input :image, :input_html=>{:class=>"form-control"}, :wrapper_html=>{:class=>"form-group"}, :label=>"上傳圖片"%> + \ No newline at end of file diff --git a/app/views/admin/photos/index.html.erb b/app/views/admin/photos/index.html.erb new file mode 100644 index 0000000..fbd0fd8 --- /dev/null +++ b/app/views/admin/photos/index.html.erb @@ -0,0 +1,4 @@ +

Index

+<% @photos.each do |photo|%> +<%= image_tag(photo.image_url)%> +<%end%> \ No newline at end of file diff --git a/app/views/admin/photos/new.html.erb b/app/views/admin/photos/new.html.erb new file mode 100644 index 0000000..1cc1161 --- /dev/null +++ b/app/views/admin/photos/new.html.erb @@ -0,0 +1,14 @@ +
+

New Photos

+ <%= simple_form_for @photo, html: { multipart: true },:url => admin_product_photos_path(@product,@photo) do |f| %> + + <%=render(:partial=>"form", :locals=>{:f=>f})%> + + + +
+ <%= f.submit class: "btn btn-primary" %> +
+ + <% end %> +
\ No newline at end of file diff --git a/app/views/admin/products/_form.html.erb b/app/views/admin/products/_form.html.erb new file mode 100644 index 0000000..15f8266 --- /dev/null +++ b/app/views/admin/products/_form.html.erb @@ -0,0 +1,26 @@ + + + <%= f.input :title, :input_html=>{:class => "form-control"}, :wrapper_html=>{ :class => "form-group"} ,:label => "名稱" , :type=>"text"%> + + <%= f.input :description, :input_html=>{:class =>"form-control", :rows=>"8"}, :wrapper_html=>{:class=>"form-group"}, :label=>"商品描述"%> + + <%= f.input :quantity, :input_html=>{:class=>"form-control"}, :wrapper_html=>{:class=>"form-group"}, :label=>"數量" %> + +
+ + + <%= f.simple_fields_for :photos do |photo|%> + + <%= render(:partial=>'photo_fields', :locals=>{:f =>photo}) %> + <%end%> + + +
+
+ <%= link_to_add_association('add photo', f, :photos, {:class=>"btn btn-sm btn-info"})%> +
+ +
+ + + diff --git a/app/views/admin/products/_photo_fields.html.erb b/app/views/admin/products/_photo_fields.html.erb new file mode 100644 index 0000000..0c1f563 --- /dev/null +++ b/app/views/admin/products/_photo_fields.html.erb @@ -0,0 +1,11 @@ + +
+
+ <%=f.input :image, :input_html=>{:class=>"form-control"}, :wrapper_html=>{:class=>"form-group"}, :label=>"上傳圖片"%> + + <%if !f.object.image_url.nil?%> + <%= image_tag(f.object.image_url, :class=>"img-rounded")%> + <%end%> + + <%=link_to_remove_association("remove photo", f, {:class=>"btn btn-sm btn-danger"})%> +
\ No newline at end of file diff --git a/app/views/admin/products/_slide.html.erb b/app/views/admin/products/_slide.html.erb new file mode 100644 index 0000000..d513f5d --- /dev/null +++ b/app/views/admin/products/_slide.html.erb @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/app/views/admin/products/edit.html.erb b/app/views/admin/products/edit.html.erb new file mode 100644 index 0000000..9254458 --- /dev/null +++ b/app/views/admin/products/edit.html.erb @@ -0,0 +1,13 @@ +
+

Edit Prduct

+ <%= simple_form_for @product, html: { multipart: true },:url => admin_product_path(@product) do |f| %> + + <%= render(:partial=>'form', :locals=>{:f=>f})%> + + +
+ <%= f.submit 'Update', class: "btn btn-primary" %> +
+ + <% end %> +
\ No newline at end of file diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb new file mode 100644 index 0000000..3765a49 --- /dev/null +++ b/app/views/admin/products/index.html.erb @@ -0,0 +1,32 @@ + +

Index

+ + +
+ + <% @products.each do |product|%> +
+ +
+ + <%= link_to(admin_product_path(product)) do%> + + <%= image_tag(product.photos.first.image_url, :class=>"img-rounded") if !product.photos.first.blank? %> + + +
+

<%= product.title%>

+
+ <%end%> +
+
+ <% end %> + +
+ + +
+ +<%= will_paginate @products, renderer: BootstrapPagination::Rails %> +
+ diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb new file mode 100644 index 0000000..f22a5f3 --- /dev/null +++ b/app/views/admin/products/new.html.erb @@ -0,0 +1,13 @@ +
+

New Prduct

+ <%= simple_form_for @product, html: { multipart: true },:url => admin_products_path(@product) do |f| %> + + <%= render(:partial=>'form', :locals=>{:f=>f})%> + + +
+ <%= f.submit class: "btn btn-primary" %> +
+ + <% end %> +
\ No newline at end of file diff --git a/app/views/admin/products/show.html.erb b/app/views/admin/products/show.html.erb new file mode 100644 index 0000000..072525a --- /dev/null +++ b/app/views/admin/products/show.html.erb @@ -0,0 +1,41 @@ + +
+
+ + <%= render(:partial=>"slide", :locals=>{:photos => @photos}) %> + +
+ +
+ + <%= link_to("Create new photo", new_admin_product_photo_path(@product), :class=> 'btn btn-info btn-sm')%> + + <%= link_to("Edit photo", edit_admin_product_photo_path(@product,@photo), :class=> 'btn btn-info btn-sm') if !@photo.nil?%> + + <%= link_to("Update Product", edit_admin_product_path(@product), :class=> 'btn btn-info btn-sm')%> + + <%= link_to("Delete Product", admin_product_path(@product), :method=>:delete, :class=> 'btn btn-danger btn-sm')%> + +
+ + +

<%= @product.title %>

+

<%= @product.description %>

+
+
+

數量： <%= @product.quantity %>

+ + +
<%=link_to("加入購物車","#", :class=> "btn btn-danger btn-lg") %>
+
+ +
+ +
+ + + + + + + diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 0000000..949b172 --- /dev/null +++ b/app/views/devise/confirmations/new.html.erb @@ -0,0 +1,16 @@ +

Resend confirmation instructions

+ +<%= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + <%= f.full_error :confirmation_token %> + +
+ <%= f.input :email, required: true, autofocus: true %> +
+ +
+ <%= f.button :submit, "Resend confirmation instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 0000000..dc55f64 --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +

Welcome <%= @email %>!

+ +

You can confirm your account email through the link below:

+ +

<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 0000000..f667dc1 --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +

Hello <%= @resource.email %>!

+ +

Someone has requested a link to change your password. You can do this through the link below.

+ +

<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>

+ +

If you didn't request this, please ignore this email.

+

Your password won't change until you access the link above and create a new one.

diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 0000000..41e148b --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +

Hello <%= @resource.email %>!

+ +

Your account has been locked due to an excessive number of unsuccessful sign in attempts.

+ +

Click the link below to unlock your account:

+ +

<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 0000000..8f995ed --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,19 @@ +

Change your password

+ +<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> + <%= f.error_notification %> + + <%= f.input :reset_password_token, as: :hidden %> + <%= f.full_error :reset_password_token %> + +
+ <%= f.input :password, label: "New password", required: true, autofocus: true %> + <%= f.input :password_confirmation, label: "Confirm your new password", required: true %> +
+ +
+ <%= f.button :submit, "Change my password" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 0000000..d1503e7 --- /dev/null +++ b/app/views/devise/passwords/new.html.erb @@ -0,0 +1,15 @@ +

Forgot your password?

+ +<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, required: true, autofocus: true %> +
+ +
+ <%= f.button :submit, "Send me reset password instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb new file mode 100644 index 0000000..ed8123f --- /dev/null +++ b/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,47 @@ +
+
+
+

Edit <%= resource_name.to_s.humanize %>

+
+
+
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put , :multipart => true}) do |f| %> + + <%= devise_error_messages! %> + +

修改基本資料

+ +
+ <%= f.label :email %> + <%= f.email_field :email, class: "form-control", :autofocus => true %> +
+ +
+

修改密碼

+ +
+ <%= f.label :password %> (leave blank if you don't want to change it) + <%= f.password_field :password, class: "form-control", :autocomplete => "off" %> +
+ + +
+ <%= f.label :current_password %> (we need your current password to confirm your changes) + <%= f.password_field :current_password, class: "form-control" %> +
+ +
+ +
+ <%= f.submit "Update", class: "btn btn-primary" %> +
+ <% end %> +
+
+

Cancel my account

+ +

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

+ + <%= link_to "Back", :back %> +
+
\ No newline at end of file diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb new file mode 100644 index 0000000..090070a --- /dev/null +++ b/app/views/devise/registrations/new.html.erb @@ -0,0 +1,39 @@ +
+
+ +
+

Sign up

+
+ +
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :multipart => true }) do |f| %> + <%= devise_error_messages! %> + + + +
+ <%= f.label :email %> + <%= f.email_field :email, autofocus: true ,class: "form-control"%> +
+ +
+ <%= f.label :password %> + <%= f.password_field :password , class: "form-control"%> +
+ +
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation , class: "form-control"%> +
+ +
+ <%= f.submit "Sign up" ,class: "btn btn-primary"%> +
+ <% end %> +
+ +
+ <%= render "devise/shared/links" %> +
+
+
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb new file mode 100644 index 0000000..b1d1e49 --- /dev/null +++ b/app/views/devise/sessions/new.html.erb @@ -0,0 +1,35 @@ +
+
Sign in +
+ +
+ + <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true , class: "form-control"%> +
+ +
+ <%= f.label :password %>
+ <%= f.password_field :password ,class: "form-control"%> +
+ + <% if devise_mapping.rememberable? -%> +
+ <%= f.check_box :remember_me %> + <%= f.label :remember_me %> +
+ <% end -%> + +
+ <%= f.submit "Sign in", class: "btn btn-primary"%> +
+ <% end %> +
+ +
+ <%= render "devise/shared/links" %> +
+
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb new file mode 100644 index 0000000..d84bdde --- /dev/null +++ b/app/views/devise/shared/_links.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Sign in", new_session_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> +<% end -%> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 0000000..788f62e --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,16 @@ +

Resend unlock instructions

+ +<%= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= f.error_notification %> + <%= f.full_error :unlock_token %> + +
+ <%= f.input :email, required: true, autofocus: true %> +
+ +
+ <%= f.button :submit, "Resend unlock instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb new file mode 100644 index 0000000..6626951 --- /dev/null +++ b/app/views/layouts/_header.html.erb @@ -0,0 +1,40 @@ + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index da9769d..14f143b 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,7 +8,14 @@ -<%= yield %> + +<%= render(:partial=>'layouts/header')%> +
+ <%flash.each do |name , msg|%> + <%= content_tag(:div , msg,class: "alert alert-info") %> + <%end%> + <%= yield %> +
diff --git a/config/database.yml b/config/database.yml index 1c1a37c..b7ec9ea 100644 --- a/config/database.yml +++ b/config/database.yml @@ -4,21 +4,42 @@ # Ensure the SQLite 3 gem is defined in your Gemfile # gem 'sqlite3' # + +#add for mysql default: &default - adapter: sqlite3 + adapter: mysql2 + encoding: utf8 pool: 5 - timeout: 5000 + username: root + password: ryan1146 + socket: /tmp/mysql.sock development: <<: *default - database: db/development.sqlite3 + database: artstore_development + +#default: &default +# adapter: sqlite3 +# pool: 5 +# timeout: 5000 +# +#development: +# <<: *default +# database: db/development.sqlite3 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. + + +#add for mysql test: <<: *default - database: db/test.sqlite3 + database: artstore_test + +#test: +# <<: *default +# database: db/test.sqlite3 production: <<: *default diff --git a/config/environments/development.rb b/config/environments/development.rb index ddf0e90..9237197 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -34,4 +34,7 @@ # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + #add for devise + config.action_mailer.default_url_options = { host: 'localhost:3000' } end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..481d02c --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,256 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # config.secret_key = 'd67846097273ae204160aed4ca73c42f7e4efd8488cd800575833f91a5b285397068966a6a74e8a5a1a06f7515635c14498bae0ce4bbbfefa2551d64208da37d' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [ :email ] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [ :email ] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [ :email ] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If http headers should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # encryptor), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = 'd039ac3dd9240765cb5c04de3b740eb67099f8da3b33fcd2e3e182d6dfdeeb44613a08fd8b821ce06c1ea691d575b4c37a09d9bdac335f570568918bd04ab4f7' + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [ :email ] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 8..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + # config.email_regexp = /\A[^@]+@[^@]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # If true, expires auth token on session timeout. + # config.expire_auth_token_on_timeout = false + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [ :email ] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = false + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [ :email ] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using omniauth, Devise cannot automatically set Omniauth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000..abccdb0 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,59 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your account was successfully confirmed." + send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid email or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account will be locked." + not_found_in_database: "Invalid email or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your account before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock Instructions" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password was changed successfully. You are now signed in." + updated_not_active: "Your password was changed successfully." + registrations: + destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address." + updated: "You updated your account successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/routes.rb b/config/routes.rb index 3f66539..fa5c447 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,15 @@ Rails.application.routes.draw do + + + devise_for :users + namespace :admin do + resources :products do + resources :photos + end + end + + root 'admin/products#index' + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20140708083012_create_products.rb b/db/migrate/20140708083012_create_products.rb new file mode 100644 index 0000000..805c976 --- /dev/null +++ b/db/migrate/20140708083012_create_products.rb @@ -0,0 +1,11 @@ +class CreateProducts < ActiveRecord::Migration + def change + create_table :products do |t| + t.string :title + t.text :description + t.integer :quantity + + t.timestamps + end + end +end diff --git a/db/migrate/20140708091058_devise_create_users.rb b/db/migrate/20140708091058_devise_create_users.rb new file mode 100644 index 0000000..cf497c2 --- /dev/null +++ b/db/migrate/20140708091058_devise_create_users.rb @@ -0,0 +1,42 @@ +class DeviseCreateUsers < ActiveRecord::Migration + def change + create_table(:users) do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end +end diff --git a/db/migrate/20140708091555_add_is_admin_to_user.rb b/db/migrate/20140708091555_add_is_admin_to_user.rb new file mode 100644 index 0000000..1ef84cf --- /dev/null +++ b/db/migrate/20140708091555_add_is_admin_to_user.rb @@ -0,0 +1,5 @@ +class AddIsAdminToUser < ActiveRecord::Migration + def change + add_column :users, :is_admin, :boolean, :default => false + end +end diff --git a/db/migrate/20140709030555_create_photos.rb b/db/migrate/20140709030555_create_photos.rb new file mode 100644 index 0000000..129afd5 --- /dev/null +++ b/db/migrate/20140709030555_create_photos.rb @@ -0,0 +1,8 @@ +class CreatePhotos < ActiveRecord::Migration + def change + create_table :photos do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140709030635_add_image_to_photos.rb b/db/migrate/20140709030635_add_image_to_photos.rb new file mode 100644 index 0000000..21dcf02 --- /dev/null +++ b/db/migrate/20140709030635_add_image_to_photos.rb @@ -0,0 +1,5 @@ +class AddImageToPhotos < ActiveRecord::Migration + def change + add_column :photos, :image, :string + end +end diff --git a/db/migrate/20140709033214_add_product_id_to_photos.rb b/db/migrate/20140709033214_add_product_id_to_photos.rb new file mode 100644 index 0000000..36fbb0d --- /dev/null +++ b/db/migrate/20140709033214_add_product_id_to_photos.rb @@ -0,0 +1,5 @@ +class AddProductIdToPhotos < ActiveRecord::Migration + def change + add_column :photos, :product_id, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000..a85734c --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,50 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20140709033214) do + + create_table "photos", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + t.string "image" + t.integer "product_id" + end + + create_table "products", force: true do |t| + t.string "title" + t.text "description" + t.integer "quantity" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "users", force: true do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "is_admin", default: false + end + + add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree + +end diff --git a/test/controllers/admin/photos_controller_test.rb b/test/controllers/admin/photos_controller_test.rb new file mode 100644 index 0000000..bda4590 --- /dev/null +++ b/test/controllers/admin/photos_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::PhotosControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/admin/products_controller_test.rb b/test/controllers/admin/products_controller_test.rb new file mode 100644 index 0000000..508fe6b --- /dev/null +++ b/test/controllers/admin/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::ProductsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/photos.yml b/test/fixtures/photos.yml new file mode 100644 index 0000000..43a4ec6 --- /dev/null +++ b/test/fixtures/photos.yml @@ -0,0 +1,22 @@ +# == Schema Information +# +# Table name: photos +# +# id :integer not null, primary key +# created_at :datetime +# updated_at :datetime +# image :string(255) +# product_id :integer +# + +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000..e9c4c3e --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,23 @@ +# == Schema Information +# +# Table name: products +# +# id :integer not null, primary key +# title :string(255) +# description :text +# quantity :integer +# created_at :datetime +# updated_at :datetime +# + +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + quantity: 1 + +two: + title: MyString + description: MyText + quantity: 1 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000..ef336eb --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,31 @@ +# == Schema Information +# +# Table name: users +# +# id :integer not null, primary key +# email :string(255) default(""), not null +# encrypted_password :string(255) default(""), not null +# reset_password_token :string(255) +# reset_password_sent_at :datetime +# remember_created_at :datetime +# sign_in_count :integer default(0), not null +# current_sign_in_at :datetime +# last_sign_in_at :datetime +# current_sign_in_ip :string(255) +# last_sign_in_ip :string(255) +# created_at :datetime +# updated_at :datetime +# is_admin :boolean default(FALSE) +# + +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/helpers/admin/photos_helper_test.rb b/test/helpers/admin/photos_helper_test.rb new file mode 100644 index 0000000..753f282 --- /dev/null +++ b/test/helpers/admin/photos_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Admin::PhotosHelperTest < ActionView::TestCase +end diff --git a/test/helpers/admin/products_helper_test.rb b/test/helpers/admin/products_helper_test.rb new file mode 100644 index 0000000..0b696b1 --- /dev/null +++ b/test/helpers/admin/products_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Admin::ProductsHelperTest < ActionView::TestCase +end diff --git a/test/models/photo_test.rb b/test/models/photo_test.rb new file mode 100644 index 0000000..33a4fd6 --- /dev/null +++ b/test/models/photo_test.rb @@ -0,0 +1,18 @@ +# == Schema Information +# +# Table name: photos +# +# id :integer not null, primary key +# created_at :datetime +# updated_at :datetime +# image :string(255) +# product_id :integer +# + +require 'test_helper' + +class PhotoTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000..d8f8315 --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,19 @@ +# == Schema Information +# +# Table name: products +# +# id :integer not null, primary key +# title :string(255) +# description :text +# quantity :integer +# created_at :datetime +# updated_at :datetime +# + +require 'test_helper' + +class ProductTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000..b5fa536 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,27 @@ +# == Schema Information +# +# Table name: users +# +# id :integer not null, primary key +# email :string(255) default(""), not null +# encrypted_password :string(255) default(""), not null +# reset_password_token :string(255) +# reset_password_sent_at :datetime +# remember_created_at :datetime +# sign_in_count :integer default(0), not null +# current_sign_in_at :datetime +# last_sign_in_at :datetime +# current_sign_in_ip :string(255) +# last_sign_in_ip :string(255) +# created_at :datetime +# updated_at :datetime +# is_admin :boolean default(FALSE) +# + +require 'test_helper' + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/user_story.todo b/user_story.todo new file mode 100644 index 0000000..919b97f --- /dev/null +++ b/user_story.todo @@ -0,0 +1,40 @@ +身為商家，我希望能夠夠過網路平台，極大化Net income + + 1.身為商家的管理者，要能夠在後台設定權限，權現分成管理者以及消費者 + + 2. 身為一個商家的管理者，我要能夠在後台管理上架商品，並能夠販賣 + 1. 身為管理者，我可以上傳商品的敘述、圖片、規格、價格、庫存 + 2. 身為管理者，我可以隨時修改商品的敘述、圖片、規格、價格、庫存 + 3. 身為管理者，我可以設定商品是否能夠上架販售 + + 3. 身為一個商家，我應該能設定商品分類，並決定商品擺放順序 + 1. 必須要有商品分類 + 2. 身為管理者，我可以新增、修改、刪除，現有分類 + 3. 身為管理者，我可以隨意修改、移動，現有商品在網站上的呈現順序 + + 4. 身為商家，我應該要隨時能將有問題的商品下架，使其禁止被下單 + + 5.身為商家，消費者購物結賬後，庫存應該自動減少 + + 6.身為商家，我應該可以收到消費者下的訂單，並設定為已結賬 + 1. 身為管理者，可以在後台看到訂單，定但狀態分為未結賬、以結賬、出貨中、已出貨、辦理退貨 + 2. 身為管理者，我可以在後台對訂單做狀態改變 + 3. 身為管理者，當我將商品射程以出貨時，消費者應該能收到一張以出貨的確認信 + + 7.身為商家，當消費者取消訂單時，庫存應自動增加，並通知我 + 1. 當消費者取消訂單，商品數量應該自動加一 + 2. 當消費者取消訂單，應該能在後台區域看到，以便我修改訂單狀態 + 3. 當消費者取消訂單，應該寄一封信件通知我 + + 8.身為商家，我想要知道誰在購買我的商品，也就是消費者的profile、以及他們的購買行為 + 1. 使用者若用fb登入，應該要記錄其年齡、性別、地區以及他有哪些朋友也曾經來消費過 + 2. 身為管理者，要能夠要能夠在後台查詢消費者的購買記錄 + + 9. 身為管理者，我想知道我做的網路行銷活動成效如何 + 1. 必須記錄使用者是從哪個連結進入（google analytics） + 2. 進入之使用者實際轉換率 （google analytics） + + 10.身為商家，我一該能記錄每天的平均銷售金額以及每月的變化 + 1. 身為管理者，我應該能在後台看到每月的平均銷售額 + 2. 身為管理者，我希望能看到每月銷售額變化的趨勢圖，以供未來策略規劃參考 +