changed prettier config

.prettierrc

@@ -1,5 +1,4 @@
 {
-	"tabWidth": 4,
 	"useTabs": true,
 	"semi": false
 }

source/generate/parseMarkdown.ts

@@ -79,8 +79,7 @@ export function parseFrontMatter(
 	).data
 
 	if (mode != ParseMode.PORTFOLIO) {
-		if (!frontMatter.title)
+		if (!frontMatter.title) throw Error(`Title is not defined in file: ${path}`)
-			throw Error(`Title is not defined in file: ${path}`)
 
 		if (mode != ParseMode.UNSEARCHABLE && !frontMatter.date)
 			throw Error(`Date is not defined in file: ${path}`)

source/generate/portfolio/badges.ejs

@@ -1,4 +1,5 @@
 <div class="items-wrapper">
-	<% badges.forEach((badge) => { %> <%- include("badge.ejs", { badge }) %> <%
+	<% badges.forEach((badge) => { %>
-	}) %>
+		<%- include("badge.ejs", { badge }) %>
+	<% }) %>
 </div>

source/generate/postProcess.ts

@@ -44,9 +44,7 @@ function parseSeries() {
 	// series length and order
 	for (const seriesURL in seriesMap) {
 		map.series[seriesURL].length = seriesMap[seriesURL].length
-		map.series[seriesURL].order = seriesMap[seriesURL].map(
+		map.series[seriesURL].order = seriesMap[seriesURL].map((item) => item.url)
-			(item) => item.url
-		)
 	}
 }
 
@@ -68,13 +66,9 @@ function generatePortfolioSVGs() {
 	}
 
 	for (const skillCategory in skills) {
-		skills[skillCategory as keyof typeof skills].forEach(
+		skills[skillCategory as keyof typeof skills].forEach((badge: string) => {
-			(badge: string) => {
+			data[skillCategory as keyof typeof skills].push(parseBadge(badge))
-				data[skillCategory as keyof typeof skills].push(
+		})
-					parseBadge(badge)
-				)
-			}
-		)
 	}
 
 	const renderedSVG = ejs.render(
@@ -92,9 +86,7 @@ function parseBadge(badgeRaw: string): Badge {
 	const isMultiWord = badgeRaw.includes(" ")
 	const words = badgeRaw.split(" ")
 
-	const icon = isMultiWord
+	const icon = isMultiWord ? simpleIcon.Get(words[0]) : simpleIcon.Get(badgeRaw)
-		? simpleIcon.Get(words[0])
-		: simpleIcon.Get(badgeRaw)
 
 	const color = tinycolor(icon.hex).lighten(5).desaturate(5)
 

source/generate/recursiveParse/parsePost.ts

@@ -7,13 +7,8 @@ import { map } from ".."
 import { DataToPass } from "."
 
 export default function parsePost(data: DataToPass): void {
-	const {
+	const { urlPath, markdownRaw, markdownData, humanizedDuration, totalWords } =
-		urlPath,
+		data
-		markdownRaw,
-		markdownData,
-		humanizedDuration,
-		totalWords,
-	} = data
 
 	const postData: PostData = {
 		title: markdownData.title as string,

source/generate/recursiveParse/parseSeries.ts

@@ -114,8 +114,7 @@ export default function parseSeries(data: DataToPass): void {
 					)
 				)
 
-				if (isNaN(index))
+				if (isNaN(index)) throw Error(`Invalid series index at: ${path}`)
-					throw Error(`Invalid series index at: ${path}`)
 
 				const itemToPush = {
 					index: index,

source/generate/util.ts

@@ -21,8 +21,7 @@ export function path2URL(pathToConvert: string): string {
  */
 export function path2FileOrFolderName(inputPath: string): string {
 	// remove trailing slash
-	if (inputPath[-1] == "/")
+	if (inputPath[-1] == "/") inputPath = inputPath.slice(0, inputPath.length - 1)
-		inputPath = inputPath.slice(0, inputPath.length - 1)
 
 	// get the last section
 	return inputPath.slice(inputPath.lastIndexOf("/") + 1)

source/markdown/portfolio/pomky.md

@@ -9,5 +9,7 @@ badges:
   # - cairo
 ---
 
+## Intro
+
 Pomky is a [conky](https://github.com/brndnmtthws/conky)-like system monitor written in rust.
 It is built to teach myself the rust programming language and to write a more flexible, efficient, and tailored version of conky.

source/src/App.tsx

@@ -91,10 +91,7 @@ const App = () => {
 					<Loading />
 				) : (
 					<Routes>
-						<Route
+						<Route path="/" element={<PostList howMany={5} title="Home" />} />
-							path="/"
-							element={<PostList howMany={5} title="Home" />}
-						/>
 						<Route path="/search" element={<Search />} />
 						<Route path="/portfolio" element={<Portfolio />} />
 						<Route path="/404" element={<NotFound />} />

source/src/components/Badge.tsx

@@ -27,9 +27,7 @@ const StyledSVG = styled.div<{ isDark: boolean }>`
 	svg {
 		height: 16px;
 		fill: ${(props) =>
-			props.isDark
+			props.isDark ? theming.dark.color1 : theming.light.color1} !important;
-				? theming.dark.color1
-				: theming.light.color1} !important;
 	}
 `
 

source/src/components/Navbar.tsx

@@ -87,9 +87,7 @@ const ReadProgress = () => {
 			const b = document.body
 
 			// https://stackoverflow.com/a/8028584/12979111
-			setScroll(
+			setScroll(((h[st] || b[st]) / ((h[sh] || b[sh]) - h.clientHeight)) * 100)
-				((h[st] || b[st]) / ((h[sh] || b[sh]) - h.clientHeight)) * 100
-			)
 		}
 
 		window.addEventListener("scroll", scrollHandler)
@@ -107,9 +105,7 @@ const Navbar = () => {
 		<StyledNav>
 			<StyledContainer>
 				<Link to="/">
-					<StyledImg
+					<StyledImg src={process.env.PUBLIC_URL + "/icon/icon_circle.svg"} />
-						src={process.env.PUBLIC_URL + "/icon/icon_circle.svg"}
-					/>
 				</Link>
 
 				<StyledNavLinks>

source/src/components/PostCard.tsx

@@ -58,9 +58,7 @@ const PostCard = (props: Props) => {
 
 	return (
 		<StyledPostCard
-			onClick={() =>
+			onClick={() => navigate(process.env.PUBLIC_URL + props.postData.url)}
-				navigate(process.env.PUBLIC_URL + props.postData.url)
-			}
 		>
 			<StyledTitle>{props.postData?.title || "No title"}</StyledTitle>
 
@@ -70,12 +68,7 @@ const PostCard = (props: Props) => {
 				<TagList direction="left">
 					{props.postData.tags &&
 						props.postData.tags.map((tag) => {
-							return (
+							return <Tag key={props.postData.title + tag} text={tag} />
-								<Tag
-									key={props.postData.title + tag}
-									text={tag}
-								/>
-							)
 						})}
 				</TagList>
 				<hr />

source/src/components/Sidebar.tsx

@@ -89,10 +89,7 @@ const Sidebar = () => {
 
 	return (
 		<>
-			<StyledOverlay
+			<StyledOverlay isSidebarOpen={isSidebarOpen} onClick={toggleSidebar} />
-				isSidebarOpen={isSidebarOpen}
-				onClick={toggleSidebar}
-			/>
 
 			<StyledToggleSidebarButton
 				data-tip

source/src/components/ThemeToggleButton.tsx

@@ -25,16 +25,10 @@ const Navbar = () => {
 						data-tip
 						data-for="theme"
 						className="right"
-						onClick={() =>
+						onClick={() => setTheme(currentTheme === "dark" ? "light" : "dark")}
-							setTheme(currentTheme === "dark" ? "light" : "dark")
-						}
 					>
-						{currentTheme == "dark" && (
+						{currentTheme == "dark" && <FontAwesomeIcon icon={faMoon} />}
-							<FontAwesomeIcon icon={faMoon} />
+						{currentTheme == "light" && <FontAwesomeIcon icon={faSun} />}
-						)}
-						{currentTheme == "light" && (
-							<FontAwesomeIcon icon={faSun} />
-						)}
 					</StyledThemeButton>
 					{!isMobile && (
 						<ReactTooltip id="theme" type="dark" effect="solid">

source/src/pages/Page/Toc.tsx

@@ -48,9 +48,7 @@ const Toc = (props: { data?: string }) => {
 			>
 				<strong>
 					Table of Contents{" "}
-					<FontAwesomeIcon
+					<FontAwesomeIcon icon={isTocOpened ? faCaretUp : faCaretDown} />
-						icon={isTocOpened ? faCaretUp : faCaretDown}
-					/>
 				</strong>
 			</StyledTocToggleButton>
 			<StyledCollapseContainer>

source/src/pages/Page/index.tsx

@@ -95,8 +95,7 @@ const Page = () => {
 			}
 
 			case PageType.SERIES: {
-				if (!(url.slice(0, url.lastIndexOf("/")) in map.series))
+				if (!(url.slice(0, url.lastIndexOf("/")) in map.series)) show404 = true
-					show404 = true
 
 				break
 			}
@@ -182,9 +181,7 @@ const Page = () => {
 
 					pageData.seriesHome = seriesURL
 					pageData.prev =
-						prev >= 0
+						prev >= 0 ? map.series[seriesURL].order[prev] : undefined
-							? map.series[seriesURL].order[prev]
-							: undefined
 					pageData.next =
 						next < map.series[seriesURL].order.length
 							? map.series[seriesURL].order[next]
@@ -195,9 +192,7 @@ const Page = () => {
 
 				case PageType.PORTFOLIO_PROJECT: {
 					const data =
-						portfolio.projects[
+						portfolio.projects[url as keyof typeof portfolio.projects]
-							url as keyof typeof portfolio.projects
-						]
 
 					pageData.content = fetched_content.content
 					pageData.toc = fetched_content.toc
@@ -246,10 +241,7 @@ const Page = () => {
 			<MainContent>
 				{/* next/previous series post buttons */}
 				{pageType == PageType.SERIES && (
-					<NextPrevButtons
+					<NextPrevButtons prevURL={pageData.prev} nextURL={pageData.next} />
-						prevURL={pageData.prev}
-						nextURL={pageData.next}
-					/>
 				)}
 
 				{pageType == PageType.PORTFOLIO_PROJECT && (
@@ -262,9 +254,7 @@ const Page = () => {
 				</StyledTitle>
 
 				{pageType == PageType.PORTFOLIO_PROJECT &&
-					pageData.badges.map((badge) => (
+					pageData.badges.map((badge) => <Badge key={badge} slug={badge} />)}
-						<Badge key={badge} slug={badge} />
-					))}
 
 				<small>
 					{/* Post tags */}
@@ -294,10 +284,7 @@ const Page = () => {
 				<Toc data={pageData.toc} />
 
 				{pageType == PageType.PORTFOLIO_PROJECT && (
-					<ProjectImage
+					<ProjectImage src={pageData.image} alt="project example image" />
-						src={pageData.image}
-						alt="project example image"
-					/>
 				)}
 
 				{/* page content */}

source/src/pages/Portfolio/ProjectCard.tsx

@@ -33,9 +33,7 @@ const ProjectCard = (props: ProjectCardProps) => {
 	const navigate = useNavigate()
 
 	useEffect(() => {
-		setBadges(
+		setBadges(project.badges.map((badge) => <Badge key={badge} slug={badge} />))
-			project.badges.map((badge) => <Badge key={badge} slug={badge} />)
-		)
 	}, [])
 
 	return (

source/src/pages/Portfolio/index.tsx

@@ -52,10 +52,7 @@ const Portfolio = () => {
 					property="og:image"
 					content="http://developomp.com/icon/icon.svg"
 				/>
-				<meta
+				<meta property="og:description" content="developomp's Portfolio" />
-					property="og:description"
-					content="developomp's Portfolio"
-				/>
 			</Helmet>
 
 			<MainContent>

source/src/pages/PostList.tsx

@@ -50,10 +50,7 @@ const PostList = (props: Props) => {
 				postCount++
 				const url: string = map.date[date][length - i - 1]
 				_postCards.push(
-					<PostCard
+					<PostCard key={url} postData={{ url: url, ...map.posts[url] }} />
-						key={url}
-						postData={{ url: url, ...map.posts[url] }}
-					/>
 				)
 			}
 		}

source/src/pages/Search/TagSelect.tsx

@@ -81,8 +81,7 @@ const TagSelect = (props: TagSelectProps) => {
 								":hover": {
 									backgroundColor: theming
 										.theme(currentTheme.currentTheme, {
-											light: theming.light
+											light: theming.light.backgroundColor0,
-												.backgroundColor0,
 											dark: theming.dark.backgroundColor0,
 										})
 										.toString(),
@@ -96,13 +95,10 @@ const TagSelect = (props: TagSelectProps) => {
 										dark: theming.dark.backgroundColor1,
 									})
 									.toString(),
-								border: theming.theme(
+								border: theming.theme(currentTheme.currentTheme, {
-									currentTheme.currentTheme,
-									{
 									light: "1px solid #ccc",
 									dark: "1px solid #555",
-									}
+								}),
-								),
 							}),
 							multiValue: (styles) => ({
 								...styles,

source/src/pages/Search/index.tsx

@@ -114,15 +114,11 @@ const Search = () => {
 		for (const [key, value] of URLSearchParams.entries()) {
 			switch (key) {
 				case "date_from":
-					setDateRange((prev) => [
+					setDateRange((prev) => [{ ...prev[0], startDate: new Date(value) }])
-						{ ...prev[0], startDate: new Date(value) },
-					])
 					break
 
 				case "date_to":
-					setDateRange((prev) => [
+					setDateRange((prev) => [{ ...prev[0], endDate: new Date(value) }])
-						{ ...prev[0], endDate: new Date(value) },
-					])
 					break
 
 				case "tags":
@@ -258,17 +254,12 @@ const Search = () => {
 							value={searchInput}
 							autoComplete="off"
 							placeholder="Search"
-							onChange={(event) =>
+							onChange={(event) => setSearchInput(event.target.value)}
-								setSearchInput(event.target.value)
-							}
 							onKeyPress={(event) => {
-								event.key === "Enter" &&
+								event.key === "Enter" && searchInput && doSearch()
-									searchInput &&
-									doSearch()
 							}}
 						/>
-						{postCards.length}{" "}
+						{postCards.length} {postCards.length > 1 ? "results" : "result"}
-						{postCards.length > 1 ? "results" : "result"}
 						<TagSelect
 							defaultValue={selectedTags}
 							onChange={(newValue) => {