Root was set to show Newsletters #11

joshsoftware · Jul 22, 2014 · 1270249 · 1270249
1 parent e472e41
commit 1270249
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 60 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,4 +49,4 @@ build/
 *.log
 config/environment.yml
 config/mongoid.yml
-config/mongoid.yml
+config/secrets.yml
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -133,12 +133,11 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.8.2)
     mime-types (1.25.1)
     mina (0.3.0)
       open4
       rake
-    method_source (0.8.2)
-    mime-types (1.25.1)
     mini_magick (3.7.0)
       subexec (~> 0.2.1)
     mini_portile (0.6.0)

diff --git a/app/assets/javascripts/home.js.coffee b/app/assets/javascripts/home.js.coffee
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -8,14 +8,11 @@
   %body
     %div.nav.navbar-inverse.navbar-fixed-top
       %div.container
-        %div.navbar-header
-          .navbar-brand
-            %h4 LightAir
         %div.nav-collapse
           %ul.nav.navbar-nav
             %li.active
-              %a{href: "#{home_index_path}"}
-                %h4 Home
+              %a{href: "#{newsletters_path}"}
+                %h4 LightAir
             %li.dropdown
               %a.dropdown-toggle{"data-toggle" => "dropdown"}
                 %h4

diff --git a/app/views/newsletters/index.html.haml b/app/views/newsletters/index.html.haml
@@ -1,10 +1,7 @@
 %table.table.table-striped
+  %tr
+    %strong Newsletters
   -@newsletters.each do |news|
     %tr
       %td
         =link_to news.sent_on, newsletter_path(news)
-      %td
-        =link_to "Edit", edit_newsletter_path(news)
-      %td
-        =link_to "Delete", newsletter_path(news), method: :delete
-    %tr
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -12,26 +12,32 @@
 #   repository   - Git repo to clone from. (needed by mina/git)
 #   branch       - Branch name to deploy. (needed by mina/git)
 
-set :domain,      '162.243.86.174'
-set :deploy_to,   '/home/deploy/projects/lightair/production'
-set :repository,  '[email protected]:joshsoftware/lightair.git'
-set :branch,      'master'
+set :domain,        'lightair.com'
+set :deploy_to,     '/home/basnal/www/lightair.com'
+set :repository,    '[email protected]:joshsoftware/lightair.git'
+set :branch,        'master'
+set :identity_file, '/home/basnal/.ssh/id_rsa'
+set :rails_env,     'production'
+set :term_mode,     nil
+
+set :current_path, 'current'
 
 # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
 # They will be linked in the 'deploy:link_shared_paths' step.
+
 set :shared_paths, ['config/mongoid.yml', 'log', 'tmp',
                     'config/initializers/google_oauth.rb',
                     'config/environment.yml']
 
 # Optional settings:
-   set :user, 'deploy'    # Username in the server to SSH to.
+set :user, 'basnal'    # Username in the server to SSH to.
 #   set :port, '30000'     # SSH port number.
 
 # This task is the environment that is loaded for most commands, such as
 # `mina deploy` or `mina rake`.
 task :environment do
   # For those using RVM, use this to load an RVM version@gemset.
-  invoke :'rvm:use[ruby-2.1.2-p95@gemset]'
+  invoke :'rvm:use[ruby-2.1.2@lightair]'
 end
 
 # Put any custom mkdir's in here for when `mina setup` is ran.
@@ -41,17 +47,23 @@
   queue! %[mkdir -p "#{deploy_to}/shared/log"]
   queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/log"]
 
+  queue! %[mkdir -p "#{deploy_to}/shared/tmp"]
+  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/tmp"]
+
   queue! %[mkdir -p "#{deploy_to}/shared/config"]
   queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config"]
 
   queue! %[touch "#{deploy_to}/shared/config/mongoid.yml"]
   queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config/mongoid.yml"]
 
+  queue! %[mkdir "#{deploy_to}/shared/config/initializers"]
+  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config/initializers"]
+
   queue! %[touch "#{deploy_to}/shared/config/initializers/google_oauth.rb"]
   queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config/initializers/google_oauth.rb"]
 
-  queue! %[touch "#{deploy_to}/shared/config/initializers/environment.yml"]
-  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config/initializers/environment.yml"]
+  queue! %[touch "#{deploy_to}/shared/config/environment.yml"]
+  queue! %[chmod g+rx,u+rwx "#{deploy_to}/shared/config/environment.yml"]
 
 end
 
@@ -77,4 +89,3 @@
 #  - http://nadarei.co/mina/tasks
 #  - http://nadarei.co/mina/settings
 #  - http://nadarei.co/mina/helpers
-
diff --git a/config/routes.rb b/config/routes.rb
@@ -10,7 +10,7 @@
   get '/auth/failure',            to: 'spreadsheets#failure'
   resources :users, :newsletters, :home, :spreadsheets
 
-  root :to => 'home#index'
+  root :to => 'newsletters#index'
 
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".

diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb
diff --git a/spec/helpers/home_helper_spec.rb b/spec/helpers/home_helper_spec.rb