now users can send messages

RubySchools · Mar 12, 2012 · ce0b365 · ce0b365
1 parent 8bd10e6
commit ce0b365
Show file tree

Hide file tree

Showing 22 changed files with 157 additions and 108 deletions.
diff --git a/app/assets/javascripts/message.js.coffee b/app/assets/javascripts/message.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://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/message.css.scss b/app/assets/stylesheets/message.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the message 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/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -0,0 +1,37 @@
+class MessagesController < ApplicationController
+
+def create
+	@recipient = User.find(params[:id])
+	@message = Message.new()
+	@message.content = params[:content]
+	@message.user = current_user
+	@message.save
+	mes_recipient = MessageRecipient.new()
+	mes_recipient.message_id = @message.id
+	mes_recipient.user_id = 1
+	mes_recipient.save
+end
+
+def show
+	@message = Message.find(params[:id])
+end
+
+def index
+	@messages = current_user.messages + current_user.recieved_messages
+end
+
+def update
+    @message = Message.find(params[:id])
+
+    respond_to do |format|
+      if @message.update_attributes(params[:message])
+        format.html { redirect_to @message, notice: 'message was successfully updated.' }
+        format.json { head :ok }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @message.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+end
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
@@ -39,7 +39,7 @@ def edit
   # POST /files.json
   def create
     @file = Upload.new(params[:upload])
-		@file.user = current_user
+	@file.user = current_user
     respond_to do |format|
       if @file.save
         format.html { redirect_to(:uploads, :notice => 'file was successfully created.') }

diff --git a/app/helpers/message_helper.rb b/app/helpers/message_helper.rb
@@ -0,0 +1,2 @@
+module MessageHelper
+end
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -0,0 +1,9 @@
+class Message < ActiveRecord::Base
+#Relations
+	belongs_to :user
+	has_many :message_recipients	
+	has_many :recipients, :through => :message_recipients, :source => :user
+#Validations
+	validate :user_id, :presence => true
+
+end
diff --git a/app/models/message_recipient.rb b/app/models/message_recipient.rb
@@ -0,0 +1,10 @@
+class MessageRecipient < ActiveRecord::Base
+#Relations
+	belongs_to :message
+	belongs_to :user
+
+#Validations
+	validate :user_id, :presence => true
+	validate :message_id , :presence => true
+
+end
diff --git a/app/models/post.rb.save b/app/models/post.rb.save
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -4,12 +4,13 @@ class User < ActiveRecord::Base
 
 #Relations
 	has_many :uploads
-
 	has_many :users_upload
 	has_many :saved_uploads, :through => :users_upload, :source => :upload
-has_many :posts, :dependent => :destroy
-#	has_many :uploads, :through => :users_uploads
-
+	has_many :posts, :dependent => :destroy
+
+	has_many :messages
+	has_many :message_recipient
+	has_many :recieved_messages, :through => :message_recipient, :source => :message
 
 
 

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -1,16 +1,19 @@
-  <header>
-    <%= image_tag("logo.png", :alt => "Ruby School", :class => "round") %>
+<header>
+   <%= image_tag("logo.png", :alt => "Ruby School", :class => "round") %>
         <nav class="round">
           <ul>
-
+			<li><%= link_to "Home", root_path %></li>
+			<li><%= link_to "Users", :userslist %></li>
 		<% if current_user %>
 			<li><%= link_to "Edit Profile", edit_user_path(current_user.id) %></li>
 			<li><%= link_to "Logout", :logout %></li>
-			<li><%= link_to "my_downloads", :downloads %></li>
-		 <% else %>
+			<li><%= link_to "my_downloads", :my_downloads %></li>
+
+		<% else %>
 			<li><%= link_to "Register", new_user_path %></li>
 			<li><%= link_to "Login", :login %></li>
 		<% end %>
           </ul>
-        </nav>
+         </nav>
+
       </header>
