faalis 1.0.0.alpha4 → 1.0.0

data/app/views/faalis/dashboard/groups/create.js.erb

@@ -0,0 +1,3 @@
+success_message('<%= _("Group saved successfully.") %>');
+var target = '<%= Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_groups_path".to_sym) %>';
+redirect_to(target);

data/app/views/faalis/dashboard/groups/edit.html.slim

@@ -0,0 +1,3 @@
+- form_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_groups_update_path".to_sym, @group.id)
+- index = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_groups_path".to_sym)
+= render partial: 'form', locals: { form_target: form_target, method: :put, index: index }

data/app/views/faalis/dashboard/groups/errors.js.erb

@@ -0,0 +1,3 @@
+var  msg = <%= @group.errors.to_json.html_safe %>;
+msg.title = "Please fix these errors first.";
+form_error(msg);

data/app/views/faalis/dashboard/groups/new.html.slim

@@ -0,0 +1,2 @@
+- form_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_groups_path".to_sym)
+= render partial: 'form', locals: { form_target: form_target, method: :post, index: form_target }

data/app/views/faalis/dashboard/groups/update.js.erb

@@ -0,0 +1,3 @@
+success_message('<%= _("Group updated successfully.") %>');
+var target = '<%= Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_groups_path".to_sym) %>';
+redirect_to(target);

data/app/views/faalis/dashboard/users/_form.html.slim

@@ -0,0 +1,80 @@
+= form_tag(form_target, remote: true, method: method) do
+  .row
+    .col-sm-12.col-lg-12
+      .box.box-primary
+        .box-header
+          .box-title
+            - if @user.new_record?
+              = _('New User')
+            - else
+              = _('Edit User')
+
+        .box-body
+          .row
+            .col-sm-12.col-lg-6
+              .form-group data-name="first_name"
+                label for="first_name"
+                  = _('First name')
+                input#group_name.form-control[placeholder==(_('Enter the first name of user')) name="user[first_name]" type="text" required value=(@user.first_name)]
+
+            .col-sm-12.col-lg-6
+              .form-group data-name="last_name"
+                label for="last_name"
+                  = _('Last name')
+                input#group_name.form-control[placeholder==(_('Enter the last name of user')) name="user[last_name]" type="text" required value=(@user.last_name)]
+
+          .row
+            .col-sm-12.col-lg-6
+              .form-group data-name="email"
+                label for="email"
+                  = _('Email')
+                input#group_name.form-control[placeholder==(_('Enter the name of group you want to create')) name="user[email]" type="text" required value=(@user.email)]
+
+          .row
+            .col-sm-12.col-lg-6
+              .form-group data-name="password"
+                label for="password"
+                  = _('Password')
+                input#group_name.form-control[name="user[password]" type="password"]
+
+            .col-sm-12.col-lg-6
+              .form-group data-name="password_confirmation"
+                label for="password_confirmation"
+                  = _('Password confirmation')
+                input#group_name.form-control[name="user[password_confirmation]" type="password"]
+
+          .row
+            .col-sm-12
+              h3
+                = _('Groups of user')
+          .row
+            .col-sm-12.col-lg-12
+              .form-group data-name="groups"
+                label
+                  = _('Goups')
+                select.multiple.select.form-control name="user[groups]" multiple="multiple" placeholder=(_("Start typing the group name"))
+                  - @groups.each do |group|
+                    - if @user.member_of? group
+                      option[value=(group.id) selected]
+                        = group.name
+                    - else
+                      option value=(group.id)
+                        = group.name
+
+
+        .box-footer
+          .row
+            .col-sm-2
+              button.btn.btn-success.btn-block type="submit"
+                i.fa.fa-check
+                |
+                = _('Save')
+
+            .col-sm-2.pull-right
+
+              div.btn.btn-danger.btn-block onclick=("redirect_to('#{index}')")
+                i.fa.fa-times
+                = _('Cancel')
+
+script
+   | $(".multiple.select").select2();

data/app/views/faalis/dashboard/users/_password_form.html.slim

