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

[material-ui] Replace the Album template with a landing page #37557

Merged
merged 116 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
8155d03
Increase card's size and actionArea
zanivan Jun 8, 2023
93a6874
Visual tweaks on the hero section
zanivan Jun 8, 2023
b796ccf
Improved contrast of hero text
zanivan Jun 8, 2023
e419480
Padding tweak
zanivan Jun 9, 2023
be6e31d
Improvements on toolbar
zanivan Jun 9, 2023
fc6d199
Fix Hero padding on mobile breakpoint
zanivan Jun 9, 2023
7ae5a4f
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Dec 8, 2023
851dd92
Remove unused import
zanivan Dec 8, 2023
4da7fc2
Run yarn docs:typescript:formatted
zanivan Dec 8, 2023
00b824a
Add custom theme
zanivan Dec 11, 2023
cd87808
Add sections to Album template to make it a LP
zanivan Dec 13, 2023
4bc14f9
Add more sections to the page
zanivan Dec 14, 2023
84ea0a3
More tweaks
zanivan Dec 14, 2023
19214a3
More design tweaks
zanivan Dec 15, 2023
9198857
add toggle for theme
zanivan Dec 18, 2023
a75093c
Visual tweaks
zanivan Dec 18, 2023
c757b4b
Round of polish after feedback
zanivan Dec 19, 2023
c4b25f8
More polishing
zanivan Dec 19, 2023
c953485
Add hover styles to cards
zanivan Dec 19, 2023
5085a3b
More polishing
zanivan Dec 19, 2023
8db4e21
Added theme toggle
zanivan Dec 20, 2023
0ac3680
Fix mode toggle
DiegoAndai Dec 20, 2023
0d8f720
Add and fix dark theme
zanivan Dec 20, 2023
9bbf1d9
Refine button styling
zanivan Dec 20, 2023
07f7405
Remove Lorem Ipsum
zanivan Dec 20, 2023
7461fbf
Refine logos
zanivan Dec 21, 2023
8edb8e0
Run yarn docs:typescript:formatted
zanivan Dec 21, 2023
1d14b48
Visual tweaks
zanivan Dec 21, 2023
30eb904
Stray polishing
zanivan Dec 22, 2023
d030c03
Run yarn docs:typescript:formatted
zanivan Dec 22, 2023
76ec174
Polish out the cards
zanivan Dec 22, 2023
e01ee49
Improve Chip contrast
zanivan Dec 22, 2023
6cf221f
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Jan 8, 2024
151e774
Refine the grey palette
zanivan Jan 8, 2024
421a2ca
Tweaks to border colors
zanivan Jan 8, 2024
be20d1d
Fix hero resposiveness
zanivan Jan 8, 2024
667848a
Tweak text colors
zanivan Jan 8, 2024
3adc4cf
Remove Lorem Ipsum
zanivan Jan 8, 2024
1ffb02f
Refine pricing cards
zanivan Jan 8, 2024
04e3c44
Add logos to testimonials
zanivan Jan 8, 2024
32a644c
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Jan 9, 2024
5ea5cea
Refine Appbar
zanivan Jan 9, 2024
4d43029
Refine appbar
zanivan Jan 10, 2024
4e60c1d
Add drawer on mobile
zanivan Jan 10, 2024
e13f080
Spacing fixes
zanivan Jan 11, 2024
d7fb70e
Add hrefs to buttons
zanivan Jan 12, 2024
681d818
Update imports to remove Album
zanivan Jan 12, 2024
8860636
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Jan 15, 2024
da1b029
Refine footer
zanivan Jan 15, 2024
28d9b5a
Fix eslint
zanivan Jan 16, 2024
de1b6aa
Fix test_types
zanivan Jan 16, 2024
6825f15
First round of polishing after feedbacks
zanivan Jan 17, 2024
a1e628c
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Jan 18, 2024
6bc459e
Second round of polishing after feedbacks
zanivan Jan 18, 2024
f2270e5
Third round of polishing after feedbacks
zanivan Jan 19, 2024
2d6cbe9
Remove secondary color
zanivan Jan 19, 2024
72e4687
More polishing
zanivan Jan 22, 2024
b2bd4f8
Stray polishing
zanivan Jan 23, 2024
b3bcd60
Fix dark mode usage
zanivan Jan 23, 2024
1114e77
docs:typescript:formatted
zanivan Jan 24, 2024
b7fc8b0
Fix chip hover
zanivan Jan 24, 2024
b71db7c
Polishing out the theme
zanivan Jan 24, 2024
b9929b9
Attempting to fix the theme
zanivan Jan 24, 2024
b449f28
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Jan 24, 2024
fa19ecf
Fix tokens and mode toggling
DiegoAndai Jan 25, 2024
d709392
Tweaks to hero image and copy
zanivan Jan 25, 2024
c203637
Tweaks to components
zanivan Jan 25, 2024
ed53429
Stray tweaks and improvements
zanivan Jan 25, 2024
901465d
Refine mockups
zanivan Jan 25, 2024
576db73
Remove custom sx from 'features'
zanivan Jan 26, 2024
4f34f70
Remove custom sx from 'highlights'
zanivan Jan 26, 2024
5b461ca
Remove custom sx from 'pricing'
zanivan Jan 26, 2024
d774936
Alphabetize imports from FAQ
zanivan Jan 26, 2024
55140e0
Alphabetize imports from Footer
zanivan Jan 26, 2024
20f8859
Remove custom sx from 'hero'
zanivan Jan 26, 2024
e461eb6
Add default theme switch and stray fixes
zanivan Jan 26, 2024
085205a
Fix to background color
zanivan Jan 26, 2024
ac59ee2
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Jan 29, 2024
2800452
Fine-tune mockups and backgrounds
zanivan Jan 29, 2024
92a9bdb
Add tooltip to hero
zanivan Jan 29, 2024
d5a8845
Further tweaks on mobile
zanivan Jan 29, 2024
b3a00bc
Updated image
zanivan Jan 29, 2024
c5e0379
Reorder templates and remove outdated
zanivan Jan 29, 2024
a893ace
docs:typescript:formatted
zanivan Jan 29, 2024
1173424
Fix lint
zanivan Jan 29, 2024
04cbae1
push in some mostly functional-only refinements
danilo-leal Jan 29, 2024
9295750
hero section light mode
danilo-leal Jan 30, 2024
1e60c60
features section light mode and other tweaks
danilo-leal Jan 30, 2024
2211de8
soften the body 1 type a bit
danilo-leal Jan 30, 2024
5baf5d0
testimonial section light mode
danilo-leal Jan 30, 2024
21a5700
highlights light mode
danilo-leal Jan 30, 2024
ca3fc56
remove double-layer containers
danilo-leal Jan 30, 2024
50ed505
pricing section light mode
danilo-leal Jan 30, 2024
847cab4
faq and footer light mode
danilo-leal Jan 30, 2024
02eaffa
spacing adjustments
danilo-leal Jan 30, 2024
4ebe944
dark mode and other adjustments
danilo-leal Jan 30, 2024
4d9a9e9
copywriting adjustments
danilo-leal Jan 30, 2024
e77bd06
color tweaks
danilo-leal Jan 30, 2024
5de6d6f
nits
danilo-leal Jan 30, 2024
49b0b1d
Small stray tweaks
zanivan Jan 30, 2024
f3c552d
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Jan 30, 2024
5099dfb
Tweaks according feedbacks
zanivan Jan 31, 2024
e85f2b9
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Jan 31, 2024
6feae56
Attempt to fix the selected toggle button
zanivan Jan 31, 2024
11385a0
docs:typescript:formatted
zanivan Jan 31, 2024
37bb001
Fix lint and stray tweaks
zanivan Jan 31, 2024
11d46c7
skip regression test for theme file
siriwatknp Feb 1, 2024
aa8218e
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Feb 1, 2024
4a2d63c
Merge remote-tracking branch 'upstream/master' into album-layout-revamp
zanivan Feb 2, 2024
9473b30
Fix a11y issues
zanivan Feb 5, 2024
fd2d331
Update thumbnail
zanivan Feb 5, 2024
66bd395
change and polish the imagery
danilo-leal Feb 5, 2024
bece0fe
adjust the toggle button
danilo-leal Feb 5, 2024
f2ee05e
mobile adjustments
danilo-leal Feb 5, 2024
d9279d9
accessibility fixes
danilo-leal Feb 5, 2024
5d40a8f
fix little typos
danilo-leal Feb 5, 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
137 changes: 0 additions & 137 deletions docs/data/material/getting-started/templates/album/Album.js

