Feature: Rename Tracks to Paths (TheOdinProject#1404)

Because: * It is a friendier name for this concept.
chiahuang · Oct 13, 2020 · 0146ac2 · 0146ac2
1 parent cbc0034
commit 0146ac2
Show file tree

Hide file tree

Showing 37 changed files with 206 additions and 205 deletions.
diff --git a/app/assets/stylesheets/application_stylesheet.scss b/app/assets/stylesheets/application_stylesheet.scss
@@ -16,5 +16,5 @@
 @import 'typography';
 @import 'mixins';
 @import 'utilities';
-@import 'tracks';
+@import 'paths';
 @import 'components/**/*';
diff --git a/app/assets/stylesheets/tracks.scss → app/assets/stylesheets/paths.scss b/app/assets/stylesheets/tracks.scss → app/assets/stylesheets/paths.scss
@@ -1,25 +1,25 @@
-// Place all the styles related to the tracks controller here.
+// Place all the styles related to the paths controller here.
 // They will automatically be included in application.css.
 // You can use Sass (SCSS) here: http://sass-lang.com/
 
-.tracks-index {
+.paths-index {
   padding-bottom: 80px;
   p {
     margin: 24px auto;
     max-width: 770px;
   }
 }
 
-.track-description {
+.path-description {
   margin-bottom: 38px;
 }
 
-.track-card {
+.path-card {
   max-width: 770px;
   margin: 0 auto;
 }
 
-.track-card-title {
+.path-card-title {
   display: flex;
   align-items: center;
   padding-bottom: 16px;

diff --git a/app/controllers/paths_controller.rb b/app/controllers/paths_controller.rb
@@ -0,0 +1,17 @@
+class PathsController < ApplicationController
+  def show
+    @path = Path.friendly.find(params[:id])
+    @courses = decorated_courses
+    @user = current_user
+  end
+
+  def index
+    @paths = Path.all
+  end
+
+  private
+
+  def decorated_courses
+    @path.courses.map { |course| CourseDecorator.new(course) }
+  end
+end
diff --git a/app/controllers/tracks_controller.rb b/app/controllers/tracks_controller.rb
diff --git a/app/controllers/users/paths_controller.rb b/app/controllers/users/paths_controller.rb
@@ -0,0 +1,20 @@
+module Users
+  class PathsController < ApplicationController
+    before_action :authenticate_user!
+
+    def create
+      current_user.update_attributes!(path_id: path_id)
+      redirect_to path
+    end
+
+    private
+
+    def path_id
+      params.fetch(:path_id)
+    end
+
+    def path
+      Path.find(path_id)
+    end
+  end
+end
diff --git a/app/controllers/users/tracks_controller.rb b/app/controllers/users/tracks_controller.rb
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -4,8 +4,8 @@ class UsersController < ApplicationController
   authorize_resource only: %i[edit update]
 
   def show
-    @courses = decorated_track_courses
-    @track = @user.track
+    @courses = decorated_path_courses
+    @path = @user.path
   end
 
   def update
@@ -15,8 +15,8 @@ def update
 
   private
 
-  def decorated_track_courses
-    @user.track.courses.map do |course|
+  def decorated_path_courses
+    @user.path.courses.map do |course|
       CourseDecorator.new(course)
     end
   end
@@ -34,7 +34,7 @@ def user_params
       :learning_goal,
       :uid,
       :provider,
-      :track_id,
+      :path_id,
     )
   end
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -59,7 +59,7 @@ def faq_items
       {
         question: 'Which technologies can one expect to learn from The Odin Project?',
         answer:
-          "<p> The Odin Project contains three tracks for students to choose from: <a href='tracks/full-stack-ruby-on-rails'>Fullstack Ruby on Rails</a>, <a href='tracks/full-stack-javascript'>Fullstack Javascript</a>, and <a href='tracks/front-end-only'>Frontend only</a>. The Ruby on Rails track gives a general overview of what fullstack is. This is the default track for most beginners. The Javascript track focuses more on the connection between the webpage and the data with Javascript and NodeJS. The Frontend track primarily goes over HTML, CSS and Javascript but no Ruby on Rails. Below are some courses that are included in these curriculums:</p>
+          "<p> The Odin Project contains three paths for students to choose from: <a href='paths/full-stack-ruby-on-rails'>Fullstack Ruby on Rails</a>, <a href='paths/full-stack-javascript'>Fullstack Javascript</a>, and <a href='paths/front-end-only'>Frontend only</a>. The Ruby on Rails path gives a general overview of what fullstack is. This is the default path for most beginners. The Javascript path focuses more on the connection between the webpage and the data with Javascript and NodeJS. The Frontend path primarily goes over HTML, CSS and Javascript but no Ruby on Rails. Below are some courses that are included in these curriculums:</p>
           <br />
           <p>The <a href='courses/web-development-101'>Web Development 101 course</a> will give you a chance to explore several of the languages and technologies you’ll need to know on your journey to becoming a web developer.  Web Development 101 introduces HTML, CSS, Javascript, Ruby, Rails, Git, databases and more. We’ve also created mini-projects that give you a chance to test your new knowledge by building your own applications and websites!</p>
           <br />

diff --git a/app/helpers/tracks_helper.rb b/app/helpers/tracks_helper.rb
diff --git a/app/models/course.rb b/app/models/course.rb
@@ -1,8 +1,8 @@
 class Course < ApplicationRecord
   extend FriendlyId
 
-  has_many :track_courses
-  has_many :tracks, through: :track_courses
+  has_many :path_courses
+  has_many :paths, through: :path_courses
   has_many :sections, -> { order(:position) }
   has_many :lessons, through: :sections
 

diff --git a/app/models/track.rb → app/models/path.rb b/app/models/track.rb → app/models/path.rb
@@ -1,9 +1,9 @@
-class Track < ApplicationRecord
+class Path < ApplicationRecord
   extend FriendlyId
 
   has_many :users
-  has_many :track_courses, -> { order(:position) }, dependent: :destroy
-  has_many :courses, through: :track_courses
+  has_many :path_courses, -> { order(:position) }, dependent: :destroy
+  has_many :courses, through: :path_courses
 
   validates :title, presence: true
   validates :description, presence: true

diff --git a/app/models/path_course.rb b/app/models/path_course.rb
@@ -0,0 +1,6 @@
+class PathCourse < ApplicationRecord
+  belongs_to :path
+  belongs_to :course
+
+  validates :position, :course_id, :path_id, presence: true
+end
diff --git a/app/models/track_course.rb b/app/models/track_course.rb
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -14,7 +14,7 @@ class User < ApplicationRecord
   has_many :project_submissions, dependent: :destroy
   has_many :user_providers, dependent: :destroy
   has_many :flags, foreign_key: :flagger_id, dependent: :destroy
-  belongs_to :track
+  belongs_to :path
 
   def progress_for(course)
     @progress ||= Hash.new { |hash, c| hash[c] = CourseProgress.new(c, self) }

diff --git a/app/views/paths/index.html.erb b/app/views/paths/index.html.erb
@@ -0,0 +1,23 @@
+<div class="curriculum-background">
+  <div class="container paths-index">
+    <h1 class="text-center camel light">Learning Paths</h1>
+    <h2 class="text-center">
+      Select from our available learning paths below
+    </h2>
+    <p class="text-center">Paths are our way of offering multiple paths through our curriculum.</p>
+    <p class="text-center">  
+      You can change your path at any time, and your progress will not be lost.  Many of our paths share the same fundamental lessons, so any progress you've made on any shared courses or lessons will transfer between paths.</p>
+
+
+    <% @paths.each do |path| %>
+      <div class="card-main path-card">
+        <div class="path-card-title">
+          <h1><%=path.title%></h1>
+          <%= link_to "View path", path_url(path), class:"button button--secondary" %>
+        </div>
+        <p><%= path.description%></p>
+      </div>
+    <% end %>
+  </div>
+</div>
+
diff --git a/app/views/paths/show.html.erb b/app/views/paths/show.html.erb
@@ -0,0 +1,30 @@
+<div class="container">
+  <h1 class="text-center camel light curriculum-title"><%= @path.title %></h1>
+  <p class="text-center path-description"><%= @path.description %></p>
+
+
+  <% @courses.each do |course| %>
+    <%= render 'courses/course_card', course: course %>
+  <% end %>
+
+  <% if user_signed_in? %>
+    <%if current_user.path == @path %>
+      <p class="text-center path-description">
+        You are currently enrolled in this path.
+      </p>
+    <% else %>
+      <p class="text-center path-description">
+      <%= link_to 'Select This Path', users_paths_url(path_id: @path.id), remote: true, method: :post, class: 'button button--primary' %>
+      </p>
+    <% end %>
+  <% else %>
+      <p class="text-center path-description">
+        <%= render 'shared/bottom_cta',
+          button: sign_in_or_view_curriculum_button,
+          heading: 'Start learning for free now!',
+          sub_heading: ''
+        %>
+      </p>
+  <% end %>
+  <p class="text-center path-description">You are viewing the <%= @path.title %> path.  To view all available paths <%= link_to 'click here', paths_url %></p>
+</div>
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
@@ -15,7 +15,7 @@
       <!-- Full Width Navbar -->
       <ul class="navbar-nav ml-auto hidden-md-down">
         <li class="nav-item <%= active_class(courses_path) %>">
-          <%= link_to 'My Courses', track_path(current_user.track), class: 'nav-link' %>
+          <%= link_to 'My Courses', path_url(current_user.path), class: 'nav-link' %>
         </li>
         <li class="nav-item dropdown js-dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -42,7 +42,7 @@
     <nav class="collapse navbar-collapse">
       <ul class="navbar-nav ml-auto">
         <li class="nav-item <%= active_class(courses_path) %>">
-          <%= link_to 'Curriculum', tracks_path, class: 'nav-link' %>
+          <%= link_to 'Curriculum', paths_url, class: 'nav-link' %>
         </li>
         <li class="nav-item dropdown js-dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

diff --git a/app/views/shared/_navbar_modal.html.erb b/app/views/shared/_navbar_modal.html.erb
@@ -17,7 +17,7 @@
           </li>
 
           <li class="nav-item <%= active_class(courses_path) %>">
-            <%= link_to 'Curriculum', track_path(current_user.track_id), class: 'nav-link' %>
+            <%= link_to 'Curriculum', path_url(current_user.path_id), class: 'nav-link' %>
           </li>
           <li class="nav-item">
             <%= link_to 'Forum', forum_link, class: 'nav-link' %>
@@ -37,7 +37,7 @@
 
         <% else %>
           <li class="nav-item <%= active_class(courses_path) %>">
-            <%= link_to 'Curriculum', tracks_path, class: 'nav-link' %>
+            <%= link_to 'Curriculum', paths_url, class: 'nav-link' %>
           </li>
 
           <li class="nav-item">

diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -3,7 +3,7 @@
     <header>
       <h1 class="accent hero__main-heading"> Your Career in Web Development Starts Here </h1>
       <p class="secondary hero__sub-heading"> Our full stack curriculum is free and supported by a passionate open source community.</p>
-        <%= link_to 'View Full Curriculum', tracks_path,  class: 'button button--primary' %>
+        <%= link_to 'View Full Curriculum', paths_url,  class: 'button button--primary' %>
     </header>
     <%= image_tag 'home-isometric.svg', class: 'hero__image', alt: 'home-page-banner' %>
   </div>

diff --git a/app/views/tracks/index.html.erb b/app/views/tracks/index.html.erb
diff --git a/app/views/tracks/show.html.erb b/app/views/tracks/show.html.erb
diff --git a/app/views/users/_skills.html.erb b/app/views/users/_skills.html.erb
@@ -10,5 +10,5 @@
     <%= render 'skill', course: course %>
   <% end %>
 
-  <p class="text-center">You are currently enrolled in the <%= @track.title %> track. To view all available tracks <%= link_to 'click here', tracks_path %></p>
+  <p class="text-center">You are currently enrolled in the <%= @path.title %> path. To view all available paths <%= link_to 'click here', paths_url %></p>
 </div>