Major changes

Author: Dima

.gitignore

@@ -14,3 +14,11 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+database.yml
+doc/
+*.swp
+*~
+.project
+.DS_Store
+.idea
+.secret

.idea/.generators

@@ -3,31 +3,29 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.0.1'
 
-# Use postgresql as the database for Active Record
-gem 'pg'
-
+group :development do
+  gem 'sqlite3'
+end
 
 gem 'thin'
 gem 'devise'
 gem 'activeadmin', github: 'gregbell/active_admin'
 gem 'slim-rails'
 gem 'bootstrap-sass-rails'
 gem 'font-awesome-sass'
-gem 'rails_12factor', group: :production
 
-# Use SCSS for stylesheets
+group :production do
+  gem 'rails_12factor'
+  gem 'pg'
+end
+
+
 gem 'sass-rails', '~> 4.0.0'
 
-# Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 
-# Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails', '~> 4.0.0'
 
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# gem 'therubyracer', platforms: :ruby
-
-# Use jquery as the JavaScript library
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 
@@ -42,14 +40,3 @@ group :doc do
   gem 'sdoc', require: false
 end
 
-# Use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.1.2'
-
-# Use unicorn as the app server
-# gem 'unicorn'
-
-# Use Capistrano for deployment
-# gem 'capistrano', group: :development
-
-# Use debugger
-# gem 'debugger', group: [:development, :test]

.idea/.rakeTasks

@@ -162,6 +162,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
+    sqlite3 (1.3.8)
     temple (0.6.7)
     thin (1.6.1)
       daemons (>= 1.0.9)
@@ -201,6 +202,7 @@ DEPENDENCIES
   sass-rails (~> 4.0.0)
   sdoc
   slim-rails
+  sqlite3
   thin
   turbolinks
   uglifier (>= 1.3.0)

.idea/Oriflame.iml

@@ -28,17 +28,6 @@ def permitted_params
       links
     end
   end
-  # See permitted parameters documentation:
-  # https://github.com/gregbell/active_admin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
-  #
-  # permit_params :list, :of, :attributes, :on, :model
-  #
-  # or
-  #
-  # permit_params do
-  #  permitted = [:permitted, :attributes]
-  #  permitted << :other if resource.something?
-  #  permitted
-  # end
+
 
 end

.idea/dataSources.xml

@@ -8,18 +8,7 @@ def permitted_params
 
   end
 
-  form do |f|
-    f.inputs "Детали" do
-      f.input :category_id, label:'Категория', :as => :select, :collection => Category.all.map{|c| ["#{c.name}", c.id]}
-      f.input :title, label: 'Наименование'
-      f.input :image_url, label: "Картинка"
-      f.input :description, label: "Описание"
-      f.input :about_product, label: "О продукте"
-      f.input :ingredients, label: "Ингредиенты"
-      f.input :price, label: "Стоимость"
-    end
-    f.actions
-  end
+  form partial: 'form'
 
 
   index title: 'Продукты' do
@@ -38,19 +27,5 @@ def permitted_params
       links
     end
   end
-
-
-  # See permitted parameters documentation:
-  # https://github.com/gregbell/active_admin/blob/master/docs/2-resource-customization.md#setting-up-strong-parameters
-  #
-  # permit_params :list, :of, :attributes, :on, :model
-  #
-  # or
-  #
-  # permit_params do
-  #  permitted = [:permitted, :attributes]
-  #  permitted << :other if resource.something?
-  #  permitted
-  # end
 
 end

.idea/workspace.xml

@@ -25,6 +25,10 @@ $(document).ready(function(){
         $('.top-header').slideToggle('fast');
         return false;
     });
+    $(".modal-wide").on("show.bs.modal", function() {
+        var height = $(window).height() - 200;
+        $(this).find(".modal-body").css("max-height", height);
+    });
 
 });
 $(document).ready(ready);

Gemfile

@@ -14,7 +14,13 @@
  *= require jquery.ui.all
  *= require_tree .
  */
-
+.notice
+  position: fixed
+  z-index: 3
+  top: 10px
+  right: 10px
+  text-align: center
+  background: rgba(242,222,222,0.8) !important
 $link-hover: #ed1c2e
 $border-color: #dbdbdb
 $head-link-color: #8e8e8e

Gemfile.lock

@@ -1,3 +1,10 @@
 // Place all the styles related to the Cart controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
+.p_b
+  border: 1px solid red
+  min-width: 100px
+.modal .modal-dialog
+  width: 90%
+.modal .modal-body
+  overflow-y: auto

Oriflame_development

@@ -79,6 +79,8 @@ def destroy
   # Use callbacks to share common setup or constraints between actions.
   def set_cart
     @cart = Cart.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    redirect_to root_path, alert: "Корзина не найдена!"
   end
 
   # Never trust parameters from the scary internet, only allow the white list through.

app/admin/category.rb

@@ -1,5 +1,6 @@
 class CategoriesController < ApplicationController
   before_action :set_category, only: [ :show, :edit, :update,  :destroy]
+  before_filter :authenticate_admin!, except: [:index, :show]
   respond_to :html, :xml, :json
 
   def index
@@ -43,6 +44,8 @@ def destroy
 
   def set_category
     @category = Category.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    redirect_to root_path, alert: "Категория не найдена!"
   end
 
   def category_params

app/admin/product.rb

