added views

Author: prio101

app/controllers/projects_controller.rb

@@ -1,29 +1,75 @@
 class ProjectsController < ApplicationController
-    before_action :authenticate_user!
-    def index
-    end
+  before_action :authenticate_user!
+  before_action :set_project, only: [:show, :edit, :update, :destroy]
 
-    def show
-    end
+  # GET /projects
+  # GET /projects.json
+  def index
+    @projects = Project.all
+  end
 
-    def new
-    end
+  # GET /projects/1
+  # GET /projects/1.json
+  def show
+  end
 
-    def create
-    end
+  # GET /projects/new
+  def new
+    @project = Project.new
+  end
 
-    def edit
+  # GET /projects/1/edit
+  def edit
+  end
+
+  # POST /projects
+  # POST /projects.json
+  def create
+    @project = Project.new(project_params)
+
+    respond_to do |format|
+      if @project.save
+        format.html { redirect_to @project, notice: 'Project was successfully created.' }
+        format.json { render :show, status: :created, location: @project }
+      else
+        format.html { render :new }
+        format.json { render json: @project.errors, status: :unprocessable_entity }
+      end
     end
+  end
 
-    def update
+  # PATCH/PUT /projects/1
+  # PATCH/PUT /projects/1.json
+  def update
+    respond_to do |format|
+      if @project.update(project_params)
+        format.html { redirect_to @project, notice: 'Project was successfully updated.' }
+        format.json { render :show, status: :ok, location: @project }
+      else
+        format.html { render :edit }
+        format.json { render json: @project.errors, status: :unprocessable_entity }
+      end
     end
+  end
 
-    def destroy
+  # DELETE /projects/1
+  # DELETE /projects/1.json
+  def destroy
+    @project.destroy
+    respond_to do |format|
+      format.html { redirect_to projects_url, notice: 'Project was successfully destroyed.' }
+      format.json { head :no_content }
     end
+  end
 
-    private
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_project
+      @project = Project.find(params[:id])
+    end
 
+    # Never trust parameters from the scary internet, only allow the white list through.
     def project_params
-     params.require(:projecs).permit(:name, :description, :contact_person_details)   
+      params.require(:project).permit(:name, :description, :contact_person_details, :user_id)
     end
 end

app/controllers/sites_controller.rb

@@ -1,29 +1,75 @@
 class SitesController < ApplicationController
-    before_action :authenticate_user!
-    def index
-    end
+  before_action :authenticate_user!
+  before_action :set_site, only: [:show, :edit, :update, :destroy]
 
-    def show
-    end
+  # GET /sites
+  # GET /sites.json
+  def index
+    @sites = Site.all
+  end
 
-    def new
-    end
+  # GET /sites/1
+  # GET /sites/1.json
+  def show
+  end
 
-    def create
-    end
+  # GET /sites/new
+  def new
+    @site = Site.new
+  end
 
-    def edit
+  # GET /sites/1/edit
+  def edit
+  end
+
+  # POST /sites
+  # POST /sites.json
+  def create
+    @site = Site.new(site_params)
+
+    respond_to do |format|
+      if @site.save
+        format.html { redirect_to @site, notice: 'Site was successfully created.' }
+        format.json { render :show, status: :created, location: @site }
+      else
+        format.html { render :new }
+        format.json { render json: @site.errors, status: :unprocessable_entity }
+      end
     end
+  end
 
-    def update
+  # PATCH/PUT /sites/1
+  # PATCH/PUT /sites/1.json
+  def update
+    respond_to do |format|
+      if @site.update(site_params)
+        format.html { redirect_to @site, notice: 'Site was successfully updated.' }
+        format.json { render :show, status: :ok, location: @site }
+      else
+        format.html { render :edit }
+        format.json { render json: @site.errors, status: :unprocessable_entity }
+      end
     end
+  end
 
-    def destroy
+  # DELETE /sites/1
+  # DELETE /sites/1.json
+  def destroy
+    @site.destroy
+    respond_to do |format|
+      format.html { redirect_to sites_url, notice: 'Site was successfully destroyed.' }
+      format.json { head :no_content }
     end
+  end
 
-    private
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_site
+      @site = Site.find(params[:id])
+    end
 
-    def sites_params
-     params.require(:sites).permit(:title, :link)   
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def site_params
+      params.require(:site).permit(:title, :link, :description, :user_id, :project_id)
     end
 end

app/controllers/users_controller.rb

@@ -1,15 +1,41 @@
 class UsersController < ApplicationController
-    before_action :authenticate_user!
+  before_action :authenticate_user!
+  before_action :set_user, only: [:show, :edit, :update]
+
+  # GET /users/1/edit
+  def edit
+  end
+
+  def show
+  end
 
-    def edit  
-    end
 
-    def update
+  # PATCH/PUT /users/1
+  # PATCH/PUT /users/1.json
+  def update
+    respond_to do |format|
+      if @user.update(user_params)
+        format.html { redirect_to @user, notice: 'User was successfully updated.' }
+        format.json { render :show, status: :ok, location: @user }
+      else
+        format.html { render :edit }
+        format.json { render json: @user.errors, status: :unprocessable_entity }
+      end
     end
