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

Break up LandingPage components into sub-components #214

Merged

Conversation

manjhss
Copy link
Contributor

@manjhss manjhss commented Jul 3, 2024

Description

This PR fixes Break up LandingPage.tsx components into multiple sub-components issue.
Fixes: #147

Contributor Checklist

Make sure to do the following steps if they are applicable to your PR:

Copy link
Member

@Martinsos Martinsos left a comment

Choose a reason for hiding this comment

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

Nice work!
I left some comments, most of which can also be applied to the rest of the code.
Some general things to do:

  • put files under landing-page/
  • fix formatting (take a look at how it was before)
  • don't use any, define TS types/interfaces instead
  • drop unneccesary <>
  • let's extract svgs, I know it is a bit beyond initial scope of this PR but it makes sense in order to improve readibility.

I think this should be it!

template/app/src/client/components/Client.tsx Outdated Show resolved Hide resolved
template/app/src/client/components/Client.tsx Outdated Show resolved Hide resolved
template/app/src/client/components/FAQ.tsx Outdated Show resolved Hide resolved
template/app/src/client/components/Feature.tsx Outdated Show resolved Hide resolved
@manjhss
Copy link
Contributor Author

manjhss commented Jul 9, 2024

@Martinsos I made all the changes you mentioned and also seperates svgs in icons folder

template/app/src/client/landing-page/Clients.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/Clients.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/FAQ.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/Feature.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/Feature.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/icons/ChatGPT.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/icons/Astro.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/icons/Prisma.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/icons/Salesforce.tsx Outdated Show resolved Hide resolved
template/app/src/client/landing-page/types.ts Outdated Show resolved Hide resolved
@manjhss
Copy link
Contributor Author

manjhss commented Jul 11, 2024

@Martinsos I made all the changes but having issue in indentation, in my IDE code is in good format, but while pushing here code is in bad format :/ i have no idea how can fix it...

@Martinsos
Copy link
Member

@Martinsos I made all the changes but having issue in indentation, in my IDE code is in good format, but while pushing here code is in bad format :/ i have no idea how can fix it...

Probably has to do with spaces / tabs! What I would recommend in general is using spaces and have editor show them exactly as they are, to avoid issues like this.

Copy link
Member

@Martinsos Martinsos left a comment

Choose a reason for hiding this comment

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

Ok we are close! Last couple of comments. But we will need to take care of that indentation -> now it is super indented! You should be able to set it up in your editor.

Copy link
Member

@Martinsos Martinsos left a comment

Choose a reason for hiding this comment

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

Ok @manjhss nice job! I would say this is all, except for following things:

  1. Indentation is off.
  2. We have conflicts with main branch.
  3. We need to update the demo app (opensaas-sh/app) and also docs if needed.

Regarding (1), if you don't manage to fix it (and you said you were having trouble with that), no big deal, we can fix indentation ourselves before the merge.
Regarding (2), since the big vertical reorganization is still happening, might be best if we wait just a bit for it to be finished and then resolve the conflicts. New version of open-saas should be released in a couple of days, so we can do it after that.
Regarding (3) -> we will take care of that as it is a bit complex!

So this is it really -> thanks for the good work, let's give it a couple of days of rest till new version of OpenSaas is released, and then we will take over the PR and do final stuff that is needed to merge this!

@Martinsos
Copy link
Member

Ok this should be it! I fixed indentation (replaced tabs with spaces), updated the demo app (app_diff/), and there were no updates for the docs needed I believe.

@Martinsos Martinsos requested a review from vincanger July 16, 2024 22:08
Copy link
Member

@Martinsos Martinsos left a comment

Choose a reason for hiding this comment

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

Done from my side!


<div className='mx-auto grid max-w-lg grid-cols-2 items-center gap-x-8 gap-y-12 sm:max-w-xl md:grid-cols-4 sm:gap-x-10 sm:gap-y-14 lg:mx-0 lg:max-w-none'>
{
[<SalesforceLogo />, <PrismaLogo />, <AstroLogo />, <OpenAILogo />].map((logo, index) => (
Copy link
Collaborator

Choose a reason for hiding this comment

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

love this!

@@ -0,0 +1,37 @@
interface Feature {
Copy link
Collaborator

Choose a reason for hiding this comment

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

🙏

Copy link
Collaborator

@vincanger vincanger left a comment

Choose a reason for hiding this comment

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

Looking very clean and organized. Thanks so much for your hard work @manjhss 🙏

@Martinsos the update to the app_diff is just a dead link I fixed. Ran the tests and they all passed. Everything looks good :)

@vincanger vincanger merged commit 5ea9f84 into wasp-lang:main Jul 17, 2024
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Break up LandingPage.tsx into multiple sub-components
3 participants