This file was deleted.

137 changes: 0 additions & 137 deletions docs/data/material/getting-started/templates/album/Album.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
import * as React from 'react';
import PropTypes from 'prop-types';

import CssBaseline from '@mui/material/CssBaseline';
import Box from '@mui/material/Box';
import Divider from '@mui/material/Divider';
import { ThemeProvider, createTheme } from '@mui/material/styles';
import ToggleButton from '@mui/material/ToggleButton';
import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
import AutoAwesomeRoundedIcon from '@mui/icons-material/AutoAwesomeRounded';
import SvgMaterialDesign from 'docs/src/icons/SvgMaterialDesign';
import AppAppBar from './components/AppAppBar';
import Hero from './components/Hero';
import LogoCollection from './components/LogoCollection';
import Highlights from './components/Highlights';
import Pricing from './components/Pricing';
import Features from './components/Features';
import Testimonials from './components/Testimonials';
import FAQ from './components/FAQ';
import Footer from './components/Footer';
import getLPTheme from './getLPTheme';

const defaultTheme = createTheme({});

function ToggleCustomTheme({ showCustomTheme, toggleCustomTheme }) {
return (
<Box
sx={{
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
width: '100dvw',
position: 'fixed',
bottom: 24,
}}
>
<ToggleButtonGroup
color="primary"
exclusive
value={showCustomTheme}
onChange={toggleCustomTheme}
aria-label="Platform"
sx={{
backgroundColor: 'background.default',
'& .Mui-selected': {
pointerEvents: 'none',
},
}}
>
<ToggleButton value>
<AutoAwesomeRoundedIcon sx={{ fontSize: '20px', mr: 1 }} />
Custom theme
</ToggleButton>
<ToggleButton value={false}>
<SvgMaterialDesign sx={{ fontSize: '20px', mr: 1 }} />
Material Design
</ToggleButton>
</ToggleButtonGroup>
</Box>
);
}

