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

Re-build sidebar UI #8680

Merged
merged 17 commits into from
Oct 8, 2024
Merged

Re-build sidebar UI #8680

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2712f56
Setup @ for imports
bodhish Oct 1, 2024
bae2f5d
Setup shadcn
bodhish Oct 1, 2024
3783809
Update title for sidebar
bodhish Oct 1, 2024
8b1f948
Use semibold for selected
bodhish Oct 1, 2024
69f698d
Add a border
bodhish Oct 1, 2024
1816200
Merge branch 'develop' into patient-form-rebuild
gigincg Oct 3, 2024
dd4f6f3
Revert changes in config
bodhish Oct 3, 2024
c8f4ff4
Fix logs
bodhish Oct 3, 2024
fdecae1
Fix Duration
gigincg Oct 3, 2024
0aa0c65
Remove height classes
bodhish Oct 3, 2024
3b85acd
Merge branch 'patient-form-rebuild' of github.com:ohcnetwork/care_fe …
bodhish Oct 3, 2024
17ee262
Minor height fix
bodhish Oct 3, 2024
11ad73a
Use ohc logo as default
bodhish Oct 4, 2024
1290021
Merge branch 'develop' into patient-form-rebuild
nihal467 Oct 4, 2024
e158e50
Merge branch 'develop' into patient-form-rebuild
nihal467 Oct 6, 2024
cdcc0e4
fixed page loader, favicon and icon size in mobile view
nihal467 Oct 6, 2024
1d334b4
fixed the cypress failure
nihal467 Oct 6, 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
4 changes: 2 additions & 2 deletions care.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ const careConfig = {
},

headerLogo: logo(env.REACT_HEADER_LOGO, {
light: "https://cdn.ohc.network/header_logo.png",
light: "/images/care_logo.svg",
dark: "https://cdn.ohc.network/header_logo.png",
}),
mainLogo: logo(env.REACT_MAIN_LOGO, {
light: "https://cdn.ohc.network/light-logo.svg",
light: "/images/care_logo.svg",
dark: "https://cdn.ohc.network/black-logo.svg",
}),
stateLogo: logo(env.REACT_STATE_LOGO),
Expand Down
20 changes: 20 additions & 0 deletions components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "new-york",
"rsc": false,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"css": "src/style/index.css",
"baseColor": "zinc",
"cssVariables": false,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils",
"ui": "@/components/ui",
"lib": "@/lib",
"hooks": "@/hooks"
}
}
Loading
Loading