Skip to content

Commit

Permalink
fix:not be eligible message + Hindi characters validation + required …
Browse files Browse the repository at this point in the history
…message...
  • Loading branch information
sagar-techjoomla authored and manojLondhe committed May 5, 2023
1 parent 92dfca2 commit df95181
Show file tree
Hide file tree
Showing 26 changed files with 814 additions and 305 deletions.
132 changes: 131 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,132 @@
# EG Website
# EG Website on Shiksha Platform Admin Console (Uses Module Federation)

## Modules

| Module | Description |
| ----------- | ------------------------------ |
| auth | Auth features like Login |
| facilitator | Facilitator features like List |

## Apps

| App | Description |
| --------- | ------------------------------------------------- |
| front-end | Host Application for EG Website web-app and admin |

## Library

| Module | Description |
| --------- | -------------------------------------------- |
| common-ui | Shared Library for UI componets and services |

## Create New Module

- copy module-template to modules/[module-name]
- update `modules/[module-name]/package.json`

```
{
"name": "[module-name]",
...
}
```

- Update modules/[module-name]/craco.config.js and assign a port for dev environment.

```
module.exports = {
devServer: {
port: 3001,
},
...
```

- update `modules/[module-name]/moduleFederation.config.js `

```
...
module.exports = {
name: "[module-name]",
...
```

# Run All Modules and Host Application

- Install dependency

```
yarn install
```

- Run all modules

```
yarn start
```

# Build Application for Production

```
yarn build
```

# Run Module as Standalone Application

```
lerna run start --scope=[module-name]
```

# Use Module in Host Application

- Add remote module url to remotes in `modules/[host-app]/moduleFederation.config.js `

```
# e.g. auth module is runninig on localhost:2001 then
remotes: {
auth: 'auth@[window.appModules.auth.url]/remoteEntry.js',
},
```

- Add entry to `modules.json`

```
# e.g. auth module is runninig on localhost:3001 then
{
"auth":{
"url": "http://localhost:2001"
},
...
}
```

- To use exposed component from remote module in react.
The lazy load componennt must be enclosed within `<React.Suspense>`

```
# e.g. usiing AppShell component from @shiksha/common-lib lib
import { AppShell } from "@shiksha/common-lib";
...
<AppShell
basename={process.env.PUBLIC_URL}
routes={routes}
guestRoutes={guestRoutes}
/>
```

# Adding New Module to Config-UI

- add navigation menu link - `config/<moduleId>`
- add config schema for `moduleId`to backend
- config editor loads config schema and data for param value `moduleId`
- on save - api invokes backkend api saves config data for given `moduleId`

# Developer Documents