diff --git a/app/views/layouts/_style_and_meta.html.erb b/app/views/layouts/_style_and_meta.html.erb
@@ -0,0 +1,16 @@
+  <head>
+    <title>Social Network | <%= @title %></title>
+
+  <!--[if lt IE 9]>
+    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+    <%= stylesheet_link_tag 'blueprint/screen', :media => 'screen' %>
+    <%= stylesheet_link_tag 'blueprint/print',  :media => 'print' %>
+    <!--[if lt IE 8]><%= stylesheet_link_tag 'blueprint/ie' %><![endif]-->
+    <%= stylesheet_link_tag 'custom', :media => 'screen' %>
+
+
+       <%= javascript_include_tag "application" %>
+      <%= csrf_meta_tags %>
+  </head>
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,43 +1,13 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>Social Network | <%= @title %></title>
-
-  <!--[if lt IE 9]>
-    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-    <%= stylesheet_link_tag 'blueprint/screen', :media => 'screen' %>
-    <%= stylesheet_link_tag 'blueprint/print',  :media => 'print' %>
-    <!--[if lt IE 8]><%= stylesheet_link_tag 'blueprint/ie' %><![endif]-->
-    <%= stylesheet_link_tag 'custom', :media => 'screen' %>
 
+	<%= render 'layouts/style_and_meta' %>
 
-       <%= javascript_include_tag "application" %>
-      <%= csrf_meta_tags %>
-  </head>
   <body>
  <div class="container">
 
-  <header>
-   <%= image_tag("logo.png", :alt => "Ruby School", :class => "round") %>
-        <nav class="round">
-          <ul>
-			<li><%= link_to "Home", root_path %></li>
-			<li><%= link_to "Users", :userslist %></li>
-		<% if current_user %>
-			<li><%= link_to "Edit Profile", edit_user_path(current_user.id) %></li>
-			<li><%= link_to "Logout", :logout %></li>
-			<li><%= link_to "downloads", :downloads %></li>
-			<li><%= link_to "my_downloads", :my_downloads %></li>
-
-		<% else %>
-			<li><%= link_to "Register", new_user_path %></li>
-			<li><%= link_to "Login", :login %></li>
-		<% end %>
-          </ul>
-        </nav>
-      </header>
-
+	<%= render 'layouts/header' %>
+
 	<div>
 		<p id="notice"><%= notice %></p>
 		<p id="alert"><%= alert %></p>
@@ -47,11 +17,5 @@
 		<%= yield %>
 	</section>
 </div>
-
-<div>
-<!--<% if current_user %><% else %>
-<%= link_to "Register", new_user_path, :class => "signup_button round" %>
-<% end %>-->
-</div>
 </body>
 </html>
diff --git a/app/views/layouts/application.html.erb~ b/app/views/layouts/application.html.erb~
@@ -1,43 +1,13 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <title>Social Network | <%= @title %></title>
-
-  <!--[if lt IE 9]>
-    <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-    <%= stylesheet_link_tag 'blueprint/screen', :media => 'screen' %>
-    <%= stylesheet_link_tag 'blueprint/print',  :media => 'print' %>
-    <!--[if lt IE 8]><%= stylesheet_link_tag 'blueprint/ie' %><![endif]-->
-    <%= stylesheet_link_tag 'custom', :media => 'screen' %>
 
+	<%= render 'layouts/head' %>
 
-       <%= javascript_include_tag "application" %>
-      <%= csrf_meta_tags %>
-  </head>
   <body>
  <div class="container">
 
-  <header>
-   <%= image_tag("logo.png", :alt => "Ruby School", :class => "round") %>
-        <nav class="round">
-          <ul>
-			<li><%= link_to "Home", :home %></li>
-			<li><%= link_to "Users", :userslist %></li>
-		<% if current_user %>
-			<li><%= link_to "Edit Profile", edit_user_path(current_user.id) %></li>
-			<li><%= link_to "Logout", :logout %></li>
-			<li><%= link_to "downloads", :downloads %></li>
-			<li><%= link_to "my_downloads", :my_downloads %></li>
-
-		<% else %>
-			<li><%= link_to "Register", new_user_path %></li>
-			<li><%= link_to "Login", :login %></li>
-		<% end %>
-          </ul>
-        </nav>
-      </header>
-
+	<%= render 'layouts/header' %>
+
 	<div>
 		<p id="notice"><%= notice %></p>
 		<p id="alert"><%= alert %></p>
