Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
260a61e
Added the boiler-plate for MyHaki dashboard
mahderbekele Sep 15, 2025
3b02580
Added the boiler-plate for MyHaki dashboard
mahderbekele Sep 15, 2025
29eb2b3
Merge pull request #1 from akirachix/feature/boiler-plate
hunterachieng Sep 15, 2025
0d1eb63
Added the shared components for MyHaki dashboard
mahderbekele Sep 15, 2025
6e1c4ab
Added the shared components of myhaki dashboard
mahderbekele Sep 16, 2025
5efbecb
Added the shared components of myhaki dashboard
mahderbekele Sep 16, 2025
353ea86
Merge pull request #3 from akirachix/feature/shared-components
hunterachieng Sep 16, 2025
cb424d7
add case and lawyers
yordanoshagos Sep 16, 2025
02c85e2
add case and lawyers
yordanoshagos Sep 16, 2025
7bb268a
Added the teaser screens for myhaki dashboard
mahderbekele Sep 16, 2025
f8818df
Added the teaser screens for myhaki dashboard
mahderbekele Sep 16, 2025
b67d98a
Merge pull request #4 from akirachix/feature/teaser-screens
hunterachieng Sep 16, 2025
a8e3120
feat: add cases and lawyers fetched from our hosted APIsand add tests
yordanoshagos Sep 17, 2025
ec8e084
feat: add cases and lawyers fetched from our hosted APIsand add tests
yordanoshagos Sep 17, 2025
11709f3
Merge branch 'develop' of github.com:akirachix/myHaki-frontend into f…
yordanoshagos Sep 17, 2025
8fc917a
feat: add cases and lawyers fetched from our hosted APIsand add tests
yordanoshagos Sep 17, 2025
376d0f3
feat: add cases and lawyers fetched from our hosted APIsand add tests
yordanoshagos Sep 17, 2025
7260e9a
feat: add cases and lawyers fetched from our hosted APIsand add tests
yordanoshagos Sep 17, 2025
9df4de0
updated lawyers route
yordanoshagos Sep 17, 2025
00236f4
Create Signin screen
fionawesonga Sep 17, 2025
4eb38b5
Merge branch 'feature/cases' of github.com:akirachix/myHaki-frontend …
fionawesonga Sep 17, 2025
80a7130
update api route and utils for authentication
yordanoshagos Sep 18, 2025
5cbeab7
Created a dashboard for LSK Admins
akezasaloi Sep 18, 2025
ab2eaa6
update api route and utils for authentication
yordanoshagos Sep 18, 2025
2faf306
update api route and utils for authentication
yordanoshagos Sep 18, 2025
9b3d139
Create Signin screen
fionawesonga Sep 18, 2025
38386bf
update api route and utils for authentication
yordanoshagos Sep 18, 2025
1254944
update api route and utils for authentication
yordanoshagos Sep 18, 2025
965758b
update api route and utils for authentication
yordanoshagos Sep 18, 2025
3043342
Merge pull request #5 from akirachix/feature/cases
hunterachieng Sep 18, 2025
76fd9d3
Added tests for utils and hooks
akezasaloi Sep 19, 2025
f846ca6
Added tests for utils and hooks
akezasaloi Sep 19, 2025
313c308
Created and tested LSK admin dashboard
akezasaloi Sep 19, 2025
1204a22
Merge pull request #6 from akirachix/feature/dashboard
hunterachieng Sep 19, 2025
04a03f2
Create sign-in screen
fionawesonga Sep 19, 2025
3bd7f59
feat: implement forgot,reset,and verify otp to my haki dashboard
lwambisrat Sep 19, 2025
cc8dd9c
Merge branch 'develop' into feature/authentication
akezasaloi Sep 19, 2025
c37112c
Merge pull request #7 from akirachix/feature/authentication
hunterachieng Sep 19, 2025
844daae
Add sign-in screen
fionawesonga Sep 19, 2025
25a3254
Merge branch 'develop' of github.com:akirachix/myHaki-frontend into f…
fionawesonga Sep 19, 2025
c65e6fb
Added the ci-cd pipeline for MyHaki dashboard
mahderbekele Sep 19, 2025
0f34e3f
Modify api folder
fionawesonga Sep 19, 2025
1dcde6e
Modify utils and hooks
fionawesonga Sep 19, 2025
e933af9
Merge pull request #8 from akirachix/feature/signin
hunterachieng Sep 19, 2025
ad307cc
Added the ci-cd pipeline and fixed errors
mahderbekele Sep 20, 2025
2dda261
Added ci-cd and fixed errors
mahderbekele Sep 21, 2025
b529745
Added the ci-cd pipeline and fixed errors
mahderbekele Sep 21, 2025
e98802c
Added the ci-cd pipeline and fixed errors
mahderbekele Sep 21, 2025
8d14f42
Added the ci-cd pipeline
mahderbekele Sep 22, 2025
4b0d8bb
Merge pull request #10 from akirachix/feature/ci_cd
hunterachieng Sep 22, 2025
42a343a
Create profile page
fionawesonga Sep 24, 2025
9b70f2b
Fix merge conflict
fionawesonga Sep 24, 2025
680d6b2
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
fd6be6f
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
02e1757
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
8c51961
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
9c5259e
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
745f4c1
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
064fe1b
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
e185cd3
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
15cf3bb
Fix CI/CD pipeline tests
fionawesonga Sep 24, 2025
4bad1e1
Modify hooks component
fionawesonga Sep 24, 2025
ea5417d
Refactor error type declaration
fionawesonga Sep 24, 2025
a1f691c
Fix test for CI/CD pipeline
fionawesonga Sep 24, 2025
6ca398d
Refactor error type declaration
fionawesonga Sep 24, 2025
ecadb2a
Refactor error type declaration
fionawesonga Sep 24, 2025
131f9a2
Modified profile page for routing
fionawesonga Sep 24, 2025
2e50f1c
Modified profile page for routing
fionawesonga Sep 24, 2025
7968daa
Modified profile page for routing
fionawesonga Sep 24, 2025
1ee28a2
Merge pull request #11 from akirachix/feature/profile
hunterachieng Sep 24, 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
35 changes: 35 additions & 0 deletions .github/workflows/ci-cd-pipeline.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Deploy Next to Vercel
on:
push:
branches:
- main
- develop
pull_request:
branches:
- main
- develop
jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "18"
- name: Install dependencies
run: npm install
working-directory: myhaki
- name: Run tests
run: npm test
working-directory: myhaki
- name: Build React app
run: npm run build
working-directory: myhaki
- name: Deploy to Vercel
if: github.ref == 'refs/heads/main'
env:
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
run: npx vercel --prod --confirm --token $VERCEL_TOKEN
working-directory: myhaki
41 changes: 41 additions & 0 deletions myhaki/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/versions

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.pnpm-debug.log*