https://shiksha-platform.github.io/docs/Developer/Frontend/
6 changes: 5 additions & 1 deletion apps/front-end/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@
"workbox-range-requests": "^5.1.4",
"workbox-routing": "^5.1.4",
"workbox-strategies": "^5.1.4",
"workbox-streams": "^5.1.4"
"workbox-streams": "^5.1.4",
"file-saver": "^2.0.5",
"caniuse-lite": "^1.0.30001482",
"use-screenshot-hook": "^1.0.2"

},
"scripts": {
"start": "craco start",
Expand Down
Binary file added apps/front-end/public/img1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/front-end/public/img2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/front-end/public/img3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/front-end/public/img4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/front-end/public/img5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added apps/front-end/public/img6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 36 additions & 2 deletions apps/front-end/public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"TOMORROW": "Tomorrow",
"USERNAME": "Username",
"TELL_US_YOUR_NAME": "Tell us your Name",
"AS_PER_AADHAAR": "(As Per Aadhaar Card)",
"PROJECT_PRAGATI": "Project Pragati",
"SPLASHSCREEN_1": "Enable adolescent girls and young women to achieve their secondary credentials",
"ALREADY_APPLIED_CHECK_STATUS": "Already Applied? Check Status",
Expand All @@ -41,6 +42,7 @@
"WORK_EXPERIENCE": "Work Experience",
"MY_PRERAKS": "My Preraks",
"FIRST_NAME": "First Name",
"MOBILE_NUMBER": "Mobile Number",
"EMAIL_ID": "Email-ID",
"STATUS": "Status",
"GENDER": "Gender",
Expand All @@ -54,6 +56,7 @@
"AVAILABILITY": "Availability",
"APPLICATION_FORM": "Application Form",
"BASIC_DETAILS": "Basic Details",
"WORK_DETAILS": "Work Details",
"LAST_NAME": "Last Name",
"MOBILE_NO": "Mobile No",
"DATE_OF_BIRTH": "Date of Birth",
Expand All @@ -72,7 +75,6 @@
"COMPLETE_AADHAAR_CARD_VERIFICATION": "Complete Aadhaar Card Verification",
"AADHAAR_NUMBER_KYC": "Aadhaar Number KYC",
"SCAN_QR_CODE": "Scan QR Code",
"WE_HAVE_SENT_YOU_A_TEXT_MESSAGE_WITH_USERNAME_AND_PASSWORD_ON_YOUR_MOBILE_NUMBER": "We have sent you a text message with username and password on your mobile number",
"SKIP_TO_LOGIN": "Skip to Login",
"GO_TO_BACK": "Go to back",
"VIEW": "View",
Expand Down Expand Up @@ -111,5 +113,37 @@
"REQUIRED_MESSAGE": "Please enter a valid data",
"SELECT_MESSAGE": "Please select a valid option",
"YOU_NOT_ELIGIBLE": "You may not be eligible for the position",
"DASHBOARD": "Dashboard"
"DASHBOARD": "Dashboard",
"SKIP_SUBMIT": "Skip and submit",
"COMPLETE_FORM": "Complete your form",
"APPLICATION_UNDER_REVIEW": "Application Under Review",
"MEANWHILE_PROFILE": "Meanwhile complete your profile to increase your chances of getting hired",
"HOW_CAN_CONTACT_YOU": "How Can we Contact You?",
"PLEASE_WHATSAPP_NUMBER": "(Please Enter Your Whatsapp Number)",
"WHAT_IS_YOUR_DATE_OF_BIRTH": "What is Your Date of Birth ?",
"WHAT_DO_YOU_IDENTIFY": "What do you Identify as?",
"WHERE_DO_YOU_CURRENTLY_LIVE": "Where do you currently Live?",
"STATE": "State",
"BLOCK": "Block",
"VILLAGE_WARD": "Village/Ward",
"GRAMPANCHAYAT": "Grampanchayat",
"ID_VERIFICATION": "ID Verification",
"ENTER_THE_12_DIGIT_AADHAAR_CARD": "Enter the 12 digit number on your Aadhaar Card",
"AADHAAR_NUMBER": "Aadhaar Number",
"YOUR_HIGHEST_QUALIFICATION": "Your Highest Qualification:",
"DO_YOU_HAVE_ANY_TEACHING_DEGREE": "Do you have any teaching degree?",
"DO_YOU_HAVE_ANY_VOLUNTEER_EXPERIENCE": "Do you have any Volunteer Experience ?",
"JOB_TITLE": "Job Title",
"COMPANY_NAME": "Company Name",
"EXPERIENCE_IN_YEARS": "Experience in years",
"IS_THE_JOB_RELATED_TO_TEACHING": "Is the job related to teaching?",
"DO_YOU_HAVE_ANY_WORK_EXPERIENCE": "Do you have any Work Experience ?",
"EXPERIENCE": "Experience",
"YOUR_WORK_AVAILABILITY_WILL_BE": "Your work availability will be ?",
"DO_YOU_OWN_A_MOBILE_PHONE": "Do you own a mobile phone ?",
"MOBILE_PHONE": "Mobile phone",
"TYPE_OF_MOBILE_PHONE": "Type of mobile phone ?",
"TYPE": "Type",
"HOW_DID_YOU_FIND_OUT_ABOUT_PROJECT_PRAGATI": "How did you find out about Project Pragati ?",
"PLEASE_SELECT": "Please select"
}
67 changes: 63 additions & 4 deletions apps/front-end/public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
"YESTERDAY": "बीता हुआ कल",
"TOMORROW": "कल",
"USERNAME": "प्रयोक्ता नाम",
"TELL_US_YOUR_NAME": "हमें अपना नाम बताए",
"TELL_US_YOUR_NAME": "हमें अपना नाम बतायें",
"AS_PER_AADHAAR": "(आपके आधार कार्ड के अनुसार)",
"PROJECT_PRAGATI": "प्रोजेक्ट प्रगति",
"SPLASHSCREEN_1": "किशोरियों और युवतियों को उनकी माध्यमिक साख हासिल करने में सक्षम बनाए",
"ALREADY_APPLIED_CHECK_STATUS": "पहले से ही लागू? स्थिति जाँचिए",
Expand Down Expand Up @@ -53,7 +54,8 @@
"VOLUNTEER_EXPERIENCE": "स्वयंसेवक अनुभव",
"AVAILABILITY": "उपलब्धता",
"APPLICATION_FORM": "आवेदन फार्म",
"BASIC_DETAILS": "बुनियादी विवरण",
"BASIC_DETAILS": "मूल विवरण",
"WORK_DETAILS": "कार्य विवरण",
"LAST_NAME": "उपनाम",
"MOBILE_NO": "मोबाइल नंबर",
"DATE_OF_BIRTH": "जन्म की तारीख",
Expand All @@ -72,7 +74,6 @@
"COMPLETE_AADHAAR_CARD_VERIFICATION": "आधार कार्ड सत्यापन पूरा करें",
"AADHAAR_NUMBER_KYC": "आधार संख्या केवाईसी",
"SCAN_QR_CODE": "क्यू आर कोड स्कैन करें",
"WE_HAVE_SENT_YOU_A_TEXT_MESSAGE_WITH_USERNAME_AND_PASSWORD_ON_YOUR_MOBILE_NUMBER": "हमने आपको आपके मोबाइल नंबर पर उपयोगकर्ता नाम और पासवर्ड के साथ एक पाठ संदेश भेजा है",
"SKIP_TO_LOGIN": "लॉगिन पर जाएं",
"SEARCH": "खोज",
"APPROVE_APPLICATION": "आवेदन स्वीकृत करें",
Expand All @@ -96,5 +97,63 @@
"SEND_MESSAGE": "मेसेज भेजें",
"VIEW": "पहा",
"GO_TO_BACK": "वापस जाएं",
"WELCOME": "स्वागत"
"WELCOME": "स्वागत",
"REMOVE": "हटाएं",
"ADD_MORE": "अधिक जोड़ें",
"NEXT": "अगला",
"YES": "हां",
"NO": "नहीं",
"CAMERA_PERMISSION_DENIED": "कैमरा अनुमति अस्वीकृत",
"COMING_SOON": "जल्द आ रहा है",
"JUST_ONE_STEP": "बस एक कदम और आगे बढ़ना है!",
"TAKE_PHOTO": "फोटो लें",
"UPLOAD_PHOTO": "फोटो अपलोड करें",
"FILE_SIZE": "फाइल का आकार 2 एमबी से कम होना चाहिए",
"TAKE_ANOTHER_PHOTO": "एक और फोटो लें",
"REQUIRED_MESSAGE": "कृपया वैध डेटा दर्ज करें",
"SELECT_MESSAGE": "कृपया वैध विकल्प चुनें",
"YOU_NOT_ELIGIBLE": "आप पद के लिए पात्र नहीं हो सकते हैं",
"DASHBOARD": "डैशबोर्ड",
"SKIP_SUBMIT": "छोड़ें और जमा करें",
"COMPLETE_FORM": "अपना फॉर्म भरें",
"APPLICATION_UNDER_REVIEW": "समीक्षा के अधीन आवेदन",
"MEANWHILE_PROFILE": "इस बीच अपनी प्रोफाइल को पूरा करें ताकि आपको काम मिलने की संभावना बढ़ सके",
"TELL_US_YOUR_NAME_AS_PER_AADHAAR_CARD": "हमें अपना नाम आधार कार्ड के अनुसार बताएं",
"HOW_CAN_WE_CONTACT_YOU": "हम आपसे कैसे संपर्क कर सकते हैं?",
"WHAT_IS_YOUR_DATE_OF_BIRTH": "आपका जन्मदिन कब है?",
"WHAT_DO_YOU_IDENTIFY_AS": "आपका क्या लिंग है?",
"GRAMPANCHAYAT": "ग्राम पंचायत",
"YOUR_HIGHEST_QUALIFICATION": "आपकी उच्चतम शैक्षिक योग्यता क्या है?",
"DO_YOU_HAVE_ANY_TEACHING_DEGREE": "क्या आपके पास कोई शिक्षण डिग्री है?",
"DO_YOU_HAVE_ANY_WORK_EXPERIENCE": "क्या आपको काम का कोई अनुभव है?",
"JOB_TITLE": "कार्य शीर्षक",
"COMPANY_NAME": "कंपनी का नाम",
"EXPERIENCE_IN_YEARS": "वर्षों का अनुभव",
"IS_THE_JOB_RELATED_TO_TEACHING": "क्या नौकरी का संबंध अध्यापन से है?",
"DO_YOU_HAVE_ANY_VOLUNTEER_EXPERIENCE": "क्या आपके पास कोई स्वयंसेवी अनुभव है?",
"YOUR_WORK_AVAILABILITY_WILL_BE": "आपकी काम की उपलब्धता क्या होगी?",
"PART_TIME": "अंशकालिक",
"FULL_TIME": "पूर्णकालिक",
"DO_YOU_OWN_A_MOBILE_PHONE": "क्या आपके पास मोबाइल फोन है?",
"NO_I_USE_A_FAMILY_MEMBERS": "नहीं, मैं एक परिवार के सदस्य का उपयोग करता हूं",
"TYPE_OF_MOBILE_PHONE": "मोबाइल फोन का प्रकार?",
"ANDROID": "एंड्रॉयड",
"IPHONE": "आइफोन",
"HOW_DID_YOU_FIND_OUT_ABOUT_PROJECT_PRAGATI": "आपको प्रोजेक्ट प्रगति के बारे में कैसे पता चला?",
"STORE_YOUR_USER_CREDENTIALS": "अपने उपयोगकर्ता क्रेडेंशियल्स को स्टोर करें",
"CLICK_HERE_TO_COPY_AND_LOGIN": "कॉपी और लॉगिन करने के लिए यहां क्लिक करें",
"HOW_CAN_CONTACT_YOU": "हम आपसे कैसे संपर्क कर सकते हैं?",
"PLEASE_WHATSAPP_NUMBER": "(कृपया अपना व्हाट्सएप नंबर दर्ज करें)",
"WHAT_DO_YOU_IDENTIFY": "आप क्या पहचानते हैं ?",
"WHERE_DO_YOU_CURRENTLY_LIVE": "वर्तमान में आप कहां रहते हो?",
"STATE": "राज्य",
"BLOCK": "ब्लॉक",
"VILLAGE_WARD": "गाँव",
"ID_VERIFICATION": "पहचान सत्यापन",
"ENTER_THE_12_DIGIT_AADHAAR_CARD": "अपने आधार कार्ड पर 12 अंकों की संख्या दर्ज करें",
"AADHAAR_NUMBER": "आधार नंबर",
"EXPERIENCE": "अनुभव",
"MOBILE_PHONE": "मोबाइल फोन",
"TYPE": "टाइप",
"PLEASE_SELECT": "कृपया चयन करें"
}
2 changes: 1 addition & 1 deletion apps/front-end/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ ul {
}
.has-error .checkbox,
.has-error .checkbox-inline,
.has-error .control-label,
.has-error label div div,
.has-error .help-block,
.has-error .radio,
.has-error .radio-inline,
Expand Down
69 changes: 67 additions & 2 deletions apps/front-end/src/component/BaseInput.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { Button, HStack, Input } from "native-base";
import { Box, Button, HStack, Input, VStack } from "native-base";
import { getInputProps } from "@rjsf/utils";
import { t } from "@shiksha/common-lib";
import { BodySmall, H2, t } from "@shiksha/common-lib";

