Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
}

export default function RootLayout({ children }: { children: React.ReactNode; params: { language: string } }) {
console.log("CLIENT_ID:", process.env.NEXT_PUBLIC_CLIENT_ID);

Check failure on line 20 in src/app/layout.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Unexpected console statement. Only these console methods are allowed: warn, error
return (
<html lang={DEFAULT_LANGUAGE} dir={DEFAULT_LANGUAGE_DIR}>
<head>
<meta name="apple-mobile-web-app-title" content="Arbisoft Session Portal" />
<GoogleTagManager gtmId={GTM_ID} />
{NODE_ENV === "production" && (
<>
<GoogleTagManager gtmId={GTM_ID} />
<Script
id="hotjar-init"
strategy="afterInteractive"
Expand Down
30 changes: 23 additions & 7 deletions src/components/VideoCard/styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,45 @@ export const VideoCardContainer = styled(Card, {
}

&.normal-card {
height: auto;

.${cardContentClasses.root} {
img {
aspect-ratio: 16 / 9;
height: auto;
max-height: unset;
min-height: unset;
}

.video-detail {
.${typographyClasses.h3} {
font-size: ${pxToRem(16)};
font-size: ${pxToRem(14)};
font-weight: 600;
-webkit-line-clamp: 2;
}

.organizer-name,
.date-time {
font-size: ${pxToRem(13)};
}
}
}
}

&.related-card {
display: flex;
margin-bottom: 20px;
margin-bottom: 16px;
width: 100%;

.${cardContentClasses.root} {
flex-direction: row;
gap: 10px;
gap: 8px;

.image-wrapper {
border-radius: ${theme.spacing()};
overflow: hidden;
width: 113px;
flex-shrink: 0;
width: 160px;

.video-player {
border-radius: ${theme.spacing()};
Expand All @@ -132,11 +148,11 @@ export const VideoCardContainer = styled(Card, {
}

.video-detail {
gap: 4px;
width: calc(100% - 113px);
gap: 3px;
width: calc(100% - 168px);

.${typographyClasses.h5} {
font-size: ${pxToRem(12)};
font-size: ${pxToRem(13)};
font-weight: 500;
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/containers/MainLayoutContainer/styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const MainContainer = styled(Container, {
})<MainContainerProps>(({ theme, isSidebarAvailable = true }) => ({
position: "relative",
display: "flex",
gap: theme.spacing(4),
gap: theme.spacing(3),
paddingTop: theme.spacing(containerTopSpacingMobile),
paddingInline: theme.spacing(0),

Expand Down Expand Up @@ -59,7 +59,7 @@ export const ContentContainer = styled(Box)(({ theme }) => ({

export const RightSidebar = styled(Box)({
flexShrink: 0,
width: 300,
width: 360,
});

export const StyledDrawer = styled(Drawer)(({ theme }) => ({
Expand Down
20 changes: 19 additions & 1 deletion src/components/theme/theme-provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,25 @@
},
},
},
MuiCssBaseline: {
MuiOutlinedInput: {
styleOverrides: {

Check failure on line 101 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Insert `Β·Β·`
root: {

Check failure on line 102 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Insert `Β·Β·`
"&.Mui-focused .MuiOutlinedInput-notchedOutline": {

Check failure on line 103 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Insert `Β·Β·`
borderColor: "#fff",

Check failure on line 104 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Insert `Β·Β·`
},

Check failure on line 105 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Insert `··················},⏎`
},
},
},

Check failure on line 108 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Delete `········},⏎`
MuiPickersOutlinedInput: {
styleOverrides: {

Check failure on line 110 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Insert `Β·Β·`
root: {

Check failure on line 111 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Insert `Β·Β·`
"&.Mui-focused .MuiPickersOutlinedInput-notchedOutline": {

Check failure on line 112 in src/components/theme/theme-provider.tsx

View workflow job for this annotation

GitHub Actions / Run linters

Insert `Β·Β·`
borderColor: "#fff",
},
},
},
},
MuiCssBaseline: {
/* c8 ignore next 14 */
styleOverrides: (val) => ({
body: {
Expand Down
9 changes: 3 additions & 6 deletions src/features/VideosListingPage/styled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ export const VideoListingContainer = styled("div", {
})(({ theme }) => ({
[".skeleton-loader, .virtuoso-grid-list"]: {
display: "grid",
gap: theme.spacing(3),
columnGap: theme.spacing(2),
rowGap: theme.spacing(3.5),
width: "100%",
gridTemplateColumns: "repeat(1, minmax(0, 1fr))",

Expand All @@ -20,11 +21,7 @@ export const VideoListingContainer = styled("div", {
},

[theme.breakpoints.up("lg")]: {
gridTemplateColumns: "repeat(auto-fill, minmax(268px, 1fr))",
},

[theme.breakpoints.up("xl")]: {
gridTemplateColumns: "repeat(auto-fill, minmax(396px, 1fr))",
gridTemplateColumns: "repeat(3, minmax(0, 1fr))",
},
},
}));
Expand Down
4 changes: 4 additions & 0 deletions src/features/VideosListingPage/videosListingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ const VideosListingPage = () => {
const isDataLoading =
isLoading || isUninitialized || !videoListings?.results || (isFetching && page === 1) || isFeatureFetching;

// eslint-disable-next-line no-console
console.warn("[VLP]", { isDataLoading, isLoading, isUninitialized, isFetching, isFeatureFetching, originalPlaylist: (originalArgs as any)?.playlist, apiPlaylist: (apiParams as any)?.playlist, resultsCount: videoListings?.results?.length, firstTitle: videoListings?.results?.[0]?.title });

// Determine what to render based on state
const renderContent = () => {
// Error state
Expand Down Expand Up @@ -157,6 +160,7 @@ const VideosListingPage = () => {
href={`/videos/${videoCard.slug}`}
key={videoCard.id}
width="100%"
height="auto"
/>
)}
/>
Expand Down
Loading