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

Refactored code. Progress bar now is empty on first step of intake. #759

Merged
merged 10 commits into from
Dec 8, 2023
Merged

Refactored code. Progress bar now is empty on first step of intake. #759

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b28e1c3
Refactored code. Progress bar now is empty on first step of intake.
mexi-cano Nov 20, 2023
6298cd7
Updated progress styling.
mexi-cano Nov 20, 2023
341cb39
Prettier changes
mexi-cano Nov 21, 2023
5dbc211
Removed progress bar border.
mexi-cano Nov 28, 2023
fbcd6e0
Removed border shadow
mexi-cano Nov 28, 2023
2c02827
Reverted nullish coalescing approach.
mexi-cano Nov 29, 2023
c58a10b
Merge branch 'main' into refactor/progress-bar-update
mexi-cano Nov 30, 2023
98c0b55
Merge branch 'Marianna/734/typography-updates' into refactor/progress…
mexi-cano Dec 6, 2023
8c372dc
Updated hard coded colors to theme variables.
mexi-cano Dec 6, 2023
206dd35
Updated terraCotta color to secondary theme color. Reverted progress …
mexi-cano Dec 7, 2023
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
15 changes: 5 additions & 10 deletions src/Components/ProgressBar/ProgressBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,17 @@ const ProgressBar = ({ step }: ProgressBarProps) => {
const { theme, formData } = useContext(Context);
const totalSteps = getStepDirectory(formData.immutableReferrer).length + STARTING_QUESTION_NUMBER;
const { id } = useParams();
let stepValue: number = 0;
if (step !== undefined) {
stepValue = step;
} else if (id !== undefined) {
stepValue = Number(id);
}

let stepValue = step ?? id ?? 0;
let progressPercentage: number = ((Number(stepValue) - 1) / totalSteps) * 100;

const progressBarStyles = {
marginBottom: '5px',
backgroundColor: '#d6d6d6c4',
border: '1px solid #B0B0B0',
borderRadius: '500rem;',
height: '1rem',
boxShadow: 'inset -1px 1px 3px rgb(0 0 0 / 0.2)',
'& .MuiLinearProgress-bar': {
background: `linear-gradient(90deg, ${theme.primaryColor} 0%, ${theme.secondaryColor} 100%)`,
background: theme.secondaryColor,
borderRadius: '500rem;',
},
};
Expand All @@ -39,7 +34,7 @@ const ProgressBar = ({ step }: ProgressBarProps) => {
<LinearProgress
sx={progressBarStyles}
variant="determinate"
value={(stepValue / totalSteps) * 100}
value={progressPercentage}
className="progress-bar"
aria-label="Progress Bar"
/>
Expand Down