Skip to content

Commit

Permalink
Merge pull request #40 from nathen418/upstream-merge
Browse files Browse the repository at this point in the history
Tweaks
  • Loading branch information
nathen418 committed May 17, 2023
2 parents 88feedf + a6db320 commit b4c767c
Show file tree
Hide file tree
Showing 13 changed files with 45 additions and 38 deletions.
15 changes: 11 additions & 4 deletions gitprofile.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const config = {
linkedin: 'nate-goldsborough',
twitter: '',
facebook: '',
instagram: 'nathen418',
instagram: '',
dribbble: '',
behance: '',
medium: '',
Expand Down Expand Up @@ -46,7 +46,7 @@ const config = {
experiences: [
{
company: 'WEC Energy Group',
position: 'Information Technology Intern',
position: 'Information Technology Intern - IT Infrastructure and Operations',
from: 'May 2023',
to: 'Present',
companyLink: 'https://www.wecenergygroup.com/',
Expand Down Expand Up @@ -135,8 +135,15 @@ const config = {
title: 'Purpose Driven Sisters Website Redesign',
description:
'Worked with a small student team to complete a digital presence redesign for Purpose Driven Sisters, a nonprofit organization focused on youth mentorship that strives to empower young girls in Milwaukee. Designed a new website by creating new and transforming existing content, refined their brand story, and defined donation and involvement incentives to prospective sponsors and members so they can better serve their community and grow as an organization. Worked on improving SEO and basic web accessibility and improving the mobile site design. This project was completed as part of the Nonprof-IT program at UW-Milwaukee',
imageUrl: 'https://static.wixstatic.com/media/40724f_2012372710cf4d099208a3349999d4ce~mv2.png',
link: 'https://purposedsisters.com',
imageUrl: 'https://antaresnetwork.com/resources/PDS_Logo.jpg',
link: 'https://purposedsisters.org',
},
{
title: 'Antares Bot',
description:
'AntaresBot a small bot with a bunch of features and cool commands. Join in the fun by adding AntaresBot to your server today. Developed for fun by me to learn type script and discord.js. Verified by Discord and in over 250 servers with over 1 million commands used and a 99% uptime. Using Discord\'s new "Slash Commands", Antares Bot supports many commands from fun random images, counting and chance games, a counting game, and more. Use /help in any channel to get a list of commands and features that are accessible. Admins can use /adminhelp',
imageUrl: 'https://antaresnetwork.com/resources/icon.png',
link: 'https://bot.antaresnetwork.com',
}
],
// Display blog posts from your medium or dev account. (Optional)
Expand Down
10 changes: 5 additions & 5 deletions src/components/GitProfile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,15 @@ const GitProfile = ({ config }) => {
</div>
<div className="lg:col-span-2 col-span-1">
<div className="grid grid-cols-1 gap-6">
<Project
repo={repo}
<ExternalProject
loading={loading}
github={sanitizedConfig.github}
externalProjects={sanitizedConfig.externalProjects}
googleAnalytics={sanitizedConfig.googleAnalytics}
/>
<ExternalProject
<Project
repo={repo}
loading={loading}
externalProjects={sanitizedConfig.externalProjects}
github={sanitizedConfig.github}
googleAnalytics={sanitizedConfig.googleAnalytics}
/>
<Blog
Expand Down
4 changes: 2 additions & 2 deletions src/components/avatar-card/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const AvatarCard = ({ profile, loading, avatarRing, resume }) => {
</span>
)}
</h5>
<div className="mt-3 text-base-content text-opacity-60 font-mono">
<div className="mt-3 text-base-content text-opacity-100 font-mono">
{loading || !profile
? skeleton({ width: 'w-48', height: 'h-5' })
: profile.bio}
Expand All @@ -64,7 +64,7 @@ const AvatarCard = ({ profile, loading, avatarRing, resume }) => {
<a
href={resume.fileUrl}
target="_blank"
className="btn btn-outline btn-sm text-xs mt-6 opacity-50"
className="btn btn-outline btn-sm text-xs mt-6 opacity-100"
download
rel="noreferrer"
>
Expand Down
12 changes: 6 additions & 6 deletions src/components/blog/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,21 +136,21 @@ const Blog = ({ loading, blog, googleAnalytics }) => {
<div className="w-full">
<div className="flex items-start px-4">
<div className="text-center md:text-left w-full">
<h2 className="font-semibold text-base-content opacity-60">
<h2 className="font-semibold text-base-content opacity-100">
{article.title}
</h2>
<p className="text-base-content opacity-50 text-xs">
<p className="text-base-content opacity-100 text-xs">
{formatDistance(article.publishedAt, new Date(), {
addSuffix: true,
})}
</p>
<p className="mt-3 text-base-content text-opacity-60 text-sm">
<p className="mt-3 text-base-content text-opacity-100 text-sm">
{article.description}
</p>
<div className="mt-4 flex items-center flex-wrap justify-center md:justify-start">
{article.categories.map((category, index2) => (
<div
className="py-2 px-4 text-xs leading-3 rounded-full bg-base-300 mr-1 mb-1 opacity-50 text-base-content"
className="py-2 px-4 text-xs leading-3 rounded-full bg-base-300 mr-1 mb-1 opacity-100 text-base-content"
key={index2}
>
#{category}
Expand All @@ -166,8 +166,8 @@ const Blog = ({ loading, blog, googleAnalytics }) => {
))
) : (
<div className="text-center mb-6">
<AiOutlineContainer className="mx-auto h-12 w-12 opacity-30" />
<p className="mt-1 text-sm opacity-50 text-base-content">
<AiOutlineContainer className="mx-auto h-12 w-12 opacity-100" />
<p className="mt-1 text-sm opacity-100 text-base-content">
No recent post
</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/certification/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ const Certification = ({ certifications, loading }) => {
)}
</h5>
</div>
<div className="text-base-content text-opacity-60">
<ol className="relative border-l border-base-300 border-opacity-30 my-2 mx-4">
<div className="text-base-content text-opacity-100">
<ol className="relative border-l border-base-300 border-opacity-100 my-2 mx-4">
{loading ? (
renderSkeleton()
) : (
Expand Down
4 changes: 2 additions & 2 deletions src/components/certifications/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ const Certifications = ({ certifications, loading }) => {
)}
</h5>
</div>
<div className="text-base-content text-opacity-60">
<ol className="relative border-l border-base-300 border-opacity-30 my-2 mx-4">
<div className="text-base-content text-opacity-100">
<ol className="relative border-l border-base-300 border-opacity-100 my-2 mx-4">
{loading ? (
renderSkeleton()
) : (
Expand Down
2 changes: 1 addition & 1 deletion src/components/details/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const Details = ({ profile, loading, social, github }) => {
return (
<div className="card shadow-lg compact bg-base-100">
<div className="card-body">
<div className="text-base-content text-opacity-60">
<div className="text-base-content text-opacity-100">
{loading || !profile ? (
renderSkeleton()
) : (
Expand Down
4 changes: 2 additions & 2 deletions src/components/education/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ const Education = ({ loading, education }) => {
)}
</h5>
</div>
<div className="text-base-content text-opacity-60">
<ol className="relative border-l border-base-300 border-opacity-30 my-2 mx-4">
<div className="text-base-content text-opacity-100">
<ol className="relative border-l border-base-300 border-opacity-100 my-2 mx-4">
{loading ? (
renderSkeleton()
) : (
Expand Down
6 changes: 3 additions & 3 deletions src/components/error-page/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ const ErrorPage = (props) => {
{props.status}
</h1>
<p className="text-lg pb-2 text-base-content">{props.title}</p>
<div className="text-base-content text-opacity-60">
<div className="text-base-content text-opacity-100">
{props.subTitle}
</div>
</div>
</div>
</div>
<div className="w-64 md:w-96 h-96 md:h-full bg-accent bg-opacity-10 absolute -top-64 md:-top-96 right-20 md:right-32 rounded-full pointer-events-none -rotate-45 transform"></div>
<div className="w-96 h-full bg-secondary bg-opacity-10 absolute -bottom-96 right-64 rounded-full pointer-events-none -rotate-45 transform"></div>
<div className="w-64 md:w-96 h-96 md:h-full bg-accent bg-opacity-100 absolute -top-64 md:-top-96 right-20 md:right-32 rounded-full pointer-events-none -rotate-45 transform"></div>
<div className="w-96 h-full bg-secondary bg-opacity-100 absolute -bottom-96 right-64 rounded-full pointer-events-none -rotate-45 transform"></div>
</div>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/experience/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const Experience = ({ experiences, loading }) => {
)}
</h5>
</div>
<div className="text-base-content text-opacity-60">
<ol className="relative border-l border-base-300 border-opacity-30 my-2 mx-4">
<div className="text-base-content text-opacity-100">
<ol className="relative border-l border-base-300 border-opacity-100 my-2 mx-4">
{loading ? (
renderSkeleton()
) : (
Expand Down
4 changes: 2 additions & 2 deletions src/components/external-project/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const ExternalProject = ({ externalProjects, loading, googleAnalytics }) => {
<div className="w-full">
<div className="px-4">
<div className="text-center w-full">
<h2 className="font-semibold text-lg tracking-wide text-center opacity-60 mb-2">
<h2 className="font-semibold text-lg tracking-wide text-center opacity-100 mb-2">
{item.title}
</h2>
{item.imageUrl && (
Expand All @@ -116,7 +116,7 @@ const ExternalProject = ({ externalProjects, loading, googleAnalytics }) => {
</div>
</div>
)}
<p className="mt-1 text-base-content text-opacity-60 text-sm">
<p className="mt-1 text-base-content text-opacity-100 text-sm">
{item.description}
</p>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/components/project/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,16 @@ const Project = ({ repo, loading, github, googleAnalytics }) => {
<div className="flex justify-between flex-col p-8 h-full w-full">
<div>
<div className="flex items-center">
<div className="card-title text-lg tracking-wide flex text-base-content opacity-60">
<div className="card-title text-lg tracking-wide flex text-base-content opacity-100">
<MdInsertLink className="my-auto" />
<span>{item.name}</span>
</div>
</div>
<p className="mb-5 mt-1 text-base-content text-opacity-60 text-sm">
<p className="mb-5 mt-1 text-base-content text-opacity-100 text-sm">
{item.description}
</p>
</div>
<div className="flex justify-between text-sm text-base-content text-opacity-60 truncate">
<div className="flex justify-between text-sm text-base-content text-opacity-100 truncate">
<div className="flex flex-grow">
<span className="mr-3 flex items-center">
<AiOutlineStar className="mr-0.5" />
Expand All @@ -110,7 +110,7 @@ const Project = ({ repo, loading, github, googleAnalytics }) => {
<div>
<span className="flex items-center">
<div
className="w-3 h-3 rounded-full mr-1 opacity-60"
className="w-3 h-3 rounded-full mr-1 opacity-100"
style={{ backgroundColor: languageColor(item.language) }}
/>
<span>{item.language}</span>
Expand Down Expand Up @@ -146,7 +146,7 @@ const Project = ({ repo, loading, github, googleAnalytics }) => {
href={`https://github.com/${github.username}?tab=repositories`}
target="_blank"
rel="noreferrer"
className="text-base-content opacity-50 hover:underline"
className="text-base-content opacity-100 hover:underline"
>
See All
</a>
Expand Down
4 changes: 2 additions & 2 deletions src/components/theme-changer/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const ThemeChanger = ({ theme, setTheme, loading, themeConfig }) => {
<div title="Change Theme" className="dropdown dropdown-end">
<div
tabIndex={0}
className="btn btn-ghost m-1 normal-case opacity-50 text-base-content"
className="btn btn-ghost m-1 normal-case opacity-100 text-base-content"
>
<AiOutlineControl className="inline-block w-5 h-5 stroke-current md:mr-2" />
<span className="hidden md:inline">Change Theme</span>
Expand Down Expand Up @@ -72,7 +72,7 @@ const ThemeChanger = ({ theme, setTheme, loading, themeConfig }) => {
onClick={(e) => changeTheme(e, item)}
className={`${theme === item ? 'active' : ''}`}
>
<span className="opacity-60 capitalize">
<span className="opacity-100 capitalize">
{item === themeConfig.defaultTheme ? 'Default' : item}
</span>
</a>
Expand Down

0 comments on commit b4c767c

Please sign in to comment.