Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "GitHub Tracker",
"name": "github-tracker",
"private": true,
"version": "0.0.0",
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navbar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NavLink, Link } from "react-router-dom";
import { useState, useContext } from "react";
import { ThemeContext } from "../context/ThemeContext";
import { Moon, Sun, Menu, X, Github } from "lucide-react";
import { Moon, Sun, Menu, X } from "lucide-react";

const Navbar: React.FC = () => {
const [isOpen, setIsOpen] = useState(false);
Expand Down
21 changes: 10 additions & 11 deletions src/components/__test__/Navbar.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// src/components/__tests__/Navbar.test.tsx
import { render, screen, fireEvent } from '@testing-library/react'
import { describe, it, expect, vi, beforeEach } from 'vitest'
import { describe, it, expect, vi } from 'vitest'
import { MemoryRouter } from 'react-router-dom'
import { ThemeContext } from "../../context/ThemeContext";
import Navbar from '../Navbar.tsx'
Expand Down Expand Up @@ -51,31 +51,30 @@ describe('Navbar', () => {
// --- Mobile menu ---
it('mobile menu is hidden by default', () => {
renderNavbar()
expect(screen.queryByText('About')).not.toBeInTheDocument()
expect(screen.getAllByRole('link', { name: /^tracker$/i })).toHaveLength(1)
})

it('opens mobile menu when hamburger is clicked', () => {
renderNavbar()
const hamburger = screen.getAllByRole('button')[1] // second button = hamburger
const hamburger = screen.getAllByRole('button')[2] // third button = hamburger
fireEvent.click(hamburger)
expect(screen.getByText('About')).toBeInTheDocument()
expect(screen.getByText('Contact')).toBeInTheDocument()
expect(screen.getAllByRole('link', { name: /^tracker$/i })).toHaveLength(2)
})

it('closes mobile menu when a nav link is clicked', () => {
renderNavbar()
const hamburger = screen.getAllByRole('button')[1]
const hamburger = screen.getAllByRole('button')[2]
fireEvent.click(hamburger) // open
expect(screen.getAllByRole('link', { name: /^tracker$/i })).toHaveLength(2)
const homeLinks = screen.getAllByRole('link', { name: /home/i })
fireEvent.click(homeLinks[homeLinks.length - 1]) // click the mobile one
expect(screen.queryByText('About')).not.toBeInTheDocument() // closed
expect(screen.getAllByRole('link', { name: /^tracker$/i })).toHaveLength(1) // closed
})

it('calls toggleTheme from the mobile menu button', () => {
it('calls toggleTheme from the mobile theme button', () => {
const { toggleTheme } = renderNavbar('dark')
const hamburger = screen.getAllByRole('button')[1]
fireEvent.click(hamburger)
fireEvent.click(screen.getByText(/light/i))
const mobileThemeBtn = screen.getAllByRole('button')[1] // second button = mobile theme toggle
fireEvent.click(mobileThemeBtn)
expect(toggleTheme).toHaveBeenCalledTimes(1)
})

Expand Down
47 changes: 38 additions & 9 deletions src/hooks/useGitHubAuth.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,54 @@
import { useState, useMemo } from 'react';
import { useState, useEffect } from 'react';
import { Octokit } from '@octokit/core';

export const useGitHubAuth = () => {
const [username, setUsername] = useState('');
const [token, setToken] = useState('');
const [username, setUsername] = useState(() => sessionStorage.getItem('tracker_username') || '');
const [token, setToken] = useState(() => sessionStorage.getItem('tracker_token') || '');
const [error, setError] = useState('');

const octokit = useMemo(() => {
if (!username) return null;
if(token){
return new Octokit({ auth: token });
useEffect(() => {
if (username) {
sessionStorage.setItem('tracker_username', username);
} else {
sessionStorage.removeItem('tracker_username');
}
if (token) {
sessionStorage.setItem('tracker_token', token);
} else {
sessionStorage.removeItem('tracker_token');
}
return new Octokit();
}, [username, token]);
Comment thread
coderabbitai[bot] marked this conversation as resolved.

const getOctokit = () => octokit;
const getOctokit = () => {
try {
setError('');
if (!username) return null;
if (token) {
return new Octokit({ auth: token });
}
return new Octokit();
} catch (err: any) {
setError(err instanceof Error ? err.message : String(err));
return null;
}
};

const logout = () => {
setUsername('');
setToken('');
setError('');
sessionStorage.removeItem('tracker_username');
sessionStorage.removeItem('tracker_token');
};

return {
username,
setUsername,
token,
setToken,
error,
setError,
getOctokit,
logout,
};
};
12 changes: 12 additions & 0 deletions src/hooks/useGitHubData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,17 @@ export const useGitHubData = (
[getOctokit, rateLimited]
);

const clearData = useCallback(() => {
lastRequestId.current++;
setLoading(false);
setIssues([]);
setPrs([]);
setTotalIssues(0);
setTotalPrs(0);
setError('');
setRateLimited(false);
}, []);
Comment thread
coderabbitai[bot] marked this conversation as resolved.

return {
issues,
prs,
Expand All @@ -248,5 +259,6 @@ export const useGitHubData = (
error,
rateLimited,
fetchData,
clearData,
};
};
55 changes: 55 additions & 0 deletions src/pages/Tracker/Tracker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ const Home: React.FC = () => {
setToken,
error: authError,
getOctokit,
logout,
} = useGitHubAuth();

const {
Expand All @@ -67,6 +68,7 @@ const Home: React.FC = () => {
loading,
error: dataError,
fetchData,
clearData,
} = useGitHubData(getOctokit);

const [tab, setTab] = useState(0);
Expand All @@ -79,6 +81,32 @@ const Home: React.FC = () => {
const [startDate, setStartDate] = useState("");
const [endDate, setEndDate] = useState("");

const handleResetFilters = () => {
setTab(0);
setPage(0);
setIssueFilter("all");
setPrFilter("all");
setSearchTitle("");
setSelectedRepo("");
setStartDate("");
setEndDate("");

localStorage.removeItem('tracker_tab');
localStorage.removeItem('tracker_page');
localStorage.removeItem('tracker_issueFilter');
localStorage.removeItem('tracker_prFilter');
localStorage.removeItem('tracker_searchTitle');
localStorage.removeItem('tracker_selectedRepo');
localStorage.removeItem('tracker_startDate');
localStorage.removeItem('tracker_endDate');
};

const handleLogout = () => {
logout();
clearData();
handleResetFilters();
};

// Fetch data when username, tab, or page changes
useEffect(() => {
if (username) {
Expand Down Expand Up @@ -238,6 +266,21 @@ const Home: React.FC = () => {
>
Fetch Data
</Button>
{(username || token) && (
<Button
type="button"
variant="outlined"
color="error"
onClick={handleLogout}
sx={{
minWidth: "100px",
minHeight: "55px",
alignSelf: "flex-start",
}}
>
Logout
</Button>
)}
</Box>
</form>
</Paper>
Expand Down Expand Up @@ -272,6 +315,18 @@ const Home: React.FC = () => {
InputLabelProps={{ shrink: true }}
sx={{ minWidth: 150 }}
/>
{(tab !== 0 || page !== 0 || issueFilter !== "all" || prFilter !== "all" || searchTitle !== "" || selectedRepo !== "" || startDate !== "" || endDate !== "") && (
<Button
variant="outlined"
onClick={handleResetFilters}
sx={{
minHeight: "56px",
alignSelf: "flex-start",
}}
>
Reset Filters
</Button>
)}
</Box>

{/* Tabs + State Filter */}
Expand Down