c80_contest 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ec190a34b844e42cfeafee62ab0d88e3b73617
-  data.tar.gz: 421a35c9f17885da1f6d193b4d3b276418a53fd3
+  metadata.gz: 83d252fc69b885e1bc70a92464817b20cdc39d1a
+  data.tar.gz: cb5a10d7604d9fb1fa3b604a2143584d5a13d5d6
 SHA512:
-  metadata.gz: 1798ce875d29f544941336bcf2ed976d5fad978bd7e8dab13f90f3657b926bcbc3e064f175af1bbb9d236acf75db272386e562eff5e18a22fb819e84bd6bdcfc
-  data.tar.gz: 9dad4584a8b24168c0f29b23a4d563886d365e89d3909355fa736ea3c3e0a0a1bc8c10cdf424990d61585ec6e4b3c0d3e759bcfbe764c8959be95ab83060d670
+  metadata.gz: 12a31fc40295304bf3c8e7a566940ae0b39db400e99cc77da75832eee90ce0dd90fab1e8dce37e3e8ccd7567fe97186b2e0e9ec43a0eac476e00912682c1f453
+  data.tar.gz: 392a997ee618f89c34040c73666e91e654ec1712b427ca62a5d8add90d582a96b3defaad01283aa9a5c550c4f4a1eb37666f7b6dff9ef2d9843052302617df82

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.2.0
 before_install: gem install bundler -v 1.15.0.pre.3

data/README.md

@@ -6,22 +6,33 @@
 Добавляет на сайт функционал для проведения конкурса типа "пришли фотографию чека - участвуй в конкурсе по розыгрышу 500 литров бензина".
 Содержит:
 
-* форму отправки: фото чека, поля для ввода имени и телефона
-* страницу в ActiveAdmin
-* виджет типа "слайдер-карусель" на ActiveAdmin dashboard
+* форму отправки: фото чека, поля для ввода имени и телефона. Форма
+защищена (по мере возможности) от спама: она запрашивается только тогда,
+когда пользователь кликнул по нужной кнопке - приходит в виде строки,
+превращается в html (с помощью `jQuery`) и помещается на страницу.
+
+* страницу в ActiveAdmin с настройками и таблицей заявок
+
+Сообщения уходят на почту админу (в настройках можно указать почтовый адрес).
 
 ## Dependencies
 
 * rails (`::Rails::Engine`)