@@ -0,0 +1,37 @@
+- form_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_edit_password_path".to_sym, @user.id)
+- index = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_path".to_sym)
+= form_tag(form_target, remote: true, method: :patch) do
+  .row
+    .col-sm-12
+      .box.box-primary
+        .box-header
+          .box-title
+            = _('Change Password')
+
+        .box-body
+          .row
+            .col-sm-12.col-lg-6
+              .form-group data-name="password"
+                label for="password"
+                  = _('Password')
+                input#group_name.form-control[name="user[password]" type="password"]
+          .row
+            .col-sm-12.col-lg-6
+              .form-group data-name="password_confirmation"
+                label for="password_confirmation"
+                  = _('Password confirmation')
+                input#group_name.form-control[name="user[password_confirmation]" type="password"]
+
+        .box-footer
+          .row
+            .col-sm-2
+              button.btn.btn-success.btn-block type="submit"
+                i.fa.fa-check
+                |
+                = _('Save')
+
+            .col-sm-2.pull-right
+
+              div.btn.btn-danger.btn-block onclick=("redirect_to('#{index}')")
+                i.fa.fa-times
+                = _('Cancel')

data/app/views/faalis/dashboard/users/create.js.erb

@@ -0,0 +1,3 @@
+success_message('<%= _("User saved successfully.") %>');
+var target = '<%= Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_path".to_sym) %>';
+redirect_to(target);

data/app/views/faalis/dashboard/users/edit.html.slim

@@ -0,0 +1,3 @@
+- form_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_update_path".to_sym, @user.id)
+- index = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_path".to_sym)
+= render partial: 'form', locals: { method: :put, form_target: form_target, index: index }

data/app/views/faalis/dashboard/users/edit_password.html.slim

@@ -0,0 +1 @@
+= render partial: 'password_form'

data/app/views/faalis/dashboard/users/errors.js.erb

@@ -0,0 +1,3 @@
+var  msg = <%= @user.errors.to_json.html_safe %>;
+msg.title = "Please fix these errors first.";
+form_error(msg);

data/app/views/faalis/dashboard/users/index.html.slim

@@ -0,0 +1,67 @@
+.row
+  .col-xs-12
+    .box.box-default
+      .box-header.with-border
+        h3.box-title
+          = _('Users')
+        .box-tools
+          - new_user = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_new_path".to_sym)
+          a.btn.btn-success.pull-right.btn-sm href=(faalisify_url(new_user))
+            i.fa.fa-plus
+            = _('Add user')
+
+      .box-body.no-padding
+        table.table.table-striped
+          tbody
+            tr
+              th
+                |#
+              th
+                = _("First Name")
+              th
+                =_("Last Name")
+              th
+                = _("Email")
+              th
+                = _('Created at')
+              th
+                =_('Last sing in at')
+              th
+                = _('Actions')
+
+            - @users.each do |user|
+              - edit_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_edit_path".to_sym, user.id)
+              - destroy_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_destroy_path".to_sym, user.id)
+              - show_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_show_path".to_sym, user.id)
+              tr
+                
+                td
+                  = user.id
+                td
+                  - if user.first_name.nil?
+                    |-
+                  - else
+                     = user.first_name
+                td
+                  - if user.last_name.nil? 
+                    | -
+                  - else
+                    = user.last_name
+                td
+                  a href=(faalisify_url(show_target))
+                    = user.email
+                td
+                  = user.created_at
+                td
+                  - if user.last_sign_in_at.nil?
+                    | -
+                  - else
+                    = user.last_sign_in_at
+                td.btn-user
+                  a.warning.link.pull-left href=(faalisify_url(edit_target))
+                    i.fa.fa-edit
+                  a.pass-change.link.pull-left href=()
+                    i.fa.fa-key.change-pass  
+                  a.link.pull-left href=(destroy_target) data-remote="true" data-method="delete"
+                    i.fa.fa-remove.btn-remove  
+      .box-footer

data/app/views/faalis/dashboard/users/new.html.slim

@@ -0,0 +1,2 @@
+- form_target = Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_path".to_sym)
+= render partial: 'form', locals: { method: :post, form_target: form_target, index: form_target}

