9 Commits
0.0.5 ... 0.0.9

Author SHA1 Message Date
4f442c369b feat(ui): make footer always visible on home and hidden in article view
All checks were successful
continuous-integration/drone/tag Build is passing
2025-11-09 00:00:55 +05:30
6b8d351fed bumping up to 0.0.8
All checks were successful
continuous-integration/drone/tag Build is passing
2025-11-07 21:49:45 +05:30
fd5093a1f8 smooth scrolling with fade 2025-11-07 21:48:01 +05:30
d3acf05b08 reduced my to 4 from 16 2025-11-07 21:43:27 +05:30
bc6bfef6ea cleanup 2025-11-07 21:43:15 +05:30
eedb9a24f3 bumping up to 0.0.7
All checks were successful
continuous-integration/drone/tag Build is passing
2025-11-07 21:34:14 +05:30
998c3d490d baking env in build 2025-11-07 21:33:44 +05:30
bb3f733ffc baking env in build 2025-11-07 21:32:31 +05:30
ce7b5dab6b infinity scrolling init 2025-11-07 21:27:29 +05:30
7 changed files with 186 additions and 265 deletions

View File

@@ -63,6 +63,9 @@ steps:
- name: build-image
image: docker:24
environment:
API_BASE_URL:
from_secret: API_BASE_URL
volumes:
- name: dockersock
path: /var/run/docker.sock
@@ -70,7 +73,12 @@ steps:
- IMAGE_TAG=$(cat /drone/src/LATEST_TAG.txt | tr -d '\n')
- echo "🔨 Building Docker image apps/blog:$IMAGE_TAG ..."
- docker build --network=host -t apps/blog:$IMAGE_TAG -t apps/blog:latest /drone/src
- |
docker build --network=host \
--build-arg VITE_API_BASE_URL="$API_BASE_URL" \
-t apps/blog:$IMAGE_TAG \
-t apps/blog:latest \
/drone/src
- name: push-image
image: docker:24
@@ -108,9 +116,6 @@ steps:
- name: run-container
image: docker:24
environment:
API_BASE_URL:
from_secret: API_BASE_URL
volumes:
- name: dockersock
path: /var/run/docker.sock
@@ -123,7 +128,6 @@ steps:
--name blog \
-p 3002:3000 \
-e NODE_ENV=production \
-e VITE_API_BASE_URL="$API_BASE_URL" \
--restart always \
apps/blog:$IMAGE_TAG

View File

@@ -14,7 +14,8 @@ RUN npm ci
COPY . .
# Build the app
RUN npm run build
ARG VITE_API_BASE_URL
RUN VITE_API_BASE_URL=$VITE_API_BASE_URL npm run build
# Stage 2: Static file server (BusyBox)
FROM busybox:latest

View File

