🚀 Release 5.3.0 (#116)

`Added` **forms-flow-service** - Added date and time service - Added resource bundle `Modified` **forms-flow-admin** - Modified user interface and improved user experience - Modified footer style **forms-flow-nav** - Modified navbar style **forms-flow-theme** - Modified CSS to SCSS and folder structure - Modified toast color override --------- Co-authored-by: abhilash-aot <[email protected]> Co-authored-by: abilpraju-aot <[email protected]> Co-authored-by: Josephalexantony-aot <[email protected]> Co-authored-by: Bonymol-aot <[email protected]> Co-authored-by: AbijithS-aot <[email protected]> Co-authored-by: Abil P Raju <[email protected]> Co-authored-by: Alex Antony <[email protected]> Co-authored-by: Bonymol Baby <[email protected]> Co-authored-by: fahad-aot <[email protected]> Co-authored-by: Abijith Sebastian <[email protected]> Co-authored-by: Ajay krishna <[email protected]> Co-authored-by: fahad-aot <[email protected]> Co-authored-by: Ajay-aot <[email protected]>
AOT-Technologies · Nov 24, 2023 · 862088c · 862088c
1 parent 28ea83a
commit 862088c
Show file tree

Hide file tree

Showing 55 changed files with 4,293 additions and 1,054 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,28 @@
 # Changelog for formsflow.ai
 
-Mark items as `Added`, `Changed`, `Fixed`, `Removed`, `Untested Features`, `Upcoming Features`, `Known Issues`
+Mark items as `Added`, `Changed`, `Fixed`, `Modified`, `Removed`, `Untested Features`, `Upcoming Features`, `Known Issues`
+
+## 5.3.0 - 2023-11-24
+
+`Added`
+
+**forms-flow-service**
+  - Added date and time service
+  - Added resource bundle 
+
+`Modified`
+
+**forms-flow-admin**
+ - Modified user interface and improved user experience 
+ - Modified footer style
+
+**forms-flow-nav**
+ - Modified navbar style
+
+**forms-flow-theme**
+ - Modified CSS to SCSS and folder structure
+ - Modified toast color override
+
 
 ## 5.2.0 - 2022-07-07
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v5.2.2
+v5.3.0
diff --git a/forms-flow-admin/package.json b/forms-flow-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@formsflow/admin",
-  "version": "5.2.1",
+  "version": "5.3.0",
   "scripts": {
     "start": "webpack serve",
     "start:standalone": "webpack serve --env standalone",

diff --git a/forms-flow-admin/src/components/dashboard/dashboard.tsx b/forms-flow-admin/src/components/dashboard/dashboard.tsx
@@ -185,13 +185,13 @@ export const InsightDashboard = React.memo((props: any) => {
       text: <Translation>{(t) => t("Access Groups")}</Translation>,
       formatter: (cell, rowData) => {
         return (
-          <div className="d-flex flex-wrap">
+          <div className="d-flex flex-wrap col-12">
             {cell?.map((label, i) => (
-              <div key={i} className="chip-element mr-2">
-                <span className="chip-label">
-                  {label}{" "}
+              <div key={i} className="d-flex align-items-center justify-content-between rounded-pill px-3 py-2 small m-2" style={{background:"#EAEFFF"}}>
+                <span className="">
+                  {label}
                   <i
-                    className="fa fa-close chip-close"
+                    className="fa-solid fa-xmark chip-close ml-2"
                     onClick={() => removeDashboardAuth(rowData, label)}
                   ></i>
                 </span>
@@ -240,10 +240,11 @@ export const InsightDashboard = React.memo((props: any) => {
             <Button
               data-testid={rowIdx}
               onClick={(e) => handleClick(e, rowData)}
-              className="btn btn-primary btn-md form-btn pull-left btn-left"
+              className="btn btn-primary"
               disabled={!isGroupUpdated}
             >
-              <Translation>{(t) => t("Add")}</Translation> <b>+</b>
+              <i className="fa-solid fa-plus mr-2"></i>
+              <Translation>{(t) => t("Add")}</Translation>  
             </Button>
           </OverlayTrigger>
         );
@@ -270,19 +271,19 @@ export const InsightDashboard = React.memo((props: any) => {
         value: 100,
       },
       {
-        text: "All",
+        text: t("All"),
         value: authDashBoardList.length
       },
     ];
     return list;
   };
 
   const customTotal = (from, to, size) => (
-    <span className="react-bootstrap-table-pagination-total" role="main">
+    <span className="ml-2" role="main">
       <Translation>{(t) => t("Showing")}</Translation> {from}{" "}
       <Translation>{(t) => t("to")}</Translation> {to}{" "}
       <Translation>{(t) => t("of")}</Translation> {size}{" "}
-      <Translation>{(t) => t("Results")}</Translation>
+      <Translation>{(t) => t("results")}</Translation>
     </span>
   );
 
@@ -298,7 +299,7 @@ export const InsightDashboard = React.memo((props: any) => {
 
   return (
     <>
-      <div className="container-admin" role="definition">
+      <div className="" role="definition">
         <br />
         <div>
           {!isLoading ? (
@@ -308,7 +309,7 @@ export const InsightDashboard = React.memo((props: any) => {
               columns={columns}
               pagination={pagination}
               bordered={false}
-              wrapperClasses="table-container-admin"
+              wrapperClasses="table-container-admin mb-3"
               rowStyle={{
                 color: "#09174A",
                 fontWeight: 600,

diff --git a/forms-flow-admin/src/components/dashboard/insightDashboard.scss b/forms-flow-admin/src/components/dashboard/insightDashboard.scss
@@ -4,52 +4,18 @@
     justify-content: space-between;
 }
 
-.chip-element{
-    border-radius: 100rem;
-	box-shadow: 0 0 0 2px rgb(217, 217, 217);
-    background-color: #EAEFFF;
-
-    .chip-label{
-        padding: 3px 6px 3px 10px;
-        display: flex;
-        align-items: center;
-        font-weight: 500;
-        justify-content: space-between;
-    }
-    .chip-close{
-        margin-left: 5px;
-        width: 20px;
-        height: 20px;
-        color: #393939;
-        font-weight: 100;
-        cursor: pointer;
-        display: inline-flex;
-        text-align: center;
-        align-items: center;
-        justify-content: center;
-
-    }
-}
+
 .table-container-admin{
-    min-height: 32rem;
-    margin-left: 3.938rem;
-    margin-right: 4.188rem !important;
-    padding-left: 1.938rem;
-    padding-right: 1.938rem;
+    min-height: 30rem;
     background: #FFFFFF;
     border: 1px solid #ECECEC;
     box-shadow: 0px 2px 8px rgba(66, 66, 66, 0.07);
     border-radius: 8px;
     max-height: 32rem;
     overflow-y: scroll;
 }
-.table-container-admin .table td{
-    padding-top: 1.5rem;
-    font-weight: 600;
-}
+
 .container-admin .react-bootstrap-table-pagination-list{
     margin-top: 1rem;
 } 
-.container-admin .react-bootstrap-table-pagination-total{
-    margin-left: 1rem;
-} 
+
diff --git a/forms-flow-admin/src/components/footer/footer.scss b/forms-flow-admin/src/components/footer/footer.scss
@@ -1,23 +0,0 @@
-
-.footer {
-  border-top: 2px solid #e8e8ee;
-  padding-bottom: 15px;
-  padding-top: 15px;
-  position: fixed;
-  background-color: white;
-  bottom: 0;
-  height: 2.3rem; /* Footer height */
-  width:100%;
-  z-index: 4;
-}
-.text-align{
-  bottom: 10px;
-}
-@media (max-width: 768px) {
-  .footer{
-    width:100% !important;
-  }
-}
-.footer-text{
-  font-size: 18px;
-}

diff --git a/forms-flow-admin/src/components/footer/footer.tsx b/forms-flow-admin/src/components/footer/footer.tsx
@@ -1,24 +1,21 @@
 import React from "react";
 import "./footer.scss";
-// import { version } from "../../../package.json";
+import packageInfo  from "../../../package.json";
 import { Translation } from "react-i18next";
 
-const version_org = "5.2.1";
+const version_org = packageInfo.version;
 const Footer = React.memo(() => {
-  //const today = new Date();
   return (
-    <div className="footer">
-      <div className="col-12 text-center text-align footer-text" role="main">
-        <Translation>{(t) => t("Powered by ")}</Translation>
-        <a
-          href="https://formsflow.ai"
-          target="_blank"
-          style={{ color: "#0000FF" }}
-          rel="noreferrer"
-        >
-           formsflow.ai 
-        </a>
-        {` v${version_org}`} {/*{today.getFullYear()}*/}
+    <div className="pl-md-3 pb-3">
+      <hr />
+      <div className="d-flex justify-content-end pb-2">
+        <div className="font-weight-bold">
+          <Translation>{(t) => t("Powered by ")}</Translation>{" "}
+          <a className="text-link" href="https://formsflow.ai/">
+            formsflow.ai
+          </a>
+          {` v${version_org}`}
+        </div>
       </div>
     </div>
   );

diff --git a/forms-flow-admin/src/components/roles/roles.scss b/forms-flow-admin/src/components/roles/roles.scss
@@ -1,9 +1,6 @@
 .table-container{
-    min-height: 28.125rem !important;
-    margin-left: 3.938rem;
-    margin-right: 4.188rem !important;
-    padding-left: 1.938rem;
-    padding-right: 1.938rem;
+    min-height: 24rem !important;
+
     background: #FFFFFF;
     border: 1px solid #ECECEC;
     box-shadow: 0px 2px 8px rgba(66, 66, 66, 0.07);
@@ -15,30 +12,16 @@
     color: #646464;
     border: none;
 }
-.table-container .table td{
-    padding-top: 1.563rem;
-    padding-bottom: 1.75rem;
-    font-weight: 600;
-}
+
 
 .search-role {
     width: 33.625rem !important;
     margin-bottom: 1.75rem;
     margin-top: 1.875rem;
     display: flex;
 }
-.sub-container{
-    margin-left: 3.938rem !important;
-    margin-right: 4.188rem;
-    padding-left: 1.938rem;
-    padding-right: 1.938rem;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-.btn-primary{
-    background-color: #2F45F3 !important;
-}
+
+
 .user-list{
     text-decoration: none;
     cursor: pointer;
@@ -66,8 +49,6 @@
 }
 .container-admin {
     .row{
-        margin-left: 2.98rem;
-        margin-right: 3.188rem;
         align-items: center;
     }
     tbody{
@@ -148,8 +129,5 @@
         white-space: nowrap;
         margin-top: 2px;
     }
-    .sub-container{
-        margin-left: 1rem !important;
-        margin-right: 2.188rem;
-    }
+
 }