Merge pull request #25 from tekdi/v0.1.6

Merge V0.1.6 to main branch
tekdi · Dec 3, 2024 · e31560a · e31560a
2 parents 666012e + 932cb3d
commit e31560a
Show file tree

Hide file tree

Showing 13 changed files with 8,561 additions and 4,464 deletions.
diff --git a/index.html b/index.html
@@ -2,9 +2,9 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/png" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React</title>
+    <title>DigiPramaan</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
     "globals": "^15.11.0",
     "postcss": "^8.4.49",
     "tailwindcss": "^3.4.15",
-    "vite": "^5.4.10"
+    "vite": "^5.4.10",
+    "vite-plugin-pwa": "^0.21.0"
   }
 }
diff --git a/public/favico.png b/public/favico.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/src/assets/icon.svg b/src/assets/icon.svg
diff --git a/src/assets/logo.svg b/src/assets/logo.svg
diff --git a/src/components/Fetch.jsx b/src/components/Fetch.jsx
@@ -143,7 +143,7 @@ const Fetch = () => {
           fullWidth
           startIcon={<DownloadIcon />}
           onClick={handleFetch} // Trigger fetch only if valid
-          sx={{ borderRadius: 7 }}
+          sx={{ borderRadius: 7,fontFamily: "Poppins, sans-serif",textTransform: "none"  }}
         >
           Fetch
         </Button>

diff --git a/src/components/Header.jsx b/src/components/Header.jsx
@@ -40,7 +40,7 @@ const Header = () => {
             fontStyle: "italic",
           }}
         >
-          E-Wallet
+          DigiPramaan
         </Typography>
 
         {/* Language Selector */}

diff --git a/src/components/LanguageSelect.jsx b/src/components/LanguageSelect.jsx
@@ -9,9 +9,11 @@ import {
   Button,
   FormControl,
   InputLabel,
+  CircularProgress,
 } from "@mui/material";
 import { useNavigate, useLocation } from "react-router-dom";
 import icon from "../assets/icon.svg";
+import logo from "../assets/logo.svg";
 import { languageOptions } from "../config";
 import { useKeycloak } from "@react-keycloak/web";
 import {jwtDecode} from 'jwt-decode'; // Fixed import
@@ -52,7 +54,21 @@ const LanguageSelect = () => {
       console.error("Login failed:", error instanceof Error ? error.message : "Unknown error");
     }
   };
