tmatt_cms 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 767e941b3f5fd70702c2ff2aecfa6ae0e5ea73b5
-  data.tar.gz: 05103ddffd45cf360b17c4e49675aa59626be504
+  metadata.gz: ff85cd2489095db214c790b4501780abf238be99
+  data.tar.gz: 131b75379db5f20bca3804d521ac11124a697567
 SHA512:
-  metadata.gz: 9f499dcf84633597f5517b9d92a0dd376406d8fdcd91439ec91954e0ea4726af3b459a5fb18f188d7ef20b78a5db94c3e4694a62176494052efcec27b8985b97
-  data.tar.gz: 35743eba7a480cb2ee8ba3e2d8eb43e6d9f973975925b8a1c16f6d55d54c472ea96d6dc55b49d76916f2328bf225b3b3bfaa114d5b122c725d818ee5cdcac8f0
+  metadata.gz: d6331e9cf6997ae69ecad63a2ebda9fe35c3fd6fd3a1bf2efcda6b45bc14809bd2198342cd8c5c95eec0eb3f314b52e03b4322b8b1b7d1f3e43a6a1eb6b6ea97
+  data.tar.gz: 8484e1351d0dab8130b8d18915308b7c02a32f283cfda44bb03ade9906856df4417c53f0227b50df47d10ae3d659c91082be6e062ac7509ac66ce129f3ab9c0a

data/binstubs/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'console' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("tmatt_cms", "console")

data/binstubs/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/binstubs/setup

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'setup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("tmatt_cms", "setup")

data/lib/generators/tmatt_cms/install_generator.rb