export function BaseInputTemplate(props) {
const {
Expand Down Expand Up @@ -75,3 +75,68 @@ export function RemoveButton({ icon, iconType, ...btnProps }) {
</Button>
);
}

export const TitleFieldTemplate = ({ id, required, title }) => {
return (
<VStack>
<H2 id={id}>
{t(title)}
{required && <mark>*</mark>}
</H2>
</VStack>
);
};

export const DescriptionFieldTemplate = ({ description, id }) => {
return (
<VStack pb="3">
<BodySmall id={id}>{t(description)}</BodySmall>
</VStack>
);
};

export const FieldTemplate = ({
id,
classNames,
style,
label,
help,
required,
description,
errors,
children,
}) => {
return (
<div className={classNames} style={style}>
<React.Fragment>
<label htmlFor={id}>
<HStack space="1" alignItems="center">
<H2>{t(label)}</H2>
<H2>{required ? "*" : null}</H2>
</HStack>
</label>
{description?.props?.description !== "" ? (
description
) : (
<React.Fragment />
)}
</React.Fragment>
{children}
{errors}
{help}
</div>
);
};
export const ObjectFieldTemplate = (props) => {
return (
<div>
{props.properties.map((element) => (
<div className="property-wrapper">{element.content}</div>
))}
</div>
);
};

export const ArrayFieldTitleTemplate = (props) => {
return <React.Fragment />;
};
Loading

0 comments on commit df95181

Please sign in to comment.