Skip to content

Commit

Permalink
Merge pull request #7 from Robert-M-Lucas/dev-SCRUM-35
Browse files Browse the repository at this point in the history
Dev scrum 35
  • Loading branch information
Robert-M-Lucas authored Apr 15, 2024
2 parents 3c1c183 + 501c7c6 commit 9127f20
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .run/Test Deploy.run.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/usr/bin/zsh" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_IN_TERMINAL" value="false" />
<option name="EXECUTE_SCRIPT_FILE" value="false" />
<envs />
<method v="2">
Expand Down
32 changes: 24 additions & 8 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
export function Footer() {
return <footer className="py-3 my-4">
<hr/>
<ul className="nav justify-content-center pb-3 mb-3">
<li className="nav-item"><a href="/" className="nav-link px-2 text-muted">Home</a></li>
<li className="nav-item"><a href="/index#contact" className="nav-link px-2 text-muted">Contact</a></li>
</ul>
<p className="text-center text-muted">Sample Footer © 2024 Group 19 Inc.</p>
import {Link} from "react-router-dom";


type HeightUnit = 'px' | 'rem' | 'vh';
type HeightProp = `${number}${HeightUnit}` | "0";

interface Props {
margin?: HeightProp;
}

export function Footer({margin = "0"}: Props) {
return <footer style={{marginTop: margin}}>
<hr className="my-0 w-100"/>

<div style={{padding: "2.5rem 0"}}>
<ul className="nav justify-content-center pt-0 mt-0 pb-3 mb-3">
<li className="nav-item"><Link to="/" className="nav-link px-2 text-muted py-0">Home</Link></li>
<li className="nav-item"><Link to="/dash" className="nav-link px-2 text-muted py-0">Dashboard</Link></li>
<li className="nav-item"><Link to="#" className="nav-link px-2 text-muted py-0" onClick={() => window.scrollTo(0, 0)}>
Top
</Link></li>
</ul>
<p className="text-center text-muted mb-0">Budget-19 © 2024 Group 19 Inc.</p>
</div>
</footer>;
}

0 comments on commit 9127f20

Please sign in to comment.