-
+  // Show loader if Keycloak is not initialized
+  if (!initialized) {
+    return (
+      <Box
+        sx={{
+          minHeight: "100vh",
+          display: "flex",
+          justifyContent: "center",
+          alignItems: "center"
+        }}
+      >
+        <CircularProgress size={50}/>
+      </Box>
+    );
+  }
   return (
     <Box
       sx={{
@@ -77,47 +93,53 @@ const LanguageSelect = () => {
       >
         <Box
           sx={{
+            flex: 1,
             display: "flex",
-            alignItems: "center",
+            flexDirection: "column",
             justifyContent: "center",
-            gap: 2,
+            alignItems: "center",
+            color: "white",
+            p: 3,
+            gap: 1,
           }}
         >
+          <Box
+            component="img"
+            src={logo}
+            alt="Logo"
+            sx={{
+              width: 100,
+              height: 38,
+            }}
+          />
           <Box
             component="img"
             src={icon}
             alt="Icon"
             sx={{
-              width: 60, // Adjust width
-              height: 60, // Adjust height
-              display: "block", // Ensure image behaves like a block element
+              width: 269,
+              height: 51,
             }}
           />
           <Typography
-            variant="h4"
-            component="h1"
+            variant="subtitle1"
             sx={{
+              textAlign: "center",
               fontFamily: "Poppins, sans-serif",
-              fontStyle: "italic",
-              textAlign: "center", // Align text center
-              lineHeight: "60px", // Match the image height for vertical centering
+              mt: 1,
             }}
-            gutterBottom
           >
-            E-Wallet
+            Your Digital Identity
           </Typography>
         </Box>
-        <Typography variant="subtitle1">
-          Unlock Opportunities, Seamlessly
-        </Typography>
       </Box>
 
       {/* Language Selection Section */}
       <Paper
         sx={{
           p: 3,
           borderRadius: "24px 24px 0 0",
-          mt: "auto", // Push this section to the bottom of the screen
+          mt: "auto",
         }}
       >
         <Typography variant="h6" gutterBottom>
@@ -153,16 +175,29 @@ const LanguageSelect = () => {
           fullWidth
           size="large"
           onClick={handleLogin}
-          sx={{ borderRadius: 7,fontFamily: "Poppins, sans-serif",bgcolor: "#121943" }}
+          sx={{
+            borderRadius: 7,
+            fontFamily: "Poppins, sans-serif",
+            textTransform: "none",
+            bgcolor: "#121943",
+          }}
         >
-          Log In to E-Wallet
+          Log In to DigiPramaan
         </Button>
         <Button
           variant="outlined"
           fullWidth
           size="large"
-          onClick={()=> navigate("/signup")}
-          sx={{ borderRadius: 7,bgcolor:'white',fontFamily: "Poppins, sans-serif",color:"#121943",mt:2,mb:5 }}
+          onClick={() => navigate("/signup")}
+          sx={{
+            borderRadius: 7,
+            bgcolor: "white",
+            fontFamily: "Poppins, sans-serif",
+            textTransform: "none",
+            color: "#121943",
+            mt: 2,
+            mb: 5,
+          }}
         >
           Register
         </Button>

diff --git a/src/components/ShareConfirmationDialog.jsx b/src/components/ShareConfirmationDialog.jsx
@@ -102,7 +102,7 @@ const ShareConfirmationDialog = ({ open, onClose, documentType,documentSubType,d
 
       <DialogContent sx={{ pt: 2 }}>
         <Typography variant="h6" sx={{ mb: 3, fontFamily: 'Poppins, sans-serif' }}>
-          Please provide your consent to share the selected document with your E-Wallet
+          Please provide your consent to share the selected document with your DigiPramaan
         </Typography>
 
         <Box sx={{ display: 'flex', alignItems: 'center', mb: 2 }}>
@@ -148,7 +148,7 @@ const ShareConfirmationDialog = ({ open, onClose, documentType,documentSubType,d
         <Typography variant="h6" sx={{ mb: 3, fontFamily: 'Poppins, sans-serif' }}>
           Your <Typography component="span" color="primary" variant="h6" sx={{ fontFamily: 'Poppins, sans-serif' }}>
             {documentName}
-          </Typography> has been added to your documents set in the E-Wallet!
+          </Typography> has been added to your documents set in the DigiPramaan!
         </Typography>
 
         <Box sx={{

diff --git a/src/components/Upload.jsx b/src/components/Upload.jsx
@@ -152,7 +152,7 @@ const Upload = () => {
         <Button
           variant="contained"
           fullWidth
-          sx={{ mt: 4, borderRadius: 7 }}
+          sx={{ mt: 4, borderRadius: 7,fontFamily: "Poppins, sans-serif",textTransform: "none" }}
           startIcon={<UploadFileIcon />}
           onClick={handleUpload}
         >

diff --git a/vite.config.js b/vite.config.js
@@ -1,7 +1,37 @@
 import { defineConfig } from 'vite'
 import react from '@vitejs/plugin-react'
+import { VitePWA } from 'vite-plugin-pwa';
 
 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [react()],
+  plugins: [react(),
+    VitePWA({
+      registerType: 'autoUpdate', // Automatically updates service workers
+      includeAssets: ['favicon.ico'], //, 'robots.txt', 'apple-touch-icon.png'
+      manifest: {
+        name: 'DigiPramaan',
+        short_name: 'DigiPramaan',
+        description: 'DigiPramaan for Piramal',
+        theme_color: '#ffffff',
+        icons: [
+          {
+            src: 'favicon.ico',
+            sizes: '192x192',
+            type: 'image/png',
+          },
+          {
+            src: 'favicon.ico',
+            sizes: '512x512',
+            type: 'image/png',
+          },
+          {
+            src: 'favicon.ico',
+            sizes: '512x512',
+            type: 'image/png',
+            purpose: 'any maskable',
+          },
+        ],
+      },
+    }),
+  ],
 })