Skip to content

Commit 875a9be

Browse files
committed
ui edits
1 parent 892537c commit 875a9be

File tree

3 files changed

+37
-13
lines changed

3 files changed

+37
-13
lines changed

rsa-frontend/src/routes/components/ScenarioArea.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ const UserContainer = ({ userId }) => {
211211
<img src="/icon/hacker.png" alt="Open Spy Menu" className={"mini-icon"} />
212212
</div></p>}
213213
{isSpyModalOpen && (
214-
<Modal isOpen={isSpyModalOpen} onRequestClose={closeSpyModal} contentLabel="Casus Menüsü">
214+
<Modal isOpen={isSpyModalOpen} onRequestClose={closeSpyModal} contentLabel="Casus Menüsü" ariaHideApp={false}>
215215
<div className={"custom-row"} style={{justifyContent:"space-between"}}>
216216
<h2>{`Bütün Dosyalar`}</h2>
217217
<p onClick={closeSpyModal} style={{cursor:"pointer"}}>Kapat</p>
@@ -266,7 +266,7 @@ const UserContainer = ({ userId }) => {
266266
</div>
267267
</div>
268268

269-
<div className={"custom-row"} style={{gap:36}}>
269+
<div className={"custom-row wrap-row wrap-gap"}>
270270
<div className={"custom-row"} style={{gap:0}}>
271271
<Switch
272272
isOn={user.fileUpload}
@@ -309,7 +309,7 @@ const UserContainer = ({ userId }) => {
309309
Dosya Görüntüle
310310
</div>
311311
</div>
312-
<Modal isOpen={isReadModalOpen} onRequestClose={closeReadModal} contentLabel="Dosyalar">
312+
<Modal isOpen={isReadModalOpen} onRequestClose={closeReadModal} contentLabel="Dosyalar" ariaHideApp={false}>
313313
<div className={"custom-row"} style={{justifyContent:"space-between"}}>
314314
<h2>{`Kullanıcı Dosyaları : ${user.name}`}</h2>
315315
<p onClick={closeReadModal} style={{cursor:"pointer"}}>Kapat</p>
@@ -358,20 +358,20 @@ const UserContainer = ({ userId }) => {
358358
</div>
359359

360360
{isUserSelectModalOpen && (
361-
<Modal isOpen={isUserSelectModalOpen} onRequestClose={closeUserSelectModal} contentLabel="Users">
361+
<Modal isOpen={isUserSelectModalOpen} onRequestClose={closeUserSelectModal} contentLabel="Users" ariaHideApp={false}>
362362
<div className={"custom-row"} style={{ justifyContent: "space-between" }}>
363363
<h3>Gönderilecek dosyayı ve kime gönderileceğini seçiniz</h3>
364364
<p onClick={closeUserSelectModal} style={{ cursor: "pointer" }}>Kapat</p>
365365
</div>
366-
<div>
366+
<div className={"custom-row"} style={{marginTop:8,marginBottom:8}}>
367367
{user.name !== "Alice" && (
368-
<p onClick={() => handleRecipientSelect(1)} style={{ color: recipientId === 1 ? "green" : "black" ,padding:8,cursor:"pointer"}}>Alice</p>
368+
<p className={"user-button"} onClick={() => handleRecipientSelect(1)} style={{ backgroundColor: recipientId === 1 ? "green" : null,width:"max-content"}}>Alice</p>
369369
)}
370370
{user.name !== "Bob" && (
371-
<p onClick={() => handleRecipientSelect(2)} style={{ color: recipientId === 2 ? "green" : "black" ,padding:8,cursor:"pointer"}}>Bob</p>
371+
<p className={"user-button"} onClick={() => handleRecipientSelect(2)} style={{ backgroundColor: recipientId === 2 ? "green" : null,width:"max-content"}}>Bob</p>
372372
)}
373373
{user.name !== "Charlie" && (
374-
<p onClick={() => handleRecipientSelect(3)} style={{ color: recipientId === 3 ? "green" : "black" ,padding:8,cursor:"pointer"}}>Charlie</p>
374+
<p className={"user-button"} onClick={() => handleRecipientSelect(3)} style={{ backgroundColor: recipientId === 3 ? "var(--green-color-1)" : null,width:"max-content"}}>Charlie</p>
375375
)}
376376
</div>
377377
{recipientId && (
@@ -401,7 +401,7 @@ const UserContainer = ({ userId }) => {
401401
Dosya Al
402402
</div>
403403
</div>
404-
<Modal isOpen={isReceiveModalOpen} onRequestClose={closeReceiveModal} contentLabel="Dosyalar">
404+
<Modal isOpen={isReceiveModalOpen} onRequestClose={closeReceiveModal} contentLabel="Dosyalar" ariaHideApp={false}>
405405
<div className={"custom-row"} style={{justifyContent:"space-between"}}>
406406
<h2>{`${user.name} Kullanıcısına Gelen Dosyalar`}</h2>
407407
<p onClick={closeReceiveModal} style={{cursor:"pointer"}}>Kapat</p>
@@ -476,7 +476,7 @@ const ScenarioArea = () => {
476476
{loading && <div className={"loading-overlay"}><div className={"main-spinner"}></div></div>}
477477
<div className="scenario-area">
478478
<p className={"title-text"}><span>Senaryo</span> Alanı</p>
479-
<div className="custom-row">
479+
<div className="custom-row wrap-row">
480480
<p className={"italic"} style={{ marginRight: 12 }}>Kullanıcı<br />Seçim</p>
481481
{
482482
(users !== null && users.length !== 0) ?
@@ -515,4 +515,4 @@ const ScenarioArea = () => {
515515
);
516516
};
517517

518-
export default ScenarioArea;
518+
export default ScenarioArea;

rsa-frontend/src/routes/components/Scenarios.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const Scenarios = () => {
1111

1212
return (
1313
<div className="scenarios">
14-
<div className="custom-row">
14+
<div className="custom-row wrap-row">
1515
{scenarios.map((scenario) => (
1616
<div
1717
key={scenario.id}
@@ -25,7 +25,7 @@ const Scenarios = () => {
2525
{activeScenario ? (
2626
<div>
2727
<p>{scenarios.find(scenario => scenario.id === activeScenario)?.text}</p>
28-
<img src={scenarios.find(scenario => scenario.id === activeScenario)?.path} alt="" width="60%" style={{marginTop:8}}/>
28+
<img src={scenarios.find(scenario => scenario.id === activeScenario)?.path} alt="" width="100%" style={{marginTop:8,maxWidth:600}}/>
2929
</div>
3030

3131
) : (

rsa-frontend/src/routes/css/index.css

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,4 +274,28 @@ span{
274274
text-align: center;
275275
font-size: 13px;
276276
}
277+
.wrap-gap{
278+
column-gap: 36px;
279+
}
280+
281+
282+
283+
@media (max-width: 1144px) {
284+
.home{
285+
flex-direction: column;
286+
}
287+
288+
.file-explorer{
289+
width: auto;
290+
}
291+
292+
.wrap-row{
293+
flex-wrap: wrap;
294+
}
295+
296+
.wrap-gap{
297+
column-gap: 32px;
298+
}
299+
}
300+
277301

0 commit comments

Comments
 (0)