+  end
 
-    private
 
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_user
+      puts params[:id]
+      @user = User.find(params[:id])
+      puts @user
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
     def user_params
-        params.require(:user).permit(:first_name, :last_name, :email, :company_name)
+       params.require(:user).permit(:first_name, :last_name, :email, :company_name)
     end
+
 end

app/views/devise/registrations/new.html.erb

@@ -1,29 +1,32 @@
-<h2>Sign up</h2>
+<div class="col-md-8">
+  <h2>Sign up</h2>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, class: 'form-control', autofocus: true, autocomplete: "email" %>
   </div>
 
   <div class="field">
     <%= f.label :password %>
     <% if @minimum_password_length %>
     <em>(<%= @minimum_password_length %> characters minimum)</em>
     <% end %><br />
-    <%= f.password_field :password, autocomplete: "new-password" %>
+    <%= f.password_field :password, class: 'form-control', autocomplete: "new-password" %>
   </div>
 
   <div class="field">
     <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "new-password" %>
+    <%= f.password_field :password_confirmation, class: 'form-control', autocomplete: "new-password" %>
   </div>
 
   <div class="actions">
-    <%= f.submit "Sign up" %>
+    <%= f.submit "Sign up", class: 'btn btn-primary' %>
   </div>
 <% end %>
 
 <%= render "devise/shared/links" %>
+
+</div>

app/views/devise/sessions/new.html.erb

@@ -1,14 +1,18 @@
-<h2>Log in</h2>
+<div class="col-md-4 col-md-offset-4">
+
+<img src="http://www.seppo.net/cartoons/albums/cartoons/nature/birds/koskikara_kevat_laulu_eng.jpg" alt="logo">
+
+<h2>Dipper Log in</h2>
 
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, class:'form-control', autofocus: true, autocomplete: "email" %>
   </div>
 
   <div class="field">
     <%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "current-password" %>
+    <%= f.password_field :password, class:'form-control', autocomplete: "current-password" %>
   </div>
 
   <% if devise_mapping.rememberable? %>
@@ -19,8 +23,10 @@
   <% end %>
 
   <div class="actions">
-    <%= f.submit "Log in" %>
+    <%= f.submit "Log in", class: 'btn btn-primary' %>
   </div>
 <% end %>
 
 <%= render "devise/shared/links" %>
+
+</diV>

app/views/layouts/application.html.erb

@@ -10,6 +10,7 @@
   </head>
 
   <body>
+  <% if user_signed_in? %>
     <nav class="navbar navbar-inverse">
   <div class="container-fluid">
     <!-- Brand and toggle get grouped for better mobile display -->
@@ -27,24 +28,27 @@
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
       <ul class="nav navbar-nav">
         <li class="active"><a href="/">Home <span class="sr-only">(current)</span></a></li>
-        <li><a href="#">Project</a></li>
-        <li><a href="#">Sites</a></li>
+        <li><%= link_to 'Projects', projects_path%></li>
+        <li><%= link_to 'Sites', sites_path%></li>
         <li class="dropdown">
           <a href="#" class="dropdown-toggle" 
           data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">User <span class="caret"></span></a>
           <ul class="dropdown-menu">
-            <li><a href="#">Profile</a></li>
+            <li><%= link_to 'Profile', user_path(current_user)%></li>
             <li><a href="#">Settings</a></li>
           </ul>
         </li>
         <li><a href="#">Apps Integration(Coming Soon) </a></li>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li><a href="#">Log Out</a></li>
+      <% if user_signed_in? %>
+        <li><%= link_to('Logout', destroy_user_session_path, method: :delete)%></li>
+      <% end %>
       </ul>
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->
 </nav>
+  <% end %>
     <%= yield %>
   </body>
 </html>

app/views/projects/_form.html.erb

@@ -0,0 +1,30 @@
+<%= form_with(model: project, local: true) do |form| %>
+  <% if project.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(project.errors.count, "error") %> prohibited this project from being saved:</h2>
+
+      <ul>
+      <% project.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+
+    
+  <% end %>
+    <div class="col-md-4">
+      <%= form.label(:name, "Name") %>
+      <%= form.text_field(:name, class: 'form-control') %>
+    
+      <%= form.label(:description, "Description") %>
+      <%= form.text_area(:description, class: 'form-control') %>
+    
+      <%= form.label(:user_id, "User") %>
+      <%= form.select(:user_id, options_for_select([[current_user.first_name, current_user.id]])) %> 
+
+    </div>
+    
+  <div class="actions">
+    <%= form.submit %>
+  </div>
+<% end %>

app/views/projects/_project.json.jbuilder

@@ -0,0 +1,2 @@
+json.extract! project, :id, :created_at, :updated_at
+json.url project_url(project, format: :json)

app/views/projects/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Project</h1>
+
+<%= render 'form', project: @project %>
+
+<%= link_to 'Show', @project %> |
+<%= link_to 'Back', projects_path %>