Skip to content

Commit bffa123

Browse files
authored
Merge pull request #95 from design-sparx/ft/refactor
chore and feature updates
2 parents 8a63537 + 6fa1c0f commit bffa123

File tree

114 files changed

+355
-377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+355
-377
lines changed

.changeset/old-cups-type.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
"antd-multi-dashboard": patch
3+
---
4+
5+
### Code optimization & bug fixes
6+
- chore: change onboarding flow. From landing → login → home
7+
- feat(ui): made general user interface simple and minimal
8+
- chore: cleaned up imports and refactors
9+
- chore(deps-dev): bump vite from 4.5.2 to 4.5.3
10+
- chore: refactored pages imports and exports
11+
- chore: refactored stories imports and exports
12+
- feat(page): added about project page
13+
- chore(docs): added CONTRIBUTING.md docs

.changeset/tiny-apes-sort.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'antd-multi-dashboard': minor
3+
---
4+
5+
optimized imports, added project about page and made UI simple and minimal

CONTRIBUTING.md

+51-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,51 @@
1-
This repo uses [changesets](https://github.com/changesets/changesets) to
2-
make releasing updates easier. For you, the contributor, this means you
3-
should run `npm run changeset` when you've got your changes ready. For
4-
more details, see this short document on [adding a changeset](https://github.com/changesets/changesets/blob/main/docs/adding-a-changeset.md#i-am-in-a-single-package-repository).
1+
# Contributing
2+
3+
👍🎉 First off, thanks for taking the time to contribute! 🎉👍
4+
5+
If you have found an issue or would like to request a new feature, simply create a new issue detailing the request. We also welcome pull requests. See below for information on getting started with development and submitting pull requests.
6+
7+
Please note we have a [code of conduct](https://github.com/design-sparx/antd-multipurpose-dashboard/blob/main/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
8+
9+
> This repo uses [changesets](https://github.com/changesets/changesets) to
10+
> make releasing updates easier. For you, the contributor, this means you
11+
> should run `npm run changeset` when you've got your changes ready. For
12+
> more details, see this short document on [adding a changeset](https://github.com/changesets/changesets/blob/main/docs/adding-a-changeset.md#i-am-in-a-single-package-repository).
13+
14+
## Found an Issue?
15+
16+
If you find a bug in the source code or a mistake in the documentation, you can help us by submitting an issue to our [GitHub Repository](https://github.com/design-sparx/antd-multipurpose-dashboard/issues/new/choose). Even better you can submit a Pull Request with a fix.
17+
18+
## Submitting a Pull Request
19+
20+
1. Make sure that the contribution you want to make is explained or detailed in a GitHub issue! Find an [existing issue](https://github.com/design-sparx/antd-multipurpose-dashboard/issues) or [open a new one](https://github.com/design-sparx/antd-multipurpose-dashboard/issues/new/choose).
21+
2. Once done, [fork the repository](https://github.com/design-sparx/antd-multipurpose-dashboard/fork) in your own GitHub account.
22+
3. [Create a new Git branch](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository).
23+
4. Make the changes on your branch.
24+
5. [Submit the branch as a PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) pointing to the main branch of the main repository.
25+
> We do not enforce a naming convention for the PRs, but please use something descriptive of your changes.
26+
27+
## Development Workflow
28+
29+
Install dependencies
30+
31+
```
32+
pnpm install
33+
```
34+
35+
Run dev server
36+
37+
```
38+
pnpm run dev
39+
```
40+
41+
## Linter
42+
43+
Each PR should pass the linter to be accepted. To fix lint and prettier errors, run `pnpm run lint:fix` and `pnpm run prettier:fix`.
44+
45+
## Commit Message
46+
47+
We use [commitlint](https://commitlint.js.org/guides/getting-started) to manage and standardize our commits:
48+
49+
- check [commitlint conventional guides](https://github.com/conventional-changelog/commitlint?tab=readme-ov-file#what-is-commitlint),
50+
- not finish by a dot or any other punctuation character (!,?),
51+
- start with a verb so that we can read your commit message this way: "This commit will ...", where "..." is the commit message. e.g.: "Fix the home page button" or "Add support for dark mode"

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
- [Live preview](https://antd-multipurpose-dashboard.netlify.app/)
3535
- [Components preview](https://6546507b657a74164abf2db6-iqmnggdrcl.chromatic.com/)
3636
- [Medium](https://medium.com/@kelvink96/designing-modern-dashboards-a-journey-through-react-vite-ant-design-and-storybook-2dac23e1e49a)
37-
- [Product roadmap](https://kelvink96.notion.site/Antd-multipurpose-dashboard-Product-roadmap-92163e05b8ea444a8f87b7f834933069) _ **New** _
37+
- [Product roadmap](https://kelvink96.notion.site/Antd-multipurpose-dashboard-Product-roadmap-92163e05b8ea444a8f87b7f834933069) **New**
3838

3939
## Introduction
4040

@@ -164,7 +164,7 @@ the source files are included in the package.
164164
┃ ┣ 📂 assets/ # Assets folder **
165165
┃ ┣ 📂 components/ # App Components **
166166
┃ ┣ 📂 constants/ # App Components **
167-
┃ ┃ ┗ 📃 routes.ts # All routes declarations **
167+
┃ ┃ ┗ 📃 routes.tsx # All routes declarations **
168168
┃ ┣ 📂 context/ # React state conexts **
169169
┃ ┣ 📂 hooks/ # React Hooks **
170170
┃ ┃ ┗ 📃 useFetch.ts # Data fetch hook (optional) **

src/components/BackBtn/BackBtn.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import { withRouter } from 'storybook-addon-react-router-v6';
33

4-
import BackBtn from './BackBtn.tsx';
4+
import { BackBtn } from './BackBtn.tsx';
55

66
// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
77
const meta = {

src/components/Card/Card.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import Card from './Card';
3+
import { Card } from './Card';
44

55
// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
66
const meta = {

src/components/ContactForm/ContactForm.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import ContactForm from './ContactForm.tsx';
3+
import { ContactForm } from './ContactForm.tsx';
44

55
// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
66
const meta = {

src/components/EmployeeCard/EmployeeCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import EmployeeCard from './EmployeeCard.tsx';
3+
import { EmployeeCard } from './EmployeeCard.tsx';
44

55
const DATA = {
66
employee_id: '24e4e64c-bf09-459f-8cea-f9d2de99d15b',

src/components/Loader/Loader.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import Loader from './Loader.tsx';
3+
import { Loader } from './Loader.tsx';
44

55
const meta = {
66
title: 'Components/Loader',

src/components/Logo/Logo.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import { withRouter } from 'storybook-addon-react-router-v6';
33

4-
import Logo from './Logo.tsx';
4+
import { Logo } from './Logo.tsx';
55

66
const meta = {
77
title: 'Components/Logo',

src/components/MoreMenu/MoreMenu.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import MoreMenu from './MoreMenu.tsx';
3+
import { MoreMenu } from './MoreMenu.tsx';
44

55
const meta = {
66
title: 'Components/More menu',

src/components/NotificationsCard/Notifications.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import NotificationsData from '../../../public/mocks/Notifications.json';
33

4-
import NotificationsCard from './NotificationsCard.tsx';
4+
import { NotificationsCard } from './NotificationsCard.tsx';
55

66
const meta = {
77
title: 'Components/Notifications/List',

src/components/NotificationsItem/NotificationsItem.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import NotificationsItem from './NotificationsItem.tsx';
3+
import { NotificationsItem } from './NotificationsItem.tsx';
44

55
const DATA = {
66
notification_id: 'dcffd2c4-63d7-4b70-88c2-e079fc7cde6f',

src/components/PageHeader/PageHeader.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
44
import { withRouter } from 'storybook-addon-react-router-v6';
55
import { DASHBOARD_ITEMS } from '../../constants';
66

7-
import PageHeader from './PageHeader.tsx';
7+
import { PageHeader } from './PageHeader.tsx';
88

99
const meta = {
1010
title: 'Components/Page header',

src/components/PricingTable/PricingTable.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import PricingData from '../../../public/mocks/Pricing.json';
33

4-
import PricingTable from './PricingTable.tsx';
4+
import { PricingTable } from './PricingTable.tsx';
55

66
const meta = {
77
title: 'Components/Pricing table',

src/components/RefreshBtn/RefreshBtn.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import RefreshBtn from './RefreshBtn.tsx';
3+
import { RefreshBtn } from './RefreshBtn.tsx';
44

55
const meta = {
66
title: 'Components/Refresh button',

src/components/SitemapCard/SitemapCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
22
import { withRouter } from 'storybook-addon-react-router-v6';
33
import { DASHBOARD_ITEMS } from '../../constants';
44

5-
import SitemapCard from './SitemapCard.tsx';
5+
import { SitemapCard } from './SitemapCard.tsx';
66

77
const meta = {
88
title: 'Components/Sitemap',

src/components/SocialMediaCard/SocialMediaCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import SocialMediaCard from './SocialMediaCard.tsx';
3+
import { SocialMediaCard } from './SocialMediaCard.tsx';
44

55
const meta = {
66
title: 'Components/Social media',

src/components/TimelineCard/TimelineCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import TimelineData from '../../../public/mocks/TimelineActivity.json';
33

4-
import TimelineCard from './TimelineCard.tsx';
4+
import { TimelineCard } from './TimelineCard.tsx';
55

66
const meta = {
77
title: 'Components/Timeline',

src/components/UserAvatar/UserAvatar.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import UserAvatar from './UserAvatar.tsx';
3+
import { UserAvatar } from './UserAvatar.tsx';
44

55
const meta = {
66
title: 'Components/User avatar',

src/components/corporate/BlogsListCard/BlogListCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import { withRouter } from 'storybook-addon-react-router-v6';
33

4-
import BlogsListCard from './BlogsListCard.tsx';
4+
import { BlogsListCard } from './BlogsListCard.tsx';
55

66
const MOCK_DATA = Array.from({ length: 5 }).map((_, i) => ({
77
href: 'https://ant.design',

src/components/dashboard/bidding/CategoriesCard/Categories.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import CategoriesCard from './CategoriesCard.tsx';
3+
import { CategoriesCard } from './CategoriesCard.tsx';
44

55
// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
66
const meta = {

src/components/dashboard/bidding/CreatorsCard/CreatorsCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import CreatorsData from '../../../../../public/mocks/AuctionCreators.json';
33

4-
import CreatorsCard from './CreatorsCard.tsx';
4+
import { CreatorsCard } from './CreatorsCard.tsx';
55

66
// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
77
const meta = {

src/components/dashboard/bidding/TopItemsCard/TopItems.stories.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import TopItemsData from '../../../../../public/mocks/BiddingTopSellers.json';
33

4-
import TopItems from './TopItems.tsx';
4+
import { TopItemsCard } from './TopItems.tsx';
55

66
// More on how to set up stories at: https://storybook.js.org/docs/react/writing-stories/introduction#default-export
77
const meta = {
88
title: 'Components/Dashboard/Bidding/Top items table',
9-
component: TopItems,
9+
component: TopItemsCard,
1010
parameters: {
1111
// Optional parameter to center the component in the Canvas. More info: https://storybook.js.org/docs/react/configure/story-layout
1212
layout: 'centered',
1313
},
1414
// This component will have an automatically generated Autodocs entry: https://storybook.js.org/docs/react/writing-docs/autodocs
1515
tags: ['autodocs'],
1616
// More on argTypes: https://storybook.js.org/docs/react/api/argtypes
17-
} satisfies Meta<typeof TopItems>;
17+
} satisfies Meta<typeof TopItemsCard>;
1818

1919
export default meta;
2020
type Story = StoryObj<typeof meta>;

src/components/dashboard/bidding/TransactionsCard/TransactionsCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import TransactionsData from '../../../../../public/mocks/BiddingTransactions.json';
33

4-
import TransactionsCard from './TransactionsCard.tsx';
4+
import { TransactionsCard } from './TransactionsCard.tsx';
55

66
const meta = {
77
title: 'Components/Dashboard/Bidding/Transactions table',

src/components/dashboard/default/CampaignsCard/CampaignsCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import CampaignsData from '../../../../../public/mocks/Campaigns.json';
33

4-
import CampaignsCard from './CampaignsCard.tsx';
4+
import { CampaignsCard } from './CampaignsCard.tsx';
55

66
const meta = {
77
title: 'Components/Dashboard/Default/Campaigns table',

src/components/dashboard/default/EarningsCard/EarningsCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import EarningsCard from './EarningsCard.tsx';
3+
import { EarningsCard } from './EarningsCard.tsx';
44

55
const meta = {
66
title: 'Components/Dashboard/Default/Earnings card',

src/components/dashboard/default/GetStartedCard/GetStartedCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import GetStartedCard from './GetStartedCard.tsx';
3+
import { GetStartedCard } from './GetStartedCard.tsx';
44

55
const meta = {
66
title: 'Components/Dashboard/Default/Get started card',

src/components/dashboard/default/LatestOrdersCard/LatestOrdersCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import CampaignsData from '../../../../../public/mocks/Campaigns.json';
33

4-
import LatestOrdersCard from './LatestOrdersCard.tsx';
4+
import { LatestOrdersCard } from './LatestOrdersCard.tsx';
55

66
const meta = {
77
title: 'Components/Dashboard/Default/Orders/Table',

src/components/dashboard/default/OrdersChart/OrdersChart.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import OrdersChart from './OrdersChart.tsx';
3+
import { OrdersChart } from './OrdersChart.tsx';
44

55
const meta = {
66
title: 'Components/Dashboard/Default/Orders/Chart',

src/components/dashboard/default/RecentUsersCard/RecentUsersCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import CampaignsData from '../../../../../public/mocks/Campaigns.json';
33

4-
import RecentUsersCard from './RecentUsersCard.tsx';
4+
import { RecentUsersCard } from './RecentUsersCard.tsx';
55

66
const meta = {
77
title: 'Components/Dashboard/Default/Users card',

src/components/dashboard/default/SubscribersChart/SubscribersChart.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import SubscribersChart from './SubscribersChart.tsx';
3+
import { SubscribersChart } from './SubscribersChart.tsx';
44

55
const meta = {
66
title: 'Components/Dashboard/Default/Subscribers card',

src/components/dashboard/default/TasksChartCard/TasksChart.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import TasksChartCard from './TasksChartCard.tsx';
3+
import { TasksChartCard } from './TasksChartCard.tsx';
44

55
const TASKS_DATA = [
66
{

src/components/dashboard/default/TasksListCard/TasksList.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import TasksListData from '../../../../../public/mocks/TasksList.json';
33

4-
import TasksListCard from './TasksListCard.tsx';
4+
import { TasksListCard } from './TasksListCard.tsx';
55

66
const meta = {
77
title: 'Components/Dashboard/Default/Tasks/List',

src/components/dashboard/default/WeeklyActivityCard/WeeklyActivityCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import WeeklyActivityCard from './WeeklyActivityCard.tsx';
3+
import { WeeklyActivityCard } from './WeeklyActivityCard.tsx';
44

55
const ACTIVITY_DATA = [
66
{

src/components/dashboard/ecommerce/CustomerReviewsCard/CustomerReviewsCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22

3-
import CustomerReviewsCard from './CustomerReviewsCard.tsx';
3+
import { CustomerReviewsCard } from './CustomerReviewsCard.tsx';
44

55
const meta = {
66
title: 'Components/Dashboard/Ecommerce/Customer reviews card',

src/components/dashboard/learning/CommunityGroupsCard/CommunityGroupsCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import CommunityGroupsData from '../../../../../public/mocks/CommunityGroups.json';
33

4-
import CommunityGroupCard from './CommunityGroupCard.tsx';
4+
import { CommunityGroupCard } from './CommunityGroupCard.tsx';
55

66
const meta = {
77
title: 'Components/Dashboard/Learning/Communities card',

src/components/dashboard/learning/CoursesCard/CoursesCard.stories.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Meta, StoryObj } from '@storybook/react';
22
import CoursesData from '../../../../../public/mocks/Courses.json';
33

4-
import CoursesCard from './CoursesCard.tsx';
4+
import { CoursesCard } from './CoursesCard.tsx';
55

66
const meta = {
77
title: 'Components/Dashboard/Learning/Courses/Table',

0 commit comments

Comments
 (0)