Add the relationship between users and projects and add a fix to the …

…footer
tamararivera · Dec 12, 2013 · badd1d1 · badd1d1
1 parent a7c5c6f
commit badd1d1
Show file tree

Hide file tree

Showing 15 changed files with 138 additions and 60 deletions.
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
@@ -60,29 +60,26 @@ p {
 }
 
 /* footer */
+html,
+body {
+  height: 100%;
+  /* The html and body elements cannot have any padding or margin. */
+}
 
-footer {
-  margin-top: 45px;
-  padding-top: 5px;
-  border-top: 1px solid #eaeaea;
-  color: $gray-light;
-  a {
-  color: #555;
-	}
-	small {
-  float: left;
-	}
-	ul {
-  float: right;
-  list-style: none;
-	li {
-  	float: left;
-  	margin-left: 10px;
-		}
-	}
-  &:hover {
-  color: #222;
-	}
+/* Wrapper for page content to push down footer */
+#wrap {
+  min-height: 100%;
+  height: auto;
+  /* Negative indent footer by its height */
+  margin: 0 auto -60px;
+  /* Pad bottom by footer height */
+  padding: 0 0 60px;
+}
+
+/* Set the fixed height of the footer here */
+#footer {
+  height: 60px;
+  background-color: #f5f5f5;
 }
 
 /* sidebar */

diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
@@ -1,5 +1,6 @@
 class StaticPagesController < ApplicationController
   def home
+    @projects = current_user.projects
   end
 
   def help

diff --git a/app/models/project.rb b/app/models/project.rb
@@ -1,3 +1,8 @@
 class Project < ActiveRecord::Base
+  has_many :user_projects, dependent: :destroy
+  has_many :users, through: :user_projects
 
+  def add_user!(user)
+    user_projects.create!(user_id: user.id)
+  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,4 +1,6 @@
 class User < ActiveRecord::Base
+  has_many :user_projects, dependent: :destroy
+  has_many :projects, through: :user_projects
   has_secure_password
 
   before_save { |user| user.email = email.downcase }

diff --git a/app/models/user_project.rb b/app/models/user_project.rb
@@ -0,0 +1,7 @@
+class UserProject < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :project
+
+  validates :user_id, presence: true
+  validates :project_id, presence: true
+end
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
@@ -1,9 +1,11 @@
-<footer class="footer">
-  <nav>
-    <ul>
-      <li><%= link_to "Nosotros",   about_path %></li>
-      <li><%= link_to "Contactanos", '#'%></li>
-      <li><a href="http://www.chileagil.cl/">ChileÁgil</a></li>
-    </ul>
-  </nav>
-</footer>
+<div id="footer">
+  <div class="container">
+    <nav>
+      <ul class="nav navbar-nav pull-right">
+        <li><%= link_to "Nosotros",   about_path %></li>
+        <li><%= link_to "Contactanos", '#'%></li>
+        <li><a href="http://www.chileagil.cl/">ChileÁgil</a></li>
+      </ul>
+    </nav>
+  </div>
+</div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -10,13 +10,15 @@
     <![endif]-->
   </head>
   <body>
-    <%= render 'layouts/header' %>
-    <div class="container">
-      <% flash.each do |key, value| %>
-        <div class="<%= flash_class(key) %>"><%= value %></div>
-      <% end %>
-      <%= yield %>
-      <%= render 'layouts/footer' %>
+    <div id="wrap">
+      <%= render 'layouts/header' %>
+      <div class="container">
+        <% flash.each do |key, value| %>
+          <div class="<%= flash_class(key) %>"><%= value %></div>
+        <% end %>
+        <%= yield %>
+      </div>
     </div>
+    <%= render 'layouts/footer' %>
   </body>
 </html>
diff --git a/app/views/shared/_project.html.erb b/app/views/shared/_project.html.erb
@@ -0,0 +1,8 @@
+<div class="col-md-4">
+  <%= link_to (project) do %>
+    <button class= "btn btn-lg btn-default">
+      <span class="glyphicon glyphicon-briefcase"></span>
+      <%= project.name %>
+    </button>
+  <%end %>
+</div>
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -1,5 +1,14 @@
 <div class="center hero-unit">
+  <%if signed_in? %>
+    <div class="col-md-6 col-md-offset-3">
+      <%if @projects.any?%>
+        <div class="row">
+          <%= render partial: 'shared/project', collection: @projects %>
+        </div>
+      <%end%>
+    </div>
+  <%else %>
   <h1>Bienvenido a Pinkunozo</h1>
-
-  <%= link_to "Identificarse", signin_path, class: "btn btn-large btn-primary" %>
+  <%= link_to "Identificarse", signin_path, class: "btn btn-lg btn-primary" %>
+  <%end %>
 </div>
diff --git a/db/migrate/20131210150951_create_user_projects.rb b/db/migrate/20131210150951_create_user_projects.rb
@@ -0,0 +1,13 @@
+class CreateUserProjects < ActiveRecord::Migration
+  def change
+    create_table :user_projects do |t|
+      t.integer :user_id
+      t.integer :project_id
+
+      t.timestamps
+    end
+    add_index :user_projects, :user_id
+    add_index :user_projects, :project_id
+    add_index :user_projects, [:user_id, :project_id], unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131205235724) do
+ActiveRecord::Schema.define(version: 20131210150951) do
 
   create_table "projects", force: true do |t|
     t.string   "name"
@@ -20,6 +20,17 @@
     t.datetime "updated_at"
   end
 
+  create_table "user_projects", force: true do |t|
+    t.integer  "user_id"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "user_projects", ["project_id"], name: "index_user_projects_on_project_id"
+  add_index "user_projects", ["user_id", "project_id"], name: "index_user_projects_on_user_id_and_project_id", unique: true
+  add_index "user_projects", ["user_id"], name: "index_user_projects_on_user_id"
+
   create_table "users", force: true do |t|
     t.string   "name"
     t.string   "email"

diff --git a/lib/tasks/sample_projects.rake b/lib/tasks/sample_projects.rake
@@ -1,7 +1,31 @@
 namespace :db do
   desc "Fill database with sample projects"
   task populate: :environment do
+    make_users
+    make_projects
+  end
+
+  def make_users
+    User.create!(name: "Tamara Rivera",
+                 email: "[email protected]",
+                 password: "memoria",
+                 password_confirmation: "memoria",
+                 admin: true)
+    99.times do |n|
+      name  = Faker::Name.name
+      email = "example-#{n+1}@railstutorial.org"
+      password  = "password"
+      User.create!(name: name,
+                   email: email,
+                   password: password,
+                   password_confirmation: password)
+    end
+  end
+
+  def make_projects
     Project.create!(name: "Proyecto Fondef",
                     description: "Este es un proyecto fabuloso")
+    project = Project.first
+    project.add_user!(User.first)
   end
 end
diff --git a/lib/tasks/sample_users.rake b/lib/tasks/sample_users.rake
diff --git a/test/fixtures/user_projects.yml b/test/fixtures/user_projects.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  user_id: 1
+  project_id: 1
+
+two:
+  user_id: 1
+  project_id: 1
diff --git a/test/models/user_project_test.rb b/test/models/user_project_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserProjectTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end