Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
d79fe3e
Update React app
Lasitha2001 Feb 20, 2025
06c9797
Create Atomic Component Folder and Add Buttons.jsx
Lasitha2001 Feb 20, 2025
73df806
Add Dialogs component to AtomicComponents
Lasitha2001 Feb 20, 2025
fca085b
Add CustomButton and CustomContainer components for custom builds
HKSahanTharaka Feb 22, 2025
97a1a75
Atomic componets, theme
Gethmi-Rathnayaka Feb 24, 2025
7382b96
table
Gethmi-Rathnayaka Feb 24, 2025
406ee87
Update App.jsx
Lasitha2001 Feb 24, 2025
e4abb90
Update index.css
Lasitha2001 Feb 24, 2025
6a745f4
Create Buttons As Atomic Component
Lasitha2001 Feb 24, 2025
f0b6d55
Merge branch 'Development' of https://github.com/Second-year-SW-Proje…
Lasitha2001 Feb 24, 2025
13b9f73
how to use theme
Gethmi-Rathnayaka Feb 24, 2025
261e131
Enhance theme configuration and button styles in AtomicComponents
Lasitha2001 Feb 24, 2025
f059e6b
Refactor App component imports and update DatePickerAtom label
Lasitha2001 Feb 24, 2025
706f71a
Merge branch 'Development' of https://github.com/Second-year-SW-Proje…
Lasitha2001 Feb 24, 2025
d9f160a
Add date picker component and update Searchbar field
Lasitha2001 Feb 24, 2025
3684e4c
Refactor InputField component and enhance theme configuration
Gethmi-Rathnayaka Feb 24, 2025
c13724c
Merge branch 'Development' of https://github.com/Second-year-SW-Proje…
Gethmi-Rathnayaka Feb 24, 2025
591d369
Fix typo in InputField import statement in App component
Gethmi-Rathnayaka Feb 24, 2025
94a10fd
Enhance UserTable component with customizable styles for color, backg…
Gethmi-Rathnayaka Feb 25, 2025
63bba84
Clear app field
ShireenShamil Feb 26, 2025
118084a
Add new card components, IconSet Componentsand Table Components
Lasitha2001 Feb 26, 2025
c5f412a
Merge branch 'Development' of https://github.com/Second-year-SW-Proje…
Lasitha2001 Feb 26, 2025
22c1488
Make UserTable component to support customizable icon types
Lasitha2001 Feb 27, 2025
b9508e3
Improved styling options
Lasitha2001 Feb 27, 2025
b74a705
Add usage examples for Buttons, SearchBar, and SetDate components
Lasitha2001 Feb 27, 2025
6af36fb
Refactor Input component to simplify code and add usage examples for …
Gethmi-Rathnayaka Feb 27, 2025
c38bb25
Update File Structure
Lasitha2001 Feb 27, 2025
6756e3e
Merge branch 'Development' of https://github.com/Second-year-SW-Proje…
Lasitha2001 Feb 27, 2025
22d5c61
updated version of user navbar and footer
dinujayawkt Feb 27, 2025
b92bb1a
logo for user navbar and footer
dinujayawkt Feb 27, 2025
a5539f9
changed the image location
dinujayawkt Feb 27, 2025
cb3b346
Refactor Table component imports to use correct paths for theme and I…
Lasitha2001 Feb 27, 2025
cf37f7d
Merge branch 'Development' of https://github.com/Second-year-SW-Proje…
Lasitha2001 Feb 27, 2025
e0b7dac
Create New Branch for Create Product Function
Lasitha2001 Mar 4, 2025
61e5fd2
Create Product Branch
Lasitha2001 Mar 4, 2025
368f972
Update package.json
Lasitha2001 Mar 16, 2025
9f8b265
navbar
ShireenShamil Mar 17, 2025
9d933c8
Admin profile updated
ShireenShamil Mar 17, 2025
97351e5
User manage page updated
ShireenShamil Mar 17, 2025
f4bc3ba
Adjust user manage page
ShireenShamil Mar 17, 2025
8d19a65
Complaints page updated
ShireenShamil Mar 17, 2025
f70ad98
login full part updated
ShireenShamil Mar 17, 2025
e76e200
json updates
ShireenShamil Mar 17, 2025
286dacf
admin profile backend connection
ShireenShamil Mar 17, 2025
6656e28
updated admin profile
ShireenShamil Mar 17, 2025
eab8f0c
updates
ShireenShamil Mar 17, 2025
517cab9
Login part styling updated
ShireenShamil Mar 18, 2025
1c9e223
profile picture updated
ShireenShamil Mar 20, 2025
e25f9b6
Add dashboard segment, new components, and update dependencies
Lasitha2001 Mar 20, 2025
73ef733
Merge branch 'CreateProduct' of https://github.com/Second-year-SW-Pro…
Lasitha2001 Mar 20, 2025
5c36899
admin setting updated
ShireenShamil Mar 20, 2025
392006f
Resolving commit issue in CreateProduct branch
ShireenShamil Mar 20, 2025
4ca1682
login update
ShireenShamil Mar 20, 2025
ca45263
rma updates
ShireenShamil Mar 20, 2025
7d6dccc
Admin setting change password updated
ShireenShamil Mar 21, 2025
0706a9b
2FA step 1 updated
ShireenShamil Mar 21, 2025
a988e0e
Stylings
ShireenShamil Mar 21, 2025
221c8c9
2FA updated success
ShireenShamil Mar 23, 2025
cbac975
user manage styling updated
ShireenShamil Mar 23, 2025
e422aaf
user side complaint submit updated
ShireenShamil Mar 23, 2025
df7a85c
user complaints updated
ShireenShamil Mar 23, 2025
0c58b52
complaints updated
ShireenShamil Mar 23, 2025
ca2458a
Signup style updated
ShireenShamil Mar 23, 2025
45cc30a
comments updated
ShireenShamil Mar 24, 2025
4c7d381
Login styling updated
ShireenShamil Mar 24, 2025
be8ad52
Update The Create Product Feature
Lasitha2001 Mar 24, 2025
d1225da
Merge branch 'CreateProduct' of into CreateProduct
Lasitha2001 Mar 24, 2025
ff69dc6
Refactor Reset Password component layout and add product slice for Re…
Lasitha2001 Mar 24, 2025
7cd0550
No code changes detected
Lasitha2001 Mar 24, 2025
d7890a5
use manage changes
ShireenShamil Mar 24, 2025
8bdb8ef
Merge branch 'CreateProduct' of https://github.com/Second-year-SW-Pro…
ShireenShamil Mar 24, 2025
ab37d5a
user manage changes
ShireenShamil Mar 24, 2025
7a3323b
updates
ShireenShamil Mar 24, 2025
5bfe7e5
updated
ShireenShamil Mar 24, 2025
9e1e49e
Invoicelist frontend
Gethmi-Rathnayaka Apr 5, 2025
76784d3
Invoice frontend
Gethmi-Rathnayaka Apr 9, 2025
31b779f
old files
dinujayawkt Apr 9, 2025
f3cab56
Full combined version of User and Admin Frontends
dinujayawkt Apr 9, 2025
44fc910
Changes of Libraries
dinujayawkt Apr 9, 2025
dd562aa
new file: client/src/AtomicComponents/ForCustomBuild/BudgetSelecto…
HKSahanTharaka Apr 10, 2025
5ddaff8
add
ShireenShamil Apr 10, 2025
c7edf00
Userdashboard
Gethmi-Rathnayaka Apr 10, 2025
3a4111a
Userdashboard cards
Gethmi-Rathnayaka Apr 10, 2025
f4bd0bb
fixing import issues
Gethmi-Rathnayaka Apr 10, 2025
27adb69
Userdashboard routes
Gethmi-Rathnayaka Apr 10, 2025
503ecac
Invoice
Gethmi-Rathnayaka Apr 10, 2025
da2f0d3
update
Gethmi-Rathnayaka Apr 10, 2025
9a3f57c
inputs
Gethmi-Rathnayaka Apr 10, 2025
60c7881
Updated Account icon of Navbar
dinujayawkt Apr 10, 2025
d2574c3
Merge remote-tracking branch 'origin/Full_Combined_Frontend' into eas…
HKSahanTharaka Apr 11, 2025
4daf06a
Merge remote-tracking branch 'origin/easyAndAdvanceModeV2' into Creat…
ShireenShamil Apr 11, 2025
e51a1ae
Merge remote-tracking branch 'origin/easyAndAdvanceModeV2' into Creat…
ShireenShamil Apr 11, 2025
241cda9
Merge branch 'CreateProduct' of https://github.com/Second-year-SW-Pro…
ShireenShamil Apr 11, 2025
8348be4
Update .env
ShireenShamil Apr 30, 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
1 change: 1 addition & 0 deletions client/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

