rails_marketplace 0.0.2 → 0.0.3

data/app/assets/stylesheets/rails_marketplace/fonts/scss/font-awesome.scss

@@ -1,17 +1,17 @@
-/*!
- *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-
-@import "variables";
-@import "mixins";
-@import "path";
-@import "core";
-@import "larger";
-@import "fixed-width";
-@import "list";
-@import "bordered-pulled";
-@import "animated";
-@import "rotated-flipped";
-@import "stacked";
-@import "icons";
+/*!
+ *  Font Awesome 4.5.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "variables";
+@import "mixins";
+@import "path";
+@import "core";
+@import "larger";
+@import "fixed-width";
+@import "list";
+@import "bordered-pulled";
+@import "animated";
+@import "rotated-flipped";
+@import "stacked";
+@import "icons";

data/app/assets/stylesheets/rails_marketplace/marketplace.scss

@@ -1,20 +1,20 @@
-/*
- * This is a manifest file that'll be compiled into application, 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 styles
- * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
- * file per style scope.
-  ** * require fonts/css/font-awesome.min
-
- *
- */
-
-@import "bootstrap-sprockets";
-@import "bootstrap";
-@import "css/custom";
+/*
+ * This is a manifest file that'll be compiled into application, 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 styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+  ** * require fonts/css/font-awesome.min
+
+ *
+ */
+
+@import "bootstrap-sprockets";
+@import "bootstrap";
+@import "css/custom";
 @import "catalog";

data/app/assets/stylesheets/rails_marketplace/pace.css

