refactor(types): centralize all interfaces into dedicated type models and update context usage
- Moved all interface definitions into - Updated all providers and components to import interfaces from types/ folder - Renamed interfaces for clarity - Updated Article component to use typed props interface - Added descriptive inline date formatting utility examples
This commit is contained in:
@@ -3,6 +3,7 @@ import { marked } from 'marked';
|
|||||||
import { Box, Typography, Avatar, Divider, IconButton, Chip } from '@mui/material';
|
import { Box, Typography, Avatar, Divider, IconButton, Chip } from '@mui/material';
|
||||||
import { styled } from '@mui/material/styles';
|
import { styled } from '@mui/material/styles';
|
||||||
import ArrowBackRoundedIcon from '@mui/icons-material/ArrowBackRounded';
|
import ArrowBackRoundedIcon from '@mui/icons-material/ArrowBackRounded';
|
||||||
|
import { ArticleProps } from '../types/props';
|
||||||
|
|
||||||
const ArticleContainer = styled(Box)(({ theme }) => ({
|
const ArticleContainer = styled(Box)(({ theme }) => ({
|
||||||
maxWidth: '800px',
|
maxWidth: '800px',
|
||||||
@@ -23,11 +24,9 @@ const CoverImage = styled('img')({
|
|||||||
|
|
||||||
export default function Article({
|
export default function Article({
|
||||||
article,
|
article,
|
||||||
onBack,
|
onBack
|
||||||
}: {
|
}: ArticleProps) {
|
||||||
article: any;
|
|
||||||
onBack: () => void;
|
|
||||||
}) {
|
|
||||||
return (
|
return (
|
||||||
<ArticleContainer>
|
<ArticleContainer>
|
||||||
<IconButton onClick={onBack} sx={{ mb: 2 }}>
|
<IconButton onClick={onBack} sx={{ mb: 2 }}>
|
||||||
@@ -44,16 +43,19 @@ export default function Article({
|
|||||||
<Typography variant="h3" component="h1" gutterBottom fontWeight="bold">
|
<Typography variant="h3" component="h1" gutterBottom fontWeight="bold">
|
||||||
{article.title}
|
{article.title}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="h5" color="text.secondary" gutterBottom>
|
|
||||||
{article.subtitle}
|
|
||||||
</Typography>
|
|
||||||
|
|
||||||
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mt: 2, mb: 1 }}>
|
<Box sx={{ display: 'flex', alignItems: 'center', gap: 1, mt: 2, mb: 1 }}>
|
||||||
<Avatar src={article.authors[0].avatar} alt={article.authors[0].name} />
|
<Avatar src={article.authors[0].avatar} alt={article.authors[0].name} />
|
||||||
<Box>
|
<Box>
|
||||||
<Typography variant="subtitle2">{article.authors[0].name}</Typography>
|
<Typography variant="subtitle2">{article.authors[0].name}</Typography>
|
||||||
<Typography variant="caption" color="text.secondary">
|
<Typography variant="caption" color="text.secondary">
|
||||||
{article.authors[0].date}
|
{new Date(article.created_at).toLocaleString('en-US', {
|
||||||
|
year: 'numeric',
|
||||||
|
month: 'short',
|
||||||
|
day: 'numeric',
|
||||||
|
hour: '2-digit',
|
||||||
|
minute: '2-digit',
|
||||||
|
})}
|
||||||
</Typography>
|
</Typography>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import Typography from '@mui/material/Typography';
|
|||||||
import { styled } from '@mui/material/styles';
|
import { styled } from '@mui/material/styles';
|
||||||
import NavigateNextRoundedIcon from '@mui/icons-material/NavigateNextRounded';
|
import NavigateNextRoundedIcon from '@mui/icons-material/NavigateNextRounded';
|
||||||
import CircularProgress from '@mui/material/CircularProgress';
|
import CircularProgress from '@mui/material/CircularProgress';
|
||||||
import type { Article } from '../providers/Article'; // ✅ import type for correctness
|
import { LatestProps } from "../types/props";
|
||||||
import Fade from '@mui/material/Fade'; // ✅ for smooth appearance
|
import Fade from '@mui/material/Fade'; // ✅ for smooth appearance
|
||||||
|
|
||||||
|
|
||||||
@@ -89,13 +89,6 @@ function Author({ authors }: { authors: { name: string; avatar: string }[] }) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- Latest component ---- //
|
|
||||||
interface LatestProps {
|
|
||||||
articles: Article[];
|
|
||||||
onSelectArticle?: (index: number) => void;
|
|
||||||
onLoadMore?: (offset: number, limit: number) => Promise<void>; // optional async callback
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function Latest({ articles, onSelectArticle, onLoadMore }: LatestProps) {
|
export default function Latest({ articles, onSelectArticle, onLoadMore }: LatestProps) {
|
||||||
const [visibleCount, setVisibleCount] = React.useState(2);
|
const [visibleCount, setVisibleCount] = React.useState(2);
|
||||||
const [loadingMore, setLoadingMore] = React.useState(false);
|
const [loadingMore, setLoadingMore] = React.useState(false);
|
||||||
|
|||||||
@@ -1,42 +1,14 @@
|
|||||||
import React, { createContext, useState, useContext, useEffect } from 'react';
|
import React, { createContext, useState, useContext, useEffect } from 'react';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
|
import { ArticleModel } from "../types/models";
|
||||||
|
import { ArticleContextModel } from "../types/contexts";
|
||||||
|
|
||||||
interface Author {
|
const ArticleContext = createContext<ArticleContextModel | undefined>(undefined);
|
||||||
_id?: string | null;
|
|
||||||
username: string;
|
|
||||||
name: string;
|
|
||||||
email: string;
|
|
||||||
avatar: string;
|
|
||||||
is_active: boolean;
|
|
||||||
created_at?: string;
|
|
||||||
updated_at?: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Article {
|
|
||||||
_id?: string | null;
|
|
||||||
created_at: string;
|
|
||||||
updated_at: string;
|
|
||||||
img: string;
|
|
||||||
tag: string;
|
|
||||||
title: string;
|
|
||||||
description: string;
|
|
||||||
content: string;
|
|
||||||
authors: Author[];
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ArticleContextType {
|
|
||||||
articles: Article[];
|
|
||||||
loading: boolean;
|
|
||||||
error: string | null;
|
|
||||||
refreshArticles: () => Promise<void>;
|
|
||||||
}
|
|
||||||
|
|
||||||
const ArticleContext = createContext<ArticleContextType | undefined>(undefined);
|
|
||||||
|
|
||||||
const API_BASE = import.meta.env.VITE_API_BASE_URL;
|
const API_BASE = import.meta.env.VITE_API_BASE_URL;
|
||||||
|
|
||||||
export const ArticleProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
|
export const ArticleProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
|
||||||
const [articles, setArticles] = useState<Article[]>([]);
|
const [articles, setArticles] = useState<ArticleModel[]>([]);
|
||||||
const [loading, setLoading] = useState<boolean>(true);
|
const [loading, setLoading] = useState<boolean>(true);
|
||||||
const [error, setError] = useState<string | null>(null);
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
@@ -46,7 +18,7 @@ export const ArticleProvider: React.FC<{ children: React.ReactNode }> = ({ child
|
|||||||
setError(null);
|
setError(null);
|
||||||
|
|
||||||
// ✅ Use correct full endpoint from OpenAPI spec
|
// ✅ Use correct full endpoint from OpenAPI spec
|
||||||
const res = await axios.get<Article[]>(`${API_BASE}/articles`, {
|
const res = await axios.get<ArticleModel[]>(`${API_BASE}/articles`, {
|
||||||
params: { skip: 0, limit: 10 },
|
params: { skip: 0, limit: 10 },
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -76,7 +48,7 @@ export const ArticleProvider: React.FC<{ children: React.ReactNode }> = ({ child
|
|||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useArticles = (): ArticleContextType => {
|
export const useArticles = (): ArticleContextModel => {
|
||||||
const ctx = useContext(ArticleContext);
|
const ctx = useContext(ArticleContext);
|
||||||
if (!ctx) throw new Error('useArticles must be used inside ArticleProvider');
|
if (!ctx) throw new Error('useArticles must be used inside ArticleProvider');
|
||||||
return ctx;
|
return ctx;
|
||||||
|
|||||||
107
src/blog/providers/Author.tsx
Normal file
107
src/blog/providers/Author.tsx
Normal file
@@ -0,0 +1,107 @@
|
|||||||
|
import React, { createContext, useState, useEffect, useContext } from 'react';
|
||||||
|
import axios from 'axios';
|
||||||
|
import { AuthorModel } from "../types/models";
|
||||||
|
import { AuthContextModel } from "../types/contexts";
|
||||||
|
|
||||||
|
const AuthContext = createContext<AuthContextModel | undefined>(undefined);
|
||||||
|
|
||||||
|
const API_BASE = import.meta.env.VITE_API_BASE_URL;
|
||||||
|
|
||||||
|
export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
|
||||||
|
const [currentUser, setCurrentUser] = useState<AuthorModel | null>(null);
|
||||||
|
const [authors, setAuthors] = useState<AuthorModel[]>([]);
|
||||||
|
const [token, setToken] = useState<string | null>(localStorage.getItem('token'));
|
||||||
|
const [loading, setLoading] = useState<boolean>(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
|
||||||
|
/** 🔹 Login and store JWT token */
|
||||||
|
const login = async (email: string, password: string) => {
|
||||||
|
try {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
const res = await axios.post(`${API_BASE}/auth/login`, { email, password });
|
||||||
|
const { access_token, user } = res.data;
|
||||||
|
|
||||||
|
if (access_token) {
|
||||||
|
localStorage.setItem('token', access_token);
|
||||||
|
setToken(access_token);
|
||||||
|
setCurrentUser(user);
|
||||||
|
}
|
||||||
|
} catch (err: any) {
|
||||||
|
console.error('Login failed:', err);
|
||||||
|
setError(err.response?.data?.detail || 'Invalid credentials');
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 🔹 Logout and clear everything */
|
||||||
|
const logout = () => {
|
||||||
|
localStorage.removeItem('token');
|
||||||
|
setToken(null);
|
||||||
|
setCurrentUser(null);
|
||||||
|
setAuthors([]);
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 🔹 Fetch all authors (requires valid JWT) */
|
||||||
|
const refreshAuthors = async () => {
|
||||||
|
if (!token) return;
|
||||||
|
try {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
const res = await axios.get<AuthorModel[]>(`${API_BASE}/authors`, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
});
|
||||||
|
|
||||||
|
setAuthors(res.data);
|
||||||
|
} catch (err: any) {
|
||||||
|
console.error('Failed to fetch authors:', err);
|
||||||
|
setError(err.message || 'Failed to fetch authors');
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 🔹 Auto-load current user if token exists */
|
||||||
|
const fetchCurrentUser = async () => {
|
||||||
|
if (!token) return;
|
||||||
|
try {
|
||||||
|
const res = await axios.get<AuthorModel>(`${API_BASE}/auth/me`, {
|
||||||
|
headers: { Authorization: `Bearer ${token}` },
|
||||||
|
});
|
||||||
|
setCurrentUser(res.data);
|
||||||
|
} catch (err: any) {
|
||||||
|
console.error('Failed to fetch current user:', err);
|
||||||
|
logout(); // invalid/expired token
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (token) fetchCurrentUser();
|
||||||
|
}, [token]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<AuthContext.Provider
|
||||||
|
value={{
|
||||||
|
currentUser,
|
||||||
|
authors,
|
||||||
|
token,
|
||||||
|
loading,
|
||||||
|
error,
|
||||||
|
login,
|
||||||
|
logout,
|
||||||
|
refreshAuthors,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{children}
|
||||||
|
</AuthContext.Provider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useAuth = (): AuthContextModel => {
|
||||||
|
const ctx = useContext(AuthContext);
|
||||||
|
if (!ctx) throw new Error('useAuth must be used inside AuthProvider');
|
||||||
|
return ctx;
|
||||||
|
};
|
||||||
19
src/blog/types/contexts.ts
Normal file
19
src/blog/types/contexts.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { ArticleModel, AuthorModel } from "./models";
|
||||||
|
|
||||||
|
export interface ArticleContextModel {
|
||||||
|
articles: ArticleModel[];
|
||||||
|
loading: boolean;
|
||||||
|
error: string | null;
|
||||||
|
refreshArticles: () => Promise<void>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuthContextModel {
|
||||||
|
currentUser: AuthorModel | null;
|
||||||
|
authors: AuthorModel[];
|
||||||
|
token: string | null;
|
||||||
|
loading: boolean;
|
||||||
|
error: string | null;
|
||||||
|
login: (email: string, password: string) => Promise<void>;
|
||||||
|
logout: () => void;
|
||||||
|
refreshAuthors: () => Promise<void>;
|
||||||
|
}
|
||||||
30
src/blog/types/models.ts
Normal file
30
src/blog/types/models.ts
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
export interface AuthorModel {
|
||||||
|
// meta fields
|
||||||
|
_id?: string | null;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
|
||||||
|
// model fields
|
||||||
|
username: string;
|
||||||
|
name: string;
|
||||||
|
email: string;
|
||||||
|
avatar: string;
|
||||||
|
is_active: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ArticleModel {
|
||||||
|
// meta fields
|
||||||
|
_id?: string | null;
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
|
||||||
|
// model fields
|
||||||
|
img: string;
|
||||||
|
tag: string;
|
||||||
|
title: string;
|
||||||
|
description: string;
|
||||||
|
content: string;
|
||||||
|
|
||||||
|
// ref fields
|
||||||
|
authors: AuthorModel[];
|
||||||
|
}
|
||||||
12
src/blog/types/props.ts
Normal file
12
src/blog/types/props.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import { ArticleModel } from "./models";
|
||||||
|
|
||||||
|
export interface LatestProps {
|
||||||
|
articles: ArticleModel[];
|
||||||
|
onSelectArticle?: (index: number) => void;
|
||||||
|
onLoadMore?: (offset: number, limit: number) => Promise<void>; // optional async callback
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ArticleProps {
|
||||||
|
article: ArticleModel;
|
||||||
|
onBack: () => void;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user