Form JSON customize and Ui sync as per figma Ui (tekdi#37)

* Task #197901 * fix:if the language is changed on any page, the app toggles to first page + When the user move back and come on the state, district, block page it appear blank * Task #197901 * Task #197901 * fix:error solving * Task #197901 * fix:remove credentials popup module + remove email id * Task #197901 * Task #198011 * fix:prerak bio Work Experience and Volunteer Experience * feat:CICD * Merge branch 'master' of https://github.com/tekdi/eg-website * fix:aadhar validation and hindi character validation * #Task197760 * #Task197760 * #Task197760 * fix:qualifications show type wise and fist name space remove * Fix : [Changes in hindi translation according to EG] * Fix:[Removed trailing white spaces in transalation hindi file] * ui * Fix:[Remaining changes in hindi translation file] * Fix:[removed white spaces] * fix: login page * Task #Task #198175 * Task #Task #198175 * Task #Task #198175 * Task #Task #198175 * Task #Task #198175 * Task #Task #198175 * Task #Task #198175 * Task #Task #198175 * fix:Password screenshot not coming properly + Teaching qualification must be shown seperately in Prerak bio -IP interface * Task #Task #198175 * Task #Task #198175 * fix:adhar validation error * Update dev-build-deploy.yml * fix:upload profile * Upload profile (tekdi#25) * fix:if the language is changed on any page, the app toggles to first page + When the user move back and come on the state, district, block page it appear blank * fix:error solving * fix:remove credentials popup module + remove email id * fix:prerak bio Work Experience and Volunteer Experience * feat:CICD * Merge branch 'master' of https://github.com/tekdi/eg-website * fix:aadhar validation and hindi character validation * fix:qualifications show type wise and fist name space remove * fix: login page * fix:Password screenshot not coming properly + Teaching qualification must be shown seperately in Prerak bio -IP interface * fix:adhar validation error * fix:upload profile * Update dev-build-deploy.yml * Update dev-build-deploy.yml * Update dev-build-deploy.yml * Fix[Change of work experience to job experience in translation file] * Task #198410 * Task #197792 - Prerak Bio Page needs to be completed - UX/ UI still under development * Task #198175 - Ui for application status of prerak * fix:upload * fix:dashboad footer links * Fix:[Sentry implementation for master branch] (tekdi#32) * Update dev-build-deploy.yml * Update dev-build-deploy.yml * Update dev-build-deploy.yml * Update dev-build-deploy.yml * Update AppShell.tsx * Update dev-build-deploy.yml * fix:yarn format * fix:errors and form ui changes * fix:errors and form ui changes --------- Co-authored-by: Ekta Yadav <[email protected]> Co-authored-by: dhanashree <[email protected]> Co-authored-by: Muzaffar khan <[email protected]> Co-authored-by: Dhanashree-Patil95 <[email protected]>
Dhanashree-Patil95 · May 22, 2023 · b0a1b32 · b0a1b32
1 parent 00bfb5f
commit b0a1b32
Show file tree

Hide file tree

Showing 51 changed files with 1,909 additions and 615 deletions.
diff --git a/.github/workflows/dev-build-deploy.yml b/.github/workflows/dev-build-deploy.yml
@@ -17,6 +17,12 @@ jobs:
           yarn workspace @shiksha/common-lib build
           yarn install
           yarn build
+        env:
+          REACT_APP_API_URL: ${{ secrets.REACT_APP_API_URL }}
+          REACT_APP_BASE_URL: ${{ secrets.REACT_APP_BASE_URL }}
+          REACT_APP_SENTRY_DSN_URL: ${{ secrets.REACT_APP_SENTRY_DSN_URL }}
+          REACT_APP_SENTRY_ENV: ${{ secrets.REACT_APP_SENTRY_ENV }}
+
       - name: Create Lerna Bundles
         run: |
           sh ./scripts/pack-prod-build.sh

diff --git a/apps/front-end/.env.development b/apps/front-end/.env.development
diff --git a/apps/front-end/.env.example b/apps/front-end/.env.example
@@ -0,0 +1,2 @@
+REACT_APP_API_URL=
+REACT_APP_BASE_URL=
diff --git a/apps/front-end/.env.production b/apps/front-end/.env.production
diff --git a/apps/front-end/public/Aadhaar2.png b/apps/front-end/public/Aadhaar2.png
diff --git a/apps/front-end/public/addAg.svg b/apps/front-end/public/addAg.svg
diff --git a/apps/front-end/public/index.html b/apps/front-end/public/index.html
@@ -2,15 +2,15 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="The teacher app Micro Frontend used in the Shiksha Platform.
       It can also function as a standalone package."
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/apps/front-end/public/locales/en/translation.json b/apps/front-end/public/locales/en/translation.json
@@ -133,7 +133,7 @@
   "JUST_ONE_STEP": "Just one more Step to go!",
   "TAKE_PHOTO": "Take a Photo",
   "UPLOAD_PHOTO": "Upload a Photo",
-  "FILE_SIZE": "file size must be less then 2MB",
+  "FILE_SIZE": "file size must be less then 25MB",
   "TAKE_ANOTHER_PHOTO": "Take another Photo",
   "REQUIRED_MESSAGE": "Please enter a valid data",
   "SELECT_MESSAGE": "Please select a valid option",
@@ -171,7 +171,7 @@
   "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 ?",
+  "DO_YOU_HAVE_ANY_JOB_EXPERIENCE": "Do you have any Job Experience ?",
   "EXPERIENCE": "Experience",
   "YOUR_WORK_AVAILABILITY_WILL_BE": "Your work availability will be ?",
   "DO_YOU_OWN_A_MOBILE_PHONE": "Do you have a personal smartphone ?",
@@ -217,6 +217,25 @@
   "MARK_ABSENT": "Mark Absent",
   "ENTER_USERNAME_PASSWORD_SENT_ON_MOBILE": "Enter the Username and Password sent on your Mobile Number",
   "AADHAAR_NUMBER_ALREADY_EXISTS": "Aadhaar number already exists",
+  "PROFILE": "Profile",
+  "INTERVIEW_DETAILS": "Interview Details",
+  "CONDUCTED_BY": "Conducted by",
+  "ORIENTATION_DETAILS": "Orientation Details",
+  "ONLINE": "Online",
+  "ACCEPT": "Accept",
+  "DOCUMENTS_YOU_NEED_TO_CARRY": "Documents you need to carry",
+  "UPLOAD_YOUR_DOCUMENTS": "Upload Your Documents",
+  "UPLOAD_NOW": "Upload Now",
+  "QUALIFICATION_PROOF": "Qualification Proof",
+  "WORK_EXPERIENCE_PROOF": "Work Experience Proof",
+  "VOLUNTEER_EXPERIENCE_PROOF": "Volunteer Experience Proof",
+  "AADHAR_NUMBER_KYC": "Aadhar Number KYC",
+  "ADD_AN_AG": "Add an AG",
+  "COMPLETE_YOUR_AADHAR_VERIFICATION_NOW": "Complete Your Aadhaar Verification Now",
+  "ADD_AN_AG_LEARNER": "Add an AG Learner",
+  "MY_CAMP": "Mycamp",
+  "LEARNERS": "learners",
+  "MAX_LENGHT_200": "Max Lenght 200",
   "OWNERSHIP": "Ownership",
   "IDENTIFY_THE_AG_LEARNER": "Identify the AG Learner",
   "MARITAL_STATUS": "Marital status",

diff --git a/apps/front-end/public/locales/hi/translation.json b/apps/front-end/public/locales/hi/translation.json
@@ -133,7 +133,7 @@
   "JUST_ONE_STEP": "बस एक कदम और आगे बढ़ना है!",
   "TAKE_PHOTO": "फोटो लें",
   "UPLOAD_PHOTO": "फोटो अपलोड करें",
-  "FILE_SIZE": "फाइल का आकार 2 एमबी से कम होना चाहिए",
+  "FILE_SIZE": "फाइल का आकार 25 एमबी से कम होना चाहिए",
   "TAKE_ANOTHER_PHOTO": "एक और फोटो लें",
   "REQUIRED_MESSAGE": "कृपया वैध दर्ज करें",
   "SELECT_MESSAGE": "कृपया वैध विकल्प चुनें",
@@ -159,7 +159,7 @@
   "GRAMPANCHAYAT": "ग्राम पंचायत",
   "YOUR_HIGHEST_QUALIFICATION": "आपकी उच्चतम शैक्षिक योग्यता क्या है?",
   "DO_YOU_HAVE_ANY_TEACHING_DEGREE": "क्या आपके पास कोई शिक्षण डिग्री है?",
-  "DO_YOU_HAVE_ANY_WORK_EXPERIENCE": "क्या आपके पास काम करने का कुछ अनुभव है?",
+  "DO_YOU_HAVE_ANY_JOB_EXPERIENCE": "क्या आपके पास नौकरी करने का कुछ अनुभव है?",
   "JOB_TITLE": "नौकरी का शीर्षक",
   "COMPANY_NAME": "कंपनी का नाम",
   "EXPERIENCE_IN_YEARS": "अनुभव (वर्षों में)",
@@ -206,6 +206,25 @@
   "LOGOUT": "लॉग आउट",
   "ENTER_USERNAME_PASSWORD_SENT_ON_MOBILE": "आपके मोबाइल नंबर पर भेजा गया यूजरनेम और पासवर्ड दर्ज करें",
   "AADHAAR_NUMBER_ALREADY_EXISTS": "आधार नंबर पहले से मौजूद है",
+  "PROFILE": "प्रोफ़ाइल",
+  "INTERVIEW_DETAILS": "साक्षात्कार विवरण",
+  "CONDUCTED_BY": "द्वारा आयोजित",
+  "ORIENTATION_DETAILS": "अभिविन्यास विवरण",
+  "ONLINE": "ऑनलाइन",
+  "ACCEPT": "स्वीकार करना",
+  "DOCUMENTS_YOU_NEED_TO_CARRY": "दस्तावेज़ जिन्हें आपको ले जाने की आवश्यकता है",
+  "UPLOAD_YOUR_DOCUMENTS": "अपने दस्तावेज़ अपलोड करें",
+  "UPLOAD_NOW": "अभी अपलोड करें",
+  "QUALIFICATION_PROOF": "योग्यता प्रमाण",
+  "WORK_EXPERIENCE_PROOF": "कार्य अनुभव प्रमाण",
+  "VOLUNTEER_EXPERIENCE_PROOF": "स्वयंसेवी अनुभव प्रमाण",
+  "AADHAR_NUMBER_KYC": "आधार संख्या केवाईसी",
+  "ADD_AN_AG": "एजी जोड़ें",
+  "COMPLETE_YOUR_AADHAR_VERIFICATION_NOW": "अपना आधार सत्यापन अभी पूरा करें",
+  "ADD_AN_AG_LEARNER": "एक एजी शिक्षार्थी जोड़ें",
+  "MY_CAMP": "मेरा डेरा",
+  "LEARNERS": "शिक्षार्थियों",
+  "MAX_LENGHT_200": "जडसे जादा 200 शब्द मान्य है",
   "OWNERSHIP": "स्वामित्व",
   "IDENTIFY_THE_AG_LEARNER": "एजी लर्नर की पहचान करें",
   "MARITAL_STATUS": "वैवाहिक स्थिति",

diff --git a/apps/front-end/public/logo.png b/apps/front-end/public/logo.png
diff --git a/apps/front-end/public/splash.png b/apps/front-end/public/splash.png
diff --git a/apps/front-end/public/splash1.png b/apps/front-end/public/splash1.png
diff --git a/apps/front-end/src/App.css b/apps/front-end/src/App.css
@@ -70,7 +70,7 @@ label {
   flex-direction: column;
 }
 select.form-control {
-  height: 48px;
+  height: 54px;
 }
 .form-control {
   height: 34px;
@@ -287,11 +287,44 @@ img {
   line-height: 15px;
   color: #790000;
 }
+
 .error-detail,
 ul {
   padding: 10px 0;
   list-style-type: none;
 }
 label {
-  margin-top: 8px !important;
+  margin-top: 8px;
+}
+
+@property --progress-value {
+  syntax: "<integer>";
+  inherits: false;
+  initial-value: 0;
+}
+
+@keyframes html-progress {
+  to {
+    --progress-value: 92;
+  }
+}
+
+.progress-bar {
+  width: 100px;
+  height: 100px;
+  border-radius: 50%;
+  /* to center the percentage value */
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  background: radial-gradient(closest-side, white 79%, transparent 80% 100%),
+    conic-gradient(hotpink calc(var(--progress-value) * 1%), pink 0);
+  animation: html-progress 2s 1 forwards;
+}
+
+.progress-bar::before {
+  counter-reset: percentage var(--progress-value);
+  content: counter(percentage) "%";
+  animation: html-progress 2s 1 forwards;
 }
diff --git a/apps/front-end/src/App.js b/apps/front-end/src/App.js
@@ -6,6 +6,7 @@ import {
   getTokernUserInfo,
   facilitatorRegistryService,
   setLocalUser,
+  t,
 } from "@shiksha/common-lib";
 import guestRoutes from "./routes/guestRoutes";
 import routes from "./routes/routes";
@@ -39,7 +40,24 @@ function App() {
       basename={process.env.PUBLIC_URL}
       routes={accessRoutes}
       guestRoutes={guestRoutes}
-      isShowFooterLink={false}
+      footerLinks={[
+        {
+          title: "HOME",
+          icon: "Home4LineIcon",
+        },
+        {
+          title: "LEARNERS",
+          icon: "PencilRulerLineIcon",
+        },
+        {
+          title: "MY_CAMP",
+          icon: "CommunityLineIcon",
+        },
+        {
+          title: "DASHBOARD",
+          icon: "DashboardLineIcon",
+        },
+      ]}
       appName="Teacher App"
       userTokenInfo={userTokenInfo}
     />