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

Added latest stepper and toast #274

Merged
merged 4 commits into from
Apr 8, 2024
Merged

Added latest stepper and toast #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d082b01
css fix
Apr 8, 2024
ad363b9
css fix
Apr 8, 2024
a5dba19
Added latest stepper and toast
Apr 8, 2024
d0342cb
Merge branch 'campaign' into CSS_CAMPAIGN
nabeelmd-eGov Apr 8, 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
2 changes: 1 addition & 1 deletion 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 @@ -16,7 +16,7 @@
"@egovernments/digit-ui-module-workbench": "1.0.1-beta.4",
"@egovernments/digit-ui-module-hcmworkbench": "0.0.38",
"@egovernments/digit-ui-module-campaign-manager": "0.0.1",
"@egovernments/digit-ui-components": "0.0.1-beta.3",
"@egovernments/digit-ui-components": "0.0.1-beta.4",
"http-proxy-middleware": "^1.0.5",
"react": "17.0.2",
"react-dom": "17.0.2",
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/example/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
href="https://unpkg.com/@egovernments/[email protected]/dist/index.css"
/> -->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].2/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].3/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<!-- added below css for hcm-workbench module inclusion-->

Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@egovernments/digit-ui-react-components": "1.8.1-beta.7",
"@egovernments/digit-ui-components": "0.0.1-beta.3",
"@egovernments/digit-ui-components": "0.0.1-beta.4",
"@rjsf/core": "5.10.0",
"@rjsf/utils": "5.10.0",
"@rjsf/validator-ajv8": "5.10.0",
Expand Down
17 changes: 15 additions & 2 deletions .../micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Loader, FormComposerV2, Header, Toast, MultiUploadWrapper, Button, Close, LogoutIcon } from "@egovernments/digit-ui-react-components";
import { Loader, FormComposerV2, Header, MultiUploadWrapper, Button, Close, LogoutIcon } from "@egovernments/digit-ui-react-components";
import React, { useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useHistory, useParams } from "react-router-dom";
import TimelineCampaign from "../../components/TimelineCampaign";
import { CampaignConfig } from "../../configs/CampaignConfig";
import { QueryClient, useQueryClient } from "react-query";
import { Stepper, Toast } from "@egovernments/digit-ui-components";

const SetupCampaign = () => {
const tenantId = Digit.ULBService.getCurrentTenantId();
Expand Down Expand Up @@ -423,7 +424,19 @@ const SetupCampaign = () => {

return (
<React.Fragment>
<TimelineCampaign currentStep={currentStep + 1} onStepClick={onStepClick} />
<Stepper
customSteps={[
"HCM_CAMPAIGN_SETUP_DETAILS",
"HCM_DELIVERY_DETAILS",
"HCM_BOUNDARY_DETAILS",
"HCM_TARGETS",
"HCM_FACILITY_DETAILS",
"HCM_USER_DETAILS",
"HCM_REVIEW_DETAILS",
]}
currentStep={currentStep + 1}
onStepClick={onStepClick}
/>
<FormComposerV2
config={config?.form.map((config) => {
return {
Expand Down
2 changes: 1 addition & 1 deletion micro-ui/web/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- added below css for hcm-workbench module inclusion-->
<!-- <link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" /> -->
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected]/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].2/dist/index.css" />
<link rel="stylesheet" href="https://unpkg.com/@egovernments/[email protected].3/dist/index.css" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#00bcd1" />
<title>DIGIT</title>
Expand Down
Loading