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

Jump to bottom

More ui changes #235

Merged
merged 1 commit into from
Mar 9, 2024
Merged

More ui changes #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 apps/amakrushi/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"lable.disclaimer": "Disclaimer",
"label.grievance_disclaimer": "If a grievance is pending, please Contact the officer for verification",
"label.eleg_disclaimer": "If not eligible, please apply for a grievance via KALIA Portal",
"label.disbursal_disclaimer": "If the payment status is failed, please link your bank account with Aadhar.",
"label.disbursal_disclaimer": "If the payment status is failed, please link your bank account with Aadhaar.",
"label.kalia_status": "KALIA Status",
"label.plant_protection":"Plant Protection",
"label.weather_advisory":"Weather Advisory",
Expand Down
1 change: 1 addition & 0 deletions apps/amakrushi/lang/or.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"table.header_windspeed": "ପବନର ବେଗ",
"table.header_cloudcover": "ମେଘ ଆବରଣ",
"table.header_conditions": "ସର୍ତ୍ତ",
"table.personalDetails": "ବ୍ୟକ୍ତିଗତ ବିବରଣୀ",
"message.speaker": "ଶୁଣିବାକୁ କ୍ଲିକ୍ କରନ୍ତୁ",
"message.options":"ଆପଣଙ୍କ ଫସଲ ସହ ଜଡିତ ପରାମର୍ଶ ପାଇବା ପାଇଁ, ଦୟାକରି ନିମ୍ନରେ ଥିବା ପ୍ରାସଙ୍ଗିକ ବଟନରେ କ୍ଲିକ୍ କରନ୍ତୁ:",
"message.no_signal":"ସିଗ୍ନାଲ ନାହିଁ। \nଦୟାକରି ଆପଣଙ୍କ ଇଣ୍ଟରନେଟ ସଂଯୋଗ କୁ ଚେକ୍ କରନ୍ତ",
Expand Down
Binary file modified apps/amakrushi/src/assets/images/kalia_status.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/amakrushi/src/components/HomePage/index.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
.voiceRecorder {
position: relative;
margin: auto;
top: 11%;
top: 15%;
text-align: center;
height: 15vh;
width: 15vh;
Expand Down
8 changes: 4 additions & 4 deletions apps/amakrushi/src/components/HomePage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ const HomePage: NextPage = () => {
context?.setMessages([]);
router.push('/chat');
if (context?.kaliaClicked) {
context?.sendMessage("Aadhar number - " + msg, null, true, null, true);
context?.sendMessage("Aadhaar number - " + msg, null, true, null, true);
} else context?.sendMessage(msg);
} else {
toast.error(t('error.disconnected'));
Expand Down Expand Up @@ -397,7 +397,7 @@ const HomePage: NextPage = () => {
</div>
</div>
<div className={styles.imgBtn} style={{ marginTop: '20px' }} onClick={() => {
sendMessage('weather advisory');
sendMessage(t('label.weather_advisory'));
}}>
<p>{t('label.weather_advisory')}</p>
<Image
Expand All @@ -409,7 +409,7 @@ const HomePage: NextPage = () => {
</div>
</div>
<div className={styles.voiceRecorder} ref={voiceRecorderRef}>
<RenderVoiceRecorder setInputMsg={setInputMsg} tapToSpeak={true} />
<RenderVoiceRecorder setInputMsg={setInputMsg} tapToSpeak={true} includeDiv={true} />
</div></>}

{/* <div
Expand Down Expand Up @@ -466,7 +466,7 @@ const HomePage: NextPage = () => {
rows={1}
value={inputMsg}
onChange={handleInputChange}
placeholder={!context?.kaliaClicked ? placeholder : 'Enter you Aadhar number'}
placeholder={!context?.kaliaClicked ? placeholder : 'Enter you Aadhaar number'}
/>
<button type="submit" className={styles.sendButton}>
<Image
Expand Down
29 changes: 28 additions & 1 deletion apps/amakrushi/src/components/chat-message-item/index.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,9 @@
flex-direction: column;
margin: 0.5rem;
gap: 0.5rem;
white-space: nowrap;
color: var(--secondarygreen);
font-weight: bold;
min-width: 7rem;
}

.tableHeaderKalia {
Expand Down Expand Up @@ -224,6 +224,10 @@
background: #F2F2F2;
}

.tableDataCol:nth-child(even) {
background: #fff
}

.tableDataColKalia:nth-child(odd) {
background: #F2F2F2;
}
Expand All @@ -237,4 +241,27 @@
background: rgba(0, 0, 0, 0.1);
height: 2px;
margin: 1rem 0rem 1rem 0rem;
}

.disbursalTable {
table-layout: fixed;
width: 100%;
margin-left: -100px;
/*ie7*/
}

.tableDataCell {
border-bottom: 1px solid grey;
width: 100%;
height: 3rem;
text-align: center;
padding: 0rem 0.5rem;
}

.tableDataCellHeader {
min-width: 10rem;
height: 3rem;
padding: 0rem 0.5rem;
word-wrap: break-word;
white-space: break-spaces;
}
32 changes: 14 additions & 18 deletions apps/amakrushi/src/components/chat-message-item/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,33 +931,29 @@ const ChatMessageItem: FC<ChatMessageItemPropType> = ({ message, onSend }) => {
<Bubble type="text">
<div className={styles.tableContainer}>
<div className={styles.tableHeader}
style={{ fontSize: '13px' }}
style={{ fontSize: '13px', width: '30%', wordWrap: 'break-word', wordBreak: 'break-word', display: 'flex' }}
>
<div>
<b>Name of<br></br> Bank</b>
</div>
<div>IFSC Code</div>
<div>Payment<br></br> processed Date</div>
<div>Saving Bank <br></br>Account No</div>
<div>Payment Status </div>
<div>UTR No</div>
<p className={styles.tableDataCellHeader}>Name of<br></br> Bank</p>
<p className={styles.tableDataCellHeader}>IFSC Code</p>
<p className={styles.tableDataCellHeader}>Payment <br></br>processed Date</p>
<p className={styles.tableDataCellHeader}>Saving Bank<br></br> Account No</p>
<p className={styles.tableDataCellHeader}>Payment <br></br>Status </p>
<p className={styles.tableDataCellHeader}>UTR No</p>
</div>
<div className={styles.tableData}>
{data?.map(
(el: any, idx: any) => (
<div
key={el?.['Name of Bank'] + idx}
className={styles.tableDataCol}
style={{ fontSize: '13px' }}
style={{ fontSize: '13px', padding: '0rem' }}
>
<div>
<b> {el['Name of Bank']}</b>
</div>
<div>{el['IFSC Code']} </div>
<div>{el['Payment processed Date']}</div><br></br>
<div>{el['Saving Bank Account No.']}</div>
<div>{el['Payment Status']}</div>
<div>{el['UTR No.']}</div>
<div className={styles.tableDataCell}>{el['Name of Bank']}</div>
<div className={styles.tableDataCell}>{el['IFSC Code']} </div>
<div className={styles.tableDataCell}>{el['Payment processed Date']}</div>
<div className={styles.tableDataCell}>{el['Saving Bank Account No.']}</div>
<div className={styles.tableDataCell}>{el['Payment Status']}</div>
<div className={styles.tableDataCell}>{el['UTR No.']}</div>
</div>
)
)}
Expand Down
56 changes: 50 additions & 6 deletions apps/amakrushi/src/components/recorder/RenderVoiceRecorder.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import toast from 'react-hot-toast';
import { useLocalization } from '../../hooks';
import { useFlags } from 'flagsmith/react';

const RenderVoiceRecorder = ({ setInputMsg, tapToSpeak }) => {
const RenderVoiceRecorder = ({ setInputMsg, tapToSpeak, includeDiv = false }) => {
const t = useLocalization();
const [mediaRecorder, setMediaRecorder] = useState(null);
const [apiCallStatus, setApiCallStatus] = useState('idle');
Expand Down Expand Up @@ -184,7 +184,7 @@ const RenderVoiceRecorder = ({ setInputMsg, tapToSpeak }) => {
<div>
{mediaRecorder && mediaRecorder.state === 'recording' ? (
<div className={styles.center}>
<div className={styles.imgContainer}>
{includeDiv ? <div className={styles.imgContainer}>
<Image
priority
src={stop}
Expand All @@ -196,21 +196,40 @@ const RenderVoiceRecorder = ({ setInputMsg, tapToSpeak }) => {
layout="responsive"
/>
</div>
:
<Image
priority
src={stop}
alt="stopIcon"
onClick={() => {
stopRecording();
}}
style={{ cursor: 'pointer' }}
layout="responsive"
/>
}
</div>
) : (
<div className={styles.center}>
{apiCallStatus === 'processing' ? (
<div className={styles.imgContainer}>
includeDiv ? <div className={styles.imgContainer}>
<Image
priority
src={processing}
alt="processingIcon"
style={{ cursor: 'pointer' }}
layout="responsive"
/>
</div> :
<Image
priority
src={processing}
alt="processingIcon"
style={{ cursor: 'pointer' }}
layout="responsive"
/>
</div>
) : apiCallStatus === 'error' ? (
<div className={styles.imgContainer}>
includeDiv ? <div className={styles.imgContainer}>
<Image
priority
src={error}
Expand All @@ -223,9 +242,20 @@ const RenderVoiceRecorder = ({ setInputMsg, tapToSpeak }) => {
layout="responsive"
/>
</div>
: <Image
priority
src={error}
alt="errorIcon"
onClick={() => {
setUserClickedError(true);
startRecording();
}}
style={{ cursor: 'pointer' }}
layout="responsive"
/>
) : (
<>
<div className={styles.imgContainer}>
{includeDiv ? <div className={styles.imgContainer}>
<Image
priority
src={start}
Expand All @@ -240,6 +270,20 @@ const RenderVoiceRecorder = ({ setInputMsg, tapToSpeak }) => {
layout="responsive"
/>
</div>
: <Image
priority
src={start}
alt="startIcon"
onClick={() => {
setUserClickedError(true);
startRecording();
}}
style={{ cursor: 'pointer' }}
height={'10px !important'}
width={'10px !important'}
layout="responsive"
/>
}
{tapToSpeak ? (
<p style={{ color: 'black', fontSize: '12px', marginTop: '4px' }}>
{t('label.tap_to_speak')}
Expand Down
4 changes: 2 additions & 2 deletions apps/amakrushi/src/components/recorder/styles.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
position: relative;
overflow: hidden;
margin: auto;
width: 6rem;
height: 6rem;
width: 4rem;
height: 4rem;
}
Loading