contact page api added

bug fix
label color fixed
2025-01-24 21:15:16 +01:00 · 2025-01-24 16:03:50 +01:00 · 2025-01-24 15:08:43 +01:00 · 2025-01-24 12:40:05 +00:00 · 2025-01-24 13:38:47 +01:00 · 2025-01-23 20:17:08 +00:00
173 changed files with 4565 additions and 2094 deletions
@@ -1,7 +1,10 @@
 SKIP_PREFLIGHT_CHECK=true 
 REACT_APP_NODE_ENV="development"
 REACT_APP_SOCKET_URL="https://dev-socket.mermsemr.com"
-REACT_APP_MAIN_API="https://dev-api.mermsemr.com"
+REACT_APP_MAIN_API="https://devapi.mermsemr.com"
 REACT_APP_MEDIA_SERVER="https://dev-media.mermsemr.com"
+REACT_APP_MAIN_SOCKET="https://dev-socket.mermsemr.com"

+# Inactivity timeout/logout AT 10MINS
+REACT_APP_TIMEOUT=600000

@@ -1,6 +1,9 @@
 SKIP_PREFLIGHT_CHECK=true 
 REACT_APP_NODE_ENV="development"
 REACT_APP_SOCKET_URL="https://dev-socket.mermsemr.com"
-REACT_APP_MAIN_API="https://dev-api.mermsemr.com"
+REACT_APP_MAIN_API="https://devapi.mermsemr.com"
 REACT_APP_MEDIA_SERVER="https://dev-media.mermsemr.com"
+REACT_APP_MAIN_SOCKET="https://dev-socket.mermsemr.com"

+# Inactivity timeout/logout AT 10MINS
+REACT_APP_TIMEOUT=600000
@@ -3,3 +3,6 @@ REACT_APP_NODE_ENV="production"
 REACT_APP_SOCKET_URL="https://socket.mermsemr.com"
 REACT_APP_MAIN_API="https://api.mermsemr.com"
 REACT_APP_MEDIA_SERVER="https://media.mermsemr.com"
+
+# Inactivity timeout/logout AT 10MINS
+REACT_APP_TIMEOUT=600000
@@ -16,6 +16,7 @@ services:
      - ./:/usr/src/app
      - ./src/:/usr/src/app/src
      - ./run.sh:/usr/src/app/run.sh
+      - ./node_modules/:/usr/src/app/node_modules
    extra_hosts:
      - api.mermsemr.com:10.10.33.15
      - devapi.mermsemr.com:10.10.33.15
@@ -1,21 +1,35 @@
 {
-  "name": "samatze-com",
-  "version": "0.1.0",
+  "name": "merms-panel",
+  "version": "0.1.1",
  "private": true,
  "dependencies": {
+    "@fullcalendar/core": "^6.1.15",
+    "@fullcalendar/daygrid": "^6.1.15",
+    "@fullcalendar/interaction": "^6.1.15",
+    "@fullcalendar/react": "^6.1.15",
+    "@fullcalendar/timegrid": "^6.1.15",
+    "@popperjs/core": "^2.11.8",
+    "@reduxjs/toolkit": "^2.4.0",
+    "@tanstack/react-query": "^5.62.3",
    "@testing-library/jest-dom": "^5.17.0",
    "@testing-library/react": "^13.4.0",
    "@testing-library/user-event": "^13.5.0",
    "apexcharts": "^4.1.0",
+    "axios": "^1.7.9",
    "bootstrap": "^5.3.3",
+    "formik": "^2.4.6",
    "react": "^18.3.1",
    "react-apexcharts": "^1.7.0",
    "react-dom": "^18.3.1",
    "react-icons": "^5.4.0",
+    "react-redux": "^9.1.2",
    "react-router-dom": "^7.0.2",
    "react-scripts": "5.0.1",
+    "redux": "^5.0.1",
    "sass": "^1.82.0",
-    "web-vitals": "^2.1.4"
+    "socket.io-client": "^4.8.1",
+    "web-vitals": "^2.1.4",
+    "yup": "^1.6.0"
  },
  "scripts": {
    "start": "react-scripts start -e .env.development",
@@ -13,8 +13,19 @@
    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
    <title>MERMS-Panel</title>
  </head>
+  <!-- Google tag (gtag.js) -->
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-Y9QSQFV003"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', 'G-Y9QSQFV003');
+  </script>
  <body class="light-sidebar">
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <div id="root"></div>
  </body>
+  <!-- <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js" integrity="sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r" crossorigin="anonymous"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.min.js" integrity="sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy" crossorigin="anonymous"></script> -->
 </html>
@@ -1,38 +1,11 @@
-.App {
-  text-align: center;
+.custom-bg {
+  background-image: url('./assets/bg/bg_1.jpg') !important;
+  background-size: cover;
+  background-repeat: no-repeat;
 }

-.App-logo {
-  height: 40vmin;
-  pointer-events: none;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  .App-logo {
-    animation: App-logo-spin infinite 20s linear;
-  }
-}
-
-.App-header {
-  background-color: #282c34;
-  min-height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  font-size: calc(10px + 2vmin);
-  color: white;
-}
-
-.App-link {
-  color: #61dafb;
-}
-
-@keyframes App-logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
+.signup-bg {
+  background-image: url('./assets/bg/signup_bg.jpg') !important;
+  background-size: cover;
+  background-repeat: no-repeat;
+}
@@ -1,31 +1,24 @@
-import { Routes, Route } from 'react-router-dom';
-// import './App.css';
-
-import LoginPage from './views/LoginPage';
-import siteLinks from './links/siteLinks';
-import HomePage from './views/HomePage';
-import SignupPage from './views/SignupPage';
-import ForgetpwdPage from './views/ForgetpwdPage';
-import UserExist from './component/authorization/UserExist';
+import { QueryClientProvider, QueryClient } from '@tanstack/react-query'
+import AppRouters from './AppRouters';

+import './App.css';


 function App() {
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: {
+        refetchOnWindowFocus: false,
+        retry: 3,
+        // refetchOnMount: false,
+        staleTime: 3000
+      },
+    },
+  })
  return (
-    <div className="">
-      <Routes>
-        <Route path={siteLinks.home} element={<LoginPage />} />
-        <Route path={siteLinks.login} element={<LoginPage />} />
-        <Route path={siteLinks.signup} element={<SignupPage />} />
-        <Route path={siteLinks.forgetpwd} element={<ForgetpwdPage />} />
-        <Route path={siteLinks.error} element={<ForgetpwdPage />} />
-
-        {/* protected routes */}
-        <Route element={<UserExist />}> 
-          <Route path={siteLinks.dash} element={<HomePage />} />
-        </Route>
-      </Routes>
-    </div>
+    <QueryClientProvider client={queryClient}>
+      <AppRouters />
+    </QueryClientProvider>
  );
 }

