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

Restyle matcher UI #470

Merged
merged 2 commits into from
Mar 14, 2024
Merged

Restyle matcher UI #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fbb101
Add confirmation modals, restyle buttons and inputs
smartspot2 Mar 4, 2024
4541152
Rework save/submit button logic
smartspot2 Mar 10, 2024
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
8 changes: 4 additions & 4 deletions csm_web/frontend/src/components/enrollment_automation/MentorSectionPreferences.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ export function MentorSectionPreferences({
// multiple selected events
<div className="matcher-sidebar-header">Multiple selected events</div>
)}
<label>
<label className="matcher-pref-input-label">
Preference:
<input
className="matcher-input"
className="form-input light"
type="number"
key={event.id}
defaultValue={event.preference}
Expand Down Expand Up @@ -236,7 +236,7 @@ export function MentorSectionPreferences({
{profile.course} ({relation})
</h2>
{switchProfileEnabled && (
<button className="matcher-secondary-btn" onClick={switchProfile}>
<button className="secondary-btn" onClick={switchProfile}>
Switch profile
</button>
)}
Expand All @@ -245,7 +245,7 @@ export function MentorSectionPreferences({
<div className="mentor-sidebar-left">
<div className="matcher-sidebar-left-top">{sidebarContents}</div>
<div className="matcher-sidebar-left-bottom-row">
<button className="matcher-submit-btn" onClick={postPreferences}>
<button className="primary-btn" onClick={postPreferences}>
Submit
</button>
<div className="matcher-submit-status-container">{statusContent}</div>
Expand Down
16 changes: 8 additions & 8 deletions csm_web/frontend/src/components/enrollment_automation/coordinator/ConfigureStage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export const ConfigureStage = ({ profile, slots, recomputeStage }: ConfigureStag
<div className="matcher-configure-sidebar-contents">
<div className="matcher-configure-input-container">Click on a time slot to configure it.</div>
<div className="matcher-configure-sidebar-buttons">
<button className="matcher-submit-btn" onClick={saveConfig}>
<button className="primary-btn" onClick={saveConfig}>
Save
</button>
<div className="matcher-submit-status-container">{statusContent}</div>
Expand All @@ -208,7 +208,7 @@ export const ConfigureStage = ({ profile, slots, recomputeStage }: ConfigureStag
<div key={`${slot.id}-${selectedEventIndices.length}-min`} className="matcher-configure-input-group">
<span>Min</span>
<input
className="matcher-configure-input"
className="form-input light matcher-configure-input"
type="number"
min={0}
max={maxMentor}
Expand All @@ -221,7 +221,7 @@ export const ConfigureStage = ({ profile, slots, recomputeStage }: ConfigureStag
<div key={`${slot.id}-${selectedEventIndices.length}-max`} className="matcher-configure-input-group">
<span>Max</span>
<input
className="matcher-configure-input"
className="form-input light matcher-configure-input"
type="number"
min={minMentor}
defaultValue={maxMentor}
Expand All @@ -239,7 +239,7 @@ export const ConfigureStage = ({ profile, slots, recomputeStage }: ConfigureStag
)}
<div className="matcher-configure-sidebar-footer">Shift-click to select more slots.</div>
<div className="matcher-configure-sidebar-buttons">
<button className="matcher-submit-btn" onClick={saveConfig}>
<button className="primary-btn" onClick={saveConfig}>
Save
</button>
<div className="matcher-submit-status-container">{statusContent}</div>
Expand All @@ -254,7 +254,7 @@ export const ConfigureStage = ({ profile, slots, recomputeStage }: ConfigureStag
<div className="coordinator-sidebar-left">
<div className="matcher-sidebar-left-top">{sidebarContents}</div>
<div className="matcher-sidebar-left-bottom">
<label className="matcher-submit-btn matcher-toggle-btn">
<label className="secondary-btn">
<input ref={selectAllRef} type="checkbox" onChange={toggleSelectAll} />
Select All
</label>
Expand All @@ -268,12 +268,12 @@ export const ConfigureStage = ({ profile, slots, recomputeStage }: ConfigureStag
getEventDetails={getEventDetails}
eventCreationEnabled={false}
limitScrolling={true}
brighterLinkedTimes={false}
brighterLinkedTimes={true}
/>
</div>
</div>
<div className="matcher-body-footer">
<button className="matcher-secondary-btn" onClick={reopenForm}>
<button className="secondary-btn" onClick={reopenForm}>
Reopen Form
</button>
{matcherError && (
Expand All @@ -282,7 +282,7 @@ export const ConfigureStage = ({ profile, slots, recomputeStage }: ConfigureStag
<span className="matcher-configure-error-text">{matcherError}</span>
</div>
)}
<button className="matcher-submit-btn" onClick={runMatcher}>
<button className="primary-btn" onClick={runMatcher}>
Run Matcher
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions csm_web/frontend/src/components/enrollment_automation/coordinator/CoordinatorMatcherForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function CoordinatorMatcherForm({
return {
interval: Interval.fromDateTimes(parseTime(time.startTime), parseTime(time.endTime)),
day: time.day,
isLinked: slot.times.length > 0
isLinked: slot.times.length > 1
};
});
return {
Expand Down Expand Up @@ -159,7 +159,7 @@ export function CoordinatorMatcherForm({
{profile.course} ({relation})
</h2>
{switchProfileEnabled && (
<button className="matcher-secondary-btn" onClick={switchProfile}>
<button className="secondary-btn" onClick={switchProfile}>
Switch profile
</button>
)}
Expand Down
Loading
Loading