Skip to content

feat: migrate to MUI 7 and refactor some components for server rendering #68

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.

Sign up for GitHub

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
revolutionxk merged 2 commits into from
Apr 9, 2025
Merged

feat: migrate to MUI 7 and refactor some components for server rendering #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d65364
feat: migrate to MUI 7 and refactor some components for server rendering
revolutionxk Apr 9, 2025
6e95908
fix: remove unnecessary Grid item wrappers in page.tsx
revolutionxk Apr 9, 2025
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
Binary file modified bun.lockb
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"@emotion/styled": "^11.13.5",
"@hookform/resolvers": "^3.9.1",
"@jest/globals": "^29.7.0",
"@mui/icons-material": "^6.1.9",
"@mui/material": "^6.1.9",
"@mui/material-nextjs": "^6.1.9",
"@mui/utils": "^6.1.9",
"@mui/x-data-grid": "^7.23.0",
"@mui/icons-material": "^7.0.0-rc.0",
"@mui/material": "^7.0.0-rc.0",
"@mui/material-nextjs": "^7.0.0-rc.0",
"@mui/utils": "^7.0.0-rc.0",
"@mui/x-data-grid": "^8.0.0-beta.3",
"@reduxjs/toolkit": "^2.4.0",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/commit-analyzer": "^13.0.0",
Expand Down
6 changes: 4 additions & 2 deletions src/app/[locale]/(home)/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { JobDetailsCard } from "@/components/job-details-card/job-details-card";
import { Location } from "@/components/location-card/location-card";
import { SocialLinks } from "@/components/social-links";
import { TechnologyList } from "@/components/technology-list";
import { TitleWithColor } from "@/components/title-with-color";
import { LocationOn } from "@mui/icons-material";
import { Divider, Stack, Typography } from "@mui/material";
import type { Metadata } from "next";
Expand Down Expand Up @@ -70,7 +69,10 @@ export default async function Page(props: {
>
<h3 className="text-4xl md:text-6xl font-bold">
{t("presentation.title")} <br />
<TitleWithColor>Revolution</TitleWithColor>.
<span className="text-4xl md:text-6xl font-bold text-primary">
Revolution
</span>
.
</h3>
<h2 className="text-4xl md:text-6xl font-bold">👋</h2>
</Stack>
Expand Down
4 changes: 2 additions & 2 deletions src/app/[locale]/(home)/projects/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export default async function ProjectsPage(props: {
{repo.language}
</Typography>
<Grid container spacing={1} alignItems="center">
<Grid item>
<Grid>
<Stack
direction="row"
spacing={1}
Expand All @@ -129,7 +129,7 @@ export default async function ProjectsPage(props: {
</Typography>
</Stack>
</Grid>
<Grid item>
<Grid>
<Stack
direction="row"
spacing={1}
Expand Down
3 changes: 1 addition & 2 deletions src/components/job-details-card/job-details-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { Circle } from "@/components/circle";
import {
JobContainer,
JobItem,
Expand Down Expand Up @@ -50,7 +49,7 @@ const Item: FC<PropsWithChildren<JobDetailsCardItemProps>> = ({
alignItems="center"
sx={{ padding: 2 }}
>
<Circle />
<span className="w-2 h-2 rounded-full bg-primary" />
<Typography variant="body1" className="opacity-60">
{position}
</Typography>
Expand Down
19 changes: 0 additions & 19 deletions src/components/title-with-color.tsx
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions src/templates/navbar/navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ const Navbar: FC<PropsWithChildren> & Extensions = ({ children }) => {
return (
<>
<nav className="my-5 hidden md:block">
<Stack direction="row">
<Stack direction="row" justifyContent="space-between">
<Stack direction="row" spacing={2}>
{children}
</Stack>

<Grid container justifyContent="flex-end" spacing={2}>
<Grid item>
<Grid>
<SpotifyWatcher />
</Grid>
<Grid item>
<Grid>
<ToggleThemeButton />
</Grid>
<Grid item>
<Grid>
Comment on lines +40 to +46
Copy link

Copilot AI Apr 9, 2025

Choose a reason for hiding this comment

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

The Grid component lost its 'item' prop during the refactor, which might affect the layout behavior. If this element is meant to function as a grid item, please restore the 'item' prop.

Copilot uses AI. Check for mistakes.
<LanguageSwitch />
</Grid>
</Grid>
Expand All @@ -55,7 +55,7 @@ const Navbar: FC<PropsWithChildren> & Extensions = ({ children }) => {
<Toolbar>
<MenuButton />
<Grid container justifyContent="flex-end">
<Grid item>
<Grid>
<SpotifyWatcher />
</Grid>
</Grid>
Expand Down
7 changes: 5 additions & 2 deletions src/theme/theme-colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
"use client";

import { extendTheme } from "@mui/material/styles";
import { createTheme } from "@mui/material/styles";

export const theme = extendTheme({
export const theme = createTheme({
cssVariables: {
colorSchemeSelector: "class",
},
colorSchemes: {
light: {
palette: {
Expand Down
2 changes: 1 addition & 1 deletion src/theme/theme-registry.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { theme } from "@/theme/theme-colors";
import { AppRouterCacheProvider } from "@mui/material-nextjs/v13-appRouter";
import { AppRouterCacheProvider } from "@mui/material-nextjs/v15-appRouter";
import CssBaseline from "@mui/material/CssBaseline";
import { Experimental_CssVarsProvider as CssVarsProvider } from "@mui/material/styles";
import InitColorSchemeScript from "@mui/system/InitColorSchemeScript";
Expand Down
Loading