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

feat(web): Add default header for fiskistofa organization #15973

Merged
merged 2 commits into from
Sep 12, 2024

Conversation

mannipje
Copy link
Member

@mannipje mannipje commented Sep 12, 2024

Add default header for fiskistofa organization

What

Make it possible to use default header for syslumenn organization via config.

Why

A design that was approved by Digital Iceland

Screenshots / Gifs

Before

image

After

image

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Formatting passes locally with my changes
  • I have rebased against main before asking for a review

Summary by CodeRabbit

  • New Features
    • Introduced a conditional rendering mechanism for the organization header, allowing for a default header display based on specific conditions.
    • Added a customizable FiskistofaDefaultHeader component that adapts to different contexts and screen sizes.
  • Style
    • Implemented new styles for the Fiskistofa theme's grid container, ensuring consistent width and alignment.
  • Documentation
    • Updated exports to include the new FiskistofaDefaultHeader component for enhanced module functionality.

@mannipje mannipje added the automerge Merge this PR as soon as all checks pass label Sep 12, 2024
@mannipje mannipje requested a review from a team as a code owner September 12, 2024 13:31
Copy link
Contributor

coderabbitai bot commented Sep 12, 2024

Walkthrough

The changes in this pull request introduce a new conditional rendering mechanism for the organization header in the OrganizationWrapper.tsx file, specifically for the fiskistofa organization. A new component, FiskistofaDefaultHeader, is created to serve as an alternative header, which is rendered based on a specific condition. Additionally, a new CSS module is added to define styles for the grid container, enhancing the layout for the Fiskistofa theme. The modifications include updates to the exports of the relevant components to incorporate the new header.

Changes

File Change Summary
apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx Introduced conditional rendering for FiskistofaHeader based on n('usingDefaultHeader', false). Added FiskistofaDefaultHeader.
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaDefaultHeader.css.ts Added a CSS module defining gridContainerWidth for the Fiskistofa theme with specific styling.
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaDefaultHeader.tsx Created FiskistofaDefaultHeader component with props for organization page, logo alt text, and subpage status. Integrated responsive design features.
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/index.ts Exported FiskistofaDefaultHeader to enhance the module's functionality without altering existing exports.

Possibly related PRs


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Outside diff range and nitpick comments (1)
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaDefaultHeader.tsx (1)

1-65: The FiskistofaDefaultHeader component implementation looks good! 👍

The component follows the NextJS best practices and efficiently manages the state using custom hooks. It is designed to be rendered on the server-side and uses TypeScript effectively to ensure type safety. The component is modular, reusable, and promotes code reuse by using the DefaultHeader component from the shared library. The use of a custom CSS module helps to avoid CSS conflicts and keeps the styles scoped to the component.

A few additional suggestions to further improve the component:

  1. Consider extracting the background style logic into a separate function or variable to improve readability and maintainability.
  2. Add PropTypes or default props to the component to improve documentation and provide better developer experience.
  3. Consider adding a loading state or placeholder for the logo image to improve the user experience while the image is loading.
+ const getBackgroundStyle = (width: number, isSubpage: boolean, themeProp: OrganizationPage['themeProperties']) => {
+   if (width > theme.breakpoints.lg && !isSubpage) {
+     return themeProp.backgroundColor
+   }
+   return 'no-repeat 52% 30% ,linear-gradient(180deg, #E6F2FB 21.56%, #90D9E3 239.74%)'
+ }
+
+ FiskistofaDefaultHeader.propTypes = {
+   organizationPage: PropTypes.object.isRequired,
+   logoAltText: PropTypes.string.isRequired,
+   isSubpage: PropTypes.bool.isRequired,
+ }
+
+ FiskistofaDefaultHeader.defaultProps = {
+   isSubpage: false,
+ }
Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 754cc56 and 3997532.

Files selected for processing (4)
  • apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx (2 hunks)
  • apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaDefaultHeader.css.ts (1 hunks)
  • apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaDefaultHeader.tsx (1 hunks)
  • apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/index.ts (1 hunks)