data/app/views/faalis/dashboard/users/show.html.slim

@@ -0,0 +1,6 @@
+.row
+  .col-xs-12
+    .box.box-default
+      .box-header.with-border
+        h3.box-title
+          = "#{@user.first_name} #{@user.last_name}"

data/app/views/faalis/dashboard/users/update.js.erb

@@ -0,0 +1,3 @@
+success_message('<%= _("User updated successfully.") %>');
+var target = '<%= Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_path".to_sym) %>';
+redirect_to(target);

data/app/views/faalis/dashboard/users/update_password.js.erb

@@ -0,0 +1,3 @@
+success_message('<%= _("Password updated successfully.") %>');
+var target = '<%= Rails.application.routes.url_helpers.send("#{Faalis::Engine.dashboard_namespace}_auth_users_path".to_sym) %>';
+redirect_to(target);

data/db/migrate/20131013091000_devise_create_faalis_users.rb

@@ -23,9 +23,6 @@ class DeviseCreateFaalisUsers < ActiveRecord::Migration
       t.string   :first_name
       t.string   :last_name
 
-      # Group
-      t.integer :group_id, :default => 2
-
       if not Devise.omniauth_providers.empty?
         # Service
         t.string   :provider, :default => ""

data/lib/faalis.rb

@@ -21,6 +21,7 @@ require 'devise'
 
 # Faalis Module
 module Faalis
+  autoload :Configuration, 'faalis/configuration'
 end
 
 require 'faalis/engine'
@@ -33,6 +34,7 @@ require 'faalis/i18n'
 require 'faalis/generators/concerns'
 require 'faalis/generators'
 require 'faalis/route'
+require 'faalis/action_dispatch'
 require 'faalis/discovery'
 require 'faalis/fake_assets'
 require 'faalis/version'

data/lib/faalis/action_dispatch.rb

@@ -0,0 +1,3 @@
+class ActionDispatch::Routing::Mapper
+  include Faalis::RouteHelpers
+end

data/lib/faalis/configuration.rb

@@ -0,0 +1,25 @@
+module Faalis
+  class Configuration
+
+    class << self
+      attr_accessor :features, :enabled_features
+
+      def enabled_features
+        @enabled_features || []
+      end
+
+      def features
+        [:colorize_output]
+      end
+
+      def enable(feature)
+        fail "No such feature: '#{feature}'" unless features.include? feature
+        features << featue unless enabled_features.include? feature
+      end
+
+      def disable
+        fail 'TODO: create a disable method'
+      end
+    end
+  end
+end

data/lib/faalis/engine.rb

@@ -29,8 +29,10 @@ require_relative './middlewares/locale'
 require 'gettext_i18n_rails' if Rails.env.development?
 
 module Faalis
+
   # `Engine` class of **Faalis**.
   class Engine < ::Rails::Engine
+
     # TODO: Break this class to modules
     # TODO: Add a facility to allow developers to select
     #       features of faalis

data/lib/faalis/fake_assets.rb

@@ -8,3 +8,4 @@ require 'rails-assets-flow.js'
 require 'rails-assets-ng-flow'
 require 'rails-assets-angular-ui-router'
 require 'rails-assets-sugar'
+require 'rails-assets-angular-loading-bar'

data/lib/faalis/route.rb

@@ -1,8 +1,79 @@
-
 module Faalis