@@ -51,6 +51,8 @@ def create
   # Use callbacks to share common setup or constraints between actions.
   def set_order
     @order = Order.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    redirect_to root_path, alert: "Заказ не найден!"
   end
 
   # Never trust parameters from the scary internet, only allow the white list through.

app/assets/javascripts/application.js

@@ -1,6 +1,7 @@
 class ProductsController < ApplicationController
 
   before_action :set_product, only: [ :show, :edit, :update,  :destroy]
+  before_filter :authenticate_admin!, except: [:index, :show]
   respond_to :html, :xml, :json
 
   def index
@@ -36,6 +37,9 @@ def destroy
 
   def set_product
     @category = Product.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:alert] = "Продукт не найден!"
+    redirect_to root_path
   end
 
   def product_params

app/assets/stylesheets/application.css.sass

@@ -0,0 +1,81 @@
+= semantic_form_for [:admin, @product], role: 'form' do |f|
+  .panel-group#accordion
+    .panel.panel-default
+      .panel-heading
+        h4.panel-title
+          = link_to 'Название/Denumire', '#collapse1', data: { toggle: 'collapse', parrent: 'accordion'}
+      #collapse1.panel-collapse.collapse
+        .panel-body
+          .form-group
+            .row
+              .col-xs-10
+                = f.input :title, :label => 'Ру', class:'form-control'
+              .col-xs-10
+                = f.input :title_ro, label: 'Ro', class:'form-control'
+    .panel.panel-default
+      .panel-heading
+        h4.panel-title
+          = link_to 'Категория/Categoria ', '#collapse8', data: { toggle: 'collapse', parrent: 'accordion'}
+      #collapse8.panel-collapse.collapse
+        .panel-body
+          .form-group
+            .row
+              .col-xs-4
+                = f.input :category_id, :as => :select, :collection => Category.all.map{|c| ["#{c.name}", c.id]}, :label => 'Категория/Categoria', input_html:{class:'form-control'}
+    .panel.panel-default
+      .panel-heading
+        h4.panel-title
+          = link_to 'Фото/Imaginea', '#collapse9', data: { toggle: 'collapse', parrent: 'accordion'}
+      #collapse9.panel-collapse.collapse
+        .panel-body
+          .form-group
+            .row
+              .col-xs-8
+                = f.input :image_url, label: 'Фото/Imaginea', class:'form-control img-i'
+    .panel.panel-default
+      .panel-heading
+        h4.panel-title
+          = link_to 'Description', '#collapse3', data: { toggle: 'collapse', parrent: 'accordion'}
+      #collapse3.panel-collapse.collapse
+        .panel-body
+          .form-group
+            .row
+              .col-xs-5
+                = f.input :description, :label => 'Ру', class:'form-control'
+              .col-xs-5
+                = f.input :description_ro, label: 'Ro', class:'form-control'
+    .panel.panel-default
+      .panel-heading
+        h4.panel-title
+          = link_to 'About Product', '#collapse4', data: { toggle: 'collapse', parrent: 'accordion'}
+      #collapse4.panel-collapse.collapse
+        .panel-body
+          .form-group
+            .row
+              .col-xs-5
+                = f.input :about_product, :label => 'Ру', class:'form-control'
+              .col-xs-5
+                = f.input :about_product_ro, label: 'Ro', class:'form-control'
+    .panel.panel-default
+      .panel-heading
+        h4.panel-title
+          = link_to 'Ingredients', '#collapse5', data: { toggle: 'collapse', parrent: 'accordion'}
+      #collapse5.panel-collapse.collapse
+        .panel-body
+          .form-group
+            .row
+              .col-xs-5
+                = f.input :ingredients, :label => 'Ру', class:'form-control'
+              .col-xs-5
+                = f.input :ingredients_ro, label: 'Ro', class:'form-control'
+    .panel.panel-default
+      .panel-heading
+        h4.panel-title
+          = link_to 'Price', '#collapse6', data: { toggle: 'collapse', parrent: 'accordion'}
+      #collapse6.panel-collapse.collapse
+        .panel-body
+          .form-group
+            .row
+              .col-xs-5
+                = f.input :price, :label => 'Цена', class:'form-control'
+  =f.actions

app/assets/stylesheets/cart.css.sass

@@ -1,11 +1,16 @@
 -if cart.items.empty?
   h1 Корзина пуста!
 -else
+  .col-md-4
+    | Кольво
+  .col-md-4
+    | Name
+  .col-md-4
+    | Total Price
   = render (cart.items)
-  li
-    span.label.label-success #{@cart.total_price}
-  .row-fluid
-    .col-md-3
-      = button_to 'Оформить заказ', new_order_path, method: :get, class: 'btn btn-info'
-    .col-md-3.pull-right
-      = button_to 'Очитсить корзину', @cart, method: :delete, class: 'btn btn-danger'
+  .col-md-12.p_b
+    | Всего:
+    .label.label-success #{@cart.total_price}
+  .col-md-12
+    = button_to 'Оформить заказ', new_order_path, method: :get, class: 'btn btn-info'
+    = button_to 'Очитсить корзину', @cart, method: :delete, class: 'btn btn-danger'

app/controllers/carts_controller.rb

@@ -1,7 +1,2 @@
-p#notice = notice
-
 = render @cart
-
-= link_to 'Edit', edit_cart_path(@cart)
-'|
-= link_to 'Back', carts_path
+= link_to 'Edit', edit_cart_path(@cart), class: 'label label-warning'