David's page

andrewcockerham · May 15, 2013 · 6c7d6c1 · 6c7d6c1
1 parent 3389bb5
commit 6c7d6c1
Show file tree

Hide file tree

Showing 20 changed files with 480 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
 gem 'rails', '3.2.12'
-
 gem 'jquery-rails'
+gem 'devise'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -29,6 +29,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
+    bcrypt-ruby (3.0.1)
     bootstrap-sass (2.3.1.0)
       sass (~> 3.2)
     builder (3.0.4)
@@ -39,6 +40,11 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.2)
+    devise (2.2.4)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -55,6 +61,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.23)
     multi_json (1.7.2)
+    orm_adapter (0.4.0)
     pg (0.15.1)
     polyglot (0.3.3)
     rack (1.4.5)
@@ -102,13 +109,16 @@ GEM
     uglifier (2.0.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
+    warden (1.2.1)
+      rack (>= 1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bootstrap-sass (~> 2.3.1.0)
   coffee-rails (~> 3.2.1)
+  devise
   jquery-rails
   pg
   rails (= 3.2.12)

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -2,12 +2,19 @@ class PagesController < ApplicationController
   def home
   end
 
-  def action
+  def about
   end
 
   def bryan
   end
 
   def dad
   end
+
+  def david
+  	@data = params[:David_answer]  	
+  end
+
+  def answer
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -0,0 +1,11 @@
+class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :confirmable,
+  # :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me
+  # attr_accessible :title, :body
+end
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -16,9 +16,10 @@
       <div class="nav-collapse collapse">
       	<ul class='nav'>
 	      	<li><%= link_to "Home", root_path %></li>
-			<li><%= link_to "About", about_path %></li>
-			<li><%= link_to "Bryan", bryan_path %></li>
-			<li><%= link_to "Dad", dad_path %></li>
+          <li><%= link_to "David", david_path %></li>
+    			<li><%= link_to "About", about_path %></li>
+    			<li><%= link_to "Bryan", bryan_path %></li>
+    			<li><%= link_to "Dad", dad_path %></li>
         <!-- .nav, .navbar-search, .navbar-form, etc -->
 	    </ul>
 	    <ul class='nav pull-right'>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -8,7 +8,11 @@
 	</head>
 		<body>
 			<%= render 'layouts/header' %>
+
 			<div class="container">
+				<% flash.each do |name, msg| %>
+					<%= content_tag(:div, msg, class: "asert alert-#{name}") %>
+			<% end %>
 			<%= yield %>
 			<%= render 'layouts/footer' %>
 		</div>

diff --git a/app/views/pages/answer.html.erb b/app/views/pages/answer.html.erb
@@ -0,0 +1,3 @@
+<p>
+	<%= @data %>
+</p>
diff --git a/app/views/pages/david.html.erb b/app/views/pages/david.html.erb
@@ -0,0 +1,14 @@
+<h1>Hey David Clayton! Welcome to your page!</h1>
+<p> Congratulations on finding your page man.  How are things? How was the hangout last night?
+
+	I'm still curious what was the thing that tipped your decision to choose Stanford.
+</p>
+<!--
+	  (if you want :)
+	<br>
+</p>
+<form>
+	<input type="text" name="David_answer" style="width: 600px; height: 400px;"/>
+</form>
+<input type="submit">
+-->
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
@@ -10,7 +10,7 @@
 				Store all of your learning and work experiences in one place.
 			</p>
 			<p>
-				<%= link_to "Create your SkillChest!", "#", class: "btn btn-primary btn-large" %>
+				<%= link_to "Create your SkillChest!", new_user_registration_path, class: "btn btn-primary btn-large" %>
 			</p>	
 		</div>
 	</div>

diff --git a/config/application.rb b/config/application.rb
@@ -58,5 +58,8 @@ class Application < Rails::Application
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    # Required for devise on heroku
+    config.assets.initialize_on_precompile = false
   end
 end
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -34,4 +34,7 @@
 
   # Expands the lines which load the assets
   config.assets.debug = true
+
+  # From Devise gem
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 end
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -64,4 +64,7 @@
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # For Devise gem.  In production, :host should be set to the actual host of your application.
+  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ @@
     				Store all of your learning and work experiences in one place.
     			</p>
     			<p>
-    				<%= link_to "Create your SkillChest!", "#", class: "btn btn-primary btn-large" %>
+    				<%= link_to "Create your SkillChest!", new_user_registration_path, class: "btn btn-primary btn-large" %>
     			</p>
     		</div>
     	</div>
@@ Expand Down @@