Skip to content

Develop #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hunterachieng merged 6 commits into from
Sep 26, 2025
Merged

Develop #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b501116
responsiveness
berissamuyizere Sep 26, 2025
dd2d392
responsiveness
berissamuyizere Sep 26, 2025
bd13879
Merge branch 'develop' into feature/new_responsiveness
berissamuyizere Sep 26, 2025
d71452e
responsiveness
berissamuyizere Sep 26, 2025
d7a78de
responsiveness
berissamuyizere Sep 26, 2025
4da69b2
Merge pull request #28 from akirachix/feature/new_responsiveness
hunterachieng Sep 26, 2025
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
11 changes: 1 addition & 10 deletions carbontrack/src/app/emissions/page.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,7 @@ jest.mock('next/link', () => ({
)
}));

jest.mock('react-icons/io5', () => ({
IoSettingsOutline: () => <div data-testid="settings-icon">Settings</div>,
IoPersonOutline: () => <div data-testid="person-icon">Person</div>
}));


describe('EmissionsHeatmapPage', () => {
const mockFactoryEmissions = [
Expand Down Expand Up @@ -173,13 +170,7 @@ describe('EmissionsHeatmapPage', () => {
expect(mockUseEmissionsData.setSelectedDate).toHaveBeenCalledWith('2023-01-15');
});

test('renders sidebar layout and icons correctly', () => {
render(<EmissionsHeatmapPage />);

expect(screen.getByTestId('sidebar-layout')).toBeInTheDocument();
expect(screen.getByTestId('settings-icon')).toBeInTheDocument();
expect(screen.getByTestId('person-icon')).toBeInTheDocument();
});

test('handles empty emissions data', () => {
(useEmissionsData as jest.Mock).mockReturnValue({
Expand Down
4 changes: 2 additions & 2 deletions carbontrack/src/app/ktda-dashboard/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export default function DashboardPage() {
</div>
<h1 className="mb-4 font-semibold text-white 2xl:text-[1.5rem] 2xl:mt-5 xl:text-[1.3rem] xl:mt-3">Emission Trend</h1>
<div className="grid grid-cols-3 2xl:gap-6 xl:gap-0">
<div className="col-span-2 bg-gray-800 p-4 rounded-lg 2xl:w-[100%] 2xl:h-[100%] xl:w-[95%] xl:h-[99%]">
<div className="col-span-2 bg-gray-800 p-4 rounded-lg 2xl:w-[100%] 2xl:h-[100%] xl:w-[95%] xl:h-[90%]">
<ResponsiveContainer width="100%" height={460}>
<LineChart data={fullEmissionTrend}>
<XAxis dataKey="month" stroke="#ccc" label={{ value: "Months", position: "insideBottom", offset: -5, fill: "#ccc" }} />
Expand Down Expand Up @@ -184,7 +184,7 @@ export default function DashboardPage() {
</div>
</div>
<h3 className="font-semibold text-white text-[20px] xl:mt-4 xl:text-[25px]">Consumed Energy</h3>
<div className="bg-gray-800 p-4 rounded-lg xl:mt-2 xl:h-[72%]">
<div className="bg-gray-800 p-4 rounded-lg xl:mt-2 xl:h-[67%]">
<ResponsiveContainer width="100%" height={250}>
<PieChart>
<Pie data={pieData} dataKey="value" nameKey="name" outerRadius={90} fill="#8884D8" label>
Expand Down