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.

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

New login page #12

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ venv/
*.pyz
*.pyw
node_modules
frontend/src/assets/images/
11 changes: 10 additions & 1 deletion frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@
"dependencies": {
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@heroicons/react": "^2.2.0",
"@mui/icons-material": "^6.1.2",
"@mui/material": "^6.1.2",
"@supabase/supabase-js": "^2.45.5",
"@supabase/supabase-js": "^2.46.1",
"axios": "^1.7.7",
"dependencies": "^0.0.1",
"pdfjs-dist": "^4.7.76",
Expand Down
Binary file added frontend/src/assets/images/ShopLogBooks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/images/logbooks.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/images/logo-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions frontend/src/components/Buttons/CLButtons.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
const DEFAULT_HEIGHT = "54px";
const DEFAULT_WIDTH = "fit-content";
const DEFAULT_BORDER_RADIUS = "20px";
const DEFAULT_ON_CLICK = () => {};

// PRIMARY specific styles
const PRIMARY_COLOR = "#F7FAFF";
const PRIMARY_BACKGROUND_COLOR = "#244B94";

// SECONDARY specific styles
const SECONDARY_COLOR = "#4F607E";
const SECONDARY_BACKGROUND_COLOR = "#F7FAFF";
const SECONDARY_BORDER = "1px solid #9AB0E1";

/**
* PRIMARY variant of the clinical logging button.
* Should work out of the box for most use cases (with the exception of onClick which does nothing by default).
* The height and width are customizable if necessary.
*/
export const CLButtonPrimary = ({
children,
height = DEFAULT_HEIGHT,
width = DEFAULT_WIDTH,
onClick = DEFAULT_ON_CLICK,
}) => {
return (
<button
onClick={onClick}
style={{
height: height,
width: width,
color: PRIMARY_COLOR,
backgroundColor: PRIMARY_BACKGROUND_COLOR,
borderRadius: DEFAULT_BORDER_RADIUS,
}}
>
{children}
</button>
);
};

/**
* SECONDARY variant of the clinical logging button.
* Should work out of the box for most use cases (with the exception of onClick which does nothing by default).
* The height and width are customizable if necessary.
*/
export const CLButtonSecondary = ({
children,
height = DEFAULT_HEIGHT,
width = DEFAULT_WIDTH,
onClick = DEFAULT_ON_CLICK,
}) => {
return (
<button
onClick={onClick}
style={{
height: height,
width: width,
color: SECONDARY_COLOR,
backgroundColor: SECONDARY_BACKGROUND_COLOR,
border: SECONDARY_BORDER,
borderRadius: DEFAULT_BORDER_RADIUS,
}}
>
{children}
</button>
);
};
4 changes: 0 additions & 4 deletions frontend/src/components/Buttons/CreateNewLogButton.css

This file was deleted.

23 changes: 0 additions & 23 deletions frontend/src/components/Buttons/CreateNewLogButton.jsx

This file was deleted.

11 changes: 0 additions & 11 deletions frontend/src/components/Buttons/HomeButton.jsx

This file was deleted.

4 changes: 0 additions & 4 deletions frontend/src/components/Buttons/LogHistoryButton.css

This file was deleted.

23 changes: 0 additions & 23 deletions frontend/src/components/Buttons/LogHistoryButton.jsx

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/src/components/Buttons/SignInButton.css

This file was deleted.

20 changes: 0 additions & 20 deletions frontend/src/components/Buttons/SignInButton.jsx

This file was deleted.

10 changes: 0 additions & 10 deletions frontend/src/components/Buttons/SignOutButton.css

This file was deleted.

24 changes: 0 additions & 24 deletions frontend/src/components/Buttons/SignOutButton.jsx

This file was deleted.

4 changes: 0 additions & 4 deletions frontend/src/components/Buttons/SignUpButton.css

This file was deleted.

15 changes: 0 additions & 15 deletions frontend/src/components/Buttons/SignUpButton.jsx

This file was deleted.

Loading