-
Notifications
You must be signed in to change notification settings - Fork 0
Responsive grid layout (#6) #22
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
eb2ee05
Constant height for Breadcrumb
theMattCode 366edc9
Rename: give room for the real ContentLayout
theMattCode e4c5f78
Stub GridLayout and apply to index route
theMattCode 63f472b
Implement solid grid model
theMattCode 35e0e9c
Fix Transactions layout
theMattCode 368b638
Fix location
theMattCode dd762b7
Use a 2/4/6/12 grid layout
theMattCode 5cf9cc0
lint-fix
theMattCode File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
...omponents/ContentLayout/ContentLayout.tsx → ...rc/components/ContentArea/ContentArea.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| import type { PropsWithChildren } from 'react'; | ||
|
|
||
| export function GridLayout({ children }: PropsWithChildren) { | ||
| return <div className="pr-4 overflow-auto grid-layout">{children}</div>; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| import type { PropsWithChildren } from 'react'; | ||
| import { cx } from '@/utils/styles.ts'; | ||
|
|
||
| export function Section({ children }: PropsWithChildren) { | ||
| return ( | ||
| <div className="self-start w-full bg-(--color-bg) flex p-4 rounded-lg border border-(--color-section-border)"> | ||
| {children} | ||
| </div> | ||
| ); | ||
| interface Props { | ||
| className?: string; | ||
| } | ||
|
|
||
| export function Section({ children, className }: PropsWithChildren<Props>) { | ||
| return <div className={cx('section-base', className)}>{children}</div>; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,25 @@ | ||
| import { createFileRoute } from '@tanstack/react-router'; | ||
| import { WeatherWidget } from '@/domain/weather/WeatherWidget.tsx'; | ||
| import { LOCATION_MOESSINGEN, LOCATION_OBERNHEIM } from '@/domain/weather/model/model.ts'; | ||
| import { LOCATION_MOESSINGEN, LOCATION_OBERNHEIM, LOCATION_TUEBINGEN } from '@/domain/weather/model/model.ts'; | ||
| import { GridLayout } from '@/components/ContentLayout/GridLayout.tsx'; | ||
| import { Section } from '@/components/Section/Section.tsx'; | ||
|
|
||
| export const Route = createFileRoute('/')({ | ||
| component: App, | ||
| component: Overview, | ||
| }); | ||
|
|
||
| function App() { | ||
| function Overview() { | ||
| return ( | ||
| <> | ||
| <WeatherWidget location={LOCATION_MOESSINGEN} /> | ||
| <WeatherWidget location={LOCATION_OBERNHEIM} /> | ||
| {/* | ||
| <VoiceWidget /> | ||
| */} | ||
| </> | ||
| <GridLayout> | ||
| <Section className="col-span-2 md:col-span-2 lg:col-span-2 2xl:col-span-2"> | ||
| <WeatherWidget location={LOCATION_MOESSINGEN} /> | ||
| </Section> | ||
| <Section className="col-span-2 md:col-span-2 lg:col-span-2 2xl:col-span-2"> | ||
| <WeatherWidget location={LOCATION_OBERNHEIM} /> | ||
| </Section> | ||
| <Section className="col-span-2 md:col-span-2 lg:col-span-2 2xl:col-span-2"> | ||
| <WeatherWidget location={LOCATION_TUEBINGEN} /> | ||
| </Section> | ||
| </GridLayout> | ||
| ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When
/finance/transactionsrenders atmdand above,GridLayoutcreates 4/6/12 columns butTransactionsis the only direct grid item and has nocol-span-*class. That leaves the whole form and table squeezed into a single narrow column instead of the full content area it occupied before this change; wrap it in a full-span item or avoid the card grid for this route.Useful? React with 👍 / 👎.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will be reworked anyways. Ok for now.