Merge pull request #20 from felix1251/develop

Develop

README.md

@@ -25,6 +25,12 @@ docker compose -f docker-compose.dev.yml up -d
 > We control all the commands inside our time_tracker_container.
 > All logic or changes will reflect in our project directory because volume are shared between our container
 
+Local server port (this is served from our docker container)
+
+```
+http://127.0.0.1:3000/
+```
+
 Open rails project container
 
 ```

app/controllers/tags_controller.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class TagsController < ApplicationController
+  def index; end
+
+  def create; end
+
+  def update; end
+
+  def destroy; end
+end

app/controllers/tracks_controller.rb

@@ -1,23 +1,7 @@
 # frozen_string_literal: true
 
 class TracksController < ApplicationController
-  before_action :set_track, only: %i[show edit update destroy]
-
-  # GET /tracks or /tracks.json
-  def index
-    @tracks = Track.all
-  end
-
-  # GET /tracks/1 or /tracks/1.json
-  def show; end
-
-  # GET /tracks/new
-  def new
-    @track = Track.new
-  end
-
-  # GET /tracks/1/edit
-  def edit; end
+  before_action :set_track, only: %i[update destroy]
 
   # POST /tracks or /tracks.json
   def create

app/helpers/tags_helper.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+module TagsHelper
+end

app/javascript/controllers/countdown_controller.js

@@ -6,6 +6,8 @@ export default class extends Controller {
 
   connect() {
     this.secondsUntilEndTime = Number(this.countdownTarget.dataset.secondsUntilEndTime)
+
+    // update coundown every one second
     this.countdown = setInterval(this.countdown.bind(this), 1000);
   }
 

app/javascript/controllers/tracks_controller.js

@@ -10,13 +10,15 @@ export default class extends Controller {
     // Create an observer instance
     const observer = new MutationObserver(() => this.calculate());
 
+    // detect if chiild element is changing 
     observer.observe(this.element, { childList: true });
   }
 
   calculate() {
     if(this.itemTargets.length == 0){
       this.element.remove()
       return;
+      // remove element if no chuld element
     }
 
     this.totalSeconds = 0

app/models/track.rb

@@ -14,7 +14,8 @@ class Track < ApplicationRecord
 
   validates :started_at, comparison: { less_than_or_equal_to: :ended_at }, if: :ended_at
 
-  before_save :capture_total_hour, if: :ended_at
+  # capture total time for easier query of total time using group_by
+  before_save :capture_total_time, if: :ended_at
 
   def countdown?
     ended_at.blank?
@@ -27,7 +28,7 @@ def date_started
 
   private
 
-  def capture_total_hour
+  def capture_total_time
     self.total_seconds = ended_at.to_i - started_at.to_i
   end
 end

app/views/layouts/_sidebar.html.haml

@@ -6,6 +6,7 @@
     .flex.flex-col.mt-2
       = render SidebarItemComponent.new path: root_path, name: "Manual", fa_icon: "keyboard"
       = render SidebarItemComponent.new path: root_path(mode: "timer"), name: "Timer", fa_icon: "clock-rotate-left"
+      = render SidebarItemComponent.new path: tags_path, name: "Tags", fa_icon: "tag"
       = render SidebarItemComponent.new path: reports_path, name: "Reports", fa_icon: "file"
   .py-4.px-4.grid.gap-2.sticky.bottom-0.bg-white.z-10
     %span.truncate.flex.items-center.gap-2

app/views/reports/index.html.haml

@@ -3,8 +3,8 @@
     .px-8.py-5.bg-white.rounded.flex.flex-col.gap-2.shadow.border
       %h1.text-zinc-600 Total hours spent
       %span.font-medium.text-xl
-        = seconds_to_hms(current_user.tracks.sum(:total_seconds))
+        = seconds_to_hms(current_user.tracks.complete.sum(:total_seconds))
     .px-8.py-5.bg-white.rounded.flex.flex-col.gap-2.shadow.border
       %h1.text-zinc-600 Total tracks
       %span.font-medium.text-xl
-        = current_user.tracks.count
+        = current_user.tracks.complete.count

app/views/tags/index.html.haml

@@ -0,0 +1,3 @@
+.margin-max-screen.py-8.grid.gap-3.relative
+  %h1 Tags#index
+  %p Find me in app/views/tags/index.html.haml

config/routes.rb

@@ -6,6 +6,7 @@
 
   resources :tracks, only: %i[update create destroy]
   resources :reports, only: :index
+  resources :tags, only: %i[index update create destroy]
 end
 
 # == Route Map

test/controllers/tags_controller_test.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class TagsControllerTest < ActionDispatch::IntegrationTest
+  test 'should get index' do
+    get tags_index_url
+    assert_response :success
+  end
+
+  test 'should get create' do
+    get tags_create_url
+    assert_response :success
+  end
+
+  test 'should get update' do
+    get tags_update_url
+    assert_response :success
+  end
+
+  test 'should get destroy' do
+    get tags_destroy_url
+    assert_response :success
+  end
+end