+  module RouteHelpers
+
+    # routes to be added to dashboard
+    def in_dashboard
+      namespace Faalis::Engine.dashboard_namespace do
+        yield
+      end
+    end
+
+    # Allow localized scope
+    def localized_scop
+      langs = ::I18n.available_locales.join('|')
+      scope '(:locale)', locale: Regexp.new(langs) do
+        yield
+      end
+    end
+
+    # This method allow user to define his routes in api
+    # namespace
+    def api_routes(version: :v1)
+      # TODO: Add a dynamic solution for formats
+      namespace :api, defaults: { format: :json } do
+        namespace version do
+          # Call user given block to define user routes
+          # inside this namespace
+          yield if block_given?
+        end
+      end
+
+      scope 'module'.to_sym => 'faalis' do
+        #dashboard = Faalis::Engine.dashboard_namespace
+        #get "#{dashboard}/auth/groups/new", to: "#{dashboard}/groups#new"
+        in_dashboard do
+          get  'auth/groups/new', to: 'groups#new'
+          get  'auth/groups/:id', to: 'groups#edit', as: 'auth_groups_edit'
+          post 'auth/groups',     to: 'groups#create'
+          put  'auth/groups/:id', to: 'groups#update', as: 'auth_groups_update'
+
+          get  'auth/users',     to: 'users#index'
+          get  'auth/users/new', to: 'users#new'
+          get  'auth/users/:id', to: 'users#show', as: 'auth_users_show'
+          get  'auth/users/:id/edit', to: 'users#edit', as: 'auth_users_edit'
+          post 'auth/users',     to: 'users#create'
+          put  'auth/users/:id', to: 'users#update', as: 'auth_users_update'
+          get('auth/users/:id/password', to: 'users#edit_password',
+              as: 'auth_users_edit_password')
+
+          patch 'auth/users/:id/password', to: 'users#update_password'
+          delete  'auth/users/:id', to: 'users#destroy', as: 'auth_users_destroy'
+
+        end
+
+        # TODO: Add a dynamic solution for formats
+        namespace :api, defaults: { format: :json } do
+          namespace version do
+            get 'permissions',      to: 'permissions#index'
+            get 'permissions/user', to: 'permissions#user_permissions'
+            resources :groups,      except: [:new]
+            resources :users,       except: [:new]
+            resource :profile,      except: [:new, :destroy]
+
+            get 'logs', to: 'logs#index'
+          end
+
+        end
+      end
+    end
+
+  end
+
+
   class Routes
 
     def self.localized_scop(router: Rails.application.routes)
+      puts '[Warning]: This method is depricated please just use "localized_scope" in your router.'
       langs = ::I18n.available_locales.join('|')
       router.scope '(:locale)', locale: Regexp.new(langs)
     end
@@ -11,7 +82,7 @@ module Faalis
     # Router
     def self.define_api_routes(routes: Rails.application.routes,
                                version: :v1)
-
+      puts '[Warning]: This method is depricated. Please use "api_routes" directly in your router.'
       routes.draw do
         # TODO: Add a dynamic solution for formats
         namespace :api, defaults: { format: :json } do

data/lib/faalis/version.rb

@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
-#    Faalis - Basic website skel engine
-#    Copyright (C) 2012-2013 Yellowen
+#    Faalis 
+#    Copyright (C) 2012-2015 Yellowen
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = '1.0.0.alpha4'
+  VERSION = '1.0.0'
 end

data/lib/faalis_application.rb

@@ -5,7 +5,7 @@ app_name = ask("What's your app name: ").downcase.underscore
 add_source 'https://rails-assets.org'
 
 gem_group :development do
-  gem 'pry'
+  gem 'pry-rails'
   gem 'annotate'
   gem 'hirb'
   gem 'quiet_assets'  # unclutters the server log from assets
@@ -13,12 +13,17 @@ gem_group :development do
   gem 'binding_of_caller'
   gem 'meta_request'
   gem 'pry-byebug'
-  gem 'puma'
+  #gem 'puma'
 end
 
 gem 'slim-rails'
-gem 'dashstrap'
-gem 'faalis'
+gem 'dashstrap', github: 'Yellowen/dashstrap'
+gem 'faalis', github: 'Yellowen/Faalis'
+
+inside app_name do
+  run 'bundle install'
+  run 'rake faalis:install:migrations'
+end
 
 application do
   'config.railties_order = [:main_app, Dashstrap::TemplateEngine, Faalis::Engine, :all]'
@@ -36,7 +41,7 @@ rakefile 'db.rake' do
   )
 end
 
-generate 'faalis::install_all'
+generate 'faalis:install_all'
 
 initializer 'assets.rb' do
   %Q(
@@ -48,7 +53,6 @@ initializer 'assets.rb' do
   )
 end
 
-
 git :init
 create_file "LICENSE" do
 <<-'CODE'