Merge pull request mosip#24 from tw-mosip/develop

[INJIWEB-129, 53] - Inji Web Logo Change, Proper Redirection to Credential Type Selection Screen
shiva-beehyv · Apr 12, 2024 · 02b8e69 · 02b8e69
2 parents 0eaaf51 + af0b91c
commit 02b8e69
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/inji-web/README.md → README.md b/inji-web/README.md → README.md
diff --git a/inji-web/src/assets/inji-logo.png b/inji-web/src/assets/inji-logo.png
diff --git a/inji-web/src/components/molecules/GridComponent.js b/inji-web/src/components/molecules/GridComponent.js
@@ -1,11 +1,10 @@
 import * as React from 'react';
-import { experimentalStyled as styled } from '@mui/material/styles';
+import {experimentalStyled as styled} from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import Paper from '@mui/material/Paper';
 import Grid from '@mui/material/Grid';
 import InteractiveCard from '../atoms/Card';
-import CustonDownloadButton from '../atoms/CustomDownloadButton';
-import { useNavigate } from 'react-router-dom';
+
 
 const Item = styled(Paper)(({ theme }) => ({
   backgroundColor: theme.palette.mode === 'dark' ? '#1A2027' : '#fff',

diff --git a/inji-web/src/pages/IssuerPage/CertificateList.js b/inji-web/src/pages/IssuerPage/CertificateList.js
@@ -1,9 +1,9 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import GridComponent from "../../components/molecules/GridComponent";
 import {Typography} from "@mui/material";
 import Box from "@mui/material/Box";
 import styled from "@emotion/styled";
-import { IssuersData } from '../Home/testData';
+import {IssuersData} from '../Home/testData';
 import {DATA_KEY_IN_LOCAL_STORAGE, getESignetRedirectURL} from "../../utils/config";
 import {generateCodeChallenge, generateRandomString} from "../../utils/oauth-utils";
 import CustonDownloadButton from "../../components/atoms/CustomDownloadButton.js";
@@ -40,7 +40,7 @@ const getCardsData = (issuerId, issuerDisplayName, authEndpoint, credentialList,
                         state: state,
                         clientId: clientId
                     }));
-                window.location.replace(getESignetRedirectURL(authEndpoint, cred.scope, clientId, codeChallenge, state));
+                window.location.assign(getESignetRedirectURL(authEndpoint, cred.scope, clientId, codeChallenge, state));
             },
             clickable: true
         }

diff --git a/inji-web/src/pages/IssuerPage/Header.js b/inji-web/src/pages/IssuerPage/Header.js
@@ -1,12 +1,10 @@
 import React, {useEffect, useState} from 'react';
-import {Grid, IconButton, Typography, Autocomplete, TextField, CircularProgress} from "@mui/material";
+import {Autocomplete, CircularProgress, Grid, IconButton, TextField, Typography} from "@mui/material";
 import styled from "@emotion/styled";
 import Box from "@mui/material/Box";
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
-import { useNavigate, useParams } from 'react-router-dom';
-import {
-    getCertificatesAutoCompleteOptions
-} from "../../utils/misc";
+import {useNavigate} from 'react-router-dom';
+import {getCertificatesAutoCompleteOptions} from "../../utils/misc";
 
 export const StyledHeader = styled(Box)`
     background-color: #F2FBFF;
@@ -74,7 +72,7 @@ function Header({issuerDisplayName, loading, credentialsList, updateCredentialsL
                                     } else {
                                         updateCredentialsList(defaultOptions)
                                     }
-                                    
+
                                 }}
                                 onClick={(event) => {
                                     if (!event?.target?.value) {

diff --git a/inji-web/src/pages/PageTemplate/Navbar.jsx b/inji-web/src/pages/PageTemplate/Navbar.jsx
@@ -1,12 +1,11 @@
 import * as React from 'react';
 import Box from '@mui/material/Box';
 import Container from '@mui/material/Container';
-import Button from '@mui/material/Button';
 import Tooltip from '@mui/material/Tooltip';
-import {Grid, Link, Typography} from "@mui/material";
+import {Grid} from "@mui/material";
 
-import {DownloadButton, InjiNavbar, StyledGridItem, StyledLink, StyledToolbar} from "./styles";
-import { useNavigate } from 'react-router-dom';
+import {InjiNavbar, StyledGridItem, StyledLink, StyledToolbar} from "./styles";
+import {useNavigate} from 'react-router-dom';
 import logo from "../../assets/inji-logo.png";
 import DownloadAppStore from '../../assets/DownloadAppStore.svg';
 import DownloadFromGooglePlay from '../../assets/DownloadFromPlay.svg';
@@ -22,7 +21,7 @@ function Navbar(props) {
                 <StyledToolbar disableGutters>
                     <Grid container style={{justifyItems: 'end'}}>
                         <StyledGridItem item xs={3} onClick={() => {navigate('/')}}>
-                            <img src={logo} alt='logo' width='116px' height='28px'/>
+                            <img src={logo} alt='logo' width='140px' height='70px'/>
                         </StyledGridItem>
                         <StyledGridItem item xs={5.5} style={{justifyContent: 'end'}}>
                             <Box>