Category model associations, category controller and views, show cate…

…gories on root
jrdnbwmn · Apr 27, 2018 · 849595f · 849595f
1 parent d494549
commit 849595f
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 54 deletions.
diff --git a/app/assets/javascripts/welcome.coffee b/app/assets/javascripts/welcome.coffee
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
@@ -0,0 +1,24 @@
+class CategoriesController < ApplicationController
+
+  def index
+  end
+
+  def show
+  end
+
+  def new
+  end
+
+  def edit
+  end
+
+  def create
+  end
+
+  def update
+  end
+
+  def destroy
+  end
+
+end
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
@@ -5,7 +5,8 @@ class DocumentsController < ApplicationController
   # GET /documents.json
   def index
     @documents = Document.where(user_id: current_user)
-    @categories = Category.where(user_id: current_user)
+    @user = current_user
+    @categories = @user.categories.all
   end
 
   # GET /documents/1
@@ -26,6 +27,8 @@ def edit
   # POST /documents.json
   def create
     @document = current_user.documents.build(document_params)
+    @user = current_user
+    @categories = @user.categories.all
 
     respond_to do |format|
       if @document.save
@@ -41,6 +44,9 @@ def create
   # PATCH/PUT /documents/1
   # PATCH/PUT /documents/1.json
   def update
+    @user = current_user
+    @categories = @user.categories.all
+
     respond_to do |format|
       if @document.update(document_params)
         format.html { render :edit }

diff --git a/app/helpers/categories_helper.rb b/app/helpers/categories_helper.rb
@@ -0,0 +1,2 @@
+module CategoriesHelper
+end
diff --git a/app/models/category.rb b/app/models/category.rb
@@ -1,2 +1,5 @@
 class Category < ApplicationRecord
+
+  has_many :documents
+
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -5,5 +5,7 @@ class User < ApplicationRecord
          :recoverable, :rememberable, :trackable, :validatable
 
   has_many :documents
+
+  has_many :categories, through: :documents
 
 end
diff --git a/app/views/categories/show.html.erb b/app/views/categories/show.html.erb
@@ -0,0 +1,5 @@
+<p>
+  <strong>Category:</strong>
+</p>
+
+<%= link_to 'Back', root_path %>
diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb
@@ -12,55 +12,34 @@
 
     <!-- Tags -->
     <ul class="no-bullets">
-        <!-- Todo -->
-        <li class="">
-            <a href="" class="link link--highlight pl2 pr2 pts pbs block">
-                <div class="grid-row">
-                    <span class="grid-column ellipsis pr0">All</span>
-                    <span class="grid-column span-3 align--right pl0">22</span>
-                </div>
-            </a>
-        </li>
-        <li class="">
-            <a href="" class="link link--highlight pl2 pr2 pts pbs block">
-                <div class="grid-row">
-                    <span class="grid-column ellipsis pr0">blog</span>
-                    <span class="grid-column span-3 align--right pl0">7</span>
-                </div>
-            </a>
-        </li>
-        <li class="">
-            <a href="" class="link link--highlight pl2 pr2 pts pbs block">
-                <div class="grid-row">
-                    <span class="grid-column ellipsis pr0">business</span>
-                    <span class="grid-column span-3 align--right pl0">3</span>
-                </div>
-            </a>
-        </li>
-        <li class="">
-            <a href="" class="link link--highlight pl2 pr2 pts pbs block">
-                <div class="grid-row">
-                    <span class="grid-column ellipsis pr0">essays</span>
-                    <span class="grid-column span-3 align--right pl0">2</span>
-                </div>
-            </a>
-        </li>
-        <li class="">
-            <a href="" class="link link--highlight pl2 pr2 pts pbs block">
-                <div class="grid-row">
-                    <span class="grid-column ellipsis pr0">journal</span>
-                    <span class="grid-column span-3 align--right pl0">10</span>
-                </div>
-            </a>
-        </li>
-        <li class="">
-            <a href="" class="link link--highlight pl2 pr2 pts pbs block">
-                <div class="grid-row">
-                    <span class="grid-column">Archived</span>
-                    <span class="grid-column span-3 align--right"></span>
-                </div>
-            </a>
+      <li>
+        <%= link_to root_path, class: 'link link--highlight pl2 pr2 pts pbs block' do %>
+          <div class="grid-row">
+            <span class="grid-column ellipsis pr0">All</span>
+            <span class="grid-column span-3 align--right pl0">22</span>
+          </div>
+        <% end %>
+      </li>
+      <% @categories.each do |category| %>
+        <li>
+          <%= link_to category_path(category), class: 'link link--highlight pl2 pr2 pts pbs block' do %>
+            <div class="grid-row">
+              <span class="grid-column ellipsis pr0"><%= category.name %></span>
+              <span class="grid-column span-3 align--right pl0">#</span>
+            </div>
+          <% end %>
         </li>
+      <% end %>
+
+      <!-- Todo -->
+      <li class="">
+          <a href="" class="link link--highlight pl2 pr2 pts pbs block">
+              <div class="grid-row">
+                  <span class="grid-column">Archived</span>
+                  <span class="grid-column span-3 align--right"></span>
+              </div>
+          </a>
+      </li>
 
     </ul>
 

diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb
@@ -1,5 +1,3 @@
-<p id="notice"><%= notice %></p>
-
 <p>
   <strong>Title:</strong>
   <%= @document.title %>

diff --git a/config/routes.rb b/config/routes.rb
@@ -5,6 +5,7 @@
   get 'welcome/index'
 
   resources :documents
+  resources :categories
 
   authenticated :user do
     root to: "documents#index", as: "authenticated_root"

diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CategoriesControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end