@@ -1,76 +1,76 @@
-.pace {
-    -webkit-pointer-events: none;
-    pointer-events: none;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    user-select: none;
-}
-
-.pace-inactive {
-    display: none;
-}
-
-.pace .pace-progress {
-    background: #29d;
-    position: fixed;
-    z-index: 2000;
-    top: 0;
-    right: 100%;
-    width: 100%;
-    height: 2px;
-}
-
-.pace .pace-progress-inner {
-    display: block;
-    position: absolute;
-    right: 0px;
-    width: 100px;
-    height: 100%;
-    box-shadow: 0 0 10px #29d, 0 0 5px #29d;
-    opacity: 1.0;
-    -webkit-transform: rotate(3deg) translate(0px, -4px);
-    -moz-transform: rotate(3deg) translate(0px, -4px);
-    -ms-transform: rotate(3deg) translate(0px, -4px);
-    -o-transform: rotate(3deg) translate(0px, -4px);
-    transform: rotate(3deg) translate(0px, -4px);
-}
-
-.pace .pace-activity {
-    display: block;
-    position: fixed;
-    z-index: 2000;
-    top: 15px;
-    right: 15px;
-    width: 14px;
-    height: 14px;
-    border: solid 2px transparent;
-    border-top-color: #29d;
-    border-left-color: #29d;
-    border-radius: 10px;
-    -webkit-animation: pace-spinner 400ms linear infinite;
-    -moz-animation: pace-spinner 400ms linear infinite;
-    -ms-animation: pace-spinner 400ms linear infinite;
-    -o-animation: pace-spinner 400ms linear infinite;
-    animation: pace-spinner 400ms linear infinite;
-}
-
-@-webkit-keyframes pace-spinner {
-    0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); }
-    100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); }
-}
-@-moz-keyframes pace-spinner {
-    0% { -moz-transform: rotate(0deg); transform: rotate(0deg); }
-    100% { -moz-transform: rotate(360deg); transform: rotate(360deg); }
-}
-@-o-keyframes pace-spinner {
-    0% { -o-transform: rotate(0deg); transform: rotate(0deg); }
-    100% { -o-transform: rotate(360deg); transform: rotate(360deg); }
-}
-@-ms-keyframes pace-spinner {
-    0% { -ms-transform: rotate(0deg); transform: rotate(0deg); }
-    100% { -ms-transform: rotate(360deg); transform: rotate(360deg); }
-}
-@keyframes pace-spinner {
-    0% { transform: rotate(0deg); transform: rotate(0deg); }
-    100% { transform: rotate(360deg); transform: rotate(360deg); }
-}
+.pace {
+    -webkit-pointer-events: none;
+    pointer-events: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    user-select: none;
+}
+
+.pace-inactive {
+    display: none;
+}
+
+.pace .pace-progress {
+    background: #29d;
+    position: fixed;
+    z-index: 2000;
+    top: 0;
+    right: 100%;
+    width: 100%;
+    height: 2px;
+}
+
+.pace .pace-progress-inner {
+    display: block;
+    position: absolute;
+    right: 0px;
+    width: 100px;
+    height: 100%;
+    box-shadow: 0 0 10px #29d, 0 0 5px #29d;
+    opacity: 1.0;
+    -webkit-transform: rotate(3deg) translate(0px, -4px);
+    -moz-transform: rotate(3deg) translate(0px, -4px);
+    -ms-transform: rotate(3deg) translate(0px, -4px);
+    -o-transform: rotate(3deg) translate(0px, -4px);
+    transform: rotate(3deg) translate(0px, -4px);
+}
+
+.pace .pace-activity {
+    display: block;
+    position: fixed;
+    z-index: 2000;
+    top: 15px;
+    right: 15px;
+    width: 14px;
+    height: 14px;
+    border: solid 2px transparent;
+    border-top-color: #29d;
+    border-left-color: #29d;
+    border-radius: 10px;
+    -webkit-animation: pace-spinner 400ms linear infinite;
+    -moz-animation: pace-spinner 400ms linear infinite;
+    -ms-animation: pace-spinner 400ms linear infinite;
+    -o-animation: pace-spinner 400ms linear infinite;
+    animation: pace-spinner 400ms linear infinite;
+}
+
+@-webkit-keyframes pace-spinner {
+    0% { -webkit-transform: rotate(0deg); transform: rotate(0deg); }
+    100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-moz-keyframes pace-spinner {
+    0% { -moz-transform: rotate(0deg); transform: rotate(0deg); }
+    100% { -moz-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-o-keyframes pace-spinner {
+    0% { -o-transform: rotate(0deg); transform: rotate(0deg); }
+    100% { -o-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-ms-keyframes pace-spinner {
+    0% { -ms-transform: rotate(0deg); transform: rotate(0deg); }
+    100% { -ms-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@keyframes pace-spinner {
+    0% { transform: rotate(0deg); transform: rotate(0deg); }
+    100% { transform: rotate(360deg); transform: rotate(360deg); }
+}

data/app/assets/stylesheets/rails_marketplace/welcome.scss

@@ -1,3 +1,3 @@
-// Place all the styles related to the welcome controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
+// Place all the styles related to the welcome controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

data/app/assets/stylesheets/scaffold.css

@@ -1,56 +1,56 @@
-body { background-color: #fff; color: #333; }
-
-body, p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size:   13px;
-  line-height: 18px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-a { color: #000; }
-a:visited { color: #666; }
-a:hover { color: #fff; background-color:#000; }
-
-div.field, div.actions {
-  margin-bottom: 10px;
-}
-
-#notice {
-  color: green;
-}
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-}
-
-#error_explanation h2 {
-  text-align: left;
-  font-weight: bold;
-  padding: 5px 5px 5px 15px;
-  font-size: 12px;
-  margin: -7px;
-  margin-bottom: 0px;
-  background-color: #c00;
-  color: #fff;
-}
-
-#error_explanation ul li {
-  font-size: 12px;
-  list-style: square;
-}
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size:   13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a { color: #000; }
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+div.field, div.actions {
+  margin-bottom: 10px;
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+}
+
+#error_explanation h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px;
+  margin-bottom: 0px;
+  background-color: #c00;
+  color: #fff;
+}
+
+#error_explanation ul li {
+  font-size: 12px;
+  list-style: square;
+}

data/app/controllers/rails_marketplace/admin_controller.rb

@@ -1,151 +1,151 @@
-require_dependency "rails_marketplace/application_controller"
-
-module RailsMarketplace
-	class AdminController < ApplicationController
-		layout 'rails_marketplace/super_admin'
-		include AdminHelper
-
-		before_action :require_login, :except => [:login_form, :login, :signup_form, :signup]
-		before_action :set_current_admin
-		before_action :set_current_category, :only => [:edit_category, :update_category, :delete_category]
-
-		def login_form
-			if admin_logged_in?
-				redirect_to admin_dashboard_path
-			end
-		end
-
-		def login
-		    admin = Admin.find_by(email: params[:admin][:email].downcase)
-		    if admin && admin.authenticate(params[:admin][:password])
-		      admin_log_in admin
-		      redirect_to admin_dashboard_path
-		    else
-		      flash.now[:error] = 'Invalid email/password combination'
-		      render 'login_form'
-		    end
-		end
-
-		def dashboard
-			
-		end
-
-		def signup_form
-			@admin = Admin.new
-		end
-
-		def signup
-			@admin = Admin.new(admin_params)
-			if @admin.save
-				admin_log_in @admin
-				redirect_to admin_dashboard_path
-			else
-		      	render 'signup_form'
-		    end
-		end
-
-		def logout
-			admin_log_out
-			redirect_to admin_login_path
-		end
-
-		def sellers
-			@sellers = Seller.all
-		end
-		
-		def seller_products
-			seller_id = params[:id]
-			seller = Seller.find(seller_id)
-			@products = Product.where(seller: seller)
-		end
-
-		def categories
-			# @categories = Category.all
-		end
-
-		def add_category
-			@categories = Category.walk_tree
-		end
-
-		def create_category
-			@category = Category.new(category_params)
-			if @category.save
-				flash[:notice] = 'New category was successfully added!'
-				redirect_to admin_categories_path
-			else
-		      	render 'add_category'
-		    end
-		end
-
-		def edit_category
-
-		end
-
-		def update_category
-			if @category.update_attributes(category_params)
-				flash[:notice] = 'Category was successfully updated!'
-				redirect_to admin_categories_path
-			else
-		      	render 'update_category'
-		    end	
-		end
-
-		def delete_category
-			@category.destroy
-			redirect_to admin_categories_path	
-		end
-
-		def products
-			@products = Product.all
-		end
-
-		def category_products
-			category_id = params[:id]
-			category = Category.friendly.find(category_id)
-			@products = category.products
-		end
-
-		def settings_form
-			if @current_admin.admin_setting.nil?
-				AdminSetting.create admin: @current_admin
-			end
-		end
-
-		def settings
-			@current_admin.admin_setting.update_attributes(admin_setting_params)
-			redirect_to admin_dashboard_path
-		end
-
-		  private
-
-			def admin_params
-			  params.require(:admin).permit(:name, :email, :password,
-			                               :password_confirmation)
-			end
-
-			def admin_setting_params
-			  params.require(:admin_setting).permit(:stripe_publishable_key, :stripe_secret_key)
-			end
-
-			def category_params
-			  params.require(:category).permit(:name, :description, :image, :parent_id)
-			end
-
-			def set_current_admin
-		    	return unless session[:admin_id]
-		    	@current_admin ||= Admin.find(session[:admin_id])
-		  	end
-
-		  	def set_current_category
-				return unless params[:id]
-				@category ||= Category.find(params[:id])
-			end
-
-			def require_login
-			    unless admin_logged_in?
-			      flash[:error] = "You must be logged in to access this section"
-			      redirect_to admin_login_path # halts request cycle
-			    end
-			end
-	end
+require_dependency "rails_marketplace/application_controller"
+
+module RailsMarketplace
+	class AdminController < ApplicationController
+		layout 'rails_marketplace/super_admin'
+		include AdminHelper
+
+		before_action :require_login, :except => [:login_form, :login, :signup_form, :signup]
+		before_action :set_current_admin
+		before_action :set_current_category, :only => [:edit_category, :update_category, :delete_category]
+
+		def login_form
+			if admin_logged_in?
+				redirect_to admin_dashboard_path
+			end
+		end
+
+		def login
+		    admin = Admin.find_by(email: params[:admin][:email].downcase)
+		    if admin && admin.authenticate(params[:admin][:password])
+		      admin_log_in admin
+		      redirect_to admin_dashboard_path
+		    else
+		      flash.now[:error] = 'Invalid email/password combination'
+		      render 'login_form'
+		    end
+		end
+
+		def dashboard
+			
+		end
+
+		def signup_form
+			@admin = Admin.new
+		end
+
+		def signup
+			@admin = Admin.new(admin_params)
+			if @admin.save
+				admin_log_in @admin
+				redirect_to admin_dashboard_path
+			else
+		      	render 'signup_form'
+		    end
+		end
+
+		def logout
+			admin_log_out
+			redirect_to admin_login_path
+		end
+
+		def sellers
+			@sellers = Seller.all
+		end
+		
+		def seller_products
+			seller_id = params[:id]
+			seller = Seller.find(seller_id)
+			@products = Product.where(seller: seller)
+		end
+
+		def categories
+			# @categories = Category.all
+		end
+
+		def add_category
+			@categories = Category.walk_tree
+		end
+
+		def create_category
+			@category = Category.new(category_params)
+			if @category.save
+				flash[:notice] = 'New category was successfully added!'
+				redirect_to admin_categories_path
+			else
+		      	render 'add_category'
+		    end
+		end
+
+		def edit_category
+
+		end
+
+		def update_category
+			if @category.update_attributes(category_params)
+				flash[:notice] = 'Category was successfully updated!'
+				redirect_to admin_categories_path
+			else
+		      	render 'update_category'
+		    end	
+		end
+
+		def delete_category
+			@category.destroy
+			redirect_to admin_categories_path	
+		end
+
+		def products
+			@products = Product.all
+		end
+
+		def category_products
+			category_id = params[:id]
+			category = Category.friendly.find(category_id)
+			@products = category.products
+		end
+
+		def settings_form
+			if @current_admin.admin_setting.nil?
+				AdminSetting.create admin: @current_admin
+			end
+		end
+
+		def settings
+			@current_admin.admin_setting.update_attributes(admin_setting_params)
+			redirect_to admin_dashboard_path
+		end
+
+		  private
+
+			def admin_params
+			  params.require(:admin).permit(:name, :email, :password,
+			                               :password_confirmation)
+			end
+
+			def admin_setting_params
+			  params.require(:admin_setting).permit(:stripe_publishable_key, :stripe_secret_key)
+			end
+
+			def category_params
+			  params.require(:category).permit(:name, :description, :image, :parent_id)
+			end
+
+			def set_current_admin
+		    	return unless session[:admin_id]
+		    	@current_admin ||= Admin.find(session[:admin_id])
+		  	end
+
+		  	def set_current_category
+				return unless params[:id]
+				@category ||= Category.find(params[:id])
+			end
+
+			def require_login
+			    unless admin_logged_in?
+			      flash[:error] = "You must be logged in to access this section"
+			      redirect_to admin_login_path # halts request cycle
+			    end
+			end
+	end
 end