rework nav to include user nav

app/views/applies/edit.html.haml

@@ -1,4 +1,3 @@
-= render 'resumes/user_sub'
 .section
   .container
     .authform.margin-bottom-30

app/views/applies/show.html.haml

@@ -1,4 +1,3 @@
-= render 'resumes/user_sub'
 .section
   .container.margin-bottom-30
     .row

app/views/devise/registrations/edit.html.haml

@@ -1,5 +1,3 @@
-= render 'resumes/user_sub'
-
 .authform
   %h3
     Edit Profile

app/views/layouts/_navigation.html.haml

@@ -1,5 +1,5 @@
 
-%nav.navbar.navbar-light.bg-faded.navbar-fixed-top
+%nav.navbar.navbar-fixed-top
   %button.navbar-toggler.hidden-lg-up{"aria-controls" => "navbarResponsive", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarResponsive", "data-toggle" => "collapse", :type => "button"}
   #navbarResponsive.collapse.navbar-toggleable-md
     %a.navbar-brand{:href => page_path(:index) }
@@ -8,11 +8,16 @@
     %ul.nav.navbar-nav.float-md-right
       %li.nav-item= link_to "Course" , page_path(:course) , class: "nav-link"
       %li.nav-item= link_to "Camp" ,   page_path(:camp) , class: "nav-link"
-      %li.nav-item= link_to "Apply" ,  new_user_registration_path , class: "nav-link"
       %li.nav-item= link_to "Q & A" ,  page_path(:answers) , class: "nav-link"
-      %li.nav-item= link_to "|" ,  page_path(:answers) , class: "nav-link"
+      -unless user_signed_in?
+        %li.nav-item= link_to "Apply" ,  new_user_registration_path , class: "nav-link"
+        %li.nav-item= link_to "|" ,  new_user_registration_path , class: "nav-link"
       -if user_signed_in?
+        %li.nav-item= link_to "|" ,  edit_user_registration_path , class: "nav-link"
+        - { "Profile" => edit_user_registration_path , "Resume" => resume_path  ,
+          "Application" => application_path }.each do | menu, slug|
+          %li.nav-item.nav-small{class: (request.path == slug) && "active" }
+            =link_to menu , slug ,class: "nav-link"
         %li.nav-item.nav-small= sign_out_link  class: "nav-link"
-        %li.nav-item.nav-small= link_to "Account" ,  edit_user_registration_path , class: "nav-link"
-      -else
+      -unless user_signed_in?
         %li.nav-item.nav-small= link_to "Sign in" , new_user_session_path, class: "nav-link"

app/views/layouts/application.html.haml.old

@@ -1,15 +0,0 @@
-!!!
-%html
-  %head
-    %meta{:name => "viewport", :content => "width=device-width, initial-scale=1.0"}
-    %title= content_for?(:title) ? yield(:title) : 'Web Dev Site'
-    %meta{:name => "description", :content => "#{content_for?(:description) ? yield(:description) : 'Web Dev Site'}"}
-    = stylesheet_link_tag 'application', media: 'all'
-    = javascript_include_tag 'application'
-    = csrf_meta_tags
-  %body
-    %header
-      = render 'layouts/navigation'
-    %main{:role => "main"}
-      = render 'layouts/messages'
-      = yield

app/views/resumes/_user_sub.html.haml

@@ -1,9 +0,0 @@
-#user-menu.page-menu-color
-  %nav.navbar.navbar-light.bg-faded
-    %button.navbar-toggler.hidden-lg-up{"aria-controls" => "navbarUser", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-target" => "#navbarUser", "data-toggle" => "collapse", :type => "button"}
-    #navbarUser.collapse.navbar-toggleable-md
-      %ul.nav.navbar-nav.float-md-right
-        - { "Profile" => edit_user_registration_path , "Resume" => resume_path  ,
-          "Application" => application_path }.each do | menu, slug|
-          %li.nav-item{class: (request.path == slug) && "active" }
-            =link_to menu , slug ,class: "nav-link"

app/views/resumes/show.html.haml

@@ -1,5 +1,3 @@
-= render 'resumes/user_sub'
-
 .row
   .col-md-2
   .col-md-8