Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DPG-2150: sidebar footer fix and breadcrumb remove for mobile view #135

Merged
merged 5 commits into from
Jan 29, 2024
Merged

DPG-2150: sidebar footer fix and breadcrumb remove for mobile view #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae8102e
DPG-2150: changes in edit profile screen
Jan 29, 2024
323a0e6
DPG-2150: sidebar footer fix and breadcrumb remove for mobile view
Jan 29, 2024
0b0a661
Merge branch 'develop' into DPG-2150
nabeelmd-eGov Jan 29, 2024
20d9b31
package version upgrade
Jan 29, 2024
f7a01e7
Merge remote-tracking branch 'origin/DPG-2150' into DPG-2150
Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions micro-ui/web/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
"dependencies": {
"@egovernments/digit-ui-libraries": "1.8.1-beta.1",
"@egovernments/digit-ui-module-workbench": "1.0.1-beta.1",
"@egovernments/digit-ui-module-core": "1.8.1-beta.2",
"@egovernments/digit-ui-module-core": "1.8.1-beta.3",
"@egovernments/digit-ui-module-hrms": "1.8.0",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.2",
"babel-loader": "8.1.0",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions micro-ui/web/micro-ui-internals/example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"@egovernments/digit-ui-libraries": "1.8.1-beta.1",
"@egovernments/digit-ui-module-workbench": "1.0.1-beta.1",
"@egovernments/digit-ui-module-dss": "1.8.0",
"@egovernments/digit-ui-module-core": "1.8.1-beta.2",
"@egovernments/digit-ui-module-core": "1.8.1-beta.3",
"@egovernments/digit-ui-module-common": "1.8.0",
"@egovernments/digit-ui-module-hrms": "1.8.0",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.1",
"@egovernments/digit-ui-module-engagement": "1.5.20",
"@egovernments/digit-ui-react-components": "1.8.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.2",
"http-proxy-middleware": "^1.0.5",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
6 changes: 6 additions & 0 deletions micro-ui/web/micro-ui-internals/packages/css/src/components/navbar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@

.drawer-list {
@apply pt-md;
margin-bottom: 2rem;
position: relative;
min-height: 1px;
overflow: auto;
Expand Down Expand Up @@ -310,3 +311,8 @@
@apply mr-sm;
}
}

.sidebar-list-footer {
position: fixed;
bottom: 0;
}
2 changes: 2 additions & 0 deletions micro-ui/web/micro-ui-internals/packages/modules/core/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ and add its related functions
### Changelog

```bash
1.8.1-beta.3 User profile back button fixes for mobile view
1.8.1-beta.2 User profile Save and change password button fixes for mobile view
1.8.1-beta.1 Republished after merging with Master due to version issues.
1.8.0-beta.16 fixed the hardcoded logout message
1.8.0-beta.15 fixed the sidebar sort order issue
Expand Down
4 changes: 2 additions & 2 deletions micro-ui/web/micro-ui-internals/packages/modules/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-module-core",
"version": "1.8.1-beta.2",
"version": "1.8.1-beta.3",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand All @@ -14,7 +14,7 @@
"prepublish": "yarn build"
},
"dependencies": {
"@egovernments/digit-ui-react-components": "1.8.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.2",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-i18next": "11.16.2",
Expand Down
4 changes: 2 additions & 2 deletions micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {

return (
<div className="user-profile">
<section style={{ margin: userType === "citizen" ? "8px" : "24px" }}>
{userType === "citizen" ? (
<section style={{ margin: userType === "citizen" || isMobile ? "8px" : "24px" }}>
{userType === "citizen" || isMobile ? (
<BackButton></BackButton>
) : (
<BreadCrumb
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/modules/utilities/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@cyntler/react-doc-viewer": "1.10.3",
"@egovernments/digit-ui-react-components": "1.8.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.2",
"react": "17.0.2",
"react-date-range": "^1.4.0",
"react-dom": "17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/modules/workbench/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"react-router-dom": "5.3.0"
},
"dependencies": {
"@egovernments/digit-ui-react-components": "1.8.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.2",
"@rjsf/core": "5.10.0",
"@rjsf/utils": "5.10.0",
"@rjsf/validator-ajv8": "5.10.0",
Expand Down
1 change: 1 addition & 0 deletions micro-ui/web/micro-ui-internals/packages/react-components/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ Syntax for the FormComposersV2
### Changelog

```bash
1.8.1-beta.2 Moved the sidebar footer outside of "drawer-list" to prevent overlapping issues.
1.8.1-beta.1 Republished after merging with Master due to version issues.
1.8.0-beta.5 added file type excel in multiUploadWrapper
1.8.0-beta.4 republished
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@egovernments/digit-ui-react-components",
"version": "1.8.1-beta.1",
"version": "1.8.1-beta.2",
"license": "MIT",
"main": "dist/index.js",
"module": "dist/index.modern.js",
Expand Down
6 changes: 3 additions & 3 deletions micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ const NavBar = ({ open, toggleSidebar, profileItem, menuItems, onClose, Footer,
<MenuItem item={item} />
</div>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

increment package version of react components

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

))}
<div className={`sidebar-list`}>
<div className="side-bar-footer">{Footer}</div>
</div>
</div>
<div className={`sidebar-list-footer`}>
<div className="side-bar-footer">{Footer}</div>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions micro-ui/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
"@egovernments/digit-ui-libraries": "1.8.1-beta.1",
"@egovernments/digit-ui-module-workbench": "1.0.1-beta.1",
"@egovernments/digit-ui-module-dss": "1.8.0",
"@egovernments/digit-ui-module-core": "1.8.1-beta.2",
"@egovernments/digit-ui-module-core": "1.8.1-beta.3",
"@egovernments/digit-ui-module-common": "1.8.0",
"@egovernments/digit-ui-module-hrms": "1.8.0",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.1",
"@egovernments/digit-ui-module-engagement": "1.5.20",
"@egovernments/digit-ui-react-components": "1.8.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.2",
"babel-loader": "8.1.0",
"clean-webpack-plugin": "4.0.0",
"react": "17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions micro-ui/web/workbench/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"dependencies": {
"@egovernments/digit-ui-libraries": "1.8.1-beta.1",
"@egovernments/digit-ui-module-workbench": "1.0.1-beta.1",
"@egovernments/digit-ui-module-core": "1.8.1-beta.2",
"@egovernments/digit-ui-module-core": "1.8.1-beta.3",
"@egovernments/digit-ui-module-utilities": "1.0.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.1",
"@egovernments/digit-ui-react-components": "1.8.1-beta.2",
"babel-loader": "8.1.0",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down