Skip to content

Commit 9cab225

Browse files
Shreya AgrawalShreya Agrawal
authored andcommitted
for add year- provide only the options which do not
already exist
2 parents 99a3692 + 2102f95 commit 9cab225

File tree

3 files changed

+42
-34
lines changed

3 files changed

+42
-34
lines changed

client/src/screens/browse/components/browsefolder/index.jsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { ConfirmDialog } from "./confirmDialog";
1111
const BrowseFolder = ({ type = "file", color, path, name, subject, folderData, parentFolder }) => {
1212
const dispatch = useDispatch();
1313
const currYear = useSelector((state) => state.fileBrowser.currentYear);
14+
const isBR = useSelector((state) => state.user.user.isBR);
1415
const [showConfirm, setShowConfirm] = useState(false);
1516
const onClick = (folderData) => {
1617
// return;
@@ -120,14 +121,14 @@ const BrowseFolder = ({ type = "file", color, path, name, subject, folderData, p
120121
<div className="top">
121122
<p className="path">{""}</p>
122123
<p className="name">{name ? name : "Name"}</p>
123-
<span
124+
{isBR && <span
124125
className="delete"
125126
onClick={(e) => {
126127
e.stopPropagation();
127128
setShowConfirm(true);
128129
}}
129130
title="Delete folder"
130-
></span>
131+
></span>}
131132
</div>
132133
<div className="bottom">
133134
<p className="subject">
@@ -136,12 +137,12 @@ const BrowseFolder = ({ type = "file", color, path, name, subject, folderData, p
136137
</div>
137138
</div>
138139
</div>
139-
<ConfirmDialog
140+
{isBR &&<ConfirmDialog
140141
isOpen={showConfirm}
141142
type="delete"
142143
onConfirm={handleDelete}
143144
onCancel={cancelDelete}
144-
/>
145+
/>}
145146
</>
146147
);
147148
};

client/src/screens/browse/components/year-info/index.jsx

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,14 @@ const YearInfo = ({
9494
key={idx}
9595
>
9696
{year.name}
97-
<div
98-
className="delete"
99-
onClick={handleDeleteYear}
100-
title="Delete Year"
101-
></div>
97+
{isBR?
98+
<div
99+
className="delete"
100+
onClick={handleDeleteYear}
101+
title="Delete Year"
102+
></div>
103+
:null
104+
}
102105

103106
</span>
104107
<ConfirmDelDialog
@@ -111,30 +114,33 @@ const YearInfo = ({
111114
);
112115
})}
113116
</div>
114-
<div className="year-content year add-year">
115-
{course &&
116-
<div>
117-
<div className="">
118-
<span className="" onClick={handleAddYear}>
119-
<span className="text">New Year</span>
120-
</span>
117+
{isBR?
118+
<div className="year-content year add-year">
119+
{course &&
120+
<div>
121+
<div className="">
122+
<span className="" onClick={handleAddYear}>
123+
<span className="text">New Year</span>
124+
</span>
125+
</div>
126+
<ConfirmDialog
127+
show={showConfirm}
128+
input={true}
129+
// inputValue={newFolderName}
130+
// onInputChange={(e) => setNewFolderName(e.target.value)}
131+
yearName={newYearName}
132+
onYearNameChange={setNewYearName}
133+
onConfirm={handleConfirmAddYear}
134+
onCancel={() => setShowConfirm(false)}
135+
confirmText="Create"
136+
cancelText="Cancel"
137+
course={course}
138+
/>
121139
</div>
122-
<ConfirmDialog
123-
show={showConfirm}
124-
input={true}
125-
// inputValue={newFolderName}
126-
// onInputChange={(e) => setNewFolderName(e.target.value)}
127-
yearName={newYearName}
128-
onYearNameChange={setNewYearName}
129-
onConfirm={handleConfirmAddYear}
130-
onCancel={() => setShowConfirm(false)}
131-
confirmText="Create"
132-
cancelText="Cancel"
133-
course={course}
134-
/>
135-
</div>
136-
}
137-
</div>
140+
}
141+
</div>
142+
:null
143+
}
138144
</div>
139145
</>
140146
);

client/src/screens/browse/index.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ const BrowseScreen = () => {
186186
folderData?.childType === "Folder"? "Select a folder..."
187187
:currCourse?"No data available for this course":"Select a course..."
188188

189-
190189
return (
191190
<Container color={"light"} type={"fluid"}>
192191
<div className="navbar-browse-screen">
@@ -205,7 +204,9 @@ const BrowseScreen = () => {
205204
{user.localCourses?.map((course, idx) => {
206205
return <Collapsible color={course.color} key={idx} course={course} />;
207206
})}
208-
207+
{user.user?.isBR && (
208+
<h4 className="heading">PREVIOUS COURSES</h4>
209+
)}
209210
{!(user.user?.isBR && user.user?.previousCourses?.length > 0)
210211
? ""
211212
: `<h4 className="heading">PREVIOUS COURSES</h4>` &&

0 commit comments

Comments
 (0)