@@ -47,11 +17,5 @@
 		<%= yield %>
 	</section>
 </div>
-
-<div>
-<!--<% if current_user %><% else %>
-<%= link_to "Register", new_user_path, :class => "signup_button round" %>
-<% end %>-->
-</div>
 </body>
 </html>
diff --git a/app/views/messages/create.html.erb b/app/views/messages/create.html.erb
@@ -0,0 +1,12 @@
+<h1>Writing message to <%= @recipient.username %></h1>
+
+<%= form_for @message do |f| %>
+	<div class="field">
+		<%= f.label :content %><br />
+		<%= f.text_field :content %>
+	</div>
+	<div class="actions">
+		<%= f.submit "Submit" %>
+	</div>
+<% end %>
+<%= link_to 'Back', @recipient %>
diff --git a/app/views/messages/index.html.erb b/app/views/messages/index.html.erb
@@ -0,0 +1,7 @@
+<% @messages.each do |message|%>
+	 <div class="field">
+		<%= message.content %> 
+		<%= message.user.username %>
+	</div>
+
+<% end %>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
@@ -0,0 +1,11 @@
+<p>
+  <b>From:</b>
+  <%= @message.user.username %>
+</p>
+
+<p>
+  <b>Message:</b>
+  <%= @message.content %>
+</p>
+
+<%= link_to 'Back', :root %>
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
@@ -14,5 +14,3 @@
 		</tr>
 	</table>
 
-	<h1>Social Network</h1>
-	<%= link_to 'New User', new_user_path %>
diff --git a/app/views/posts/_post.html.erb b/app/views/posts/_post.html.erb
@@ -8,9 +8,7 @@
 <% user = post.user rescue User.find(post.user_id) %>
 <% if current_user?(user) %>
 <td>
-<%= link_to "delete", post, :method => :delete,
-:confirm => "You sure?",
-:title => post.content %>
+<%= link_to "delete", post, :method => :delete,:confirm => "You sure?",:title => post.content %>
 </td>
 <% end %>
 

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
@@ -15,8 +15,7 @@
     <td><%= user.email %></td>
     <td><%= link_to 'Show', user %></td>
     <td><%= link_to 'Edit', edit_user_path(user) %></td>
-    <td><%= link_to 'Destroy', user, confirm: 'Are you sure?', method: :delete %></td>
-  </tr>
+   </tr>
 <% end %>
 </table>
 

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -1,12 +1,12 @@
 <table class="profile">
 	<tr>
 		<td class="sidebar round">
-			<strong>Name</strong> <%= @user.username %><br />
+			<strong>Name</strong> <%= link_to @user.username, @user %><br />
 			<strong>E-mail</strong> <%= @user.email %><br />
-			<strong>URL</strong> <%= link_to user_path(@user), @user %><br />
 			<strong>Posts</strong> <%= @user.posts.count %>
-			<br>
-			<%= link_to 'Edit', edit_user_path(@user) %> | <%= link_to 'Back', users_path %>
+			<%= link_to "Downloads", :downloads %>
+		<br>
+			<%= link_to 'Edit', edit_user_path(@user) %> | <%= link_to 'Back', users_path %> | <%= link_to 'write', send_message_path(@user) %>
 		</td>
 	</tr>
 </table>

diff --git a/db/migrate/20120305154705_create_messages.rb b/db/migrate/20120305154705_create_messages.rb
@@ -0,0 +1,10 @@
+class CreateMessages < ActiveRecord::Migration
+  def change
+    create_table :messages do |t|
+      t.integer :user_id
+      t.text :content
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20120305154753_create_messages_recipients.rb b/db/migrate/20120305154753_create_messages_recipients.rb
@@ -0,0 +1,10 @@
+class CreateMessagesRecipients < ActiveRecord::Migration
+  def change
+    create_table :message_recipients do |t|
+      t.integer :user_id
+      t.integer :message_id
+
+      t.timestamps
+    end
+  end
+end