@@ -0,0 +1,53 @@
+import { Routes, Route } from 'react-router-dom';
+
+import UserExist from './component/authorization/UserExist';
+import AuthLayout from './component/auth/AuthLayout';
+import siteLinks from './links/siteLinks';
+
+import LoginPage from './views/LoginPage';
+import SignupPage from './views/SignupPage';
+import ForgetpwdPage from './views/ForgetpwdPage';
+import HomePage from './views/HomePage';
+import ReportsPage from './views/ReportsPage'
+import CommentsPage from './views/CommentsPage'
+import ContactsPage from './views/ContactsPage'
+import UserPage from './views/UserPage'
+import CalendarPage from './views/CalendarPage'
+import SettingsPage from './views/SettingsPage'
+import ProductPage from './views/ProductPage'
+import SocketIOContextProvider from './component/context/SocketIOContext';
+import CSignupPage from './views/CSignupPage';
+
+function AppRouters() {
+  return (
+    <div className="">
+      <Routes>
+        {/* auth routes wrapper */}
+        <Route element={<AuthLayout />}>
+          <Route path={siteLinks.home} element={<LoginPage />} />
+          <Route path={siteLinks.login} element={<LoginPage />} />
+          <Route path={siteLinks.signup} element={<SignupPage />} />
+          <Route path={siteLinks.forgetpwd} element={<ForgetpwdPage />} />
+          <Route path={siteLinks.csignup} element={<CSignupPage />} />
+          <Route path={siteLinks.error} element={<LoginPage />} />
+        </Route>
+
+        {/* protected routes */}
+        <Route element={<SocketIOContextProvider />}>
+          <Route element={<UserExist />}> 
+            <Route path={siteLinks.dash} element={<HomePage />} />
+            <Route path={siteLinks.product} element={<ProductPage />} />
+            <Route path={siteLinks.reports} element={<ReportsPage />} />
+            <Route path={siteLinks.comments} element={<CommentsPage />} />
+            <Route path={siteLinks.contacts} element={<ContactsPage />} />
+            <Route path={siteLinks.user} element={<UserPage />} />
+            <Route path={siteLinks.calendar} element={<CalendarPage />} />
+            <Route path={siteLinks.settings} element={<SettingsPage />} />
+          </Route>
+        </Route>
+      </Routes>
+    </div>
+  );
+}
+
+export default AppRouters;
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="18" viewBox="0 0 548.29 548.291"><path d="M486.2 196.121h-13.164V132.59c0-.399-.064-.795-.116-1.2-.021-2.52-.824-5-2.551-6.96L364.656 3.677c-.031-.034-.064-.044-.085-.075-.629-.707-1.364-1.292-2.141-1.796a8.528 8.528 0 0 0-.704-.419 11.262 11.262 0 0 0-2.121-.893c-.199-.052-.377-.134-.576-.188-.8-.188-1.629-.306-2.467-.306H96.757C84.893 0 75.256 9.649 75.256 21.502v174.613H62.093c-16.972 0-30.733 13.756-30.733 30.73v159.81c0 16.966 13.761 30.736 30.733 30.736h13.163V526.79c0 11.854 9.637 21.501 21.501 21.501h354.777c11.853 0 21.502-9.647 21.502-21.501V417.392H486.2c16.966 0 30.729-13.764 30.729-30.731v-159.81c.001-16.979-13.763-30.73-30.729-30.73zM96.757 21.502H345.81v110.006c0 5.94 4.818 10.751 10.751 10.751h94.973v53.861H96.757V21.502zM258.618 313.18c-26.68-9.291-44.063-24.053-44.063-47.389 0-27.404 22.861-48.368 60.733-48.368 18.107 0 31.447 3.811 40.968 8.107l-8.09 29.3c-6.43-3.107-17.862-7.632-33.59-7.632-15.717 0-23.339 7.149-23.339 15.485 0 10.247 9.047 14.769 29.78 22.632 28.341 10.479 41.681 25.239 41.681 47.874 0 26.909-20.721 49.786-64.792 49.786-18.338 0-36.449-4.776-45.497-9.77l7.38-30.016c9.772 5.014 24.775 10.006 40.264 10.006 16.671 0 25.488-6.908 25.488-17.396-.005-10.01-7.632-15.721-26.923-22.619zM69.474 302.692c0-54.781 39.074-85.269 87.654-85.269 18.822 0 33.113 3.811 39.549 7.149l-7.392 28.816c-7.38-3.084-17.632-5.939-30.491-5.939-28.822 0-51.206 17.375-51.206 53.099 0 32.158 19.051 52.4 51.456 52.4 10.947 0 23.097-2.378 30.241-5.238l5.483 28.346c-6.672 3.34-21.674 6.919-41.208 6.919-55.5.001-84.086-34.551-84.086-80.283zm382.06 218.27H96.757v-103.57h354.777v103.57zm-24.016-140.379h-42.399l-51.45-160.536h39.787l19.526 67.894c5.479 19.046 10.479 37.386 14.299 57.397h.709c4.048-19.298 9.045-38.352 14.526-56.693l20.487-68.598h38.599l-54.084 160.536z" fill="#FFF"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="18" viewBox="0 0 548.291 548.291"><path d="M486.201 196.124h-13.166V132.59c0-.396-.062-.795-.115-1.196-.021-2.523-.825-5-2.552-6.963L364.657 3.677c-.033-.031-.064-.042-.085-.075-.63-.704-1.364-1.29-2.143-1.796-.229-.154-.461-.283-.702-.418a11.22 11.22 0 0 0-2.121-.892c-.2-.055-.379-.134-.577-.188A10.684 10.684 0 0 0 356.562 0H96.757C84.894 0 75.256 9.649 75.256 21.502v174.616H62.09c-16.968 0-30.729 13.753-30.729 30.73V386.66c0 16.961 13.761 30.731 30.729 30.731h13.166V526.79c0 11.854 9.638 21.501 21.501 21.501h354.776c11.853 0 21.501-9.647 21.501-21.501V417.392H486.2c16.966 0 30.729-13.764 30.729-30.731V226.854c.001-16.982-13.762-30.73-30.728-30.73zM96.757 21.502h249.054v110.006c0 5.943 4.817 10.751 10.751 10.751h94.972v53.864H96.757V21.502zm106.057 203.54h41.68l14.063 29.3c4.756 9.756 8.336 17.622 12.147 26.676h.48c3.798-10.242 6.9-17.392 10.95-26.676l13.587-29.3h41.449l-45.261 78.363 47.638 82.185H297.62l-14.525-29.06c-5.956-11.197-9.771-19.528-14.299-28.825h-.478c-3.334 9.297-7.381 17.628-12.381 28.825l-13.336 29.06h-41.455l46.455-81.224-44.787-79.324zM66.08 255.532v-30.489h123.382v30.489h-43.828v130.049H109.2V255.532H66.08zm385.454 265.43H96.757v-103.57h354.776v103.57zm20.23-265.43h-43.831v130.049h-36.442V255.532h-43.119v-30.489h123.393v30.489z" fill="#FFF"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="18" viewBox="0 0 550.801 550.801"><path d="M488.432 197.019h-13.226v-63.816c0-.398-.063-.799-.111-1.205-.021-2.531-.833-5.021-2.568-6.992L366.325 3.694c-.032-.031-.063-.042-.085-.076-.633-.707-1.371-1.295-2.151-1.804-.231-.155-.464-.285-.706-.422a11.325 11.325 0 0 0-2.131-.896c-.2-.053-.38-.135-.58-.188A10.828 10.828 0 0 0 358.193 0H97.2C85.282 0 75.6 9.693 75.6 21.601v175.413H62.377c-17.049 0-30.873 13.818-30.873 30.873v160.545c0 17.038 13.824 30.87 30.873 30.87h13.224V529.2c0 11.907 9.682 21.601 21.6 21.601h356.4c11.907 0 21.6-9.693 21.6-21.601V419.302h13.226c17.044 0 30.871-13.827 30.871-30.87v-160.54c-.001-17.06-13.818-30.873-30.866-30.873zM97.2 21.601h250.193v110.51c0 5.967 4.841 10.8 10.8 10.8H453.6v54.108H97.2V21.601zm242.362 332.743v31.324H236.509V220.704h37.46v133.64h65.593zM74.25 385.663l47.73-83.458-46.019-81.501h42.833l14.439 30.099c4.899 10.03 8.572 18.116 12.49 27.414h.483c3.926-10.529 7.101-17.872 11.259-27.414l13.954-30.099h42.588l-46.509 80.525 48.961 84.438h-43.081l-14.929-29.858c-6.115-11.507-10.036-20.07-14.684-29.615h-.49c-3.431 9.55-7.583 18.119-12.722 29.615l-13.711 29.858H74.25v-.004zm379.351 137.69H97.2V419.302h356.4v104.051zm-51.638-135.228c-18.837 0-37.446-4.904-46.738-10.04l7.578-30.839c10.04 5.136 25.46 10.283 41.375 10.283 17.139 0 26.188-7.099 26.188-17.867 0-10.283-7.831-16.157-27.659-23.256-27.411-9.55-45.282-24.722-45.282-48.718 0-28.15 23.498-49.684 62.427-49.684 18.594 0 32.305 3.927 42.093 8.322l-8.322 30.109c-6.607-3.186-18.361-7.834-34.509-7.834-16.152 0-23.983 7.338-23.983 15.913 0 10.525 9.291 15.18 30.591 23.258 29.125 10.769 42.836 25.936 42.836 49.191-.013 27.664-21.301 51.162-66.595 51.162z" fill="#FFF"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="18" viewBox="0 0 548.291 548.291"><path d="M486.206 196.121H473.04v-63.525c0-.396-.062-.795-.109-1.2-.021-2.52-.829-4.997-2.556-6.96L364.657 3.677c-.033-.031-.064-.042-.085-.075-.63-.704-1.364-1.29-2.143-1.796-.229-.154-.461-.283-.702-.419a11.29 11.29 0 0 0-2.121-.893c-.2-.052-.379-.134-.577-.186A10.684 10.684 0 0 0 356.562 0H96.757C84.894 0 75.256 9.649 75.256 21.502v174.613H62.092c-16.971 0-30.732 13.756-30.732 30.733V386.66c0 16.961 13.761 30.731 30.732 30.731h13.164V526.79c0 11.854 9.638 21.501 21.501 21.501h354.776c11.853 0 21.501-9.647 21.501-21.501V417.392H486.2c16.966 0 30.729-13.764 30.729-30.731V226.854c.001-16.982-13.753-30.733-30.723-30.733zM96.757 21.502h249.054v110.006c0 5.94 4.817 10.751 10.751 10.751h94.972v53.861H96.757V21.502zm217.819 293.159c-21.124-7.359-34.908-19.045-34.908-37.544 0-21.698 18.11-38.297 48.116-38.297 14.331 0 24.903 3.014 32.442 6.413l-6.411 23.2c-5.091-2.446-14.146-6.037-26.598-6.037s-18.488 5.662-18.488 12.266c0 8.115 7.171 11.696 23.58 17.921 22.446 8.305 33.013 20 33.013 37.921 0 21.323-16.415 39.435-51.318 39.435-14.524 0-28.861-3.769-36.031-7.737l5.843-23.77c7.738 3.958 19.627 7.927 31.885 7.927 13.218 0 20.188-5.47 20.188-13.774.005-7.918-6.031-12.455-21.313-17.924zM265.917 343.9v24.157h-79.439V240.882h28.877V343.9h50.562zm-171.68 24.157H61.411l36.788-64.353-35.473-62.827h33.021l11.125 23.21c3.774 7.736 6.606 13.954 9.628 21.135h.367c3.027-8.115 5.477-13.775 8.675-21.135l10.756-23.21h32.827l-35.848 62.066 37.74 65.103h-33.202L126.3 345.024c-4.709-8.855-7.73-15.465-11.316-22.824h-.375c-2.645 7.359-5.845 13.969-9.811 22.824l-10.561 23.033zm357.297 152.911H96.757V417.392h354.776v103.576zm.194-152.911l-11.512-23.022c-4.715-8.863-7.733-15.465-11.319-22.825h-.366c-2.646 7.36-5.858 13.962-9.827 22.825l-10.551 23.022h-32.836l36.788-64.353-35.471-62.827h33.02l11.139 23.21c3.77 7.736 6.593 13.954 9.618 21.135h.377c3.013-8.115 5.459-13.775 8.671-21.135l10.752-23.21h32.835l-35.849 62.066 37.733 65.103h-33.202v.011z" fill="#FFF"/></svg>
@@ -0,0 +1 @@
+<svg class="lds-typing" width="200" height="200" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" style="background:0 0"><circle cx="27.5" cy="62.5" r="5" fill="#3be8b0"><animate attributeName="cy" calcMode="spline" keySplines="0 0.5 0.5 1;0.5 0 1 0.5;0.5 0.5 0.5 0.5" repeatCount="indefinite" values="62.5;37.5;62.5;62.5" keyTimes="0;0.25;0.5;1" dur="1s" begin="-0.5s"/></circle><circle cx="42.5" cy="62.5" r="5" fill="#1aafd0"><animate attributeName="cy" calcMode="spline" keySplines="0 0.5 0.5 1;0.5 0 1 0.5;0.5 0.5 0.5 0.5" repeatCount="indefinite" values="62.5;37.5;62.5;62.5" keyTimes="0;0.25;0.5;1" dur="1s" begin="-0.375s"/></circle><circle cx="57.5" cy="51.068" r="5" fill="#6a67ce"><animate attributeName="cy" calcMode="spline" keySplines="0 0.5 0.5 1;0.5 0 1 0.5;0.5 0.5 0.5 0.5" repeatCount="indefinite" values="62.5;37.5;62.5;62.5" keyTimes="0;0.25;0.5;1" dur="1s" begin="-0.25s"/></circle><circle cx="72.5" cy="39.642" r="5" fill="#ffb900"><animate attributeName="cy" calcMode="spline" keySplines="0 0.5 0.5 1;0.5 0 1 0.5;0.5 0.5 0.5 0.5" repeatCount="indefinite" values="62.5;37.5;62.5;62.5" keyTimes="0;0.25;0.5;1" dur="1s" begin="-0.125s"/></circle></svg>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
victorAnumudu	4505a6fbcd	contact page api added	2025-01-24 21:15:16 +01:00
victorAnumudu	4367364d4f	bug fix	2025-01-24 16:03:50 +01:00
victorAnumudu	b2b0bf8af6	label color fixed	2025-01-24 15:08:43 +01:00
victor.ebuka	fcde22d4cb	Merge branch 'calendar_filtering' of MERMS/MermsPanelReactJS into master	2025-01-24 12:40:05 +00:00
victorAnumudu	56125b427d	calendar filtering started	2025-01-24 13:38:47 +01:00
victor.ebuka	16066d030b	Merge branch 'scroll-fix' of MERMS/MermsPanelReactJS into master	2025-01-23 20:17:08 +00:00
victorAnumudu	b6c79303ae	contact scroll bar fixed	2025-01-23 21:13:29 +01:00
victor.ebuka	ada406eb3f	Merge branch 'promotion-api-query-update' of MERMS/MermsPanelReactJS into master	2025-01-23 17:24:18 +00:00
victorAnumudu	9479be61f1	header link fixed	2025-01-23 18:22:50 +01:00
victorAnumudu	9c8405cf1c	Merge master into promotion-api-query-update	2025-01-23 18:18:52 +01:00
victorAnumudu	92ddea329d	product subscription uid added	2025-01-23 18:18:00 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	a79ab63163	Removed waste	2025-01-23 11:20:25 -05:00
victor.ebuka	d7fce908cc	Merge branch 'calendar-api' of MERMS/MermsPanelReactJS into master	2025-01-21 20:16:54 +00:00
victorAnumudu	1708cb893f	started calendar api integration	2025-01-21 21:14:03 +01:00
ameye	7ec139c5ad	Merge branch 'auth-page-centralized' of MERMS/MermsPanelReactJS into master	2025-01-20 18:35:46 +00:00
ameye	03d395560a	Merge branch 'section-removal' of MERMS/MermsPanelReactJS into master	2025-01-20 18:35:41 +00:00
victorAnumudu	fa234a7fae	auth page centralized	2025-01-20 18:46:36 +01:00
victorAnumudu	b869b76602	removed sections not needed	2025-01-20 17:12:52 +01:00
ameye	6f38611606	Merge branch 'confirm-bug' of MERMS/MermsPanelReactJS into master	2025-01-20 12:07:41 +00:00
victorAnumudu	37774c0aa3	bug commented	2025-01-20 13:02:31 +01:00
victor.ebuka	373956da39	Merge branch 'master-bootstrap' of MERMS/MermsPanelReactJS into master	2025-01-20 05:17:17 +00:00
victorAnumudu	cd7e6fdf75	calendar fixing contd	2025-01-20 06:15:11 +01:00
victorAnumudu	d1d6c6a9fc	calendar fix contd	2025-01-19 07:14:46 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	e8123bc898	node_modules	2025-01-18 11:22:33 -05:00
victor.ebuka	4bcbdc5a12	Merge branch 'calendar-fix-start' of MERMS/MermsPanelReactJS into master-bootstrap	2025-01-17 23:05:00 +00:00
victorAnumudu	b5d0fc5564	calendar fix contd	2025-01-18 00:03:20 +01:00
victor.ebuka	5c68c5a51b	Merge branch 'calendar-fix-start' of MERMS/MermsPanelReactJS into master-bootstrap	2025-01-17 22:26:00 +00:00
victorAnumudu	0e2f5f6760	calendar fix unused fxn commented	2025-01-17 23:23:51 +01:00
victorAnumudu	7d7a15e386	calendar fix started	2025-01-17 23:21:38 +01:00
victorAnumudu	4079d27017	drop down fix	2025-01-17 10:38:21 +01:00
victorAnumudu	ca0274aeb1	product API refetched on modal close	2025-01-15 10:30:11 +01:00
victorAnumudu	29efac554e	min height added to payment box	2025-01-14 18:00:29 +01:00
victorAnumudu	83a8b3234c	subscription auto reload started	2025-01-14 08:49:43 +01:00
victorAnumudu	bdf3f5c9a0	refresh promotion socket event added	2025-01-13 20:07:26 +01:00
victorAnumudu	6ac8c41221	joining promotion room added	2025-01-13 17:40:26 +01:00
victorAnumudu	950eb72051	product provision list fixed	2025-01-13 12:11:13 +01:00
victorAnumudu	098f59a929	my product provision API added	2025-01-13 11:05:59 +01:00
victorAnumudu	484d872699	Merge with master-bootstrap	2025-01-13 09:40:05 +01:00
victorAnumudu	69cecd2c39	date and status fixed	2025-01-13 09:35:10 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	c4521914fe	URL fix	2025-01-12 16:56:43 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	33edb1b59f	product additions	2025-01-12 12:21:10 -05:00
victorAnumudu	4d71547c94	date style fixed	2025-01-12 05:27:34 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	656e3fd24a	added image	2025-01-10 11:55:16 -05:00
victorAnumudu	8d9eabe877	product uid changed to product id	2025-01-10 13:25:00 +01:00
victorAnumudu	e15fa4ddd0	adding complete registration endpoint started	2025-01-07 23:48:56 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	5b0f79bba5	Clear data	2025-01-06 13:39:04 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	7d3ec88c1b	Clean app part show	2025-01-05 20:13:43 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	68c4bbbca7	New active [product page	2025-01-05 17:50:39 -05:00
victorAnumudu	a60a18dce8	menu drop down fix	2025-01-03 21:17:46 +01:00
victorAnumudu	27e30c1e34	dropdown fix started	2025-01-02 10:33:34 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	1a2d137f12	Settings page	2024-12-31 09:01:26 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	0dfae27896	Users layout	2024-12-31 08:51:43 -05:00
victorAnumudu	f64e188598	signup bg size fixed	2024-12-31 14:38:47 +01:00
victorAnumudu	9011a83259	subscribe api bug fix	2024-12-31 14:33:11 +01:00
victorAnumudu	3f9157c812	removal of unwanted logs	2024-12-31 10:32:08 +01:00
victorAnumudu	1bcd26e602	subscribe api added	2024-12-31 10:25:51 +01:00
victorAnumudu	46621f60c0	added select country in complete signup page	2024-12-30 19:17:52 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	10c8636bd7	Sub scribrr button	2024-12-30 11:35:42 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	6814957c2e	Procuct ready select	2024-12-30 11:17:19 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	603bac7b21	Product updates	2024-12-30 07:46:34 -05:00
ameye	397eb7c88b	Merge branch 'master-bootstrap' of MERMS/MermsPanelReactJS into master	2024-12-27 23:51:45 +00:00
victorAnumudu	bd0e5bcb91	signup bg added	2024-12-27 13:53:39 +01:00
victorAnumudu	714221fa3c	new signup bg added to assets folder	2024-12-27 12:35:53 +01:00
victorAnumudu	caa60f541d	complete signup dummy page added	2024-12-26 19:52:16 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	912b287f6e	increae app button size	2024-12-25 15:34:29 -05:00
victorAnumudu	c79527ef26	bg fix	2024-12-22 16:42:16 +01:00
victorAnumudu	3680abbef2	action refresh fixed	2024-12-21 23:28:06 +01:00
victorAnumudu	4e86fba581	Merge remote branch 'master-bootstrap' master-bootstrap	2024-12-21 21:40:04 +01:00
victorAnumudu	688705d126	action data refresh	2024-12-21 21:38:25 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	8ac04f2380	Joned one more room	2024-12-21 12:22:57 -05:00
victorAnumudu	110dca142f	modal added	2024-12-21 09:03:55 +01:00
victorAnumudu	97f8b9b716	referesh on logout implemented	2024-12-18 21:35:46 +01:00
victorAnumudu	a62aea19d8	socket context added	2024-12-18 21:17:03 +01:00
victorAnumudu	592229b172	fixing calendar issues	2024-12-18 17:41:10 +01:00
victorAnumudu	bd28971de0	fixing calendar issues	2024-12-18 16:37:04 +01:00
victorAnumudu	3c046c90d7	fixing calendar issues	2024-12-18 16:36:22 +01:00
victorAnumudu	60b827ffc5	calendar fixing	2024-12-18 16:24:51 +01:00
victorAnumudu	dc0f40dd15	calendar fixing update	2024-12-18 15:57:31 +01:00
victorAnumudu	319b9d04aa	calendar fix	2024-12-18 14:12:45 +01:00
victorAnumudu	b6886956c9	Merge branch 'master-bootstrap' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS into master-bootstrap	2024-12-18 09:45:25 +01:00
victorAnumudu	99975fef23	socket package added	2024-12-18 09:43:54 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	c32dfc7b6b	Merge branch 'master-bootstrap' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS into master-bootstrap	2024-12-18 03:25:52 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	30b7648ae0	Fix text	2024-12-18 03:21:50 -05:00
victorAnumudu	e640b6686e	Merge branch 'master-bootstrap' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS into master-bootstrap	2024-12-18 09:19:58 +01:00
victorAnumudu	d0e7bb7207	added reset PWD API	2024-12-18 09:18:39 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	0ca2cd9cc2	Added scoket config	2024-12-18 01:53:07 -05:00
victorAnumudu	c8cfea9db6	rounded edges added	2024-12-18 07:06:33 +01:00
victorAnumudu	a025f0960c	partly implemented login remember me	2024-12-17 18:55:43 +01:00
victorAnumudu	5a6fd30d39	terms and policy check implemented	2024-12-17 18:23:01 +01:00
victorAnumudu	947e068c6c	input label font weight increased	2024-12-17 16:37:44 +01:00
victorAnumudu	2ce0005667	input label font weight increased	2024-12-17 16:36:03 +01:00
victorAnumudu	75d570ef6a	started calendar styling	2024-12-17 15:35:08 +01:00
victorAnumudu	a364269547	signup api added	2024-12-17 13:56:00 +01:00
victorAnumudu	f6e714ed4b	login input label font color updated	2024-12-17 13:25:17 +01:00
victorAnumudu	4258e1a615	formik package added	2024-12-17 09:36:25 +01:00
victorAnumudu	61c50c03e4	calendar component added	2024-12-17 02:57:53 +01:00
victorAnumudu	263fec36c5	added add new event modal	2024-12-17 00:15:13 +01:00
victorAnumudu	e0c41d1e02	background image added	2024-12-16 13:27:27 +01:00
victorAnumudu	eaba0f7088	app download icons added	2024-12-16 08:57:42 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	e3c7f1002f	fix upper text	2024-12-15 20:40:31 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	7bcd2bd05a	product_name	2024-12-15 19:46:36 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	530631dac2	Fix texts	2024-12-15 19:26:32 -05:00
victorAnumudu	fe114433ff	product url added	2024-12-15 07:34:38 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	0fbadd5b68	fix style	2024-12-14 13:27:26 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	3fc9949023	Product page	2024-12-14 12:58:32 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	82ee55800a	product path	2024-12-14 11:57:57 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	d4366b39a6	product page	2024-12-14 10:55:29 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	4ba259dcce	Added page	2024-12-13 21:23:52 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	a3cf18b96a	Commnent page	2024-12-13 17:05:41 -05:00
victorAnumudu	a62ee8aedc	Merge branch 'master-bootstrap' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS into master-bootstrap	2024-12-13 19:22:27 +01:00
victorAnumudu	71f3c7bcd6	top bar contents updated	2024-12-13 19:20:20 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	902aebd560	page fillers	2024-12-13 13:19:39 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	1f07d92aae	clean up	2024-12-13 12:03:17 -05:00
victorAnumudu	2cf501dd2e	added products API	2024-12-12 22:01:19 +01:00
victorAnumudu	03af1d8887	actions API fixed	2024-12-12 21:30:41 +01:00
victorAnumudu	26bb5d0d11	added retry count to global react-query setup	2024-12-12 19:56:11 +01:00
victorAnumudu	94d8e9f0ef	recent action API added	2024-12-12 19:38:44 +01:00
victorAnumudu	bf41d91640	background updated	2024-12-12 19:04:40 +01:00
victorAnumudu	c81b1061d3	bug fix	2024-12-12 11:40:39 +01:00
victorAnumudu	ff7e1d9b3e	user header name added	2024-12-11 21:56:41 +01:00
victorAnumudu	b3dab25fa9	accout dash API fix	2024-12-11 20:47:25 +01:00
victorAnumudu	ccebcb04ee	dashboard API added	2024-12-11 19:03:57 +01:00
victorAnumudu	1b3b2c3eae	services file updated	2024-12-11 17:10:27 +01:00
victorAnumudu	5fbb9e2302	login btn alignment adjusted	2024-12-10 20:02:19 +01:00
victorAnumudu	2aa95b5661	throws error on empty login details	2024-12-10 12:38:50 +01:00
victorAnumudu	c47efaaadc	logout function added	2024-12-10 10:37:43 +01:00
victorAnumudu	70d0691f71	login API added	2024-12-09 17:55:09 +01:00
victorAnumudu	5e7d1672b9	added site logo	2024-12-09 06:29:27 +01:00
victorAnumudu	3041e3e748	mobile sidebar toggle fixed	2024-12-08 07:52:21 +01:00
victorAnumudu	7bad07b692	mobile user image toggle fixed	2024-12-07 13:00:14 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	0a316ac997	fix section	2024-12-07 06:27:29 -05:00
victorAnumudu	ef782d25a0	Merge branch 'master-bootstrap' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS into master-bootstrap	2024-12-07 07:22:05 +01:00
victorAnumudu	943818aafa	drop down fix	2024-12-07 07:10:08 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	a1ee2d9470	Fix text	2024-12-06 23:30:13 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	61cc2d01d0	Description	2024-12-06 22:57:19 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	79f3f7542d	fix page	2024-12-06 22:52:44 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	c8bf4069fc	Products lists	2024-12-06 22:00:48 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	73ca831e1a	added elsments	2024-12-06 21:45:43 -05:00
tokslaw	0f0a674fea	Merge branch 'master-bootstrap' of MERMS/MermsPanelReactJS into master	2024-12-06 18:33:29 +00:00
victor.ebuka	8c1f081c90	Merge branch 'dummy_pages' of MERMS/MermsPanelReactJS into master-bootstrap	2024-12-06 17:47:14 +00:00
victorAnumudu	8d2731cee0	added pages	2024-12-06 18:45:44 +01:00
victorAnumudu	19d816ba5c	path bug fixed	2024-12-06 15:36:53 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	bee3edfce3	fix	2024-12-06 09:14:24 -05:00
victorAnumudu	7d17232136	bug fix	2024-12-06 14:28:20 +01:00
victorAnumudu	ac5efd2dcd	notification blink	2024-12-06 13:33:42 +01:00
victorAnumudu	3be8663510	nav image fix	2024-12-06 13:27:37 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	07456579b9	change text in footer	2024-12-06 06:29:43 -05:00
victorAnumudu	1839cb4398	map list key added	2024-12-06 10:29:52 +01:00
victorAnumudu	387b985946	aside bar inner menu drop down fixed	2024-12-06 09:43:04 +01:00
victorAnumudu	4b63384092	auth layout fix	2024-12-06 09:08:54 +01:00
victorAnumudu	53726ad8eb	layout component started	2024-12-06 03:53:30 +01:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	cab73be4d0	header cleanup	2024-12-05 20:00:01 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	19ae527808	fix text	2024-12-05 19:41:37 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	7f24514a47	menu fix	2024-12-05 19:20:06 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	fa7c867b5e	fav icons added	2024-12-05 16:52:53 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	f573730595	Clean sections	2024-12-05 16:34:08 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	e41696bca5	fix page	2024-12-05 16:14:46 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	434ef8c9db	loader image apart	2024-12-05 14:54:38 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	09e6ced70a	Merge branch 'master-bootstrap' of https://gitlab.chiefsoft.net/MERMS/MermsPanelReactJS into master-bootstrap	2024-12-05 14:42:08 -05:00
$CHIEFSOFT\ameye$ CHIEFSOFT\ameye	942013dfb6	added parts	2024-12-05 14:41:33 -05:00
victor.ebuka	8ad12b4978	Merge branch 'auth_pages' of MERMS/MermsPanelReactJS into master-bootstrap	2024-12-05 18:40:19 +00:00
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="16" height="18" viewBox="0 0 548.29 548.291"><path d="M486.2 196.121h-13.164V132.59c0-.399-.064-.795-.116-1.2-.021-2.52-.824-5-2.551-6.96L364.656 3.677c-.031-.034-.064-.044-.085-.075-.629-.707-1.364-1.292-2.141-1.796a8.528 8.528 0 0 0-.704-.419 11.262 11.262 0 0 0-2.121-.893c-.199-.052-.377-.134-.576-.188-.8-.188-1.629-.306-2.467-.306H96.757C84.893 0 75.256 9.649 75.256 21.502v174.613H62.093c-16.972 0-30.733 13.756-30.733 30.73v159.81c0 16.966 13.761 30.736 30.733 30.736h13.163V526.79c0 11.854 9.637 21.501 21.501 21.501h354.777c11.853 0 21.502-9.647 21.502-21.501V417.392H486.2c16.966 0 30.729-13.764 30.729-30.731v-159.81c.001-16.979-13.763-30.73-30.729-30.73zM96.757 21.502H345.81v110.006c0 5.94 4.818 10.751 10.751 10.751h94.973v53.861H96.757V21.502zM258.618 313.18c-26.68-9.291-44.063-24.053-44.063-47.389 0-27.404 22.861-48.368 60.733-48.368 18.107 0 31.447 3.811 40.968 8.107l-8.09 29.3c-6.43-3.107-17.862-7.632-33.59-7.632-15.717 0-23.339 7.149-23.339 15.485 0 10.247 9.047 14.769 29.78 22.632 28.341 10.479 41.681 25.239 41.681 47.874 0 26.909-20.721 49.786-64.792 49.786-18.338 0-36.449-4.776-45.497-9.77l7.38-30.016c9.772 5.014 24.775 10.006 40.264 10.006 16.671 0 25.488-6.908 25.488-17.396-.005-10.01-7.632-15.721-26.923-22.619zM69.474 302.692c0-54.781 39.074-85.269 87.654-85.269 18.822 0 33.113 3.811 39.549 7.149l-7.392 28.816c-7.38-3.084-17.632-5.939-30.491-5.939-28.822 0-51.206 17.375-51.206 53.099 0 32.158 19.051 52.4 51.456 52.4 10.947 0 23.097-2.378 30.241-5.238l5.483 28.346c-6.672 3.34-21.674 6.919-41.208 6.919-55.5.001-84.086-34.551-84.086-80.283zm382.06 218.27H96.757v-103.57h354.777v103.57zm-24.016-140.379h-42.399l-51.45-160.536h39.787l19.526 67.894c5.479 19.046 10.479 37.386 14.299 57.397h.709c4.048-19.298 9.045-38.352 14.526-56.693l20.487-68.598h38.599l-54.084 160.536z" fill="#FFF"/></svg>
				`@@ -0,0 +1 @@`
				<svg class="lds-typing" width="200" height="200" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" style="background:0 0"><circle cx="27.5" cy="62.5" r="5" fill="#3be8b0"><animate attributeName="cy" calcMode="spline" keySplines="0 0.5 0.5 1;0.5 0 1 0.5;0.5 0.5 0.5 0.5" repeatCount="indefinite" values="62.5;37.5;62.5;62.5" keyTimes="0;0.25;0.5;1" dur="1s" begin="-0.5s"/></circle><circle cx="42.5" cy="62.5" r="5" fill="#1aafd0"><animate attributeName="cy" calcMode="spline" keySplines="0 0.5 0.5 1;0.5 0 1 0.5;0.5 0.5 0.5 0.5" repeatCount="indefinite" values="62.5;37.5;62.5;62.5" keyTimes="0;0.25;0.5;1" dur="1s" begin="-0.375s"/></circle><circle cx="57.5" cy="51.068" r="5" fill="#6a67ce"><animate attributeName="cy" calcMode="spline" keySplines="0 0.5 0.5 1;0.5 0 1 0.5;0.5 0.5 0.5 0.5" repeatCount="indefinite" values="62.5;37.5;62.5;62.5" keyTimes="0;0.25;0.5;1" dur="1s" begin="-0.25s"/></circle><circle cx="72.5" cy="39.642" r="5" fill="#ffb900"><animate attributeName="cy" calcMode="spline" keySplines="0 0.5 0.5 1;0.5 0 1 0.5;0.5 0.5 0.5 0.5" repeatCount="indefinite" values="62.5;37.5;62.5;62.5" keyTimes="0;0.25;0.5;1" dur="1s" begin="-0.125s"/></circle></svg>