@@ -51,11 +51,11 @@ module TmattCms
         if File.readlines(filename).grep(/smtp/).size == 0
           line_count = get_line_count filename
           insert_at_line(filename, line_count - 1, [
-              "\n\tconfig.action_mailer.default_url_options = { :host => '0.0.0.0:3000' }",
+              "\n\tconfig.action_mailer.default_url_options = { :host => ENV['DEVELOPMENT_URL'] }",
               "\tconfig.action_mailer.delivery_method = :smtp",
               "\tconfig.action_mailer.smtp_settings = {",
-              "\t\t:address => 'smtp.gmail.com',",
-              "\t\t:port => 587,",
+              "\t\t:address => ENV['SMTP_ADDRESS'],",
+              "\t\t:port => ENV['SMTP_PORT'].to_i,",
               "\t\t:user_name => ENV['MAILER_EMAIL'],",
               "\t\t:password => ENV['MAILER_PASSWORD'],",
               "\t\t:authentication => :plain",
@@ -67,12 +67,12 @@ module TmattCms
         if File.readlines(filename).grep(/smtp/).size == 0
           line_count = get_line_count filename
           insert_at_line(filename, line_count - 1, [
-              "\n\tconfig.action_mailer.default_url_options = { :host => 'tmatt.com.au' }",
-              "\tconfig.action_mailer.asset_host = 'http://tmatt.com.au'",
+              "\n\tconfig.action_mailer.default_url_options = { :host => ENV['PRODUCTION_URL'] }",
+              "\tconfig.action_mailer.asset_host = \"\#{ENV['PROTOCOL']}\#{ENV['PRODUCTION_URL']}\"",
               "\tconfig.action_mailer.delivery_method = :smtp",
               "\tconfig.action_mailer.smtp_settings = {",
-              "\t\t:address => 'smtp.gmail.com',",
-              "\t\t:port => 587,",
+              "\t\t:address => ENV['SMTP_ADDRESS'],",
+              "\t\t:port => ENV['SMTP_PORT'].to_i,",
               "\t\t:user_name => ENV['MAILER_EMAIL'],",
               "\t\t:password => ENV['MAILER_PASSWORD'],",
               "\t\t:authentication => :plain,",
@@ -130,7 +130,7 @@ module TmattCms
         copy_file 'css/application/variables.css.scss', 'app/assets/stylesheets/application/variables.css.scss'
 
         remove_file 'app/assets/stylesheets/application/application.css'
-        copy_file 'css/application/application.css', 'app/assets/stylesheets/application/application.css'
+        copy_file 'css/application/application.scss', 'app/assets/stylesheets/application/application.scss'
 
         remove_file 'app/assets/stylesheets/application/index.css.scss'
         copy_file 'css/application/index.css.scss', 'app/assets/stylesheets/application/index.css.scss'
@@ -268,13 +268,22 @@ module TmattCms
 
         if File.readlines(filename).grep(/project_name/).size == 0
           line_count = get_line_count filename
-          insert_at_line(filename, line_count - 3, [
+          insert_at_line(filename, line_count - 8, [
+              "set :branch,      'master'",
+              "set :rails_env,   'production'",
+              "set :migrate_env, 'production'",
+              "set :use_sudo, false",
+              'set :deploy_via, :remote_cache',
+              'set :db_local_clean, true',
+              "set :locals_rails_env, 'development'",
               "\n\nproject_name = 'project_name'",
+              "server_address = 'server_address'",
+              "server_ip = 'server_ip'",
               "\n\nputs 'Enter rake command[db:migrate]: '",
               'db_cmd = STDIN.gets.chomp',
               "db_cmd = 'db:migrate' if db_cmd == ''",
-              "\nset :server_address, 'tmatt.com.au'",
-              "server '0.0.0.0', :app, :web, :db, :primary => true",
+              "\nset :server_address, server_address",
+              'server server_ip, :app, :web, :db, :primary => true',
               "\nafter 'deploy:restart', 'deploy:cleanup'",
               "after 'deploy:restart', 'unicorn:restart'",
               "after 'deploy:restart', 'sidekiq:restart'",
@@ -308,6 +317,11 @@ module TmattCms
         end
       end
 
+      def config_devise_async
+        copy_file 'config/initializers/devise_async.rb', 'config/initializers/devise_async.rb'
+        copy_file 'config/sidekiq.yml', 'config/sidekiq.yml'
+      end
+
       private
 
       def get_line_count(filename)

data/lib/generators/tmatt_cms/locale_generator.rb

@@ -0,0 +1,62 @@
+require 'rails/generators'
+
+module TmattCms
+  module Generators
+    class LocaleGenerator < Rails::Generators::Base
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      argument :key, :type => :string
+      argument :zh_value, :type => :string
+      argument :en_value, :type => :string, :default => ''
+
+      def generate_locale
+        prefix_length = 45
+        blank_space = ' ' * (prefix_length - 2 - ("#{key}").length)
+
+        p "#{key} => #{zh_value} | #{en_value == '' ? key : en_value}"
+
+        if File.readlines('config/locales/views/global/en.yml').grep(/  #{key}: /).size == 0
+
+          File.open(File.join('config', 'locales', 'views', 'global', 'en.yml'), 'a+') do |f|
+            f.puts "  #{key}:#{blank_space}\"#{en_value == '' ? key : en_value}\""
+          end
+
+          File.open(File.join('config', 'locales', 'views', 'global', 'zh.yml'), 'a+') do |f|
+            f.puts "  #{key}:#{blank_space}\"#{zh_value}\""
+          end
+
+        else
+          p "#{key} exists!!! Override?(y/n) [n]:"
+          is_override = STDIN.gets.chomp
+
+          is_override = is_override == 'y' ? true : false
+
+          if is_override
+            line_number_en = get_line_number('config/locales/views/global/en.yml', "  #{key}: ")
+            override_line('config/locales/views/global/en.yml', line_number_en, "  #{key}:#{blank_space}\"#{en_value == '' ? key : en_value}\"")
+
+            line_number_zh = get_line_number('config/locales/views/global/zh.yml', "  #{key}: ")
+            override_line('config/locales/views/global/zh.yml', line_number_zh, "  #{key}:#{blank_space}\"#{zh_value}\"")
+          end
+        end
+      end
+
+      private
+
+      def get_line_number(file, word)
+        count = 0
+        File.open(file, "r") { |f| f.each_line { |line|
+          count += 1
+          return count if line =~ /#{word}/
+        }}
+      end
+
+      def override_line(file_path, line_number, new_line)
+        lines = File.readlines(file_path)
+        lines[line_number - 1] = new_line << $/
+        File.open(file_path, 'w') { |f| f.write(lines.join) }
+      end
+    end
+  end
+end

data/lib/generators/tmatt_cms/templates/config/application.yml

@@ -3,6 +3,13 @@ default: &default
   MAILER_EMAIL:                   ''
   MAILER_PASSWORD:                ''
   MAILER_DEFAULT_FROM:            ''
+  SMTP_ADDRESS:                   'smtp.gmail.com'
+  SMTP_PORT:                      '587'
+  DEVELOPMENT_URL:                '0.0.0.0:3000'
+  PRODUCTION_URL:                 ''
+  PROTOCOL:                       'http://'
+
+
 
 
 development:

data/lib/generators/tmatt_cms/templates/config/initializers/devise.rb

@@ -0,0 +1,259 @@
+# 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 = '835a7a7f51d573eb54c2de38b52aa1b349096d283ce163235301f76598e14de20d556ce7085fcf9345a4fd87b93378153ce626e42bdb6c77166c9e579a2c1e2c'
+
+  # ==> 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 401 status code 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 = 'ab4d3412e761b379a494fce8ea0c4822fed17ff9264ba7b69a3185bf65a65964cfaa84cc29ea10047f8cd7e84e16f54c3f881206341c03b61769235b9d058f8c'
+
+  # ==> 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 = false
+
+  # 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
+
+  # Invalidates all the remember me tokens when the user signs out.
+  config.expire_all_remember_me_on_sign_out = true
+
+  # 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 = true
+
+  # ==> 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 = true
+
+  # 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

data/lib/generators/tmatt_cms/templates/config/initializers/devise_async.rb

@@ -0,0 +1,3 @@
+# Supported options: :resque, :sidekiq, :delayed_job
+Devise::Async.backend = :sidekiq
+Devise::Async.queue = :devise_mailer

data/lib/generators/tmatt_cms/templates/config/locales/views/global/en.yml

@@ -1,2 +1,2 @@
 en:
-  language:                           "Language"
+  language:                                   "language"

data/lib/generators/tmatt_cms/templates/config/locales/views/global/zh.yml

@@ -1,2 +1,2 @@
 zh:
-  language:                           "语言"
+  language:                                   "语言"

data/lib/generators/tmatt_cms/templates/config/sidekiq.yml

@@ -0,0 +1,11 @@
+---
+:concurrency: 5
+:pidfile: tmp/pids/sidekiq.pid
+staging:
+  :concurrency: 10
+production:
+  :concurrency: 20
+:queues:
+  - default
+  - mailer
+  - [devise_mailer, 2]

data/lib/generators/tmatt_cms/templates/css/application/application.scss

@@ -0,0 +1,7 @@
+@import "application/chromeframe";
+@import "font-awesome";
+@import "jquery-ui";
+@import "owl.carousel";
+@import "owl.theme";
+@import "magnific-popup";
+@import "material_icons";

data/lib/generators/tmatt_cms/templates/css/layouts/form.css.scss

@@ -1,3 +0,0 @@
-header {
-
-}

data/lib/generators/tmatt_cms/templates/css/layouts/header.css.scss

@@ -0,0 +1,3 @@
+header {
+
+}

data/lib/generators/tmatt_cms/templates/css/style.css.scss

@@ -37,6 +37,40 @@ ul {
   }
 }
 
+ul, li {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+ol, ul {
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+
+
+ul, menu, dir {
+  display: block;
+  list-style-type: disc;
+  -webkit-margin-before: 1rem;
+  -webkit-margin-after: 1rem;
+  -webkit-margin-start: 0;
+  -webkit-margin-end: 0;
+  -webkit-padding-start: 0;
+}
+
+a, a:hover {
+  outline: none;
+  text-decoration: none;
+  color: currentColor;
+}
+
+a:visited, a:hover, a:active, a:focus {
+  text-decoration: none;
+  outline: none;
+  color: currentColor;
+}
+
 hr {
   margin: $gutter 0;
   border-top: 1px solid $light-gray;
@@ -48,36 +82,125 @@ abbr[title] { border: 0; }
 .block { display:block; }
 .inline-block { display:inline-block; }
 .relative { position:relative; }
+
+
 .m-c { margin:0 !important; }
+
 .m-a { margin:0 auto !important; }
+.m-1-a { margin:$gutter auto !important; }
+.m-2-a { margin:$gutter*2 auto !important; }
+.m-3-a { margin:$gutter*3 auto !important; }
 .m-4-a { margin: $gutter*4 auto !important; }
+.m-5-a { margin: $gutter*5 auto !important; }
+.m-1_2-a { margin:$gutter/2 auto !important; }
+.m-1_3-a { margin:$gutter/3 auto !important; }
+.m-1_4-a { margin:$gutter/4 auto !important; }
+.m-3_4-a { margin:$gutter*3/4 auto !important; }
+
 .m-b { margin-bottom: $gutter !important; }
+.m-b-2 { margin-bottom: $gutter*2 !important; }
+.m-b-3 { margin-bottom: $gutter*3 !important; }
+.m-b-4 { margin-bottom: $gutter*4 !important; }
+.m-b-5 { margin-bottom: $gutter*5 !important; }
 .m-b-1_2 { margin-bottom: $gutter/2 !important; }
+.m-b-1_3 { margin-bottom: $gutter*1/3 !important; }
 .m-b-1_4 { margin-bottom: $gutter/4 !important; }
+.m-b-3_4 { margin-bottom: $gutter*3/4 !important; }
 .m-b-c { margin-bottom:0 !important; }
-.m-t-1_2 { margin-top: $gutter/2; }
 
-.padd { padding: $gutter;}
-.padd-1_2 { padding: $gutter/2;}
-.padd-2 { padding: $gutter*2;}
+.m-t { margin-top: $gutter !important; }
+.m-t-2 { margin-top: $gutter*2 !important; }
+.m-t-3 { margin-top: $gutter*3 !important; }
+.m-t-4 { margin-top: $gutter*4 !important; }
+.m-t-5 { margin-top: $gutter*5 !important; }
+.m-t-1_2 { margin-top: $gutter/2 !important; }
+.m-t-1_3 { margin-top: $gutter*1/3 !important; }
+.m-t-1_4 { margin-top: $gutter/4 !important; }
+.m-t-3_4 { margin-top: $gutter*3/4 !important; }
+.m-t-c { margin-top:0 !important; }
+
+
+.padd { padding: $gutter; }
+.padd-2 { padding: $gutter*2; }
+.padd-3 { padding: $gutter*3; }
+.padd-4 { padding: $gutter*4; }
+.padd-5 { padding: $gutter*5; }
+.padd-1_2 { padding: $gutter/2; }
+.padd-1_3 { padding: $gutter/3; }
+.padd-1_4 { padding: $gutter/4; }
+.padd-3_4 { padding: $gutter*3/4; }
+.padd-c { padding: 0; }
+
 .padd-side { padding: 0 $gutter;}
-.padd-side-c { padding-left: 0 !important; padding-right: 0 !important; }
-.padd-side-1_2 { padding: 0 $gutter/2; }
-.padd-side-3_4 { padding: 0 $gutter/4*3; }
 .padd-side-2 { padding: 0 $gutter*2; }
 .padd-side-3 { padding: 0 $gutter*3; }
+.padd-side-4 { padding: 0 $gutter*4; }
+.padd-side-5 { padding: 0 $gutter*5; }
+.padd-side-1_2 { padding: 0 $gutter/2; }
+.padd-side-1_3 { padding: 0 $gutter/3; }
+.padd-side-1_4 { padding: 0 $gutter/4; }
+.padd-side-3_4 { padding: 0 $gutter*3/4; }
+.padd-side-c { padding-left: 0; padding-right: 0; }
+
+.padd-l { padding-left: $gutter; }
+.padd-l-2 { padding-left: $gutter*2; }
 .padd-l-3 { padding-left: $gutter*3; }
+.padd-l-4 { padding-left: $gutter*4; }
+.padd-l-5 { padding-left: $gutter*5; }
+.padd-l-1_2 { padding-left: $gutter/2; }
+.padd-l-1_3 { padding-left: $gutter/3; }
+.padd-l-1_4 { padding-left: $gutter/4; }
+.padd-l-3_4 { padding-left: $gutter*3/4; }
+.padd-l-c { padding-left: 0; }
+
+.padd-r { padding-right: $gutter; }
+.padd-r-2 { padding-right: $gutter*2; }
+.padd-r-3 { padding-right: $gutter*3; }
+.padd-r-4 { padding-right: $gutter*4; }
+.padd-r-5 { padding-right: $gutter*5; }
+.padd-r-1_2 { padding-right: $gutter/2; }
+.padd-r-1_3 { padding-right: $gutter/3; }
+.padd-r-1_4 { padding-right: $gutter/4; }
+.padd-r-3_4 { padding-right: $gutter*3/4; }
+.padd-r-c { padding-right: 0; }
+
 .padd-t { padding-top: $gutter; }
-.padd-t-1_2 { padding-top: $gutter/2; }
+.padd-t-2 { padding-top: $gutter*2; }
 .padd-t-3 { padding-top: $gutter*3; }
+.padd-t-4 { padding-top: $gutter*4; }
+.padd-t-5 { padding-top: $gutter*5; }
+.padd-t-1_2 { padding-top: $gutter/2; }
+.padd-t-1_3 { padding-top: $gutter/3; }
+.padd-t-1_4 { padding-top: $gutter/4; }
+.padd-t-3_4 { padding-top: $gutter*3/4; }
+.padd-t-c { padding-top: 0; }
+
 .padd-b { padding-bottom: $gutter; }
-.padd-b-1_2 { padding-bottom: $gutter/2; }
-.padd-b-1_4 { padding-bottom: $gutter/4; }
 .padd-b-2 { padding-bottom: $gutter*2; }
+.padd-b-3 { padding-bottom: $gutter*3; }
+.padd-b-4 { padding-bottom: $gutter*4; }
 .padd-b-5 { padding-bottom: $gutter*5; }
-.padd-t-b-c { padding-top: 0 !important; padding-bottom: 0 !important; }
+.padd-b-1_2 { padding-bottom: $gutter/2; }
+.padd-b-1_3 { padding-bottom: $gutter/3; }
+.padd-b-1_4 { padding-bottom: $gutter/4; }
+.padd-b-3_4 { padding-bottom: $gutter*3/4; }
+.padd-b-c { padding-bottom: 0; }
+
+.padd-t-b { padding: $gutter 0; }
+.padd-t-b-2 { padding: $gutter*2 0; }
 .padd-t-b-3 { padding: $gutter*3 0; }
+.padd-t-b-4 { padding: $gutter*4 0; }
 .padd-t-b-5 { padding: $gutter*5 0; }
+.padd-t-b-1_2 { padding: $gutter/2 0; }
+.padd-t-b-1_3 { padding: $gutter/3 0; }
+.padd-t-b-1_4 { padding: $gutter/4 0; }
+.padd-t-b-3_4 { padding: $gutter*3/4 0; }
+.padd-t-b-c { padding-top: 0; padding-bottom: 0; }
+
+.btn_padding_mid {
+  padding: $gutter/4 $gutter*2;
+  @extend .font-medium;
+}
 
 .bordered { border:0.1rem solid #ddd; }
 
@@ -130,6 +253,11 @@ abbr[title] { border: 0; }
 .font-4xlarge { font-size:5.0rem !important; }
 .font-5xlarge { font-size:6.0rem !important; }
 
+.font-light { font-weight: 100; }
+.font-300 { font-weight: 300; }
+.font-bold { font-weight: 700; }
+.font-italic { font-style: italic; }
+
 .text-primary { color: $blue !important; }
 .text-danger { color: $red !important; }
 
@@ -137,6 +265,7 @@ abbr[title] { border: 0; }
 .text-black { color: $black !important; }
 .text-orange { color: $orange !important; }
 .text-blue { color: $blue !important; }
+.text-grey { color: $gray; }
 
 .pull-none { float: none; }
 .media > .pull-left { margin-right: $gutter*2; }
@@ -200,43 +329,17 @@ abbr[title] { border: 0; }
   background-repeat: no-repeat;background-size: cover;
 }
 
-.sccsa_link:hover, .sccsa_link.active {
-  color: $blue !important;
-  border-bottom: 0.2rem solid $blue;
-  text-decoration: none;
-}
-
-
-ul, li {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-
-ol, ul {
-  margin-top: 0;
-  margin-bottom: 10px;
+.fa-lg {
+  font-size: 1.3333333333em;
+  line-height: 0.75em;
+  vertical-align: -15%;
 }
 
-
-ul, menu, dir {
-  display: block;
-  list-style-type: disc;
-  -webkit-margin-before: 1rem;
-  -webkit-margin-after: 1rem;
-  -webkit-margin-start: 0;
-  -webkit-margin-end: 0;
-  -webkit-padding-start: 0;
-}
-
-a, a:hover {
-  outline: none;
-  text-decoration: none;
-  color: currentColor;
-}
-
-a:visited, a:hover, a:active, a:focus {
-  text-decoration: none;
-  outline: none;
-  color: currentColor;
+.fa {
+  display: inline-block;
+  font: normal normal normal 1.4rem/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }

data/lib/generators/tmatt_cms/templates/gemfile/Gemfile

@@ -4,6 +4,8 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.6'
 
+gem 'thor', '0.19.1', '!=0.19.2', '!=0.19.3', '!=0.19.4'
+
 gem 'pg'
 
 # SEO pack
@@ -44,6 +46,7 @@ gem 'jquery-rails'
 gem 'jquery-ui-rails'
 
 gem 'devise', '~> 3.4.1'
+gem 'devise-async'
 gem 'omniauth-facebook'
 
 
@@ -124,4 +127,7 @@ gem 'nokogiri'
 gem 'geocoder'
 
 # Owl Carousel
-gem 'owlcarousel-rails'
+gem 'owlcarousel-rails'
+
+# Material Icon
+gem 'material_icons'

data/lib/tmatt_cms/version.rb

@@ -1,3 +1,3 @@
 module TmattCms
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tmatt_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Xingyu Ye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,21 +58,27 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- binstubs/console
+- binstubs/rake
+- binstubs/setup
 - lib/generators/tmatt_cms/install_generator.rb
+- lib/generators/tmatt_cms/locale_generator.rb
 - lib/generators/tmatt_cms/templates/.keep
 - lib/generators/tmatt_cms/templates/concerns/db_init.rb
 - lib/generators/tmatt_cms/templates/concerns/pretty_url.rb
 - lib/generators/tmatt_cms/templates/concerns/string_addition.rb
 - lib/generators/tmatt_cms/templates/concerns/translatable.rb
-- lib/generators/tmatt_cms/templates/config/application.rb
 - lib/generators/tmatt_cms/templates/config/application.yml
 - lib/generators/tmatt_cms/templates/config/initializers/active_job.rb
+- lib/generators/tmatt_cms/templates/config/initializers/devise.rb
+- lib/generators/tmatt_cms/templates/config/initializers/devise_async.rb
 - lib/generators/tmatt_cms/templates/config/locales/views/dashboard/en.yml
 - lib/generators/tmatt_cms/templates/config/locales/views/dashboard/zh.yml
 - lib/generators/tmatt_cms/templates/config/locales/views/global/en.yml
 - lib/generators/tmatt_cms/templates/config/locales/views/global/zh.yml
+- lib/generators/tmatt_cms/templates/config/sidekiq.yml
 - lib/generators/tmatt_cms/templates/controllers/pages_controller.rb
-- lib/generators/tmatt_cms/templates/css/application/application.css
+- lib/generators/tmatt_cms/templates/css/application/application.scss
 - lib/generators/tmatt_cms/templates/css/application/ckeditor.css.scss
 - lib/generators/tmatt_cms/templates/css/application/index.css.scss
 - lib/generators/tmatt_cms/templates/css/application/magnific_popup_rails.css.scss

data/lib/generators/tmatt_cms/templates/config/application.rb

@@ -1,41 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'rails/all'
-
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(*Rails.groups)
-
-ENV.update YAML.load_file('config/application.yml')[Rails.env] rescue {}
-
-module LannisterWebsite
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    config.autoload_paths += %W(#{config.root}/app/models/concerns)
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-    config.i18n.enforce_available_locales = false
-    config.i18n.fallbacks = true
-
-    Time::DATE_FORMATS[:aus] = '%l:%M %p on %d %B %Y'
-    Date::DATE_FORMATS[:aus] = '%d %B %Y'
-
-    Time::DATE_FORMATS[:zh] = '%l:%M %p on %d %B %Y'
-    Date::DATE_FORMATS[:zh] = '%d %B %Y'
-    config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
-
-    config.i18n.default_locale = 'en'
-
-
-    config.assets.precompile += %w( ckeditor/* )
-  end
-end

data/lib/generators/tmatt_cms/templates/css/application/application.css

@@ -1,18 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, 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 top of the
- * compiled file, but it's generally better to create a new file per style scope.
- *
-
- *= require application/chromeframe
- *= require font-awesome
- *= require jquery-ui
- *= require owl.carousel
- *= require owl.theme
- *= require magnific-popup
- */