-* activeadmin
-* bootstrap
-* bootstrap/modal
+* activeadmin (backend)
+* ckeditor (backend)
+* bootstrap (frontend)
+* bootstrap/modal (frontend)
+* c80: modal forms (frontend)
+* remote multipart form (frontend)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
+gem 'remotipart'
+gem 'c80_modal_forms'
+
 gem 'c80_contest'
 ```
 
@@ -29,4 +40,74 @@ And then execute:
 
     $ bundle
 
+application.js:
+
+    //= require bootstrap/modal
+    //= require bootstrap/transitions
+    //= require jquery.remotipart
+    //= require c80_modal_forms
+    
+    //= require c80_contest
+
+application.scss:
+
+    @import 'c80_contest';
+
+application_controller.rb:
+
+    helper C80Contest::Engine.helpers
+
+routes.rb:
+
+    mount C80Contest::Engine => '/'
+
 ## Usage
+
+### Settings
+
+В админке появляется пункт меню 'Розыгрыш', в котором содержатся
+два подпункта: собственно, заявки от посетителей сайта и настройки
+модуля. Модуль можно выключить - тогда всё исчезнет с сайта, что
+касается розыгрыша, и код менять при этом не нужно. Там же в настройках
+можно менять другие параметры модуля.
+
+### Helpers
+
+* `render_banner_button` - отрисует кнопку, по которой можно кликнуть,
+чтобы получить с сервера форму, которую можно заполнить.
+
+### Прелоадер
+
+Это то, что видно после клика по кнопке до тех пор,
+пока не получен ответ от сервера (с формой, которую можно заполнить).
+
+Кастомизируется с помощью css вида:
+
+```css
+/* этот прелоадер ложится поверх картинки-кнопки,
+закрывая её всю полупрозрачным чёрным, а по-центру
+этого поля расположен анимированный гиф. */
+
+/* С помощью width/height подгоняем под конкретный размер картинки,
+которую надо накрыть. */
+
+/* т.к. js уже позиционировал див с помощью top/left - 
+в css корректируем местонах. с помощью margin.
+*/
+
+div#lo {
+  width: 965px;  
+  height: 160px;
+  background-size: 10%;
+  background-color: rgba(0,0,0,0.3);
+  margin-top: -65px; 
+  margin-left: 60px;
+}
+```
+
+# TODO
+
+* [ ] Проверить, удаляются ли окна из html, когда их закрываем или когда они сами исчезают
+* [ ] Вывести в настройки размер кнопки-картинки, использовать их в uploader-е и в css прелоадера
+* [ ] Дописать тесты
+* [ ] Допилить Readme

data/app/admin/c80_contest/bids.rb

@@ -2,7 +2,7 @@ ActiveAdmin.register C80Contest::Bid, :as => 'Bid' do
 
   if ActiveRecord::Base.connection.table_exists?('c80_contest_settings')
     menu :parent => C80Contest::Setting.first.admin_label_menu,
-         :label => C80Contest::Setting.first.admin_label_menu if C80Contest::Setting.first.present?
+         :label => C80Contest::Setting.first.admin_label_bids if C80Contest::Setting.first.present?
   end
 
   config.sort_order = 'created_at_desc'

data/app/admin/c80_contest/settings.rb

@@ -0,0 +1,129 @@
+if defined?(ActiveAdmin)
+  ActiveAdmin.register C80Contest::Setting do
+
+    if ActiveRecord::Base.connection.table_exists?('c80_contest_settings')
+      menu :parent => C80Contest::Setting.first.admin_label_menu,
+           :label => C80Contest::Setting.first.admin_label_settings if C80Contest::Setting.first.present?
+    end
+
+    # noinspection RubyResolve
+    before_filter :skip_sidebar!, :only => :index
+
+    controller do
+
+      def update
+        setting = C80Contest::Setting.find(params[:id])
+        permitted_params[:setting].each_key do |k|
+          if k == 'button_photo'
+            # byebug
+            # noinspection RubyResolve
+            setting.button_photo = permitted_params[:setting][k]
+            setting.save!
+          else
+            setting.update_column(k, permitted_params[:setting][k])
+          end
+        end
+        # noinspection RailsParamDefResolve
+        redirect_to :action => :index
+      end
+
+      def permitted_params
+        params.permit(
+            :utf8, :_method, :authenticity_token, :commit, :id,
+            :setting => [
+                :form_title,
+                :form_label_name,
+                :form_label_phone,
+                :form_label_photo,
+                :form_label_button_send,
+                :form_label_button_sending,
+                :rules,
+                :ok_text,
+                :ok_text_title,
+                :message_letter_subj,
+                :message_text,
+                :admin_label_menu,
+                :admin_label_settings,
+                :admin_label_bids,
+                :mail_from,
+                :mail_to,
+                :is_active,
+                :button_photo
+            ]
+        )
+      end
+    end
+
+    index do
+      column do |s|
+        a = ''
+        s.attribute_names.sort.each do |n|
+          next if n =~ /message_text|created_at|updated_at|id/
+          sn = s[n]
+
+          # особым образом выведем фотку
+          if n == 'button_photo'
+            if s[n].nil?
+              sn = '<картинка баннера не загружена>'
+            else
+              sn = "<img src='#{# noinspection RubyResolve
+              s.button_photo.url}'/>"
+            end
+          end
+
+          # особым образом выведем правила
+          if n == 'rules' && sn.present?
+            tmp = ActionView::Base.full_sanitizer.sanitize(sn)
+
+            t = tmp.gsub("\n",'')
+            s = t unless t.nil?
+
+            t = s.gsub("\t",' ')
+            s = t unless t.nil?
+
+            t = s.gsub("\r",'')
+            s = t unless t.nil?
+
+            t = s.gsub(/&\w+;/,'*')
+            s = t unless t.nil?
+
+            ah = "<a href='/rules_page' target='_blank' style='text-decoration: underline;'>Просмотреть</a>"
+            sn = "#{tmp[0..129]}... <em style='color:#2b2b2b;'>(знаков с пробелами: ~#{s.size})</em> #{ah}"
+          end
+
+          a += "<li><em>#{n}:</em>#{sn}</li>"
+        end
+        "<ul>#{a}</ul>".html_safe
+      end
+
+      actions
+    end
+
+    form(:html => {:multipart => true}) do |f|
+      f.inputs do
+        f.input :is_active
+        f.input :form_title
+        f.input :form_label_name
+        f.input :form_label_phone
+        f.input :form_label_photo
+        f.input :form_label_button_send
+        f.input :form_label_button_sending
+        # noinspection RubyResolve
+        f.input :button_photo, :hint => "#{image_tag(f.object.button_photo.url)}".html_safe
+        f.input :rules, :as => :ckeditor
+        f.input :ok_text
+        f.input :ok_text_title
+        f.input :mail_from
+        f.input :mail_to
+        f.input :message_letter_subj
+        f.input :message_text, :input_html => {:rows => 3, :class => 'code_area'}
+
+        f.input :admin_label_menu
+        f.input :admin_label_settings
+        f.input :admin_label_bids
+      end
+      f.actions
+    end
+
+  end
+end

data/app/assets/stylesheets/c80_contest/backend/settings_page.scss

@@ -0,0 +1,32 @@
+body.admin_c80_contest_settings {
+
+  #titlebar_right .action_items {
+    display: none;
+  }
+
+  .table_tools {
+    display: none;
+  }
+
+  a.view_link {
+    display: none;
+  }
+  a.delete_link {
+    display: none;
+  }
+
+  .blank_slate_container {
+    opacity: 0;
+  }
+
+  ul {
+    white-space: nowrap;
+    em {
+      font-weight: bold;
+      display: inline-block;
+      width: 200px;
+    }
+
+  }
+
+}

data/app/assets/stylesheets/c80_contest/frontend/bid_form.scss

@@ -0,0 +1,85 @@
+div#bid_form {
+
+  .modal-content {
+
+    .modal-header {
+
+      h4 {
+      }
+
+      a.medium {
+        display: block;
+        margin: 0 auto;
+        text-align: center;
+        color: white;
+        font-size: 16px;
+        text-decoration: underline;
+        /*font-family: "DinCondProBold";*/
+      }
+
+      button.close {
+      }
+
+    }
+
+    .modal-body {
+      label.control-label {
+      }
+
+      .form-control {
+
+        /*стилизуем bootstrap fileinput*/
+        &.kv-fileinput-caption {
+
+          /*в этом блоке живёт имя файла и иконка слева*/
+          div.file-caption-name {
+            overflow: visible;
+            height: 28px;
+            margin-top: 8px;
+            margin-left: 6px;
+
+            /*иконку чуть отодвинем влево*/
+            i.glyphicon {
+              left: -6px;
+              color: #337ab7;
+            }
+
+          }
+        }
+
+      }
+
+      .input-group-btn {
+
+        /*скроем кнопку "загрузить" плагина fileinput*/
+        .fileinput-upload-button {
+          display: none;
+        }
+
+        /*кнопки "удалить" и "browse" подгоним по высоте к полю, где живёт имя файла*/
+        .btn {
+        }
+
+      }
+
+      /*у плагина fileinput картинку-предпросмотр ограничим по ширине*/
+      .kv-file-content {
+        img.file-preview-image {
+          width: auto !important;
+          height: auto !important;
+          max-width: 625px;
+        }
+      }
+
+      div.actions {
+        label.control-label {
+          display: none;
+        }
+        input.btn {
+
+        }
+      }
+    }
+
+  }
+}

data/app/assets/stylesheets/c80_contest/frontend/lo.scss

@@ -0,0 +1,14 @@
+#lo {
+  position: absolute;
+  width: 50px;
+  height: 17px;
+  background: transparent url(image_path('c80_contest/lo.gif')) no-repeat 50% 50%;
+  z-index: 120;
+  transition: visibility 1s, opacity 0.5s linear;
+
+  &.invis {
+    visibility: hidden;
+    opacity: 0;
+  }
+
+}

data/app/assets/stylesheets/lib/fileinput/fileinput.scss

@@ -109,7 +109,7 @@
     }
 
     .kv-file-content {
-      height: 170px;
+      height: auto;
     }
 
     .file-thumbnail-footer {

data/app/controllers/c80_contest/application_controller.rb

@@ -1,5 +1,18 @@
 module C80Contest
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
+
+    # noinspection RubyResolve
+    before_filter :check_is_active
+
+    private
+
+    def check_is_active
+      # noinspection RubyResolve
+      unless Setting.first.is_active
+        render :plain => 'none'
+      end
+    end
+
   end
 end

data/app/controllers/c80_contest/bid_controller.rb

@@ -8,8 +8,7 @@ module C80Contest
 
           # noinspection RubyResolve
           format.js
-          settings = Setting.first
-          # MessageOrderMailer.send_mess(m, settings.message_letter_subj).deliver
+          BidMailer.send_letter(m).deliver#_now
         else
           # noinspection RubyResolve
           format.js { render json: m.errors, status: :unprocessable_entity }

data/app/controllers/c80_contest/pages_controller.rb

@@ -0,0 +1,21 @@
+module C80Contest
+  class PagesController < ::ApplicationController
+
+    # noinspection RubyResolve
+    before_filter :check_is_active
+
+    def rules_page
+      @rules = Setting.first.rules
+    end
+
+    private
+
+    def check_is_active
+      # noinspection RubyResolve
+      unless Setting.first.is_active
+        render :plain => 'none'
+      end
+    end
+
+  end
+end

data/app/helpers/c80_contest/application_helper.rb

@@ -1,25 +1,53 @@
 module C80Contest
   module ApplicationHelper
 
-    def render_bid_form(bid)
+    # такое тоже бывает, после того, как создал PagesController
+    def root_url
+      '/'
+    end
 
-      settings = Setting.first
+    def render_bid_form(bid)
+      # noinspection RubyResolve
+      if settings.is_active
+        render :partial => 'c80_contest/shared/bid_form',
+               :locals => {
+                   bid: bid,
+                   settings: settings
+               }
+      else
+        render :plain => ''
+      end
+    end
 
-      render :partial => 'c80_contest/shared/bid_form',
-             :locals => {
-                 bid: bid,
-                 settings: settings
-             }
+    def render_ok_message
+      # noinspection RubyResolve
+      if settings.is_active
+        render :partial => 'c80_contest/shared/ok_message',
+               :locals => {
+                   ok_text: settings.ok_text,
+                   ok_text_title: settings.ok_text_title
+               }
+      else
+        render :plain => ''
+      end
+    end
 
+    def render_banner_button
+      # noinspection RubyResolve
+      if settings.is_active
+        render :partial => 'c80_contest/shared/banner_button',
+               :locals => {
+                   img_url: settings.button_photo.url
+               }
+      else
+        render :plain => ''
+      end
     end
 
-    def render_ok_message
-      settings = Setting.first
-      render :partial => 'c80_contest/shared/ok_message',
-             :locals => {
-                 ok_text: settings.ok_text,
-                 ok_text_title: settings.ok_text_title
-             }
+    private
+
+    def settings
+      @settings ||= Setting.first
     end
 
   end

data/app/helpers/c80_contest/mailer_helper.rb

@@ -0,0 +1,22 @@
+module C80Contest
+  module MailerHelper
+    def format_message(bid)
+
+      # noinspection RubyResolve
+      m = Setting.first.message_text
+
+      tmp = m.gsub!('{title}',bid.title)
+      m = tmp unless tmp.nil?
+
+      tmp = m.gsub!('{phone}',bid.phone)
+      m = tmp unless tmp.nil?
+
+      tmp = m.gsub!('{bid_id}',bid.id.to_s)
+      m = tmp unless tmp.nil?
+
+      tmp = m.gsub!('{photo_url}',bid.photo.url.to_s)
+      m = tmp unless tmp.nil?
+      m
+    end
+  end
+end

data/app/mailers/c80_contest/bid_mailer.rb

@@ -0,0 +1,25 @@
+module C80Contest
+  class BidMailer < ActionMailer::Base
+
+    include C80Contest::MailerHelper
+
+    default from: Proc.new { Setting.first.mail_from },
+            to: Proc.new { Setting.first.mail_to }
+
+    def send_letter(bid)
+
+      subj = Setting.first.message_letter_subj
+
+      # Rails.logger.debug "<BidMailer.send_letter> subj: #{subj}, #{bid.as_json}"
+      @message = format_message(bid)
+
+      # puts '<BidMailer.send_letter> Отправляем сообщение.'
+      mail(subject: subj) do |format|
+        format.html { render inline: '<%= @message.html_safe %>'}
+      end
+
+      #puts "#{SiteProps.first.mail_to}"
+    end
+
+  end
+end

data/app/models/c80_contest/setting.rb

@@ -1,6 +1,8 @@
 module C80Contest
   class Setting < ActiveRecord::Base
 
+    mount_uploader :button_photo, C80Contest::ButtonPhotoUploader
+
     validates :form_title,
               :presence => true,
               :length => { :in => 5..125 }
@@ -39,7 +41,7 @@ module C80Contest
 
     validates :rules,
               # :presence => true,
-              :length => { :in => 0..1000 }
+              :length => { :in => 0..10000 }
 
     validates :message_letter_subj,
               :presence => true,
@@ -49,5 +51,23 @@ module C80Contest
               :presence => true,
               :length => { :in => 20..499 }
 
+    validates :admin_label_settings,
+              :presence => true,
+              :length => { in: 5..20 }
+
+    validates :admin_label_bids,
+              :presence => true,
+              :length => { in: 5..20 }
+
+    validates :mail_from,
+              :presence => true,
+              :length => { in: 5..40 },
+              :format => { with: /\A([a-z0-9_.-]+)@([a-z0-9-]+)\.[a-z.]+\z/ }
+
+    validates :mail_to,
+              :presence => true,
+              :length => { in: 5..40 },
+              :format => { with: /\A([a-z0-9_.-]+)@([a-z0-9-]+)\.[a-z.]+\z/ }
+
   end
 end

data/app/uploaders/c80_contest/button_photo_uploader.rb

@@ -0,0 +1,32 @@
+module C80Contest
+
+  class ButtonPhotoUploader < ::CarrierWave::Uploader::Base
+
+    include ::CarrierWave::MiniMagick
+
+    storage :file
+    process :resize_to_limit => [965, 965]
+
+    version :thumb do
+      process :resize_to_fit => [500,500]
+    end
+
+    def store_dir
+      'uploads/buttons/'
+    end
+
+    def filename
+      if original_filename
+        "button_#{secure_token(4)}.#{file.extension}"
+      end
+    end
+
+    protected
+    def secure_token(length=16)
+      var = :"@#{mounted_as}_secure_token"
+      model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
+    end
+
+  end
+
+end

data/app/views/c80_contest/pages/rules_page.html.erb

@@ -0,0 +1,7 @@
+<div class="center-block rules-page-btn">
+  <%= render_banner_button %>
+</div>
+<div class="center-block rules-page">
+<%= # noinspection RubyResolve
+    @rules.html_safe if @rules.present? %>
+</div>

data/app/views/c80_contest/shared/_banner_button.html.erb

@@ -0,0 +1,3 @@
+<%# C80Contest::ApplicationHelper: render_banner_button %>
+<%= # noinspection RubyResolve
+    link_to image_tag(img_url), '#', :class => 'c80_contest_invoking_btn' %>

data/app/views/c80_contest/shared/_bid_form.html.erb

@@ -8,6 +8,7 @@
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         <h4 class="modal-title medium" id="myModalLabel"><%= settings.form_title %></h4>
+        <%= link_to 'Подробные условия акции', '/rules_page', :class => 'medium', :target => :blank %>
       </div>
       <div class="modal-body regular">
 

data/c80_contest.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bootstrap-sass', '>= 3.3.5.1'
   spec.add_development_dependency 'sass-rails', '>= 5.0.4'
   spec.add_development_dependency 'c80_modal_forms', '~> 0.1.0.1'
-  spec.add_development_dependency 'byebug', '~> 9.0.6'
+  spec.add_dependency 'byebug', '~> 9.0.6'
 
   # spec.add_development_dependency 'combustion', '~> 0.6.0'
 

data/config/routes.rb

@@ -1,4 +1,5 @@
 C80Contest::Engine.routes.draw do
   match '/give_me_bid_form', :to => 'site#give_me_form', :via => :post, :defaults => { :format => 'js' }
   match '/make_bid', :to => 'bid#make_bid', :via => :post, :defaults => { :format => 'js' }
+  match '/rules_page', :to => 'pages#rules_page', :via => :get
 end

data/db/migrate/20170512114103_add_c80_contest_admin_labels_to_settings.rb

@@ -0,0 +1,6 @@
+class AddC80ContestAdminLabelsToSettings < ActiveRecord::Migration
+  def change
+    add_column :c80_contest_settings, :admin_label_settings, :string
+    add_column :c80_contest_settings, :admin_label_bids, :string
+  end
+end

data/db/migrate/20170512170504_add_c80_contest_mail_from_to_settings.rb

@@ -0,0 +1,6 @@
+class AddC80ContestMailFromToSettings < ActiveRecord::Migration
+  def change
+    add_column :c80_contest_settings, :mail_from, :string
+    add_column :c80_contest_settings, :mail_to, :string
+  end
+end

data/db/migrate/20170518165005_add_c80_contest_is_active_to_settings.rb

@@ -0,0 +1,5 @@
+class AddC80ContestIsActiveToSettings < ActiveRecord::Migration
+  def change
+    add_column :c80_contest_settings, :is_active, :boolean
+  end
+end

data/db/migrate/20170518191906_add_c80_contest_button_photo_to_settings.rb

@@ -0,0 +1,5 @@
+class AddC80ContestButtonPhotoToSettings < ActiveRecord::Migration
+  def change
+    add_column :c80_contest_settings, :button_photo, :string
+  end
+end

data/db/seeds/c80_contest_fill_settings.rb

@@ -11,8 +11,13 @@ C80Contest::Setting.create!({
                                    :ok_text => 'Ваша заявка принята',
                                    :ok_text_title => 'Ваша заявка отправлена',
                                    :admin_label_menu => 'Розыгрыш',
+                                   :admin_label_bids => 'Заявки',
+                                   :admin_label_settings => 'Настройки',
                                    :rules => 'Акция проводится с 18 мая по 18 июня. В розыгрыше участвуют чеки на покупки, совершённые в цетре "7авто".',
                                    :message_letter_subj => 'Заявка на участие',
+                                   :mail_from => 'robot@mail.ru',
+                                   :mail_to => 'admin@mail.ru',
+                                   :is_active => true,
                                    :message_text => ' • Имя: {name}<br>' +
                                        ' • Номер телефона: {phone}<br>' +
                                        ' • Фото чека: <br>' +

data/lib/c80_contest/version.rb

@@ -1,3 +1,3 @@
 module C80Contest
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/c80_contest.rb

@@ -1,5 +1,6 @@
 require 'c80_contest/version'
 require 'c80_contest/engine'
+require 'byebug'
 
 module C80Contest
   def self.table_name_prefix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_contest
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -241,7 +241,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 9.0.6
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -268,9 +268,8 @@ files:
 - README.rdoc
 - Rakefile
 - app/admin/c80_contest/bids.rb
-- app/assets/images/c80_contest/.keep
-- app/assets/images/loading-sm.gif
-- app/assets/images/loading.gif
+- app/admin/c80_contest/settings.rb
+- app/assets/images/c80_contest/lo.gif
 - app/assets/javascripts/c80_contest.js.coffee
 - app/assets/javascripts/c80_contest/frontend/ajax_bid_form.js
 - app/assets/javascripts/lib/fileinput/fileinput.js
@@ -279,18 +278,26 @@ files:
 - app/assets/javascripts/lib/fileinput/themes/gly/theme.js
 - app/assets/stylesheets/c80_contest.scss
 - app/assets/stylesheets/c80_contest/backend/bid_page.scss
-- app/assets/stylesheets/c80_contest/frontend/foo.scss
+- app/assets/stylesheets/c80_contest/backend/settings_page.scss
+- app/assets/stylesheets/c80_contest/frontend/bid_form.scss
+- app/assets/stylesheets/c80_contest/frontend/lo.scss
 - app/assets/stylesheets/c80_contest_active_admin.scss
 - app/assets/stylesheets/lib/fileinput/fileinput.scss
 - app/assets/stylesheets/lib/fileinput/themes/explorer/theme.scss
 - app/controllers/c80_contest/application_controller.rb
 - app/controllers/c80_contest/bid_controller.rb
+- app/controllers/c80_contest/pages_controller.rb
 - app/controllers/c80_contest/site_controller.rb
 - app/helpers/c80_contest/application_helper.rb
+- app/helpers/c80_contest/mailer_helper.rb
+- app/mailers/c80_contest/bid_mailer.rb
 - app/models/c80_contest/bid.rb
 - app/models/c80_contest/setting.rb
 - app/uploaders/c80_contest/bid_photo_uploader.rb
+- app/uploaders/c80_contest/button_photo_uploader.rb
 - app/views/c80_contest/bid/make_bid.js.erb
+- app/views/c80_contest/pages/rules_page.html.erb
+- app/views/c80_contest/shared/_banner_button.html.erb
 - app/views/c80_contest/shared/_bid_form.html.erb
 - app/views/c80_contest/shared/_ok_message.html.erb
 - app/views/c80_contest/site/give_me_form.js.erb
@@ -303,6 +310,10 @@ files:
 - create_base.rb
 - db/migrate/20170510124400_create_c80_contest_bids.rb
 - db/migrate/20170511145501_create_c80_contest_settings.rb
+- db/migrate/20170512114103_add_c80_contest_admin_labels_to_settings.rb
+- db/migrate/20170512170504_add_c80_contest_mail_from_to_settings.rb
+- db/migrate/20170518165005_add_c80_contest_is_active_to_settings.rb
+- db/migrate/20170518191906_add_c80_contest_button_photo_to_settings.rb
 - db/seeds/c80_contest_fill_settings.rb
 - lib/c80_contest.rb
 - lib/c80_contest/engine.rb