From 465be49692b46a9c6c718805979d51efec0dbb2c Mon Sep 17 00:00:00 2001 From: aidy8847 Date: Tue, 23 Jul 2024 13:44:59 +0300 Subject: [PATCH 1/8] change the index --- client-side/src/stories/index.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client-side/src/stories/index.js b/client-side/src/stories/index.js index e9e73207a..afa731529 100644 --- a/client-side/src/stories/index.js +++ b/client-side/src/stories/index.js @@ -4,21 +4,21 @@ import Footer from './footer/FooterComponent'; import GenericInput from './GenericInput/genericInput'; import ResponsiveAppBar from './header/header'; import Select from './Select/Select'; -//import ScrollButton from './ScrollButton/ScrollButton' -// import TableComponent from './table/TableComponent'; -//import RadioButton from './RadioButton/radio-Button'; -//import ToastMessage from './Toast/ToastMessage' +import ScrollButton from './ScrollButton/ScrollButton' +import TableComponent from './table/TableComponent'; +import RadioButton from './RadioButton/radio-Button'; +import ToastMessage from './Toast/ToastMessage' import LabTabs from './tabs/tabs'; -export{ +export { GenericButton, DateInput, Footer, GenericInput, ResponsiveAppBar, Select, - // ScrollButton, - // TableComponent, + ScrollButton, + TableComponent, LabTabs, RadioButton, ToastMessage From 1ea16d6bb1cbc8a61f12c1a3202f597f20f9c7e1 Mon Sep 17 00:00:00 2001 From: aidy8847 Date: Wed, 24 Jul 2024 22:46:27 +0300 Subject: [PATCH 2/8] change the index --- client-side/package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-side/package-lock.json b/client-side/package-lock.json index d8fcdf057..abdbc4f0f 100644 --- a/client-side/package-lock.json +++ b/client-side/package-lock.json @@ -23062,7 +23062,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "license": "MIT" + "license": "MIT", "dev": true, "license": "MIT" }, From ee3390bed50b347be091d69307f266d2948af70c Mon Sep 17 00:00:00 2001 From: aidy8847 Date: Tue, 6 Aug 2024 21:11:30 +0300 Subject: [PATCH 3/8] change --- client-side/package-lock.json | 88 ++++++++++++++++++- client-side/src/App.jsx | 2 +- .../src/stories/DateTime/DateInput.jsx | 22 ----- .../src/stories/DateTime/DateInput.scss | 38 -------- .../src/stories/DateTime/DateInput.stories.js | 15 ---- client-side/src/stories/index.js | 24 +---- 6 files changed, 89 insertions(+), 100 deletions(-) delete mode 100644 client-side/src/stories/DateTime/DateInput.jsx delete mode 100644 client-side/src/stories/DateTime/DateInput.scss delete mode 100644 client-side/src/stories/DateTime/DateInput.stories.js diff --git a/client-side/package-lock.json b/client-side/package-lock.json index b547dae1c..94e60a78b 100644 --- a/client-side/package-lock.json +++ b/client-side/package-lock.json @@ -469,6 +469,92 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/highlight": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "license": "MIT" + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/parser": { "version": "7.25.3", "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz", @@ -26573,4 +26659,4 @@ } } } -} \ No newline at end of file +} diff --git a/client-side/src/App.jsx b/client-side/src/App.jsx index 94644a5b2..f33ddeeee 100644 --- a/client-side/src/App.jsx +++ b/client-side/src/App.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { Provider } from 'react-redux'; import { RouterProvider } from 'react-router-dom'; -import Footer from './stories/footer/FooterComponent'; +import Footer from './stories/index'; import { router } from './router/router.jsx'; import { store } from './redux/store.jsx'; import { SnackbarProvider } from 'notistack'; diff --git a/client-side/src/stories/DateTime/DateInput.jsx b/client-side/src/stories/DateTime/DateInput.jsx deleted file mode 100644 index 2807aacdd..000000000 --- a/client-side/src/stories/DateTime/DateInput.jsx +++ /dev/null @@ -1,22 +0,0 @@ -import React from "react"; -import PropTypes from 'prop-types'; -import { TextField } from "@mui/material"; -import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; -import { DatePicker, LocalizationProvider } from '@mui/x-date-pickers'; -import './DateInput.scss'; -const DateInputs = ({ onChange }) => { - return ( -
- - } - /> - -
- ); -}; -DateInputs.propTypes = { - onChange: PropTypes.func.isRequired, -}; -export default DateInputs; \ No newline at end of file diff --git a/client-side/src/stories/DateTime/DateInput.scss b/client-side/src/stories/DateTime/DateInput.scss deleted file mode 100644 index fbfc06062..000000000 --- a/client-side/src/stories/DateTime/DateInput.scss +++ /dev/null @@ -1,38 +0,0 @@ -@import '../stylies.scss'; - - -.timeInputWrapper { - -width: 40%; - -.MuiOutlinedInput-root { - -.MuiOutlinedInput-notchedOutline { - -border-color: $secondary-color; - -border-width: 2px; - -border-style: solid; - -transition: border-color 0.3s ease; - - -&.Mui-focused { - -border-color: $secondary-color; - -} - - -&:hover { - -border-color: $secondary-color; - -} - -} - -} - -} \ No newline at end of file diff --git a/client-side/src/stories/DateTime/DateInput.stories.js b/client-side/src/stories/DateTime/DateInput.stories.js deleted file mode 100644 index edb816207..000000000 --- a/client-side/src/stories/DateTime/DateInput.stories.js +++ /dev/null @@ -1,15 +0,0 @@ -import React from "react"; - -import DateInputs from './DateInputs'; - - -export default{ - title: 'DateInputs', - component: DateInputs -}; - - - -const Template = (args) => ; - -export const ClasicDateInputs = Template.bind({}); \ No newline at end of file diff --git a/client-side/src/stories/index.js b/client-side/src/stories/index.js index afa731529..36c4a6dc3 100644 --- a/client-side/src/stories/index.js +++ b/client-side/src/stories/index.js @@ -1,25 +1,3 @@ -import GenericButton from './Button/GenericButton'; -import DateInput from './DateTime/DateInputs'; import Footer from './footer/FooterComponent'; -import GenericInput from './GenericInput/genericInput'; -import ResponsiveAppBar from './header/header'; -import Select from './Select/Select'; -import ScrollButton from './ScrollButton/ScrollButton' -import TableComponent from './table/TableComponent'; -import RadioButton from './RadioButton/radio-Button'; -import ToastMessage from './Toast/ToastMessage' -import LabTabs from './tabs/tabs'; -export { - GenericButton, - DateInput, - Footer, - GenericInput, - ResponsiveAppBar, - Select, - ScrollButton, - TableComponent, - LabTabs, - RadioButton, - ToastMessage -}; \ No newline at end of file +export default Footer; From 8b3351f0b5bd3bd010a66176ae7595c708dabb30 Mon Sep 17 00:00:00 2001 From: aidy8847 Date: Wed, 7 Aug 2024 11:42:38 +0300 Subject: [PATCH 4/8] change --- client-side/package.json | 3 +-- client-side/src/App.jsx | 3 ++- .../src/stories/Toast/ToastMessage.scss | 2 +- client-side/src/stories/index.js | 20 ++++++++++++++++++- client-side/src/stories/variables.scss | 5 +++-- 5 files changed, 26 insertions(+), 7 deletions(-) diff --git a/client-side/package.json b/client-side/package.json index 18778111b..c0da4fbbb 100644 --- a/client-side/package.json +++ b/client-side/package.json @@ -17,10 +17,9 @@ "@testing-library/user-event": "^13.5.0", "@types/redux": "^3.6.31", "axios": "^1.7.2", - - "jest": "^29.7.0", "html2canvas": "^1.4.1", "html2pdf.js": "^0.10.2", + "jest": "^29.7.0", "jspdf": "^2.5.1", "jspdf-autotable": "^3.8.2", "react": "^18.3.1", diff --git a/client-side/src/App.jsx b/client-side/src/App.jsx index f33ddeeee..693a60684 100644 --- a/client-side/src/App.jsx +++ b/client-side/src/App.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { Provider } from 'react-redux'; import { RouterProvider } from 'react-router-dom'; -import Footer from './stories/index'; +import { Footer, GenericButton, LabTabs, Loader, RadioButtonComponent, ResponsiveAppBar, Select, TableComponent, ToastMessage } from './stories/index'; import { router } from './router/router.jsx'; import { store } from './redux/store.jsx'; import { SnackbarProvider } from 'notistack'; @@ -13,6 +13,7 @@ function App() { +

hello