Dockerize project

.dockerignore

@@ -0,0 +1,5 @@
+.git
+.dockerignore
+.byebug_history
+log/*
+tmp/*

.gitignore

@@ -15,6 +15,7 @@
 /vendor/bundle/
 /vendor/ruby/
 /node_modules
+/docker/ssl_keys
 
 
 # minimal Rails specific artifacts

Gemfile

@@ -7,6 +7,7 @@ gem 'bootstrap', '~> 4.0.0'
 gem 'jquery-rails'
 gem 'bourbon'
 gem 'foreman'
+gem 'rails_12factor', group: :production
 gem 'dotenv'
 gem 'coffee-rails', '~> 4.2'
 gem 'devise'

Gemfile.lock

@@ -270,7 +270,12 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
+    rails_12factor (0.0.3)
+      rails_serve_static_assets
+      rails_stdout_logging
     rails_layout (1.0.42)
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (5.2.1)
       actionpack (= 5.2.1)
       activesupport (= 5.2.1)
@@ -429,6 +434,7 @@ DEPENDENCIES
   puma (~> 3.11)
   pundit
   rails (~> 5.2.0)
+  rails_12factor
   rails_layout
   rspec-rails
   sass-rails (~> 5.0)

app/assets/javascripts/application.js

@@ -15,8 +15,6 @@
 //= require popper
 //= require bootstrap-sprockets
 //= require moment
-////= require select2/dist/js/select2.full.js
-//= require chart.js/dist/Chart.js
 //= require cable
 //= require moment
 //= require jquery

app/assets/stylesheets/application.css.scss

@@ -11,7 +11,6 @@
  * It is generally better to create a new file per style scope.
  *
  *= require fullcalendar
- //*= require select2/dist/css/select2.css
  *= require_tree .
  *= require_self
 
@@ -32,14 +31,14 @@
 }
 
 .main.ui.container {
-//#main-container {
+  //#main-container {
   display:  flex;
   flex-flow:  row nowrap;
   justify-content:  center;
 }
 
 .ui.raised.container.segment {
-//#container-segment {
+  //#container-segment {
   margin-top: 23px;
   margin-right: auto !important;
   margin-left: auto !important;
@@ -52,7 +51,7 @@
   margin-left: 210px;
 }
 
-@media only screen and (max-width: 1520px) {
+@media only screen and (max-width: 1144px) {
   #fixed-sidebar {
     display: none;
   }
@@ -77,7 +76,7 @@
   }
 }
 
-@media only screen and (min-width: 1521px) {
+@media only screen and (min-width: 1145px) {
   #fixed-sidebar {
     display: flex;
   }

app/controllers/trainings_controller.rb

@@ -8,13 +8,26 @@ class TrainingsController < ApplicationController
   # protect_from_forgery with: :null_session
   skip_before_action :verify_authenticity_token, only: %i[join_clients exercises]
 
+  def index
+    @training = Training.where(user_id: current_user.id).map do |training|
+      {
+          name:     Client.find_by(id: training.client_id).full_name,
+          training: training
+      }
+    end
+  end
+
+  def show
+    @name = Client.find_by(id: @training.client_id).full_name
+    @sets = kit_constructor
+  end
+
   def new
     @clients = current_user.clients
     (current_user.trainings.find_by(status: 0))&.delete
+    @date = params[:date]
     training = current_user.trainings.build
     redirect_url calendar_path, alert: "Couldn't create training" unless training.save
-    @date = params[:date]
-    @training = current_user.trainings.build
   end
 
   def join_clients
@@ -52,22 +65,15 @@ def exercises
     render layout: false
   end
 
-  def show
-    authorize @training
-    @name = Client.find_by(id: @training.client_id).full_name
-    @sets = kit_constructor
-  end
-
   def client_list
     current_user.clients.map do |client|
-    # Client.where(user_id: user).map do |client|
+      # Client.where(user_id: user).map do |client|
       [client.first_name + ' ' + client.second_name, client.id]
     end
   end
 
   def create
     @training = current_user.trainings.build(training_params)
-    authorize @training
     if @training.save
       calendar_id = Calendar.find_by(user_id: current_user.id).calendar_id
       begin
@@ -84,13 +90,13 @@ def create
           end_time = start_time + 2.hours
           summary = Client.find_by(id: @training.client_id).full_name
           event = Google::Apis::CalendarV3::Event.new(
-                                                          id: 'training' + @training.id.to_s + 'fitfree1asslcom',
-                                                          start: Google::Apis::CalendarV3::EventDateTime.new(date_time: (start_time - 3.hours).to_datetime.rfc3339),
-                                                          end: Google::Apis::CalendarV3::EventDateTime.new(date_time: (end_time - 3.hours).to_datetime.rfc3339),
-                                                          summary: summary,
-                                                          description: @training.description
-                                                      )
-            service.insert_event(calendar_id, event)
+              id: 'training' + @training.id.to_s + 'fitfree1asslcom',
+              start: Google::Apis::CalendarV3::EventDateTime.new(date_time: (start_time - 3.hours).to_datetime.rfc3339),
+              end: Google::Apis::CalendarV3::EventDateTime.new(date_time: (end_time - 3.hours).to_datetime.rfc3339),
+              summary: summary,
+              description: @training.description
+          )
+          service.insert_event(calendar_id, event)
         end
       rescue Google::Apis::AuthorizationError
         response = client.refresh!
@@ -105,15 +111,13 @@ def create
   end
 
   def edit
-    authorize @training
     @list = client_list
     @name = name(@training)
     @sets = sets(@training, current_user)
   end
 
   def update
     @training.update(status: :planned)
-    authorize @training
     if @training.update(training_params)
       calendar_id = Calendar.find_by(user_id: current_user.id).calendar_id
       begin
@@ -130,11 +134,11 @@ def update
           end_time = start_time + 2.hours
           summary = Client.find_by(id: @training.client_id).full_name
           event = Google::Apis::CalendarV3::Event.new(
-                                                          start: Google::Apis::CalendarV3::EventDateTime.new(date_time: (start_time - 3.hours).to_datetime.rfc3339),
-                                                          end: Google::Apis::CalendarV3::EventDateTime.new(date_time: (end_time - 3.hours).to_datetime.rfc3339),
-                                                          summary: summary,
-                                                          description: @training.description
-                                                      )
+              start: Google::Apis::CalendarV3::EventDateTime.new(date_time: (start_time - 3.hours).to_datetime.rfc3339),
+              end: Google::Apis::CalendarV3::EventDateTime.new(date_time: (end_time - 3.hours).to_datetime.rfc3339),
+              summary: summary,
+              description: @training.description
+          )
           if service.get_event(calendar_id, 'training' + @training.id.to_s + 'fitfree1asslcom')
             service.patch_event(calendar_id, 'training' + @training.id.to_s + 'fitfree1asslcom', event)
           end
@@ -157,12 +161,10 @@ def update
   end
 
   def cancel
-    authorize @training
     @training.update(status: :canceled)
   end
 
   def destroy
-    authorize @training
     calendar_id = Calendar.find_by(user_id: current_user.id).calendar_id
     begin
       if calendar_id
@@ -178,14 +180,14 @@ def destroy
           service.delete_event(calendar_id, 'training' + @training.id.to_s + 'fitfree1asslcom')
         end
       end
+      TrainingsHelper::BackgroundProccess.delete_background_proc(@training.id) if @training.status == :planned
+      @training.destroy
+      redirect_to calendar_index_path
     rescue Google::Apis::AuthorizationError
       response = client.refresh!
       session[:authorization] = session[:authorization].merge(response)
       retry
     end
-    TrainingsHelper::BackgroundProccess.delete_background_proc(@training.id) if @training.status == :planned
-    @training.destroy
-    redirect_to calendar_index_path
   end
 
   private
@@ -216,8 +218,8 @@ def create_background_proc(training_id)
   def kit_constructor
     sets = Kit.where(training_id: @training.id, user_id: current_user.id).map do |kit|
       {
-        exercises: Exercise.where(kit_id: kit.id, user_id: current_user.id),
-        kit:       kit
+          exercises: Exercise.where(kit_id: kit.id, user_id: current_user.id),
+          kit:       kit
       }
     end
     sets.each do |kit|

app/views/layouts/application.html.erb

@@ -28,7 +28,7 @@
         <i class="users icon"></i>
         <%= t('navigation.clients') %>
       </a>
-      <a class="item" href="#">
+      <a class="item" href="<%= metrics_path %>">
         <i class="cog icon"></i>
         <%= t('navigation.settings') %>
       </a>
@@ -55,7 +55,7 @@
           <i class="users icon"></i>
           <%= t('navigation.clients') %>
         </a>
-        <a class="item" href="#">
+        <a class="item" href="<%= metrics_path %>">
           <i class="cog icon"></i>
           <%= t('navigation.settings') %>
         </a>

app/views/payments/index.html.slim

@@ -1,6 +1,6 @@
 = render 'clients/navbar', active_section: :payments
 
-.ui.container
+.main.ui.container
   /todo: change depends screen size => .html.ui.top.attached.segment
   .ui.raised.container.segment
     .ui.top.attached.label
@@ -21,11 +21,22 @@
                   td.Date = payment.datetime.strftime("%B %d, %Y")
                   td.Price = payment.price
                   td.right.aligned.Cancel: button.negative.ui.button [onclick="document.location.replace('#{'payments/' + payment.id.to_s + '/delete'}')"] Ⓧ
-          center
-            .pagniation-wrapper align="center"
-              = paginate @payments_list
-            button.positive.ui.button [onclick="window.location='payments/create';"] #{t('.add')}
-
+            tfoot
+              tr
+                th colspan="3"
+                  button.positive.ui.button [onclick="window.location='payments/create';"] Add
+                  .ui.right.floated.pagination.menu
+                    a.icon.item
+                      i.left.chevron.icon
+                    a.item 1
+                    a.item 2
+                    a.item 3
+                    a.item 4
+                    a.icon.item
+                      i.right.chevron.icon
         - else
           h4 #{t('payments.index.no_payments')}
-          button.positive.ui.button [type="submit" onclick="window.location='payments/create';"] #{t('.add')}
+          button.positive.ui.button [type="submit" onclick="window.location='payments/create';"] #{t('payments.index.add')}
+    /todo: make pagination
+    = paginate @payments_list,
+            previous_label: 'Previous', next_label: 'Next', inner_window: 1, outer_window: 0

config/application.rb

@@ -29,7 +29,7 @@ class Application < Rails::Application
     config.i18n.default_locale = :en
     # Initialize configuration defaults for originally generated Rails version.
     config.load_defaults 5.2
-    config.active_job.queue_adapter = Rails.env.production? ? :sidekiq : :async
+    config.active_job.queue_adapter = :sidekiq
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading

config/initializers/sidekiq.rb

@@ -3,11 +3,17 @@
 
 Sidekiq.configure_client do |config|
   # accepts :expiration (optional)
+  config.redis = {
+     url: "redis://#{ENV["REDIS_HOST"]}:#{ENV["REDIS_PORT"]}"
+   }
   Sidekiq::Status.configure_client_middleware config, expiration: 30.minutes
 end
 
 Sidekiq.configure_server do |config|
   # accepts :expiration (optional)
+  config.redis = {
+      url: "redis://#{ENV["REDIS_HOST"]}:#{ENV["REDIS_PORT"]}"
+  }
   Sidekiq::Status.configure_server_middleware config, expiration: 30.minutes
 
   # accepts :expiration (optional)

config/secrets.yml

@@ -38,7 +38,7 @@ test:
 production:
   admin_name: <%= ENV["ADMIN_NAME"] %>
   admin_email: <%= ENV["ADMIN_EMAIL"] %>
-  admin_password: <%= ENV["ADMIN_PASSWORD"] %>
+  admin_password: 123456789
   email_provider_username: <%= ENV["SENDGRID_USERNAME"] %>
   email_provider_password: <%= ENV["SENDGRID_PASSWORD"] %>
   domain_name: <%= ENV["DOMAIN_NAME"] %>