Skip to content

Commit 41c4614

Browse files
Prasanjeet-MicrosoftPrasanjeet-Microsoft
committed
Merge branch 'main' into PSL-BUG-7953
2 parents cddd63f + be19c6a commit 41c4614

File tree

9 files changed

+87
-61
lines changed

9 files changed

+87
-61
lines changed

‎ClientAdvisor/App/frontend/src/components/Cards/Cards.module.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,12 @@
100100
display: flex;
101101
justify-content: center;
102102
margin: 1rem;
103+
}
104+
105+
@media screen and (-ms-high-contrast: active), (forced-colors: active) {
106+
.nextMeetingHeader{
107+
border: 2px solid WindowText;
108+
background-color: Window;
109+
color: WindowText;
110+
}
103111
}

‎ClientAdvisor/App/frontend/src/components/UserCard/UserCard.tsx‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,19 @@ const UserCard: React.FC<UserCardProps> = ({
4040
}) => {
4141
const [showMore, setShowMore] = useState(false);
4242

43-
const handleShowMoreClick = (event: React.MouseEvent) => {
43+
const handleShowMoreClick = (event: React.MouseEvent | React.KeyboardEvent) => {
4444
event.stopPropagation(); // Prevent the onCardClick from triggering
4545
setShowMore(!showMore);
46-
};
46+
};
4747

4848
return (
4949
<div className={styles.cardContainer}>
50-
<div className={`${styles.userInfo} ${isSelected ? styles.selected : ''}`} onClick={onCardClick}>
50+
<div tabIndex={0} className={`${styles.userInfo} ${isSelected ? styles.selected : ''}`} onClick={onCardClick} onKeyDown={(e) => {
51+
if (e.key === 'Enter' || e.key === ' ') {
52+
e.preventDefault(); // Prevent the default action like scrolling.
53+
handleShowMoreClick(e); // Call the same function as onClick.
54+
}
55+
}}>
5156
<div className={styles.clientName}>{ClientName}</div>
5257
<div className={styles.nextMeeting}><span><Icon iconName='Calendar' className={styles.calendarIcon} /></span>{NextMeeting}</div>
5358
<div className={styles.nextMeeting}><span><Icon iconName='Clock' className={styles.calendarIcon} /></span>{NextMeetingTime} - {NextMeetingEndTime}</div>
@@ -68,7 +73,12 @@ const UserCard: React.FC<UserCardProps> = ({
6873

6974

7075

71-
<div className={styles.showBtn} onClick={handleShowMoreClick}>
76+
<div tabIndex={0} className={styles.showBtn} onClick={handleShowMoreClick} onKeyDown={(e) => {
77+
if (e.key === 'Enter' || e.key === ' ') {
78+
e.preventDefault(); // Prevent the default action like scrolling.
79+
handleShowMoreClick(e); // Call the same function as onClick.
80+
}
81+
}}>
7282
{showMore ? 'Less details' : 'More details'}
7383
</div>
7484
</div>

‎ClientAdvisor/App/frontend/src/pages/layout/Layout.module.css‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,3 +309,11 @@
309309
position: absolute;
310310
right: 0.8rem;
311311
}
312+
313+
@media screen and (-ms-high-contrast: active), (forced-colors: active) {
314+
.contentColumn, .welcomeMessage, .shareButtonContainer, .meeting{
315+
border: 2px solid WindowText;
316+
background-color: Window;
317+
color: WindowText;
318+
}
319+
}

‎ClientAdvisor/App/frontend/src/pages/layout/Layout.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ const Layout = () => {
157157
/>
158158
<div className={styles.cardsColumn}>
159159
<div className={styles.selectClientHeading}>
160-
<h4 className={styles.meeting}>Upcoming meetings</h4>
160+
<h3 className={styles.meeting}>Upcoming meetings</h3>
161161
</div>
162162

163163
<Cards onCardClick={handleCardClick} />
@@ -191,7 +191,7 @@ const Layout = () => {
191191
<div className={styles.welcomeCardIcon}>
192192
<img src={welcomeIcon} alt="Icon" className={styles.icon} />
193193
</div>
194-
<h3 className={styles.welcomeTitle}>Select a client</h3>
194+
<h2 className={styles.welcomeTitle}>Select a client</h2>
195195
<p className={styles.welcomeText}>
196196
You can ask questions about their portfolio details and previous conversations or view their
197197
profile.

‎ClientAdvisor/Deployment/bicep/deploy_app_service.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ param VITE_POWERBI_EMBED_URL string = ''
172172

173173
// var WebAppImageName = 'DOCKER|ncwaappcontainerreg1.azurecr.io/ncqaappimage:v1.0.0'
174174

175-
var WebAppImageName = 'DOCKER|bycwacontainer.azurecr.io/byc-wa-app:latest'
175+
var WebAppImageName = 'DOCKER|bycwacontainerreg.azurecr.io/byc-wa-app:latest'
176176

177177
resource HostingPlan 'Microsoft.Web/serverfarms@2020-06-01' = {
178178
name: HostingPlanName

‎ClientAdvisor/Deployment/bicep/main.json‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.28.1.47646",
8-
"templateHash": "2944030756805106229"
7+
"version": "0.29.47.4906",
8+
"templateHash": "13936106300349938200"
99
}
1010
},
1111
"parameters": {
@@ -55,8 +55,8 @@
5555
"metadata": {
5656
"_generator": {
5757
"name": "bicep",
58-
"version": "0.28.1.47646",
59-
"templateHash": "14133192615685065374"
58+
"version": "0.29.47.4906",
59+
"templateHash": "14160084237240395045"
6060
}
6161
},
6262
"parameters": {
@@ -147,8 +147,8 @@
147147
"metadata": {
148148
"_generator": {
149149
"name": "bicep",
150-
"version": "0.28.1.47646",
151-
"templateHash": "3150658961575622806"
150+
"version": "0.29.47.4906",
151+
"templateHash": "17399517323120345417"
152152
}
153153
},
154154
"parameters": {
@@ -316,8 +316,8 @@
316316
"metadata": {
317317
"_generator": {
318318
"name": "bicep",
319-
"version": "0.28.1.47646",
320-
"templateHash": "7107429209445703694"
319+
"version": "0.29.47.4906",
320+
"templateHash": "16818958292648129851"
321321
}
322322
},
323323
"parameters": {
@@ -473,8 +473,8 @@
473473
"metadata": {
474474
"_generator": {
475475
"name": "bicep",
476-
"version": "0.28.1.47646",
477-
"templateHash": "11943975717275371176"
476+
"version": "0.29.47.4906",
477+
"templateHash": "17750640431748386549"
478478
}
479479
},
480480
"parameters": {
@@ -631,8 +631,8 @@
631631
"metadata": {
632632
"_generator": {
633633
"name": "bicep",
634-
"version": "0.28.1.47646",
635-
"templateHash": "13579945607876056775"
634+
"version": "0.29.47.4906",
635+
"templateHash": "14900700646237730459"
636636
}
637637
},
638638
"parameters": {
@@ -713,8 +713,8 @@
713713
"metadata": {
714714
"_generator": {
715715
"name": "bicep",
716-
"version": "0.28.1.47646",
717-
"templateHash": "1115057879253008311"
716+
"version": "0.29.47.4906",
717+
"templateHash": "5512132473254602596"
718718
}
719719
},
720720
"parameters": {
@@ -801,8 +801,8 @@
801801
"metadata": {
802802
"_generator": {
803803
"name": "bicep",
804-
"version": "0.28.1.47646",
805-
"templateHash": "16634912007560166724"
804+
"version": "0.29.47.4906",
805+
"templateHash": "18087275960613812283"
806806
}
807807
},
808808
"parameters": {
@@ -935,8 +935,8 @@
935935
"metadata": {
936936
"_generator": {
937937
"name": "bicep",
938-
"version": "0.28.1.47646",
939-
"templateHash": "11457072075934122081"
938+
"version": "0.29.47.4906",
939+
"templateHash": "5446272928246139512"
940940
}
941941
},
942942
"parameters": {
@@ -1054,8 +1054,8 @@
10541054
"metadata": {
10551055
"_generator": {
10561056
"name": "bicep",
1057-
"version": "0.28.1.47646",
1058-
"templateHash": "13902352642561651651"
1057+
"version": "0.29.47.4906",
1058+
"templateHash": "3863583258880925565"
10591059
}
10601060
},
10611061
"parameters": {
@@ -1164,8 +1164,8 @@
11641164
"metadata": {
11651165
"_generator": {
11661166
"name": "bicep",
1167-
"version": "0.28.1.47646",
1168-
"templateHash": "9511772940816294948"
1167+
"version": "0.29.47.4906",
1168+
"templateHash": "17656221802073055142"
11691169
}
11701170
},
11711171
"parameters": {
@@ -1281,8 +1281,8 @@
12811281
"metadata": {
12821282
"_generator": {
12831283
"name": "bicep",
1284-
"version": "0.28.1.47646",
1285-
"templateHash": "12144928080353588229"
1284+
"version": "0.29.47.4906",
1285+
"templateHash": "15721711795451128385"
12861286
}
12871287
},
12881288
"parameters": {
@@ -1787,8 +1787,8 @@
17871787
"metadata": {
17881788
"_generator": {
17891789
"name": "bicep",
1790-
"version": "0.28.1.47646",
1791-
"templateHash": "4307519442711409663"
1790+
"version": "0.29.47.4906",
1791+
"templateHash": "9953522498407272740"
17921792
}
17931793
},
17941794
"parameters": {
@@ -1991,8 +1991,8 @@
19911991
"metadata": {
19921992
"_generator": {
19931993
"name": "bicep",
1994-
"version": "0.28.1.47646",
1995-
"templateHash": "6875226704105965946"
1994+
"version": "0.29.47.4906",
1995+
"templateHash": "5513270017559796037"
19961996
}
19971997
},
19981998
"parameters": {
@@ -2377,7 +2377,7 @@
23772377
}
23782378
},
23792379
"variables": {
2380-
"WebAppImageName": "DOCKER|bycwacontainer.azurecr.io/byc-wa-app:latest"
2380+
"WebAppImageName": "DOCKER|bycwacontainerreg.azurecr.io/byc-wa-app:latest"
23812381
},
23822382
"resources": [
23832383
{

‎ClientAdvisor/Deployment/scripts/create_azure_functions.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ az storage account create --name $storageAccount --location eastus --resource-gr
3636
az functionapp create --resource-group $resourceGroupName --name $functionappname \
3737
--environment $env_name --storage-account $storageAccount \
3838
--functions-version 4 --runtime python \
39-
--image bycwacontainer.azurecr.io/byc-wa-fn:latest
39+
--image bycwacontainerreg.azurecr.io/byc-wa-fn:latest
4040

4141
# Sleep for 120 seconds
4242
echo "Waiting for 120 seconds to ensure the Function App is properly created..."

‎ResearchAssistant/Deployment/bicep/deploy_app_service.bicep‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ param AIStudioDraftFlowDeploymentName string = ''
162162
param AIStudioUse string = 'False'
163163

164164

165-
var WebAppImageName = 'DOCKER|byoaiacontainer.azurecr.io/byoaia-app:latest'
165+
var WebAppImageName = 'DOCKER|byoaiacontainerreg.azurecr.io/byoaia-app:latest'
166166

167167
resource HostingPlan 'Microsoft.Web/serverfarms@2020-06-01' = {
168168
name: HostingPlanName

0 commit comments

Comments
 (0)