From ebda980c126e0d5a61e7ad3414a2f45018dac90b Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Mon, 16 Oct 2023 13:25:46 -0700 Subject: [PATCH 01/20] Removed container class override and #main and reset the alignment --- forms-flow-theme/src/global.css | 49 ++++++++++++--------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/forms-flow-theme/src/global.css b/forms-flow-theme/src/global.css index daa97ce7..52d4d9d3 100644 --- a/forms-flow-theme/src/global.css +++ b/forms-flow-theme/src/global.css @@ -47,21 +47,9 @@ --navbar-logo-path: var(--logo-path); } + -.container, -.container-sm, -.container-md, -.container-lg, -.container-xl { - max-width: 100vw; -} - -.container { - margin-top: 3px; - padding-left: 0; - padding-right: 0; - height: 100%; -} + .overflow-x-auto { overflow-x: auto; @@ -121,13 +109,7 @@ h4 { font-size: 1.2rem; } - -#main { - min-height: 84vh; - padding-bottom: 1.5rem; - overflow-x: hidden; - overflow-y: auto; -} + body { font-size: 16px; @@ -135,6 +117,15 @@ body { overflow: hidden; } +.main-container{ + max-height: calc(100vh - 59px); + overflow-y: auto; +} + +.min-hightcontainer{ + min-height: calc(100vh - 164px); +} + .loader-container { display: flex; height: 80vh; @@ -508,20 +499,12 @@ select option:hover { margin: 8.75rem auto !important; } -#main { - background-color: #fff; - padding: 10px; - box-shadow: 0 3px 3px -2px rgba(0, 0, 0, 0.2), - 0px 3px 4px 0px rgba(0, 0, 0, 0.14), 0px 1px 8px 0px rgba(0, 0, 0, 0.12); -} + #sidebar { background: #fff; } - -.content { - background-color: #f8f8f8; -} + #sidebar ul li.active>a, #sidebar a[aria-expanded="true"] { @@ -804,4 +787,8 @@ div.upload input[type="file"] { flex-direction: row; flex-wrap: wrap; } +} + +hr { + border-top: 2px solid rgba(0,0,0,.1); } \ No newline at end of file From 84f665e378d338cb9447f88ba8e2435aeab6a729 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Mon, 16 Oct 2023 13:30:29 -0700 Subject: [PATCH 02/20] admin footer changed --- .../src/components/footer/footer.scss | 23 --------------- .../src/components/footer/footer.tsx | 28 ++++++++----------- 2 files changed, 12 insertions(+), 39 deletions(-) diff --git a/forms-flow-admin/src/components/footer/footer.scss b/forms-flow-admin/src/components/footer/footer.scss index b709efc6..e69de29b 100644 --- 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; -} \ No newline at end of file diff --git a/forms-flow-admin/src/components/footer/footer.tsx b/forms-flow-admin/src/components/footer/footer.tsx index 4f46735b..9b714749 100644 --- a/forms-flow-admin/src/components/footer/footer.tsx +++ b/forms-flow-admin/src/components/footer/footer.tsx @@ -1,25 +1,21 @@ import React from "react"; import "./footer.scss"; -import Package from "../../../package.json"; +import { version } from "../../../package.json"; import { Translation } from "react-i18next"; -const version_org = "5.3.0-alpha"; +const version_org = version; const Footer = React.memo(() => { - //const today = new Date(); - return ( -
-
- {(t) => t("Powered by ")} - - formsflow.ai - - {` v${Package.version}`} {/*{today.getFullYear()}*/} +
+
+
+
+ {(t) => t("Powered by ")}{" "} + + formflow.ai + + {` v${version_org}`} +
); From 15f0d45ee32638bc656631d0e003b670a0c95cd8 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Tue, 17 Oct 2023 22:22:37 -0700 Subject: [PATCH 03/20] contianer max size added for 1400 pixel --- forms-flow-theme/src/bootstrapOverride.css | 5 +++++ forms-flow-theme/src/global.css | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 forms-flow-theme/src/bootstrapOverride.css diff --git a/forms-flow-theme/src/bootstrapOverride.css b/forms-flow-theme/src/bootstrapOverride.css new file mode 100644 index 00000000..b7555030 --- /dev/null +++ b/forms-flow-theme/src/bootstrapOverride.css @@ -0,0 +1,5 @@ +@media (min-width: 1400px) { + .container { + max-width: 1320px; + } +} \ No newline at end of file diff --git a/forms-flow-theme/src/global.css b/forms-flow-theme/src/global.css index 52d4d9d3..bb755a25 100644 --- a/forms-flow-theme/src/global.css +++ b/forms-flow-theme/src/global.css @@ -1,3 +1,4 @@ +@import url("./bootstrapOverride.css"); :root { --color-primary: #0072ed; --color-secondary: #6c757d; @@ -48,9 +49,6 @@ --navbar-logo-path: var(--logo-path); } - - - .overflow-x-auto { overflow-x: auto; overflow-y: hidden; From 7633d6b1fb707ad384acca759b4a68f67dafbe21 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Mon, 23 Oct 2023 23:12:25 -0700 Subject: [PATCH 04/20] Added design-changes branch into cd for developing --- .github/workflows/forms-flow-admin-cd.yml | 1 + .github/workflows/forms-flow-nav.cd.yml | 1 + .github/workflows/forms-flow-service.yml | 1 + .github/workflows/forms-flow-theme.yml | 1 + VERSION | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/forms-flow-admin-cd.yml b/.github/workflows/forms-flow-admin-cd.yml index d99fd6bc..5ace6916 100644 --- a/.github/workflows/forms-flow-admin-cd.yml +++ b/.github/workflows/forms-flow-admin-cd.yml @@ -6,6 +6,7 @@ on: - main - develop - release/* + - design-changes-5.3.0 paths: - "forms-flow-admin/**" - "VERSION" diff --git a/.github/workflows/forms-flow-nav.cd.yml b/.github/workflows/forms-flow-nav.cd.yml index d157d4fa..bd5d4295 100644 --- a/.github/workflows/forms-flow-nav.cd.yml +++ b/.github/workflows/forms-flow-nav.cd.yml @@ -6,6 +6,7 @@ on: - main - develop - release/* + - design-changes-5.3.0 paths: - "forms-flow-nav/**" - "VERSION" diff --git a/.github/workflows/forms-flow-service.yml b/.github/workflows/forms-flow-service.yml index 9bf4596a..07a65afe 100644 --- a/.github/workflows/forms-flow-service.yml +++ b/.github/workflows/forms-flow-service.yml @@ -6,6 +6,7 @@ on: - main - develop - release/* + - design-changes-5.3.0 paths: - "forms-flow-service/**" - "VERSION" diff --git a/.github/workflows/forms-flow-theme.yml b/.github/workflows/forms-flow-theme.yml index 62842514..3746e9b6 100644 --- a/.github/workflows/forms-flow-theme.yml +++ b/.github/workflows/forms-flow-theme.yml @@ -6,6 +6,7 @@ on: - main - develop - release/* + - design-changes-5.3.0 paths: - "forms-flow-theme/**" - "VERSION" diff --git a/VERSION b/VERSION index 83a14fc5..aeef3430 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v5.3.0-alpha +design-changes-5.3.0 \ No newline at end of file From 08bddcad4ef32aa6af08fe5d4830360f00f89cea Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Tue, 24 Oct 2023 02:23:38 -0700 Subject: [PATCH 05/20] css converted into scss --- .../{bootstrapOverride.css => bootstrapOverride.scss} | 0 forms-flow-theme/src/formsflow-theme.js | 2 +- forms-flow-theme/src/{global.css => global.scss} | 5 ++++- forms-flow-theme/src/utils/cursor.scss | 9 +++++++++ forms-flow-theme/src/utils/overflow.scss | 10 ++++++++++ 5 files changed, 24 insertions(+), 2 deletions(-) rename forms-flow-theme/src/{bootstrapOverride.css => bootstrapOverride.scss} (100%) rename forms-flow-theme/src/{global.css => global.scss} (99%) create mode 100644 forms-flow-theme/src/utils/cursor.scss create mode 100644 forms-flow-theme/src/utils/overflow.scss diff --git a/forms-flow-theme/src/bootstrapOverride.css b/forms-flow-theme/src/bootstrapOverride.scss similarity index 100% rename from forms-flow-theme/src/bootstrapOverride.css rename to forms-flow-theme/src/bootstrapOverride.scss diff --git a/forms-flow-theme/src/formsflow-theme.js b/forms-flow-theme/src/formsflow-theme.js index 41781f8d..c385b392 100644 --- a/forms-flow-theme/src/formsflow-theme.js +++ b/forms-flow-theme/src/formsflow-theme.js @@ -1,3 +1,3 @@ // Anything exported from this file is importable by other in-browser modules. -import "./global.css?modules=false"; +import "./global.scss?modules=false"; export function publicApiFunction() {} diff --git a/forms-flow-theme/src/global.css b/forms-flow-theme/src/global.scss similarity index 99% rename from forms-flow-theme/src/global.css rename to forms-flow-theme/src/global.scss index bb755a25..d1421a53 100644 --- a/forms-flow-theme/src/global.css +++ b/forms-flow-theme/src/global.scss @@ -1,4 +1,7 @@ -@import url("./bootstrapOverride.css"); +@import "./utils/cursor.scss"; +@import "./utils/overflow.scss"; +@import "./bootstrapOverride.scss"; + :root { --color-primary: #0072ed; --color-secondary: #6c757d; diff --git a/forms-flow-theme/src/utils/cursor.scss b/forms-flow-theme/src/utils/cursor.scss new file mode 100644 index 00000000..33d03d6f --- /dev/null +++ b/forms-flow-theme/src/utils/cursor.scss @@ -0,0 +1,9 @@ +@mixin generate-cursor($value) { + .cursor-#{$value} { + cursor: #{$value} !important; + } +} + +@include generate-cursor("default"); +@include generate-cursor("pointer"); + \ No newline at end of file diff --git a/forms-flow-theme/src/utils/overflow.scss b/forms-flow-theme/src/utils/overflow.scss new file mode 100644 index 00000000..620b6336 --- /dev/null +++ b/forms-flow-theme/src/utils/overflow.scss @@ -0,0 +1,10 @@ +@mixin generate-overflow($axis, $value) { + .overflow-#{$axis}-#{$value} { + overflow-#{$axis}: #{$value} !important; + } + } + + @include generate-overflow(x, auto); + @include generate-overflow(y, auto); + @include generate-overflow(x, hidden); + @include generate-overflow(y, hidden); \ No newline at end of file From 3e3d5b41341fe4a09709c98e41874c4c76bb1a45 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Sun, 29 Oct 2023 07:43:15 -0700 Subject: [PATCH 06/20] new navbar design --- forms-flow-nav/src/Navbar.css | 137 ++++------------------------------ forms-flow-nav/src/Navbar.jsx | 135 +++++++++++++++++---------------- 2 files changed, 85 insertions(+), 187 deletions(-) diff --git a/forms-flow-nav/src/Navbar.css b/forms-flow-nav/src/Navbar.css index 5a0ce59c..2f961163 100644 --- a/forms-flow-nav/src/Navbar.css +++ b/forms-flow-nav/src/Navbar.css @@ -1,95 +1,26 @@ -.btn-primary { - background-color: var(--button-primary-background); -} -.logo { - height: 1.9em; -} -h4 { - font-size: 1.2rem; -} -body { - font-size: var(--navbar-items-font-size); - font-family: Nunito Sans, SemiBold; -} -h5, -.h5 { - font-size: 16px !important; -} - -.navbar { +.navbar-background{ background-color: var(--navbar-background); } -.nav-dropdown .dropdown-menu { - width: 15rem; - height: 14rem; - padding: 15px 20px 0 20px; - right: 0; - top: 2rem; - left: auto; - box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2); -} - -.nav-dropdown :hover { - text-decoration: none !important; -} -.nav-custom-tab { - padding-left: 60px !important; -} -.main-nav { - text-decoration: none !important; - /* font-size: var(--navbar-items-font-size) !important; */ +.nav-item{ + font-size: var(--navbar-items-font-size); font-weight: var(--navbar-items-font-weight); + transition: 0.2s ease-in-out; + position: relative; } -.inactive-tab { - color: var(--navbar-items) !important; -} -.active-tab { - color: var(--navbar-active) !important; -} - -.active-tab-dropdown > #dashboard-dropdown { - background-color: transparent; - filter: invert(36%) sepia(38%) saturate(7152%) hue-rotate(227deg) - brightness(101%) contrast(98%); -} -.active-tab-dropdown > #task-dropdown { - background-color: transparent; - filter: invert(36%) sepia(38%) saturate(7152%) hue-rotate(227deg) - brightness(101%) contrast(98%); -} - -.nav-dropdown .dropdown-menu { - height: auto !important; -} -.navbar-dark .navbar-toggler { - border-color: white; -} -.navbar-brand { - align-items: center; -} - -.navbar-brand .img-fluid, -.navbar-brand .img-thumbnail { - max-width: 100%; - height: 100%; -} - -header nav { - border-bottom: var(--color-white); -} - -.topheading-border-bottom { - z-index: 2000; - border-bottom: 2px solid var(--color-primary) !important; - padding: 0 0.5rem !important; - box-shadow: 0 3px 3px -2px rgba(0, 0, 0, 0.2), - 0px 3px 4px 0px rgba(0, 0, 0, 0.14), 0px 1px 8px 0px rgba(0, 0, 0, 0.12); + +.nav-item.active { + font-size: 18px !important; + border-bottom: 3px solid var(--color-primary) !important; + color: var(--color-primary) !important; + font-weight: calc(var(--navbar-items-font-weight) + 100) !important; } + + .custom-app-name { font-size: 30px; - font-weight: 600; + font-weight: 700; color: var(--navbar-app-name); margin-left: var(--appname-margin-left); margin-right: var(--appname-margin-right); @@ -97,46 +28,6 @@ header nav { margin-bottom: var(--appname-margin-bottom); } -.navbar-light .navbar-nav .nav-link { - color: var(--navbar-items); -} - -.navbar-collapse{ - justify-content: space-evenly !important; - -} -.nav-user { - margin-left: auto; -} - -.navbar-nav .nav-link:hover, -.navbar-nav .nav-link:focus { - text-decoration: none !important; -} .custom-logo{ width: var(--navbar-logo-width); -} -@media (max-width: 768px) { - .head-item { - padding-bottom: 0rem; - } - .padding-left-60 { - margin-left: 0px; - } - .main-header { - flex-wrap: nowrap; - } - .admin-container > .header-container { - margin-left: -1rem; - } - .head-rule { - margin-top: -25px; - margin-left: -15px; - margin-right: -86px; -} -} -@media (max-width: 992px) and (max-height: 590px) { - .nav-user { - margin-left: inherit; - } } \ No newline at end of file diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx index 4b160e02..21eef33a 100644 --- a/forms-flow-nav/src/Navbar.jsx +++ b/forms-flow-nav/src/Navbar.jsx @@ -34,16 +34,18 @@ const NavBar = React.memo(({ props }) => { const [selectLanguages, setSelectLanguages] = React.useState([]); const [applicationTitle, setApplicationTitle] = React.useState(""); const [tenantLogo, setTenantLogo] = React.useState("/logo_skeleton.svg"); - const defaultLogoPath = document.documentElement.style.getPropertyValue("--navbar-logo-path") || "/logo.svg"; + const defaultLogoPath = + document.documentElement.style.getPropertyValue("--navbar-logo-path") || + "/logo.svg"; React.useEffect(() => { props.subscribe("FF_AUTH", (msg, data) => { setInstance(data); }); props.subscribe("FF_PUBLIC", () => { - if(MULTITENANCY_ENABLED){ - setApplicationTitle(APPLICATION_NAME) - setTenantLogo(defaultLogoPath) + if (MULTITENANCY_ENABLED) { + setApplicationTitle(APPLICATION_NAME); + setTenantLogo(defaultLogoPath); } }); @@ -86,6 +88,7 @@ const NavBar = React.memo(({ props }) => { const [userDetail, setUserDetail] = React.useState({}); const [lang, setLang] = React.useState(userDetail?.locale); + const [selectedLanguage, setSelectedLanguage] = useState({}); const userRoles = JSON.parse( StorageService.get(StorageService.User.USER_ROLE) ); @@ -102,9 +105,7 @@ const NavBar = React.memo(({ props }) => { const [loginUrl, setLoginUrl] = useState(baseUrl); - const logoPath = MULTITENANCY_ENABLED - ? tenantLogo - : defaultLogoPath; + const logoPath = MULTITENANCY_ENABLED ? tenantLogo : defaultLogoPath; const getAppName = useMemo( () => () => { if (!MULTITENANCY_ENABLED) { @@ -137,6 +138,11 @@ const NavBar = React.memo(({ props }) => { localStorage.setItem("lang", language); }, [lang]); + useEffect(()=>{ + const language = selectLanguages?.find((item)=> item.name === lang); + setSelectedLanguage(language || {}) + },[lang,selectLanguages]) + React.useEffect(() => { setUserDetail( JSON.parse(StorageService.get(StorageService.User.USER_DETAILS)) @@ -160,59 +166,59 @@ const NavBar = React.memo(({ props }) => { instance.userLogout(); }; + console.log(lang,"lang") + return ( -
- - - - - Logo - +
+ + + + Logo
{appName}
 - + {isAuthenticated && } + {isAuthenticated ? ( - - - + ) : ( - !MULTITENANCY_ENABLED && - Login - + !MULTITENANCY_ENABLED && ( + + Login + + ) )} - - + +
); From a6251b269403ae5668e0837fc1ffe02471703d72 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Sun, 29 Oct 2023 07:51:00 -0700 Subject: [PATCH 07/20] class name changed to nav-item to nav-menu-item --- forms-flow-nav/src/Navbar.css | 4 ++-- forms-flow-nav/src/Navbar.jsx | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/forms-flow-nav/src/Navbar.css b/forms-flow-nav/src/Navbar.css index 2f961163..16a7afed 100644 --- a/forms-flow-nav/src/Navbar.css +++ b/forms-flow-nav/src/Navbar.css @@ -2,14 +2,14 @@ .navbar-background{ background-color: var(--navbar-background); } -.nav-item{ +.nav-menu-item{ font-size: var(--navbar-items-font-size); font-weight: var(--navbar-items-font-weight); transition: 0.2s ease-in-out; position: relative; } -.nav-item.active { +.nav-menu-item.active { font-size: 18px !important; border-bottom: 3px solid var(--color-primary) !important; color: var(--color-primary) !important; diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx index 21eef33a..0224b112 100644 --- a/forms-flow-nav/src/Navbar.jsx +++ b/forms-flow-nav/src/Navbar.jsx @@ -196,7 +196,7 @@ const NavBar = React.memo(({ props }) => { { { { { { as={Link} to={`${baseUrl}metrics`} data-testid="Dashboards" - className={`nav-item py-md-3 px-0 mx-2 ${ + className={`nav-menu-item py-md-3 px-0 mx-2 ${ pathname.match( createURLPathMatchExp("metrics", baseUrl) ) || From cdfef52b26ee8e31b392d1cf06ed2960e25721b3 Mon Sep 17 00:00:00 2001 From: abilpraju-aot Date: Mon, 30 Oct 2023 13:17:13 +0530 Subject: [PATCH 08/20] updated code fix --- forms-flow-admin/src/components/dashboard/dashboard.tsx | 2 +- .../src/components/dashboard/insightDashboard.scss | 1 - forms-flow-admin/src/components/footer/footer.tsx | 4 ++-- forms-flow-admin/src/components/users/users.tsx | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/forms-flow-admin/src/components/dashboard/dashboard.tsx b/forms-flow-admin/src/components/dashboard/dashboard.tsx index 6bfab4b0..89df283d 100644 --- a/forms-flow-admin/src/components/dashboard/dashboard.tsx +++ b/forms-flow-admin/src/components/dashboard/dashboard.tsx @@ -191,7 +191,7 @@ export const InsightDashboard = React.memo((props: any) => { {label}{" "} removeDashboardAuth(rowData, label)} > diff --git a/forms-flow-admin/src/components/dashboard/insightDashboard.scss b/forms-flow-admin/src/components/dashboard/insightDashboard.scss index 9294d576..beb9dd03 100644 --- a/forms-flow-admin/src/components/dashboard/insightDashboard.scss +++ b/forms-flow-admin/src/components/dashboard/insightDashboard.scss @@ -21,7 +21,6 @@ width: 20px; height: 20px; color: #393939; - font-weight: 100; cursor: pointer; display: inline-flex; text-align: center; diff --git a/forms-flow-admin/src/components/footer/footer.tsx b/forms-flow-admin/src/components/footer/footer.tsx index 9b714749..764e87ca 100644 --- a/forms-flow-admin/src/components/footer/footer.tsx +++ b/forms-flow-admin/src/components/footer/footer.tsx @@ -1,9 +1,9 @@ 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 = version; +const version_org = packageInfo.version; const Footer = React.memo(() => { return (
diff --git a/forms-flow-admin/src/components/users/users.tsx b/forms-flow-admin/src/components/users/users.tsx index 4d65d09e..22af3865 100644 --- a/forms-flow-admin/src/components/users/users.tsx +++ b/forms-flow-admin/src/components/users/users.tsx @@ -206,7 +206,7 @@ const Users = React.memo((props: any) => { {item?.name}{" "} removePermission(rowData, item)} > From 91c75bc6f9e375018e62ddbde4e64cdefc08e3b1 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Wed, 1 Nov 2023 22:30:06 -0700 Subject: [PATCH 09/20] Admin UI refresh 1. removed custom classes and used bootstrap classes 2. added main and base classes into admin from global css 3. moved .table td override style into bootstrapOverride scss file --- .../src/components/dashboard/dashboard.tsx | 16 ++-- .../dashboard/insightDashboard.scss | 41 +-------- .../src/components/roles/roles.scss | 34 ++------ .../src/components/roles/roles.tsx | 8 +- .../src/components/users/users.scss | 22 +---- .../src/components/users/users.tsx | 16 ++-- forms-flow-admin/src/containers/head.tsx | 2 +- forms-flow-admin/src/index.scss | 4 +- forms-flow-admin/src/index.tsx | 6 +- forms-flow-nav/src/Navbar.jsx | 6 +- forms-flow-theme/src/bootstrapOverride.scss | 11 +++ forms-flow-theme/src/global.scss | 86 +------------------ 12 files changed, 56 insertions(+), 196 deletions(-) diff --git a/forms-flow-admin/src/components/dashboard/dashboard.tsx b/forms-flow-admin/src/components/dashboard/dashboard.tsx index 89df283d..d278ffa4 100644 --- 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: {(t) => t("Access Groups")}, formatter: (cell, rowData) => { return ( -
+
{cell?.map((label, i) => ( -
- - {label}{" "} +
+ + {label} removeDashboardAuth(rowData, label)} > @@ -278,7 +278,7 @@ export const InsightDashboard = React.memo((props: any) => { }; const customTotal = (from, to, size) => ( - + {(t) => t("Showing")} {from}{" "} {(t) => t("to")} {to}{" "} {(t) => t("of")} {size}{" "} @@ -298,7 +298,7 @@ export const InsightDashboard = React.memo((props: any) => { return ( <> -
+

{!isLoading ? ( @@ -308,7 +308,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 index beb9dd03..25c05ed9 100644 --- a/forms-flow-admin/src/components/dashboard/insightDashboard.scss +++ b/forms-flow-admin/src/components/dashboard/insightDashboard.scss @@ -4,37 +4,9 @@ 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; - 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); @@ -42,13 +14,8 @@ 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; -} \ No newline at end of file + \ No newline at end of file diff --git a/forms-flow-admin/src/components/roles/roles.scss b/forms-flow-admin/src/components/roles/roles.scss index 95074f91..d211abe8 100644 --- 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,11 +12,7 @@ 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; @@ -27,18 +20,8 @@ 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; - } + } \ No newline at end of file diff --git a/forms-flow-admin/src/components/roles/roles.tsx b/forms-flow-admin/src/components/roles/roles.tsx index 6c452479..f41095e2 100644 --- a/forms-flow-admin/src/components/roles/roles.tsx +++ b/forms-flow-admin/src/components/roles/roles.tsx @@ -363,7 +363,7 @@ const Roles = React.memo((props: any) => { ); const customTotal = (from, to, size) => ( - + {(t) => t("Showing")} {from}{" "} {(t) => t("to")} {to}{" "} {(t) => t("of")} {size}{" "} @@ -483,7 +483,7 @@ const Roles = React.memo((props: any) => { checkDefaultRoleOrNot(rowData.name) ? null :
{ setSelectedRoleIdentifier(KEYCLOAK_ENABLE_CLIENT_AUTH ? rowData.name : rowData.id) @@ -492,7 +492,7 @@ const Roles = React.memo((props: any) => { }} /> { setDeleteCandidate(rowData); @@ -507,7 +507,7 @@ const Roles = React.memo((props: any) => { return ( <>
-
+
select { border: none; diff --git a/forms-flow-admin/src/components/users/users.tsx b/forms-flow-admin/src/components/users/users.tsx index 22af3865..beb9bbc4 100644 --- a/forms-flow-admin/src/components/users/users.tsx +++ b/forms-flow-admin/src/components/users/users.tsx @@ -92,7 +92,7 @@ const Users = React.memo((props: any) => { setSizePerPage(sizePerPage); }; const customTotal = (from, to, size) => ( - + {(t) => t("Showing")} {from}{" "} {(t) => t("to")} {to}{" "} {(t) => t("of")} {size}{" "} @@ -196,17 +196,17 @@ const Users = React.memo((props: any) => { text: {(t) => t("Role")}, formatter: (cell, rowData) => { return ( -
+
{cell?.map((item, i) => ( -
+
{item?.path} : <>} > - - {item?.name}{" "} + + {item?.name} removePermission(rowData, item)} > @@ -326,7 +326,7 @@ const Users = React.memo((props: any) => { return ( <>
-
+
{
{t("Filter By:")} - + diff --git a/forms-flow-admin/src/containers/head.tsx b/forms-flow-admin/src/containers/head.tsx index 63eb70f4..ad300148 100644 --- a/forms-flow-admin/src/containers/head.tsx +++ b/forms-flow-admin/src/containers/head.tsx @@ -28,7 +28,7 @@ const Head = React.memo((props: any) => {
))}
-
+
); }); diff --git a/forms-flow-admin/src/index.scss b/forms-flow-admin/src/index.scss index 9f218afa..6150f0bd 100644 --- a/forms-flow-admin/src/index.scss +++ b/forms-flow-admin/src/index.scss @@ -1,6 +1,4 @@ -.admin-container{ - background-color: #F9F9F9; -} + .loader-container{ display: flex; height: 50vh !important; diff --git a/forms-flow-admin/src/index.tsx b/forms-flow-admin/src/index.tsx index aa0107f4..1b6e5766 100644 --- a/forms-flow-admin/src/index.tsx +++ b/forms-flow-admin/src/index.tsx @@ -93,7 +93,9 @@ const Admin = React.memo(({ props }: any) => { return ( <> {isAdmin && ( -
+
+
+
@@ -132,7 +134,9 @@ const Admin = React.memo(({ props }: any) => { /> +
+
)} diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx index 0a80348d..013f933a 100644 --- a/forms-flow-nav/src/Navbar.jsx +++ b/forms-flow-nav/src/Navbar.jsx @@ -166,13 +166,11 @@ const NavBar = React.memo(({ props }) => { instance.userLogout(); }; - console.log(lang,"lang") - return (
- + { : "" }`} > - + {t("Processes")} ) diff --git a/forms-flow-theme/src/bootstrapOverride.scss b/forms-flow-theme/src/bootstrapOverride.scss index b7555030..606252d4 100644 --- a/forms-flow-theme/src/bootstrapOverride.scss +++ b/forms-flow-theme/src/bootstrapOverride.scss @@ -2,4 +2,15 @@ .container { max-width: 1320px; } +} +.table { + border-collapse: inherit; +} + +.table th { + vertical-align: inherit !important; +} + +.table td { + vertical-align: inherit !important; } \ No newline at end of file diff --git a/forms-flow-theme/src/global.scss b/forms-flow-theme/src/global.scss index 863a4de2..10228c5f 100644 --- a/forms-flow-theme/src/global.scss +++ b/forms-flow-theme/src/global.scss @@ -66,19 +66,7 @@ color: var(--color-primary) !important; } -.table { - border-collapse: inherit; -} - -.table th { - padding: 8px 34px; - vertical-align: inherit !important; -} -.table td { - padding: 8px 34px; - vertical-align: inherit !important; -} .footer-text { font-size: 18px; @@ -333,64 +321,6 @@ i.fa.fa-question-circle.text-muted { max-width: 104px; } -/* .d-md-none { - .dropup, - .dropright, - .dropdown, - .dropleft { - position: initial; - } - .nav-dropdown .dropdown-menu { - position: absolute; - } - .dropdown-menu:before { - position: absolute; - top: -6px; - right: 4px; - display: inline-block; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-left: 7px solid transparent; - border-bottom-color: rgba(0, 0, 0, 0.2); - content: ""; - } - - .dropdown-menu:after { - position: absolute; - top: -5px; - right: 5px; - display: inline-block; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - border-left: 6px solid transparent; - content: ""; - } -} -.lbl-app-nanme { - font-size: 20px; - color: #ffff; - margin-bottom: 0; - font-weight: bold; - margin-left: 20px; -} -.app-name { - color: $yellow; - margin: 0; -} -.nav-icons { - vertical-align: text-top; - margin-right: 3px; -} -.nav-dropdown .dropdown-menu { - height: auto !important; -} -.table-bordered thead th, -.table-bordered thead td { - background-color: #f2f2f2 !important; -} -.navbar-dark.navbar-toggler { - border-color: white; -} */ .main-header { margin-left: 15px !important; display: flex; @@ -411,10 +341,7 @@ i.fa.fa-question-circle.text-muted { .back-icon { display: flex; } - -.sub-container { - margin-left: 15px; -} + .task-head { font-weight: bold; @@ -599,7 +526,6 @@ div[disabled] { } .delete_button { - font-size: 25px; color: red; cursor: pointer; transition: transform 0.5s, color 0.5s; @@ -742,7 +668,6 @@ div.upload input[type="file"] { .head-rule { margin-top: -10px; - padding-top: -10px; } .application-head { @@ -773,14 +698,7 @@ div.upload input[type="file"] { margin-left: 5px; } -.main-header { - margin-left: 15px !important; - display: flex; - margin-top: 10px; - margin-bottom: 25px; - height: 30px; - width: 100%; -} + .cursor-default { cursor: default !important; } From 6f50f254bef830da8ec9356ffca46a1fcf4e470b Mon Sep 17 00:00:00 2001 From: AbijithS-aot Date: Fri, 3 Nov 2023 08:54:57 -0700 Subject: [PATCH 10/20] new changes --- forms-flow-theme/src/baseStyle.scss | 17 +++++++++++ forms-flow-theme/src/bootstrapOverride.scss | 2 ++ .../src/components/custom-table.scss | 28 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 forms-flow-theme/src/baseStyle.scss create mode 100644 forms-flow-theme/src/components/custom-table.scss diff --git a/forms-flow-theme/src/baseStyle.scss b/forms-flow-theme/src/baseStyle.scss new file mode 100644 index 00000000..4be03610 --- /dev/null +++ b/forms-flow-theme/src/baseStyle.scss @@ -0,0 +1,17 @@ +/* This file contains style for the main classes of application */ + +body { + font-size: 16px; + font-family: Nunito Sans, SemiBold; + overflow: hidden; + } + + .main-container{ + max-height: calc(100vh - 59px); + overflow-y: auto; + background-color: var(--color-main-bg); + } + + .min-hightcontainer{ + min-height: calc(100vh - 164px); + } \ No newline at end of file diff --git a/forms-flow-theme/src/bootstrapOverride.scss b/forms-flow-theme/src/bootstrapOverride.scss index 606252d4..fd80bafc 100644 --- a/forms-flow-theme/src/bootstrapOverride.scss +++ b/forms-flow-theme/src/bootstrapOverride.scss @@ -8,9 +8,11 @@ } .table th { + padding: 8px 20px; vertical-align: inherit !important; } .table td { + padding: 8px 20px; vertical-align: inherit !important; } \ No newline at end of file diff --git a/forms-flow-theme/src/components/custom-table.scss b/forms-flow-theme/src/components/custom-table.scss new file mode 100644 index 00000000..1231f832 --- /dev/null +++ b/forms-flow-theme/src/components/custom-table.scss @@ -0,0 +1,28 @@ +.custom-table { + font-family: Arial, Helvetica, sans-serif; + border-collapse: separate !important; + border-spacing: 0 15px; + width: 100%; + border: none; + + td, th { + padding: 20px; + } + + tr { + background-color: #FFFFFF; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); + border: none; + } + + th { + padding-top: 12px; + padding-bottom: 12px; + text-align: left; + background-color: #f0f6fb; + padding-left: 8px; // Adjust the padding to your liking + padding-right: 8px; // Adjust the padding to your liking + margin: 0; + border: none; + } + } \ No newline at end of file From 79d868eda10dfb9ae1b2b4abf743e0bd9c808e8d Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Mon, 6 Nov 2023 13:21:58 +0530 Subject: [PATCH 11/20] cleanup --- forms-flow-nav/src/Navbar.css | 6 +-- forms-flow-nav/src/Navbar.jsx | 4 +- forms-flow-theme/src/baseStyle.scss | 4 +- forms-flow-theme/src/bootstrapOverride.scss | 2 - .../src/components/custom-table.scss | 4 -- forms-flow-theme/src/global.scss | 37 ++++++------------- 6 files changed, 18 insertions(+), 39 deletions(-) diff --git a/forms-flow-nav/src/Navbar.css b/forms-flow-nav/src/Navbar.css index 16a7afed..a5d0793b 100644 --- a/forms-flow-nav/src/Navbar.css +++ b/forms-flow-nav/src/Navbar.css @@ -5,12 +5,12 @@ .nav-menu-item{ font-size: var(--navbar-items-font-size); font-weight: var(--navbar-items-font-weight); - transition: 0.2s ease-in-out; + /* transition: 0.2s ease-in-out; */ position: relative; } .nav-menu-item.active { - font-size: 18px !important; + /* font-size: 18px !important; */ border-bottom: 3px solid var(--color-primary) !important; color: var(--color-primary) !important; font-weight: calc(var(--navbar-items-font-weight) + 100) !important; @@ -19,7 +19,7 @@ .custom-app-name { - font-size: 30px; + font-size: 24px; font-weight: 700; color: var(--navbar-app-name); margin-left: var(--appname-margin-left); diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx index 013f933a..2e894cd9 100644 --- a/forms-flow-nav/src/Navbar.jsx +++ b/forms-flow-nav/src/Navbar.jsx @@ -170,8 +170,8 @@ const NavBar = React.memo(({ props }) => {
- - + + Date: Mon, 6 Nov 2023 19:51:00 +0530 Subject: [PATCH 12/20] admin window cleanup --- forms-flow-admin/src/components/footer/footer.tsx | 2 +- forms-flow-admin/src/components/roles/roles.tsx | 3 ++- forms-flow-admin/src/index.tsx | 6 +++--- forms-flow-theme/src/baseStyle.scss | 7 ++++--- forms-flow-theme/src/global.scss | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/forms-flow-admin/src/components/footer/footer.tsx b/forms-flow-admin/src/components/footer/footer.tsx index 764e87ca..d7ab968a 100644 --- a/forms-flow-admin/src/components/footer/footer.tsx +++ b/forms-flow-admin/src/components/footer/footer.tsx @@ -6,7 +6,7 @@ import { Translation } from "react-i18next"; const version_org = packageInfo.version; const Footer = React.memo(() => { return ( -
+
diff --git a/forms-flow-admin/src/components/roles/roles.tsx b/forms-flow-admin/src/components/roles/roles.tsx index f41095e2..95014cf3 100644 --- a/forms-flow-admin/src/components/roles/roles.tsx +++ b/forms-flow-admin/src/components/roles/roles.tsx @@ -418,6 +418,7 @@ const Roles = React.memo((props: any) => { const pagination = paginationFactory({ showTotal: true, align: "center", + className:"d-flex", sizePerPageList: getpageList(), page: activePage, sizePerPage: sizePerPage, @@ -508,7 +509,7 @@ const Roles = React.memo((props: any) => { <>
-
+
{ return ( <> {isAdmin && ( -
-
-
+
+
+
diff --git a/forms-flow-theme/src/baseStyle.scss b/forms-flow-theme/src/baseStyle.scss index 7676d2c0..da9b1849 100644 --- a/forms-flow-theme/src/baseStyle.scss +++ b/forms-flow-theme/src/baseStyle.scss @@ -4,14 +4,15 @@ body { font-size: 16px; font-family: Nunito Sans, SemiBold; overflow: hidden; + background-color: var(--color-main-bg); } .main-container{ - max-height: calc(100vh - 59px); + max-height: calc(100vh - 52px); overflow-y: auto; - background-color: var(--color-main-bg); + } .min-container-height{ - min-height: calc(100vh - 164px); + min-height: calc(100vh - 170px); } \ No newline at end of file diff --git a/forms-flow-theme/src/global.scss b/forms-flow-theme/src/global.scss index cdb93a84..d9dd5a21 100644 --- a/forms-flow-theme/src/global.scss +++ b/forms-flow-theme/src/global.scss @@ -31,7 +31,7 @@ --color-gray-700: #495057; --color-gray-800: #373a3c; --color-gray-900: #212529; - + --color-main-bg: #F7F7F7; --head-inactive: #909090; --logo-path: "./logo.svg"; From 52f53e5a15173fd3485573aba3ce2569a8b59842 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Tue, 7 Nov 2023 11:36:03 +0530 Subject: [PATCH 13/20] fixed navbar --- forms-flow-nav/src/Navbar.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx index 2e894cd9..c5fc8125 100644 --- a/forms-flow-nav/src/Navbar.jsx +++ b/forms-flow-nav/src/Navbar.jsx @@ -171,7 +171,7 @@ const NavBar = React.memo(({ props }) => {
- + Date: Tue, 7 Nov 2023 15:28:48 +0530 Subject: [PATCH 14/20] font size and table margin update --- forms-flow-theme/src/components/custom-table.scss | 1 + forms-flow-theme/src/global.scss | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/forms-flow-theme/src/components/custom-table.scss b/forms-flow-theme/src/components/custom-table.scss index 04423ac0..00c6c1f3 100644 --- a/forms-flow-theme/src/components/custom-table.scss +++ b/forms-flow-theme/src/components/custom-table.scss @@ -4,6 +4,7 @@ border-spacing: 0 15px; width: 100%; border: none; + margin: 0; td, th { padding: 20px; diff --git a/forms-flow-theme/src/global.scss b/forms-flow-theme/src/global.scss index d9dd5a21..d86f58bd 100644 --- a/forms-flow-theme/src/global.scss +++ b/forms-flow-theme/src/global.scss @@ -357,7 +357,7 @@ i.fa.fa-question-circle.text-muted { .task-head-details { font-weight: bold; - font-size: 30px; + font-size: 25px; margin-left: 10px !important; } @@ -698,6 +698,9 @@ div.upload input[type="file"] { cursor: pointer !important; } +.application-head-details{ + font-size: 25px; +} hr { From d0ab06e19cb958044db1264b3115adf3e10d3d93 Mon Sep 17 00:00:00 2001 From: fahad-aot Date: Tue, 7 Nov 2023 21:57:07 -0800 Subject: [PATCH 15/20] internsationalisation changes --- .../src/resourceBundles/bg/resourceBundles.ts | 13 +++++++++++++ .../src/resourceBundles/de/resourceBundles.ts | 13 +++++++++++++ .../src/resourceBundles/en/resourceBundles.ts | 13 +++++++++++++ .../src/resourceBundles/fr/resourceBundles.ts | 13 +++++++++++++ .../src/resourceBundles/pt/resourceBundles.ts | 15 ++++++++++++++- .../src/resourceBundles/zh/resourceBundles.ts | 13 +++++++++++++ 6 files changed, 79 insertions(+), 1 deletion(-) diff --git a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts index 794150ee..138a996e 100644 --- a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts @@ -1,5 +1,18 @@ /* eslint-disable max-len */ export const RESOURCE_BUNDLES_BG = { + "View Submitted Form": "Преглед на представен формуляр", + "View Draft Details": "Преглед на детайлите на черновата", + "Edit Draft": "Редактиране на черновата", + "Draft Title": "Заглавие на черновата", + "Filter": "Филтър", + "Advanced Options": "Разширени опции", + "Enter the path name": "Въведете името на пътя", + "Search by form title": "Търсене по заглавие на формуляра", + "Associate Workflow": "Свързване с работен процес", + "Search by workflow name": "Търсене по име на работен процес", + "View Details": "Преглед на детайлите", + "Visibility": "Видимост", + "Form Title":"Заглавие на формуляра", "Access restricted by its designer..!": "Достъпът е ограничен от дизайнера..!", "and you will no longer have the access to this form in bundles": "и няма да имате достъп до тази форма в пакети", "You will no longer have the access to this form in bundles": "Вече няма да имате достъп до тази форма в пакети", diff --git a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts index fe0b2460..b69a6b45 100644 --- a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts @@ -1,5 +1,18 @@ /* eslint-disable max-len */ export const RESOURCE_BUNDLES_DE = { + "View Submitted Form": "Eingereichtes Formular anzeigen", + "View Draft Details": "Entwurfsdetails anzeigen", + "Edit Draft": "Entwurf bearbeiten", + "Draft Title": "Titel des Entwurfs", + "Filter": "Filter", + "Advanced Options": "Erweiterte Optionen", + "Enter the path name": "Geben Sie den Pfadnamen ein", + "Search by form title": "Nach Formulartitel suchen", + "Associate Workflow": "Workflow verknüpfen", + "Search by workflow name": "Nach Workflow-Namen suchen", + "View Details": "Details anzeigen", + "Visibility": "Sichtbarkeit", + "Form Title": "Formulartitel", "Access restricted by its designer..!": "Zugriff durch den Designer eingeschränkt..!", "and you will no longer have the access to this form in bundles": "und Sie haben keinen Zugriff mehr auf dieses Formular in Bündeln", "You will no longer have the access to this form in bundles": "Sie haben keinen Zugriff mehr auf dieses Formular in Bündel", diff --git a/forms-flow-service/src/resourceBundles/en/resourceBundles.ts b/forms-flow-service/src/resourceBundles/en/resourceBundles.ts index 410ee082..f89e63be 100644 --- a/forms-flow-service/src/resourceBundles/en/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/en/resourceBundles.ts @@ -1,5 +1,18 @@ /* eslint-disable max-len */ export const RESOURCE_BUNDLES_EN = { + "View Submitted Form": "View Submitted Form", + "View Draft Details": "View Draft Details", + "Edit Draft": "Edit Draft", + "Draft Title": "Draft Title", + "Filter": "Filter", + "Advanced Options": "Advanced Options", + "Enter the path name": "Enter the path name", + "Search by form title": "Search by form title", + "Associate Workflow": "Associate Workflow", + "Search by workflow name": "Search by workflow name", + "View Details": "View Details", + "Visibility": "Visibility", + "Form Title": "Form Title", "Access restricted by its designer..!": "Access restricted by its designer..!", "and you will no longer have the access to this form in bundles": "and you will no longer have the access to this form in bundles", "You will no longer have the access to this form in bundles": "You will no longer have access to this form in bundles", diff --git a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts index 65edb905..d94f09af 100644 --- a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts @@ -1,5 +1,18 @@ /* eslint-disable max-len */ export const RESOURCE_BUNDLES_FR = { + "View Submitted Form": "Voir le formulaire soumis", + "View Draft Details": "Voir les détails du brouillon", + "Edit Draft": "Éditer le brouillon", + "Draft Title": "Titre du brouillon", + "Filter": "Filtre", + "Advanced Options": "Options avancées", + "Enter the path name": "Entrer le nom du chemin", + "Search by form title": "Rechercher par titre de formulaire", + "Associate Workflow": "Associer le flux de travail", + "Search by workflow name": "Rechercher par nom de flux de travail", + "View Details": "Voir les détails", + "Visibility": "Visibilité", + "Form Title": "Titre du formulaire", "Access restricted by its designer..!": "Accès restreint par son concepteur..!", "and you will no longer have the access to this form in bundles": "et vous n'aurez plus accès à ce formulaire dans les bundles", "You will no longer have the access to this form in bundles": "Vous n'aurez plus accès à ce formulaire dans les bundles", diff --git a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts index b6b9a69c..220513de 100644 --- a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts @@ -1,5 +1,18 @@ /* eslint-disable max-len */ export const RESOURCE_BUNDLES_PT = { + "View Submitted Form": "Ver Formulário Enviado", + "View Draft Details": "Ver Detalhes do Rascunho", + "Edit Draft": "Editar Rascunho", + "Draft Title": "Título do Rascunho", + "Filter": "Filtro", + "Advanced Options": "Opções Avançadas", + "Enter the path name": "Digite o nome do caminho", + "Search by form title": "Buscar por título de formulário", + "Associate Workflow": "Associar Fluxo de Trabalho", + "Search by workflow name": "Buscar por nome de fluxo de trabalho", + "View Details": "Ver Detalhes", + "Visibility": "Visibilidade", + "Form Title": "Título do Formulário", "Access restricted by its designer..!": "Acesso restrito pelo designer..!", "and you will no longer have the access to this form in bundles": "e você não terá mais acesso a este formulário em pacotes", "You will no longer have the access to this form in bundles": "Você não terá mais acesso a este formulário em pacotes", @@ -173,7 +186,7 @@ export const RESOURCE_BUNDLES_PT = { "Details": "Detalhes", "example":"exemplo", "Path":"Caminho", - "Status": "Status", + "Status": "Estado", "Submissions": "Submissões", "No Application History found": "Nenhum histórico de aplicativo encontrado", "Link To Form Submission": "Link para o envio do formulário", diff --git a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts index f0c3494b..4b5235cb 100644 --- a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts +++ b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts @@ -1,5 +1,18 @@ /* eslint-disable max-len */ export const RESOURCE_BUNDLES_ZH = { + "View Submitted Form": "查看已提交的表单", + "View Draft Details": "查看草稿详情", + "Edit Draft": "编辑草稿", + "Draft Title": "草稿标题", + "Filter": "过滤器", + "Advanced Options": "高级选项", + "Enter the path name": "输入路径名称", + "Search by form title": "按表单标题搜索", + "Associate Workflow": "关联工作流程", + "Search by workflow name": "按工作流程名称搜索", + "View Details": "查看详细信息", + "Visibility": "可见性", + "Form Title": "表单标题", "Access restricted by its designer..!": "访问受设计者限制..!", "and you will no longer have the access to this form in bundles": "而且您将不再能够在包裹中访问此表单", "You will no longer have the access to this form in bundles": "您将不再能够在包裹中访问此表单", From f929d2479b82ecf5a98eb30bdcaee9871ddc66c8 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Thu, 9 Nov 2023 09:08:00 +0530 Subject: [PATCH 16/20] user table changes --- forms-flow-admin/src/components/users/users.tsx | 2 +- forms-flow-theme/src/components/toastifyOverride.scss | 3 +++ forms-flow-theme/src/global.scss | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 forms-flow-theme/src/components/toastifyOverride.scss diff --git a/forms-flow-admin/src/components/users/users.tsx b/forms-flow-admin/src/components/users/users.tsx index beb9bbc4..52082382 100644 --- a/forms-flow-admin/src/components/users/users.tsx +++ b/forms-flow-admin/src/components/users/users.tsx @@ -327,7 +327,7 @@ const Users = React.memo((props: any) => { <>
-
+
Date: Thu, 9 Nov 2023 12:56:10 +0530 Subject: [PATCH 17/20] tenanty key fixed and footer fix --- forms-flow-admin/src/components/footer/footer.tsx | 2 +- forms-flow-admin/src/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forms-flow-admin/src/components/footer/footer.tsx b/forms-flow-admin/src/components/footer/footer.tsx index d7ab968a..325f07cf 100644 --- a/forms-flow-admin/src/components/footer/footer.tsx +++ b/forms-flow-admin/src/components/footer/footer.tsx @@ -12,7 +12,7 @@ const Footer = React.memo(() => {
{(t) => t("Powered by ")}{" "} - formflow.ai + formsflow.ai {` v${version_org}`}
diff --git a/forms-flow-admin/src/index.tsx b/forms-flow-admin/src/index.tsx index f3ae7bc4..d3a856e8 100644 --- a/forms-flow-admin/src/index.tsx +++ b/forms-flow-admin/src/index.tsx @@ -39,7 +39,7 @@ const Admin = React.memo(({ props }: any) => { }, []); React.useEffect(()=>{ - StorageService.save("tenantKey", tenantId) + StorageService.save("tenantKey", tenantId || '') },[tenantId]) React.useEffect(() => { From 0ab8f9b93b74ba0e3d9f5ea358469bcfeb5ae198 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Thu, 9 Nov 2023 14:58:25 +0530 Subject: [PATCH 18/20] toast fix and navbar font size fix --- forms-flow-nav/src/Navbar.css | 2 +- forms-flow-theme/src/components/toastifyOverride.scss | 6 +++++- forms-flow-theme/src/global.scss | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/forms-flow-nav/src/Navbar.css b/forms-flow-nav/src/Navbar.css index a5d0793b..5510940a 100644 --- a/forms-flow-nav/src/Navbar.css +++ b/forms-flow-nav/src/Navbar.css @@ -13,7 +13,7 @@ /* font-size: 18px !important; */ border-bottom: 3px solid var(--color-primary) !important; color: var(--color-primary) !important; - font-weight: calc(var(--navbar-items-font-weight) + 100) !important; + font-weight: bold !important; } diff --git a/forms-flow-theme/src/components/toastifyOverride.scss b/forms-flow-theme/src/components/toastifyOverride.scss index 07abfe3c..696c8768 100644 --- a/forms-flow-theme/src/components/toastifyOverride.scss +++ b/forms-flow-theme/src/components/toastifyOverride.scss @@ -1,3 +1,7 @@ .Toastify__toast--success{ - background: var(--toastify-success-color) !important; + background: var(--color-primary) !important; +} + +.Toastify__progress-bar--success{ + background: var(--color-white) !important; } \ No newline at end of file diff --git a/forms-flow-theme/src/global.scss b/forms-flow-theme/src/global.scss index 49e60994..a55c3197 100644 --- a/forms-flow-theme/src/global.scss +++ b/forms-flow-theme/src/global.scss @@ -35,7 +35,6 @@ --color-main-bg: #F7F7F7; --head-inactive: #909090; --logo-path: "./logo.svg"; - --toastify-success-color: #39A7FF; --logo-width: 40px; --appname-margin-left: 0px; --appname-margin-right: 0px; @@ -43,7 +42,7 @@ --appname-margin-bottom: 0px; --navbar-items-font-size: 16px; - --navbar-items-font-weight: 600; + --navbar-items-font-weight: 400; --navbar-background: var(--color-white); --navbar-items: var(--color-black); From 950ebf6a9b95b6fa57014286a934dd5fed3d5b46 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Thu, 9 Nov 2023 15:13:44 +0530 Subject: [PATCH 19/20] removed full language name from navbar --- forms-flow-nav/src/Navbar.jsx | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx index c5fc8125..bc508b26 100644 --- a/forms-flow-nav/src/Navbar.jsx +++ b/forms-flow-nav/src/Navbar.jsx @@ -86,9 +86,7 @@ const NavBar = React.memo(({ props }) => { const isAuthenticated = instance?.isAuthenticated(); const { pathname } = location; const [userDetail, setUserDetail] = React.useState({}); - - const [lang, setLang] = React.useState(userDetail?.locale); - const [selectedLanguage, setSelectedLanguage] = useState({}); + const [lang, setLang] = React.useState(userDetail?.locale); const userRoles = JSON.parse( StorageService.get(StorageService.User.USER_ROLE) ); @@ -138,10 +136,7 @@ const NavBar = React.memo(({ props }) => { localStorage.setItem("lang", language); }, [lang]); - useEffect(()=>{ - const language = selectLanguages?.find((item)=> item.name === lang); - setSelectedLanguage(language || {}) - },[lang,selectLanguages]) + React.useEffect(() => { setUserDetail( @@ -324,8 +319,8 @@ const NavBar = React.memo(({ props }) => { title={ <> - {selectedLanguage?.value} - ({lang ? lang : "LANGUAGE"}) + + {lang ? lang : "LANGUAGE"} } id="basic-nav-dropdown" From 2601008305246e235ebf05cf2686670acda92c61 Mon Sep 17 00:00:00 2001 From: shuhaib-aot Date: Thu, 9 Nov 2023 16:07:31 +0530 Subject: [PATCH 20/20] temp version removed --- .github/workflows/forms-flow-admin-cd.yml | 1 - .github/workflows/forms-flow-nav.cd.yml | 1 - .github/workflows/forms-flow-service.yml | 1 - .github/workflows/forms-flow-theme.yml | 1 - VERSION | 2 +- 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/forms-flow-admin-cd.yml b/.github/workflows/forms-flow-admin-cd.yml index 5ace6916..d99fd6bc 100644 --- a/.github/workflows/forms-flow-admin-cd.yml +++ b/.github/workflows/forms-flow-admin-cd.yml @@ -6,7 +6,6 @@ on: - main - develop - release/* - - design-changes-5.3.0 paths: - "forms-flow-admin/**" - "VERSION" diff --git a/.github/workflows/forms-flow-nav.cd.yml b/.github/workflows/forms-flow-nav.cd.yml index bd5d4295..d157d4fa 100644 --- a/.github/workflows/forms-flow-nav.cd.yml +++ b/.github/workflows/forms-flow-nav.cd.yml @@ -6,7 +6,6 @@ on: - main - develop - release/* - - design-changes-5.3.0 paths: - "forms-flow-nav/**" - "VERSION" diff --git a/.github/workflows/forms-flow-service.yml b/.github/workflows/forms-flow-service.yml index 07a65afe..9bf4596a 100644 --- a/.github/workflows/forms-flow-service.yml +++ b/.github/workflows/forms-flow-service.yml @@ -6,7 +6,6 @@ on: - main - develop - release/* - - design-changes-5.3.0 paths: - "forms-flow-service/**" - "VERSION" diff --git a/.github/workflows/forms-flow-theme.yml b/.github/workflows/forms-flow-theme.yml index 3746e9b6..62842514 100644 --- a/.github/workflows/forms-flow-theme.yml +++ b/.github/workflows/forms-flow-theme.yml @@ -6,7 +6,6 @@ on: - main - develop - release/* - - design-changes-5.3.0 paths: - "forms-flow-theme/**" - "VERSION" diff --git a/VERSION b/VERSION index aeef3430..a716fcda 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -design-changes-5.3.0 \ No newline at end of file +v5.3.0-alpha \ No newline at end of file