@@ -1,6 +1,6 @@
{
"name": "aetoskia-blog-app",
"version": "0.0.4",
"version": "0.0.8",
"private": true,
"scripts": {
"dev": "vite",

View File

@@ -1,15 +1,16 @@
import * as React from 'react';
import CssBaseline from '@mui/material/CssBaseline';
import Container from '@mui/material/Container';
import Box from '@mui/material/Box';
import AppTheme from '../shared-theme/AppTheme';
import MainContent from './components/MainContent';
import Article from './components/Article';
import Latest from './components/Latest';
import Footer from './components/Footer';
import { useArticles } from './providers/Article'; // ✅ custom hook for global articles
import { useArticles } from './providers/Article';
export default function Blog(props: { disableCustomTheme?: boolean }) {
const { articles, loading, error } = useArticles(); // ✅ Hook must be inside component
const { articles, loading, error } = useArticles();
const [selectedArticle, setSelectedArticle] = React.useState<number | null>(null);
const handleSelectArticle = (index: number) => {
@@ -26,7 +27,12 @@ export default function Blog(props: { disableCustomTheme?: boolean }) {
<Container
maxWidth="lg"
component="main"
sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100vh' }}
sx={{
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
height: '100vh',
}}
>
Loading articles...
</Container>
@@ -41,7 +47,12 @@ export default function Blog(props: { disableCustomTheme?: boolean }) {
<Container
maxWidth="lg"
component="main"
sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100vh' }}
sx={{
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
height: '100vh',
}}
>
Failed to load articles: {error}
</Container>
@@ -53,21 +64,61 @@ export default function Blog(props: { disableCustomTheme?: boolean }) {
<AppTheme {...props}>
<CssBaseline enableColorScheme />
<Container
maxWidth="lg"
component="main"
sx={{ display: 'flex', flexDirection: 'column', my: 16, gap: 4 }}
<Box
sx={{
display: 'flex',
flexDirection: 'column',
minHeight: '100vh',
}}
>
{selectedArticle === null ? (
<>
<MainContent articles={articles} onSelectArticle={handleSelectArticle} />
<Latest articles={articles.slice(0, 3)} /> {/* show 3 most recent */}
</>
) : (
<Article article={articles[selectedArticle]} onBack={handleBack} />
<Container
maxWidth="lg"
component="main"
sx={{
flex: '1 0 auto',
display: 'flex',
flexDirection: 'column',
my: 4,
gap: 4,
pb: selectedArticle === null ? 24 : 0, // space for fixed footer on home
}}
>
{selectedArticle === null ? (
<>
<MainContent
articles={articles}
onSelectArticle={handleSelectArticle}
/>
<Latest
articles={articles}
onSelectArticle={handleSelectArticle}
onLoadMore={async (offset, limit) => {
// Optional pagination call
}}
/>
</>
) : (
<Article article={articles[selectedArticle]} onBack={handleBack} />
)}
</Container>
{selectedArticle === null && (
<Box
component="footer"
sx={{
position: 'fixed',
bottom: 0,
left: 0,
right: 0,
zIndex: 1000,
bgcolor: 'background.paper',
boxShadow: '0 -2px 10px rgba(0,0,0,0.08)',
}}
>
<Footer />
</Box>
)}
</Container>
<Footer />
</Box>
</AppTheme>
);
}

View File

@@ -1,24 +1,14 @@
import * as React from 'react';
import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
import Container from '@mui/material/Container';
import Divider from '@mui/material/Divider';
import IconButton from '@mui/material/IconButton';
import InputLabel from '@mui/material/InputLabel';
import Link from '@mui/material/Link';
import Stack from '@mui/material/Stack';
import TextField from '@mui/material/TextField';
import Typography from '@mui/material/Typography';
import GitHubIcon from '@mui/icons-material/GitHub';
import LinkedInIcon from '@mui/icons-material/LinkedIn';
import TwitterIcon from '@mui/icons-material/X';
function Copyright() {
return (
<Typography variant="body2" sx={{ color: 'text.secondary', mt: 1 }}>
{'Copyright © '}
<Link color="text.secondary" href="https://mui.com/">
Sitemark
<Typography variant="body2" sx={{ color: 'text.secondary' }}>
<Link color="text.secondary" href="https://www.aetoskia.com/">
{'Copyright © Aetoskia Internal Infrastructure — All rights reserved.'}
</Link>
&nbsp;
{new Date().getFullYear()}
@@ -29,197 +19,17 @@ function Copyright() {
export default function Footer() {
return (
<React.Fragment>
<Divider />
<Container
sx={{
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
gap: { xs: 4, sm: 8 },
py: { xs: 8, sm: 10 },
gap: { xs: 2, sm: 4 },
py: { xs: 2, sm: 4 },
textAlign: { sm: 'center', md: 'left' },
}}
>
<Box
sx={{
display: 'flex',
flexDirection: { xs: 'column', sm: 'row' },
width: '100%',
justifyContent: 'space-between',
}}
>
<Box
sx={{
display: 'flex',
flexDirection: 'column',
gap: 4,
minWidth: { xs: '100%', sm: '60%' },
}}
>
<Box sx={{ width: { xs: '100%', sm: '60%' } }}>
<Typography
variant="body2"
gutterBottom
sx={{ fontWeight: 600, mt: 2 }}
>
Join the newsletter
</Typography>
<Typography variant="body2" sx={{ color: 'text.secondary', mb: 2 }}>
Subscribe for weekly updates. No spams ever!
</Typography>
<InputLabel htmlFor="email-newsletter">Email</InputLabel>
<Stack direction="row" spacing={1} useFlexGap>
<TextField
id="email-newsletter"
hiddenLabel
size="small"
variant="outlined"
fullWidth
aria-label="Enter your email address"
placeholder="Your email address"
slotProps={{
htmlInput: {
autoComplete: 'off',
'aria-label': 'Enter your email address',
},
}}
sx={{ width: '250px' }}
/>
<Button
variant="contained"
color="primary"
size="small"
sx={{ flexShrink: 0 }}
>
Subscribe
</Button>
</Stack>
</Box>
</Box>
<Box
sx={{
display: { xs: 'none', sm: 'flex' },
flexDirection: 'column',
gap: 1,
}}
>
<Typography variant="body2" sx={{ fontWeight: 'medium' }}>
Product
</Typography>
<Link color="text.secondary" variant="body2" href="#">
Features
</Link>
<Link color="text.secondary" variant="body2" href="#">
Testimonials
</Link>
<Link color="text.secondary" variant="body2" href="#">
Highlights
</Link>
<Link color="text.secondary" variant="body2" href="#">
Pricing
</Link>
<Link color="text.secondary" variant="body2" href="#">
FAQs
</Link>
</Box>
<Box
sx={{
display: { xs: 'none', sm: 'flex' },
flexDirection: 'column',
gap: 1,
}}
>
<Typography variant="body2" sx={{ fontWeight: 'medium' }}>
Company
</Typography>
<Link color="text.secondary" variant="body2" href="#">
About us
</Link>
<Link color="text.secondary" variant="body2" href="#">
Careers
</Link>
<Link color="text.secondary" variant="body2" href="#">
Press
</Link>
</Box>
<Box
sx={{
display: { xs: 'none', sm: 'flex' },
flexDirection: 'column',
gap: 1,
}}
>
<Typography variant="body2" sx={{ fontWeight: 'medium' }}>
Legal
</Typography>
<Link color="text.secondary" variant="body2" href="#">
Terms
</Link>
<Link color="text.secondary" variant="body2" href="#">
Privacy
</Link>
<Link color="text.secondary" variant="body2" href="#">
Contact
</Link>
</Box>
</Box>
<Box
sx={{
display: 'flex',
justifyContent: 'space-between',
pt: { xs: 4, sm: 8 },
width: '100%',
borderTop: '1px solid',
borderColor: 'divider',
}}
>
<div>
<Link color="text.secondary" variant="body2" href="#">
Privacy Policy
</Link>
<Typography sx={{ display: 'inline', mx: 0.5, opacity: 0.5 }}>
&nbsp;&nbsp;
</Typography>
<Link color="text.secondary" variant="body2" href="#">
Terms of Service
</Link>
<Copyright />
</div>
<Stack
direction="row"
spacing={1}
useFlexGap
sx={{ justifyContent: 'left', color: 'text.secondary' }}
>
<IconButton
color="inherit"
size="small"
href="https://github.com/mui"
aria-label="GitHub"
sx={{ alignSelf: 'center' }}
>
<GitHubIcon />
</IconButton>
<IconButton
color="inherit"
size="small"
href="https://x.com/MaterialUI"
aria-label="X"
sx={{ alignSelf: 'center' }}
>
<TwitterIcon />
</IconButton>
<IconButton
color="inherit"
size="small"
href="https://www.linkedin.com/company/mui/"
aria-label="LinkedIn"
sx={{ alignSelf: 'center' }}
>
<LinkedInIcon />
</IconButton>
</Stack>
</Box>
<Copyright />
</Container>
</React.Fragment>
);

View File

@@ -3,11 +3,12 @@ import Avatar from '@mui/material/Avatar';
import AvatarGroup from '@mui/material/AvatarGroup';
import Box from '@mui/material/Box';
import Grid from '@mui/material/Grid';
import Pagination from '@mui/material/Pagination';
import Typography from '@mui/material/Typography';
import { styled } from '@mui/material/styles';
import NavigateNextRoundedIcon from '@mui/icons-material/NavigateNextRounded';
import CircularProgress from '@mui/material/CircularProgress';
import type { Article } from '../providers/Article'; // ✅ import type for correctness
import Fade from '@mui/material/Fade'; // ✅ for smooth appearance
const StyledTypography = styled(Typography)({
@@ -92,65 +93,121 @@ function Author({ authors }: { authors: { name: string; avatar: string }[] }) {
interface LatestProps {
articles: Article[];
onSelectArticle?: (index: number) => void;
onLoadMore?: (offset: number, limit: number) => Promise<void>; // optional async callback
}
export default function Latest({ articles, onSelectArticle }: LatestProps) {
const [focusedCardIndex, setFocusedCardIndex] = React.useState<number | null>(null);
export default function Latest({ articles, onSelectArticle, onLoadMore }: LatestProps) {
const [visibleCount, setVisibleCount] = React.useState(2);
const [loadingMore, setLoadingMore] = React.useState(false);
const [animating, setAnimating] = React.useState(false);
const loaderRef = React.useRef<HTMLDivElement | null>(null);
const handleFocus = (index: number) => setFocusedCardIndex(index);
const handleBlur = () => setFocusedCardIndex(null);
const displayedArticles = articles.slice(0, visibleCount);
// limit to 4-6 items for visual balance
const displayedArticles = articles.slice(0, 6);
React.useEffect(() => {
if (!loaderRef.current) return;
const observer = new IntersectionObserver(
async (entries) => {
const first = entries[0];
if (first.isIntersecting && !loadingMore && visibleCount < articles.length) {
console.log('🟡 Intersection triggered — loading more blogs...');
setLoadingMore(true);
// simulate API load delay
await new Promise((resolve) => setTimeout(resolve, 1000));
if (onLoadMore) {
console.log(`📡 Calling onLoadMore(offset=${visibleCount}, limit=2)`);
await onLoadMore(visibleCount, 2);
}
setAnimating(true);
setVisibleCount((prev) => {
const newCount = prev + 2;
console.log(`✅ Increasing visibleCount from ${prev}${newCount}`);
return newCount;
});
setTimeout(() => setAnimating(false), 600);
setLoadingMore(false);
}
},
{ threshold: 0.5 }
);
const current = loaderRef.current;
observer.observe(current);
console.log('👀 IntersectionObserver attached to loaderRef:', loaderRef.current);
return () => {
if (current) observer.unobserve(current);
console.log('🧹 IntersectionObserver detached');
};
}, [loadingMore, visibleCount, articles.length, onLoadMore]);
return (
<div>
<Box>
<Typography variant="h2" gutterBottom>
Latest
</Typography>
<Grid container spacing={8} columns={12} sx={{ my: 4 }}>
{displayedArticles.map((article, index) => (
<Grid key={index} size={{ xs: 12, sm: 6 }}>
<Box
sx={{
display: 'flex',
flexDirection: 'column',
justifyContent: 'space-between',
gap: 1,
height: '100%',
}}
>
<Typography gutterBottom variant="caption" component="div">
{article.tag}
</Typography>
<TitleTypography
gutterBottom
variant="h6"
tabIndex={0}
onFocus={() => handleFocus(index)}
onBlur={handleBlur}
onClick={() => onSelectArticle?.(index)}
className={focusedCardIndex === index ? 'Mui-focused' : ''}
<Fade in timeout={animating ? 700 : 0}>
<Box
sx={{
display: 'flex',
flexDirection: 'column',
justifyContent: 'space-between',
gap: 1,
height: '100%',
transition: 'transform 0.3s ease',
'&:hover': { transform: 'translateY(-3px)' },
}}
>
{article.title}
<NavigateNextRoundedIcon
className="arrow"
sx={{ fontSize: '1rem' }}
/>
</TitleTypography>
<StyledTypography variant="body2" color="text.secondary" gutterBottom>
{article.description}
</StyledTypography>
<Typography gutterBottom variant="caption" component="div">
{article.tag}
</Typography>
<Author authors={article.authors} />
</Box>
<TitleTypography
gutterBottom
variant="h6"
tabIndex={0}
onClick={() => onSelectArticle?.(index)}
>
{article.title}
<NavigateNextRoundedIcon className="arrow" sx={{ fontSize: '1rem' }} />
</TitleTypography>
<StyledTypography variant="body2" color="text.secondary" gutterBottom>
{article.description}
</StyledTypography>
<Author authors={article.authors} />
</Box>
</Fade>
</Grid>
))}
</Grid>
<Box sx={{ display: 'flex', flexDirection: 'row', pt: 4 }}>
<Pagination hidePrevButton hideNextButton count={10} boundaryCount={10} />
<Box
ref={loaderRef}
sx={{
display: 'flex',
justifyContent: 'center',
py: 3,
opacity: loadingMore ? 1 : 0.6,
transition: 'opacity 0.4s ease',
}}
>
{loadingMore ? (
<CircularProgress size={32} thickness={5} />
) : (
<Typography variant="caption">Scroll to load more...</Typography>
)}
</Box>
</div>
</Box>
);
}

View File

@@ -16,7 +16,6 @@ import { styled } from '@mui/material/styles';
import SearchRoundedIcon from '@mui/icons-material/SearchRounded';
import RssFeedRoundedIcon from '@mui/icons-material/RssFeedRounded';
import { useArticles } from '../providers/Article';
const StyledCard = styled(Card)(({ theme }) => ({
display: 'flex',
@@ -138,7 +137,6 @@ export default function MainContent({
<Typography variant="h1" gutterBottom>
Blog
</Typography>
<Typography>Stay in the loop with the latest about our products</Typography>
</div>
<Box
sx={{