+ jobs.data?.map((job) => (
+
diff --git a/src/components/Skills.tsx b/src/components/Skills.tsx
index 5fa5272..f8b92fd 100644
--- a/src/components/Skills.tsx
+++ b/src/components/Skills.tsx
@@ -17,7 +17,7 @@ const Skills = () => {
) : (
technicalSkills.data?.map((skill) => (
-
+
{skill.skill}
))
@@ -28,7 +28,7 @@ const Skills = () => {
) : (
leadershipSkills.data?.map((skill) => (
-
+
{skill.skill}
))
diff --git a/src/last-updated.ts b/src/last-updated.ts
index d543ccc..a3e637c 100644
--- a/src/last-updated.ts
+++ b/src/last-updated.ts
@@ -1 +1 @@
-export const lastUpdated = 100;
+export const lastUpdated = 0;
diff --git a/src/main.tsx b/src/main.tsx
index cd9f6cd..6b64201 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -6,7 +6,6 @@ import './index.css';
import { FirebaseContext } from './contexts/FirebaseContext';
import { QueryContext } from './contexts/QueryContext';
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
ReactDOM.createRoot(document.getElementById('root')!).render(
diff --git a/src/store/education.ts b/src/store/education.ts
index 43c5332..943dd28 100644
--- a/src/store/education.ts
+++ b/src/store/education.ts
@@ -5,6 +5,7 @@ import { education } from '~/store/store-backup';
import { db } from '~/contexts/FirebaseContext';
export interface EducationType {
+ id: string;
title: string;
subTitle: string;
school: string;
@@ -14,7 +15,7 @@ export interface EducationType {
export function useEducation() {
return useQuery(['education'], () =>
getDocs(collection(db, 'education')).then(
- (r) => r.docs.map((doc) => doc.data()) as EducationType[],
+ (r) => r.docs.map((doc) => ({ ...doc.data(), id: doc.id })) as EducationType[],
() => education
)
);
diff --git a/src/store/jobs.ts b/src/store/jobs.ts
index f47a20e..7283fc5 100644
--- a/src/store/jobs.ts
+++ b/src/store/jobs.ts
@@ -5,6 +5,7 @@ import { jobs } from '~/store/store-backup';
import { db } from '~/contexts/FirebaseContext';
export interface JobType {
+ id: string;
title: string;
company: string;
duration: string;
@@ -15,7 +16,7 @@ export interface JobType {
export function useJobs() {
return useQuery(['jobs'], () =>
getDocs(collection(db, 'jobs')).then(
- (r) => r.docs.map((doc) => doc.data()) as JobType[],
+ (r) => r.docs.map((doc) => ({ ...doc.data(), id: doc.id })) as JobType[],
() => jobs
)
);
diff --git a/src/store/skills.ts b/src/store/skills.ts
index 95f1db2..9fe2bf4 100644
--- a/src/store/skills.ts
+++ b/src/store/skills.ts
@@ -4,13 +4,14 @@ import { collection, getDocs } from 'firebase/firestore';
import { db } from '~/contexts/FirebaseContext';
export interface SkillType {
+ id: string;
skill: string;
}
export function useTechnicalSkills() {
return useQuery(['skills', 'technical'], () =>
getDocs(collection(db, 'skills_technical')).then(
- (r) => r.docs.map((doc) => doc.data()) as SkillType[]
+ (r) => r.docs.map((doc) => ({ ...doc.data(), id: doc.id })) as SkillType[]
)
);
}
@@ -18,7 +19,7 @@ export function useTechnicalSkills() {
export function useLeadershipSkills() {
return useQuery(['skills', 'leadership'], () =>
getDocs(collection(db, 'skills_leadership')).then(
- (r) => r.docs.map((doc) => doc.data()) as SkillType[]
+ (r) => r.docs.map((doc) => ({ ...doc.data(), id: doc.id })) as SkillType[]
)
);
}
diff --git a/src/store/store-backup.ts b/src/store/store-backup.ts
index 9a2b1cb..e0cf303 100644
--- a/src/store/store-backup.ts
+++ b/src/store/store-backup.ts
@@ -4,6 +4,7 @@ import { JobType } from './jobs';
export const education: EducationType[] = [
{
+ id: '1',
title: 'Bachelor of Computer Science',
subTitle: 'Minor in Business Administration (CO-OP)',
school: 'University of New Brunswick',
@@ -30,6 +31,7 @@ export const professionalSkills: string[] = [
export const jobs: JobType[] = [
{
+ id: '1',
title: 'Frontend Developer',
company: 'Magnet Forensics',
duration: 'July 2022 - Present',
@@ -41,6 +43,7 @@ export const jobs: JobType[] = [
]
},
{
+ id: '2',
title: 'Lead Frontend Developer - Lead UX Designer',
company: 'Gray Wolf Analytics Inc.',
duration: 'January 2021 - July 2022',
@@ -52,6 +55,7 @@ export const jobs: JobType[] = [
]
},
{
+ id: '3',
title: 'Software Developer',
company: 'IBM',
duration: 'September 2017 - September 2020',
diff --git a/tailwind.config.js b/tailwind.config.js
index 788e321..936da5c 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,10 +1,10 @@
module.exports = {
- content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
+ content: ['./index.html', './src/**/*.{ts,tsx}'],
theme: {
extend: {
colors: {
motif: '#A57A58',
- accent: '#8B8064'
+ accent: '#0ea5e9'
},
fontFamily: {
body: ['Roboto', 'sans-serif']