# env files (can opt-in for committing if needed)
.env*

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
36 changes: 36 additions & 0 deletions myhaki/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).

## Getting Started

First, run the development server:

```bash
npm run dev
# or
yarn dev
# or
pnpm dev
# or
bun dev
```

Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.

You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.

This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.

## Learn More

To learn more about Next.js, take a look at the following resources:

- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.

You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!

## Deploy on Vercel

The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.

Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
25 changes: 25 additions & 0 deletions myhaki/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { dirname } from "path";
import { fileURLToPath } from "url";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);

const compat = new FlatCompat({
baseDirectory: __dirname,
});

const eslintConfig = [
...compat.extends("next/core-web-vitals", "next/typescript"),
{
ignores: [
"node_modules/**",
".next/**",
"out/**",
"build/**",
"next-env.d.ts",
],
},
];

export default eslintConfig;
18 changes: 18 additions & 0 deletions myhaki/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
const nextJest = require('next/jest');

const createJestConfig = nextJest({
dir: './',
});

/** @type {import('jest').Config} */
const customJestConfig = {
testEnvironment: 'jest-environment-jsdom',
setupFilesAfterEnv: ['<rootDir>/jest.setup.js'],
moduleNameMapper: {
'\\.(jpg|jpeg|png|gif|webp|svg|mp4)$': '<rootDir>/__mocks__/fileMock.js',

'^@/(.*)$': '<rootDir>/src/$1',
},
};

module.exports = createJestConfig(customJestConfig);
16 changes: 16 additions & 0 deletions myhaki/jest.setup.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import '@testing-library/jest-dom';

jest.mock('recharts', () => {
const OriginalRecharts = jest.requireActual('recharts');
return {
...OriginalRecharts,
ResponsiveContainer: ({ children }) => <div style={{ width: 800, height: 400 }}>{children}</div>,
};
});
beforeAll(() => {
jest.spyOn(console, 'error').mockImplementation(() => {});
});

afterAll(() => {
console.error.mockRestore();
});
9 changes: 9 additions & 0 deletions myhaki/next.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import type { NextConfig } from "next";
import path from "path";

const nextConfig: NextConfig = {

outputFileTracingRoot: path.join(__dirname),
};

export default nextConfig;
Loading