ToggleCustomTheme.propTypes = {
showCustomTheme: PropTypes.shape({
valueOf: PropTypes.func.isRequired,
}).isRequired,
toggleCustomTheme: PropTypes.func.isRequired,
};
Comment on lines +63 to +68
Copy link
Member

Choose a reason for hiding this comment

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

Should we remove the proptypes? It's not for everyone especially people who use TypeScript.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's from docs:typescript:formatted, isn't it? Also, this is in the js. file, users who use Typescript will use the .tsx file, won't they?

Anyway, I leave the decision to you @siriwatknp :)


export default function LandingPage() {
const [mode, setMode] = React.useState('dark');
const [showCustomTheme, setShowCustomTheme] = React.useState(true);
const LPtheme = createTheme(getLPTheme(mode));

const toggleColorMode = () => {
setMode((prev) => (prev === 'dark' ? 'light' : 'dark'));
};

const toggleCustomTheme = () => {
setShowCustomTheme((prev) => !prev);
};

return (
<ThemeProvider theme={showCustomTheme ? LPtheme : defaultTheme}>
<CssBaseline />
<AppAppBar mode={mode} toggleColorMode={toggleColorMode} />
<Hero />
<Box sx={{ bgcolor: 'background.default' }}>
<LogoCollection />
<Features />
<Divider />
<Testimonials />
<Divider />
<Highlights />
<Divider />
<Pricing />
<Divider />
<FAQ />
<Divider />
<Footer />
</Box>
<ToggleCustomTheme
showCustomTheme={showCustomTheme}
toggleCustomTheme={toggleCustomTheme}
/>
</ThemeProvider>
);
}
Loading
Loading