Generated Profile Controller

lsecrease · lsecrease · commit 10a04ecb7934 · 2014-07-14T18:27:16.000Z
diff --git a/app/assets/javascripts/profiles.js.coffee b/app/assets/javascripts/profiles.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -13,3 +13,6 @@
  *= require_tree .
  *= require_self
  */
+.alert {
+  margin-top: 10px;
+}
diff --git a/app/assets/stylesheets/profiles.css.scss b/app/assets/stylesheets/profiles.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the profiles controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb
@@ -0,0 +1,4 @@
+class ProfilesController < ApplicationController
+  def show
+  end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,2 +1,4 @@
 module ApplicationHelper
-end
+  
+
+ end
diff --git a/app/helpers/profiles_helper.rb b/app/helpers/profiles_helper.rb
@@ -0,0 +1,2 @@
+module ProfilesHelper
+end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -3,4 +3,6 @@ class User < ActiveRecord::Base
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
+  
+
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -69,8 +69,19 @@
         </div>
       </div>
       </div>
-     <p class="notice"><%= notice %></p>                                                                                                        <p class="alert"><%= alert %></p> 
-
+   
+    <% if flash[:notice] %>
+    <div class="alert alert-success">
+        <button class="close" data-dismiss="alert">x</button>
+      <%= flash[:notice] %>
+         </div>
+    <% end %>
+    <% if flash[:alert] %>
+    <div class="alert alert-error">
+        <button class="close" data-dismiss="alert">x</button>
+      <%= flash[:alert] %>
+         </div>
+    <% end %>
     <div class="container">
         <div class="row">
           <div class="span9">
diff --git a/app/views/profiles/show.html.erb b/app/views/profiles/show.html.erb
@@ -0,0 +1,2 @@
+<h1>Profiles#show</h1>
+<p>Find me in app/views/profiles/show.html.erb</p>
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,6 @@
 Rails.application.routes.draw do
+  get 'profiles/show'
+
   devise_for :users
   resources :statuses
 
diff --git a/test/controllers/profiles_controller_test.rb b/test/controllers/profiles_controller_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class ProfilesControllerTest < ActionController::TestCase
+  test "should get show" do
+    get :show
+    assert_response :success
+  end
+
+end
diff --git a/test/helpers/profiles_helper_test.rb b/test/helpers/profiles_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ProfilesHelperTest < ActionView::TestCase
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Place all the behaviors and hooks related to the matching controller here.`
	`2`	`+# All this logic will automatically be available in application.js.`
	`3`	`+# You can use CoffeeScript in this file: http://coffeescript.org/`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Place all the styles related to the profiles controller here.`
	`2`	`+// They will automatically be included in application.css.`
	`3`	`+// You can use Sass (SCSS) here: http://sass-lang.com/`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +class ProfilesController < ApplicationController
 +  def show
 +  end
 +end
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<h1>Profiles#show</h1>`
	`2`	`+<p>Find me in app/views/profiles/show.html.erb</p>`