Merge pull request #30 from beatriceo/del

del

app/assets/stylesheets/application.scss

@@ -20,3 +20,5 @@ body {
 }
 @import "devise/index";
 @import "users/index";
+@import "connections/index";
+

app/assets/stylesheets/connections/_index.scss

@@ -0,0 +1 @@
+@import 'new';

app/assets/stylesheets/connections/_new.scss

@@ -0,0 +1,11 @@
+.align-center {
+  justify-content: center;
+  text-align: center;
+  h2 {
+    color: white;
+  }
+}
+.email {
+  color: white;
+}
+

app/assets/stylesheets/pages/_contacts.scss

@@ -2,6 +2,14 @@ a:hover {
   text-decoration: none;
 }
 
+.contacts-header {
+  display: flex;
+  justify-content: space-between;
+  a {
+    align-self: flex-end;
+  }
+}
+
 .card {
   display: flex;
   justify-content: space-between;

app/controllers/connections_controller.rb

@@ -0,0 +1,18 @@
+class ConnectionsController < ApplicationController
+  def new
+
+  end
+
+  def create
+    @connection = Connection.new
+    @connection.user = current_user
+    contact_user = User.find_by(email: params[:user][:email])
+    @connection.contact = contact_user
+
+    if @connection.save
+        redirect_to contacts_path
+    else
+
+    end
+  end
+end

app/controllers/pages_controller.rb

@@ -6,11 +6,15 @@ class PagesController < ApplicationController
   end
 
   def index
+    @contact = Connection.new
   end
 
   def home
   end
 
+
+
+
   def cable_testing
     chatroom = 'chat_room_' + params[:chat_room_id]
     puts params

app/controllers/users_controller.rb

@@ -31,6 +31,7 @@ class UsersController < ApplicationController
   end
 
 
+
   private
 
   def find_user

app/views/connections/new.html.erb

@@ -0,0 +1,9 @@
+<div class="align-center">
+  <h2>Add a new contact:</h2>
+  <%= form_for User.new, url: connections_path do |f| %>
+    <%= f.label :email, class: "email" %>:
+    <%= f.text_field :email %>
+
+    <%= f.submit %>
+  <% end %>
+</div>

app/views/pages/_contact.html.erb

@@ -6,7 +6,11 @@ end
 
 <div class="card">
   <div class="info">
-    <img src="https://kitt.lewagon.com/placeholder/users/ssaunier" alt="" class="profile img-circle" width=65>
+    <% if contact.photo.url.nil? %>
+      <img src="https://upload.wikimedia.org/wikipedia/commons/8/89/Portrait_Placeholder.png" class="avatar profile dropdown-toggle img-circle" width=65>
+    <% else %>
+      <%= cl_image_tag contact.photo, class: "profile avatar dropdown-toggle img-circle", width:65%>
+    <% end %>
     <div class="text text-color">
       <% if contact.nil? || contact.nil? %> <!-- REPLACE WITH FIRST NAME AND LAST NAME -->
         <p><%= contact.email %></p>

app/views/pages/index.html.erb

@@ -1,10 +1,17 @@
 <div class="container">
   <div class="contacts-container text-color">
     <div class="contacts half">
-    <h2 class="contact">Contacts</h2>
+      <div class="contacts-header">
+        <h2>Contacts</h2>
+
+        <%= link_to new_connection_path do %>
+          <i class="fas fa-plus-square"></i>
+        <% end %>
+      </div>
       <% current_user.contacts.each do |contact| %>
         <%= render "pages/contact", contact: contact %>
       <% end %>
+
     </div>
     <div class="video-feed half">
       <div class="video-content">

config/routes.rb

@@ -41,4 +41,7 @@ Rails.application.routes.draw do
   get '/users/:id/edit', to: 'users#edit', as: :user_edit
   patch '/users/:id', to: 'users#update'
   delete '/users/:id', to: 'users#destroy'
+
+  resources :connections, only: [:create, :new]
+  #get '/add_contact', to: 'connections#create'
 end

db/seeds.rb

@@ -5,3 +5,5 @@
 #
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.first)
+
+

test/controllers/connections_controller_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ConnectionsControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end