diff --git a/frontend/src/app/project/pages/board/board.component.html b/frontend/src/app/project/pages/board/board.component.html
index aaa70eb1..62eb0ba1 100644
--- a/frontend/src/app/project/pages/board/board.component.html
+++ b/frontend/src/app/project/pages/board/board.component.html
@@ -4,6 +4,8 @@
         <div class="text-2xl font-medium">Kanban board</div>
         <div class="social-links">
             <a href="https://www.buymeacoffee.com/tuantrungvo"
+               targetClick
+               targetEventName="Support buymeacoffee"
                target="_blank"
                rel="noopener">
                 <j-button className="btn-secondary mr-2"> 🍺 Support
@@ -11,6 +13,8 @@
             </a>
 
             <a href="https://github.com/trungk18/angular-spotify"
+               targetClick
+               targetEventName="Spotify"
                target="_blank"
                rel="noopener">
                 <j-button className="btn-secondary mr-2"> 🎧 Spotify
@@ -18,6 +22,8 @@
             </a>
 
             <a href="https://tetris.trungk18.com/"
+               targetClick
+               targetEventName="Tetris"
                target="_blank"
                rel="noopener">
                 <j-button className="btn-secondary mr-2"> 🎮 Tetris
@@ -25,6 +31,8 @@
             </a>
 
             <a href="https://jira-storybook.trungk18.com/"
+               targetClick
+               targetEventName="Storybook"
                target="_blank"
                rel="noopener">
                 <j-button className="btn-secondary mr-2"> 📕 Storybook
@@ -32,7 +40,8 @@
             </a>
 
             <a href="https://twitter.com/intent/tweet?url=https%3A%2F%2Fgithub.com%2Ftrungk18%2Fjira-clone-angular&text=Awesome%20Jira%20clone%20app%20built%20with%20Angular%209%20and%20Akita&hashtags=angular,akita,typescript"
-               (click)="sendTwitterEventButton()"
+               targetClick
+               targetEventName="Share Twitter"
                target="_blank"
                rel="noopener"
                class="mr-2">
@@ -46,6 +55,8 @@
                 </j-button>
             </a>
             <a href="https://github.com/trungk18/jira-clone-angular"
+               targetClick
+               targetEventName="Source Code"
                target="_blank"
                rel="noopener">
                 <j-button className="btn-secondary"
@@ -57,4 +68,4 @@
 
     <board-filter></board-filter>
     <board-dnd></board-dnd>
-</div>
\ No newline at end of file
+</div>
diff --git a/frontend/src/app/project/pages/board/board.component.ts b/frontend/src/app/project/pages/board/board.component.ts
index dc4aec67..a1fe74e4 100644
--- a/frontend/src/app/project/pages/board/board.component.ts
+++ b/frontend/src/app/project/pages/board/board.component.ts
@@ -1,17 +1,11 @@
-import { Component } from '@angular/core';
-import { GoogleAnalyticsService } from '@trungk18/core/services/google-analytics.service';
+import {ChangeDetectionStrategy, Component} from '@angular/core';
 
 @Component({
   selector: 'board',
   templateUrl: './board.component.html',
-  styleUrls: ['./board.component.scss']
+  styleUrls: ['./board.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class BoardComponent {
   breadcrumbs: string[] = ['Projects', 'Angular Jira Clone', 'Kanban Board'];
-
-  constructor(private _googleAnalytics: GoogleAnalyticsService) {}
-
-  sendTwitterEventButton() {
-    this._googleAnalytics.sendEvent('Share Twitter', 'button');
-  }
 }
diff --git a/frontend/src/app/project/project.module.ts b/frontend/src/app/project/project.module.ts
index 5c04d397..d631f4a0 100644
--- a/frontend/src/app/project/project.module.ts
+++ b/frontend/src/app/project/project.module.ts
@@ -33,10 +33,12 @@ import { FullIssueDetailComponent } from './pages/full-issue-detail/full-issue-d
 import { SettingsComponent } from './pages/settings/settings.component';
 import { ProjectRoutingModule } from './project-routing.module';
 import { ProjectComponent } from './project.component';
+import { TargetClickDirective } from '@trungk18/core/directives/target-click.directive';
 
 @NgModule({
   declarations: [
     AutofocusDirective,
+    TargetClickDirective,
     ...NavigationComponents,
     ...BoardPageComponents,
     ...IssueUtilComponents,