Additional context used
Path-based instructions (4)
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaDefaultHeader.css.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/index.ts (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaDefaultHeader.tsx (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx (1)

Pattern apps/**/*: "Confirm that the code adheres to the following:

  • NextJS best practices, including file structure, API routes, and static generation methods.
  • Efficient state management and server-side rendering techniques.
  • Optimal use of TypeScript for component and utility type safety."
Additional comments not posted (6)
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/FiskistofaDefaultHeader.css.ts (1)

1-6: LGTM!

The CSS module follows best practices and adheres to the project's conventions:

  • The exported constant uses camelCase, which is the recommended naming convention for CSS Modules.
  • The @vanilla-extract/css library is utilized, providing type safety and other benefits associated with CSS-in-JS solutions.
  • The maximum width of 1342px seems appropriate for a header component, assuming it aligns with the design requirements.
  • Centering the element horizontally using margin: '0 auto' is a common and effective technique.
apps/web/components/Organization/Wrapper/Themes/FiskistofaTheme/index.ts (2)

3-3: LGTM!

The import statement is correct and necessary for exporting FiskistofaDefaultHeader later in the file.


11-11: LGTM!

The export statement is correct and aligns with the PR objective of introducing a default header for the Fiskistofa organization. It enhances the module's functionality by providing an additional header component that can be utilized in other parts of the application.

apps/web/components/Organization/Wrapper/OrganizationWrapper.tsx (3)

62-65: LGTM!

The import statements are correct and necessary for the conditional rendering logic introduced later in the file.


334-340: Excellent work!

The conditional rendering logic for the fiskistofa organization header is implemented correctly. The FiskistofaDefaultHeader component receives the necessary props to render correctly based on the condition n('usingDefaultHeader', false). The changes adhere to the best practices and are consistent with the existing code.


335-339: Great job!

The isSubpage prop is correctly passed to the FiskistofaDefaultHeader component based on the condition (isSubpage && n('smallerSubpageHeader', false)) ?? false. This ensures that the isSubpage prop is set to false if either isSubpage is false or n('smallerSubpageHeader', false) evaluates to false. The changes are consistent with the existing code and follow the best practices.

@datadog-island-is
Copy link

datadog-island-is bot commented Sep 12, 2024

Datadog Report

Branch report: feature/add-default-header-for-fiskistofa
Commit report: 91ed653
Test service: web

✅ 0 Failed, 84 Passed, 0 Skipped, 29.87s Total Time
➡️ Test Sessions change in coverage: 1 no change

Copy link

codecov bot commented Sep 12, 2024

Codecov Report

Attention: Patch coverage is 0% with 17 lines in your changes missing coverage. Please review.

Project coverage is 36.86%. Comparing base (754cc56) to head (3781493).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...Themes/FiskistofaTheme/FiskistofaDefaultHeader.tsx 0.00% 13 Missing ⚠️
...nents/Organization/Wrapper/OrganizationWrapper.tsx 0.00% 3 Missing ⚠️
...ganization/Wrapper/Themes/FiskistofaTheme/index.ts 0.00% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #15973      +/-   ##
==========================================
+ Coverage   36.85%   36.86%   +0.01%     
==========================================
  Files        6715     6716       +1     
  Lines      137690   137584     -106     
  Branches    39143    39105      -38     
==========================================
- Hits        50744    50721      -23     
+ Misses      86946    86863      -83     
Flag Coverage Δ
web 1.84% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...ganization/Wrapper/Themes/FiskistofaTheme/index.ts 0.00% <0.00%> (ø)
...nents/Organization/Wrapper/OrganizationWrapper.tsx 0.00% <0.00%> (ø)
...Themes/FiskistofaTheme/FiskistofaDefaultHeader.tsx 0.00% <0.00%> (ø)

... and 6 files with indirect coverage changes


Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 754cc56...3781493. Read the comment docs.

@kodiakhq kodiakhq bot merged commit a308daf into main Sep 12, 2024
30 checks passed
@kodiakhq kodiakhq bot deleted the feature/add-default-header-for-fiskistofa branch September 12, 2024 14:02
jonnigs pushed a commit that referenced this pull request Sep 12, 2024
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this PR as soon as all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants