Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@samuelsycamore
samuelsycamore committed Sep 23, 2024
2 parents c5c98f6 + 43c14e0 commit b5e1ffa
Show file tree
Hide file tree
Showing 26 changed files with 593 additions and 795 deletions.
2 changes: 1 addition & 1 deletion apps/pigment-css-next-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@types/node": "^20.16.5",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"typescript": "^5.5.4"
},
"nx": {
Expand Down
2 changes: 1 addition & 1 deletion apps/pigment-css-vite-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@vitejs/plugin-react": "^4.3.1",
"postcss": "^8.4.47",
"postcss-combine-media-query": "^1.0.1",
"vite": "5.4.6",
"vite": "5.4.7",
"vite-plugin-node-polyfills": "0.22.0",
"vite-plugin-pages": "^0.32.3"
},
Expand Down
8 changes: 5 additions & 3 deletions docs/data/material/getting-started/templates/sign-in-side/SignInCard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ export default function SignInCard() {
};

const handleSubmit = (event) => {
event.preventDefault();
if (emailError || passwordError) {
event.preventDefault();
return;
}
const data = new FormData(event.currentTarget);
console.log({
email: data.get('email'),
Expand Down Expand Up @@ -126,6 +129,7 @@ export default function SignInCard() {
<FormLabel htmlFor="password">Password</FormLabel>
<Link
component="button"
type="button"
onClick={handleClickOpen}
variant="body2"
sx={{ alignSelf: 'baseline' }}
Expand Down Expand Up @@ -172,7 +176,6 @@ export default function SignInCard() {
<Divider>or</Divider>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
<Button
type="submit"
fullWidth
variant="outlined"
onClick={() => alert('Sign in with Google')}
Expand All @@ -181,7 +184,6 @@ export default function SignInCard() {
Sign in with Google
</Button>
<Button
type="submit"
fullWidth
variant="outlined"
onClick={() => alert('Sign in with Facebook')}
Expand Down
8 changes: 5 additions & 3 deletions docs/data/material/getting-started/templates/sign-in-side/SignInCard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ export default function SignInCard() {
};

const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
if (emailError || passwordError) {
event.preventDefault();
return;
}
const data = new FormData(event.currentTarget);
console.log({
email: data.get('email'),
Expand Down Expand Up @@ -126,6 +129,7 @@ export default function SignInCard() {
<FormLabel htmlFor="password">Password</FormLabel>
<Link
component="button"
type="button"
onClick={handleClickOpen}
variant="body2"
sx={{ alignSelf: 'baseline' }}
Expand Down Expand Up @@ -172,7 +176,6 @@ export default function SignInCard() {
<Divider>or</Divider>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
<Button
type="submit"
fullWidth
variant="outlined"
onClick={() => alert('Sign in with Google')}
Expand All @@ -181,7 +184,6 @@ export default function SignInCard() {
Sign in with Google
</Button>
<Button
type="submit"
fullWidth
variant="outlined"
onClick={() => alert('Sign in with Facebook')}
Expand Down
2 changes: 1 addition & 1 deletion docs/data/material/getting-started/templates/sign-in-side/SignInSide.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default function SignInSide() {
sx={{
justifyContent: 'center',
gap: { xs: 6, sm: 12 },
p: 2,
p: { xs: 2, sm: 4 },
m: 'auto',
}}
>
Expand Down
2 changes: 1 addition & 1 deletion docs/data/material/getting-started/templates/sign-in-side/SignInSide.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default function SignInSide() {
sx={{
justifyContent: 'center',
gap: { xs: 6, sm: 12 },
p: 2,
p: { xs: 2, sm: 4 },
m: 'auto',
}}
>
Expand Down
15 changes: 10 additions & 5 deletions docs/data/material/getting-started/templates/sign-in/SignIn.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ const Card = styled(MuiCard)(({ theme }) => ({
}));

const SignInContainer = styled(Stack)(({ theme }) => ({
padding: 20,
marginTop: '10vh',
minHeight: '100%',
padding: theme.spacing(2),
[theme.breakpoints.up('sm')]: {
padding: theme.spacing(4),
},
'&::before': {
content: '""',
display: 'block',
Expand Down Expand Up @@ -72,7 +75,10 @@ export default function SignIn(props) {
};

const handleSubmit = (event) => {
event.preventDefault();
if (emailError || passwordError) {
event.preventDefault();
return;
}
const data = new FormData(event.currentTarget);
console.log({
email: data.get('email'),
Expand Down Expand Up @@ -155,6 +161,7 @@ export default function SignIn(props) {
<FormLabel htmlFor="password">Password</FormLabel>
<Link
component="button"
type="button"
onClick={handleClickOpen}
variant="body2"
sx={{ alignSelf: 'baseline' }}
Expand Down Expand Up @@ -206,7 +213,6 @@ export default function SignIn(props) {
<Divider>or</Divider>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
<Button
type="submit"
fullWidth
variant="outlined"
onClick={() => alert('Sign in with Google')}
Expand All @@ -215,7 +221,6 @@ export default function SignIn(props) {
Sign in with Google
</Button>
<Button
type="submit"
fullWidth
variant="outlined"
onClick={() => alert('Sign in with Facebook')}
Expand Down
15 changes: 10 additions & 5 deletions docs/data/material/getting-started/templates/sign-in/SignIn.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ const Card = styled(MuiCard)(({ theme }) => ({
}));

const SignInContainer = styled(Stack)(({ theme }) => ({
padding: 20,
marginTop: '10vh',
minHeight: '100%',
padding: theme.spacing(2),
[theme.breakpoints.up('sm')]: {
padding: theme.spacing(4),
},
'&::before': {
content: '""',
display: 'block',
Expand Down Expand Up @@ -72,7 +75,10 @@ export default function SignIn(props: { disableCustomTheme?: boolean }) {
};

const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
if (emailError || passwordError) {
event.preventDefault();
return;
}
const data = new FormData(event.currentTarget);
console.log({
email: data.get('email'),
Expand Down Expand Up @@ -155,6 +161,7 @@ export default function SignIn(props: { disableCustomTheme?: boolean }) {
<FormLabel htmlFor="password">Password</FormLabel>
<Link
component="button"
type="button"
onClick={handleClickOpen}
variant="body2"
sx={{ alignSelf: 'baseline' }}
Expand Down Expand Up @@ -206,7 +213,6 @@ export default function SignIn(props: { disableCustomTheme?: boolean }) {
<Divider>or</Divider>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
<Button
type="submit"
fullWidth
variant="outlined"
onClick={() => alert('Sign in with Google')}
Expand All @@ -215,7 +221,6 @@ export default function SignIn(props: { disableCustomTheme?: boolean }) {
Sign in with Google
</Button>
<Button
type="submit"
fullWidth
variant="outlined"
onClick={() => alert('Sign in with Facebook')}
Expand Down
Loading

0 comments on commit b5e1ffa

Please sign in to comment.