Merge pull request #37 from td1128/hatif

mergin transaction pages with main

.env

@@ -1,5 +1,6 @@
 VITE_APP_API_URL=https://library-management-system-ce6z.onrender.com
 VITE_APP_COMMON_PATH="api/common"
 VITE_APP_ADMIN_PATH="api/admin"
+VITE_APP_USER_PATH="api/user"
 VITE_APP_USER_ROOT_URL=https://library-management-system-f9gh.onrender.com/api/user
-VITE_APP_USER_ROOT_URL_2=https://library-management-system-ce6z.onrender.com/api/user
+VITE_APP_GET_USER_DETAILS=profile/

package.json

@@ -27,6 +27,7 @@
     "bootstrap": "^5.3.3",
     "dayjs": "^1.11.11",
     "gh-pages": "^6.1.1",
+    "ag-grid-react": "^31.3.2",
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.3",
     "react-dom": "^18.2.0",
@@ -37,8 +38,6 @@
     "react-share": "^5.1.0",
     "react-slick": "^0.30.2",
     "react-toastify": "^10.0.5",
-    "react-whatsapp": "^0.3.0",
-    "react-whatsapp-button": "^2.0.0",
     "slick-carousel": "^1.8.1",
     "styled-components": "^6.1.11"
   },

src/App.css

@@ -1,42 +1,85 @@
-#root {
-  display: flex;
-  flex-direction: column;
-  flex-grow: 1;
-  /* width: fit-content; */
-}
-
-/*.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
-}
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
-}
-.logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafbaa);
-}
-
-@keyframes logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  a:nth-of-type(2) .logo {
-    animation: logo-spin infinite 20s linear;
-  }
-}
-
-.card {
-  padding: 2em;
-}
-
-.read-the-docs {
-  color: #888;
-}*/
+#root {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  width: fit-content;
+}
+
+/*.logo {
+  height: 6em;
+  padding: 1.5em;
+  will-change: filter;
+  transition: filter 300ms;
+}
+.logo:hover {
+  filter: drop-shadow(0 0 2em #646cffaa);
+}
+.logo.react:hover {
+  filter: drop-shadow(0 0 2em #61dafbaa);
+}
+
+@keyframes logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  a:nth-of-type(2) .logo {
+    animation: logo-spin infinite 20s linear;
+  }
+}
+
+.card {
+  padding: 2em;
+}
+
+.read-the-docs {
+  color: #888;
+}*/
+
+/* Headings with specified font sizes */
+
+.h1 {
+  font-size: 2vw;
+}
+
+.h2 {
+  font-size: 1.5vw;
+}
+
+.h3 {
+  font-size: 1.2vw;
+}
+
+.h4 {
+  font-size: 1vw;
+}
+
+.h5 {
+  font-size: 0.7vw;
+}
+
+/* Theme colors */
+.dark-theme {
+  background-color: #4F0C24;
+}
+
+.bold-theme {
+  color: #761236;
+}
+
+.light-primary {
+  background-color: #FAE6E6;
+}
+
+.light-secondary {
+  background-color: #F7E9FF;
+}
+
+.grey {
+  color: #666666;
+}

src/App.jsx

@@ -6,6 +6,9 @@ import './App.css'
 import 'bootstrap/dist/css/bootstrap.min.css'
 import { Toaster } from 'react-hot-toast';
 
+import { ToastContainer } from 'react-toastify';
+import 'react-toastify/dist/ReactToastify.css';
+
 
 import Books from './pages/user/Books_catalog/Books'
 
@@ -16,6 +19,18 @@ function App() {
         <BrowserRouter basename="/Library_Management_System">
           <Routers />
         </BrowserRouter>
+        <ToastContainer
+              position="top-right"
+              autoClose={5000}
+              hideProgressBar={false}
+              newestOnTop={false}
+              closeOnClick
+              rtl={false}
+              pauseOnFocusLoss
+              draggable
+              pauseOnHover
+              theme="light"
+              />
       </Provider>
       <Toaster/>
    </>

src/api/index.js

@@ -1,7 +1,12 @@
-import fetchUserDetails from "./fetchUserDetails";
-import updateUserDetails from "./updateUserDetails";
-import updateFavSubject from "./updateFavSubject";
-import getLibraryCards from "./getLibraryCards";
-import fetchWishListBook from "./fetchWishListBook";
-
-export { fetchUserDetails, updateUserDetails, updateFavSubject, getLibraryCards, fetchWishListBook };
+import axios from 'axios';
+
+const fetchUserDetails = async ( studentID ) => {
+    const userRootUrl = import.meta.env.VITE_APP_USER_ROOT_URL;
+    const getUserDetails = import.meta.env.VITE_APP_GET_USER_DETAILS;
+
+    const res = await axios.get( `${userRootUrl}/${getUserDetails}/${studentID}` );
+    console.log( res )
+    return res.data;
+}
+
+export { fetchUserDetails };

src/app/store.js

@@ -1,15 +1,11 @@
-import { configureStore } from '@reduxjs/toolkit';
-import { statsReducer, searchBookReducer, userSliceReducer,recomendedBookReducer } from '../features';
-import RelatedBookReducer from '../features/relatedBoolReducer/RelatedBookReducer';
-import ShowOverlayReducer from '../features/showOverlayReducer/ShowOverlayReducer'
-
-export const store = configureStore({
-  reducer: {
-    user: userSliceReducer,
-    stats: statsReducer,
-    relatedBookList: RelatedBookReducer,
-    recomendedBookList:recomendedBookReducer,
-    searchBookList: searchBookReducer,
-    showOverlay:ShowOverlayReducer,
-  },
-});
+import { configureStore } from '@reduxjs/toolkit';
+import { statsReducer, searchBookReducer } from '../features';
+import RelatedBookReducer from '../features/relatedBoolReducer/RelatedBookReducer';
+
+export const store = configureStore({
+  reducer: {
+    stats: statsReducer,
+    relatedBookList: RelatedBookReducer,
+    searchBookList: searchBookReducer,
+  },
+});

src/assets/style/style.css

@@ -0,0 +1,5 @@
+.horizontal-scroll-container {
+    overflow-x: auto;
+    margin-bottom: 15px;
+    position: relative;
+}

src/common_components/Navbar/Navbar.css

@@ -1,8 +1,8 @@
-.navbar {
-    @apply flex flex-col justify-start bg-gray-200 ml-4 mr-10 mb-8 pt-4 w-40 rounded-md text-base;
-}
-
-.navbar_title {
-    @apply text-2xl font-bold whitespace-nowrap;
-    color: #666666
-}
+.navbar {
+    @apply flex flex-col justify-start bg-gray-200 ml-4 mr-10 mb-8 pt-4 w-40 rounded-md text-base;
+}
+
+.navbar_title {
+    @apply text-2xl font-bold whitespace-nowrap;
+    color: #666666
+}