11 changes: 6 additions & 5 deletions client/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# React + Vite
(1)uninstall the old version Toolpad/core 0.8.1 and install the latest toolpad/core 0.13.0..

(2)additional added the latest stripe libraries-

"@stripe/react-stripe-js": "^3.6.0",
"@stripe/stripe-js": "^7.0.0",

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
5,428 changes: 4,984 additions & 444 deletions client/package-lock.json

Large diffs are not rendered by default.

27 changes: 24 additions & 3 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,30 @@
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@mui/icons-material": "^6.4.4",
"@mui/material": "^6.4.4",
"@mui/lab": "^6.0.0-beta.28",
"@mui/material": "^6.4.8",
"@mui/x-date-pickers": "^7.27.0",
"@reduxjs/toolkit": "^2.6.1",
"@stripe/react-stripe-js": "^3.6.0",
"@stripe/stripe-js": "^7.0.0",
"@tiptap/pm": "^2.11.5",
"@tiptap/react": "^2.11.5",
"@tiptap/starter-kit": "^2.11.5",
"@toolpad/core": "^0.13.0",
"axios": "^1.8.3",
"chart.js": "^4.4.8",
"date-fns": "^4.1.0",
"dayjs": "^1.11.13",
"qrcode": "^1.5.4",
"qrcode.react": "^4.2.0",
"react": "^19.0.0",
"react-dom": "^19.0.0"
"react-chartjs-2": "^5.3.0",
"react-dom": "^19.0.0",
"react-redux": "^9.2.0",
"react-router-dom": "^7.2.0",
"redux-persist": "^6.0.0",
"sonner": "^2.0.1",
"speakeasy": "^2.0.0"
},
"devDependencies": {
"@eslint/js": "^9.19.0",
Expand All @@ -29,7 +50,7 @@
"eslint-plugin-react-refresh": "^0.4.18",
"globals": "^15.14.0",
"postcss": "^8.5.2",
"tailwindcss": "^3.3.3",
"tailwindcss": "^3.4.17",
"vite": "^6.1.0"
}
}
Binary file added client/public/Home1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/categorybg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/graph1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/pc1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/proc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/processorbannernew.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/rambanner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/sub0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added client/public/sub1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion client/public/vite.svg

This file was deleted.

Loading