feat: CV using content collections

luigieai · Feb 15, 2023 · f0906c0 · f0906c0
1 parent a85b86d
commit f0906c0
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 75 deletions.
diff --git a/src/components/cv/TimeLine.astro b/src/components/cv/TimeLine.astro
@@ -1,5 +1,23 @@
 ---
-const { title, subtitle, desc } = Astro.props;
+
+
+const { title, timeStart, timeEnd, company, desc } = Astro.props;
+
+function formatTime(timeStart, timeEnd) {
+
+  let formatOptions : Intl.DateTimeFormatOptions = {
+    month: 'short',
+    year: 'numeric'
+  }
+  let formattedStart = new Date(timeStart).toLocaleDateString('en-US', formatOptions);
+  if(!timeEnd) {
+    return formattedStart + " - Present";
+  }
+  let formattedEnd = new Date(timeEnd).toLocaleDateString('en-US', formatOptions);
+  return formattedStart + " - " + formattedEnd;
+}
+const time = formatTime(timeStart, timeEnd);
+
 ---
 
 <div class="flex">
@@ -9,7 +27,9 @@ const { title, subtitle, desc } = Astro.props;
   </div>
   <div class="experience__data bd-grid px-5">
     <h3 class="font-semibold mb-1">{title}</h3>
-    <span class="font-light text-sm">{subtitle}</span>
+    <span class="font-semibold text-sm">{time}</span>
+    <br/>
+    <span class="font-semibold text-sm">{company}</span>
     <p class="my-2 text-justify">
       {desc}
     </p>

diff --git a/src/content/config.ts b/src/content/config.ts
@@ -7,19 +7,20 @@ const blogSchema = z.object({
     updatedDate : z.string().optional(),
     heroImage: z.string().optional(),
 });
-const testSchema = z.object({
-        nome: z.string(),
-        lista: z.array(z.string()),
-        data: z.string().transform(str => new Date(str)),
-    });
 
-export type SchemaTest = z.infer<typeof testSchema>;
+const experienceSchema = z.object({
+        title: z.string(),
+        company: z.string(), 
+        timeStart: z.coerce.date(),
+        timeEnd : z.coerce.date().optional(),
+    });
 export type BlogSchema = z.infer<typeof blogSchema>;
+export type ExperienceSchema = z.infer<typeof experienceSchema>;
 
-const testCollection = defineCollection( { schema : testSchema } ) ;
 const blogCollection = defineCollection( { schema : blogSchema } ) ;
+const experienceCollection = defineCollection( { schema : experienceSchema } ) ;
 
 export const collections = {
     'blog' : blogCollection,
-    'test' : testCollection,
+    'experience' : experienceCollection, 
 }
diff --git a/src/content/experience/company1.uidesigner.md b/src/content/experience/company1.uidesigner.md
@@ -0,0 +1,8 @@
+---
+title: "UI Designer and Developer"
+company: "Integral Access Control System (Thesis)"
+timeStart: "Sep 2015"
+timeEnd: "Jan 2016"
+---
+
+2System multiplatform that includes the steps of a company's personnel, the structure and composition thereof, as well as a powerful designer of credentials and module of control of access. Outspread at the MINFAR and another entities of the country. Technologies: C++, Qt Framework, Subversión, Visual Paradigm, PostgreSQL, Jmeter
diff --git a/src/content/experience/company2.fullstack.md b/src/content/experience/company2.fullstack.md
@@ -0,0 +1,7 @@
+---
+title: "Full Stack Dev, Software Architect and Project Leader"
+company: "Integral Oil Drilling System 2.0"
+timeStart: "Jul 2016"
+---
+
+3System of steps of process of perforation of oil wells. Outspread in the direction of Intervención of Wells and various wells of drilling of the Occident of the country. Generate reports and graphs of process of perforation making use of data mining. Technologies: Php,Symfony 2.8 , Gitlab, PostgreSQL, HigthChart, Boostrap 2, JQuery, HTML,CSS, JavaScript
diff --git a/src/content/experience/company2.webdev.md b/src/content/experience/company2.webdev.md
@@ -0,0 +1,8 @@
+---
+title: "Web Developer"
+company: "Integral Oil Drilling System 2.0"
+timeStart: "Jan 2016"
+timeEnd: "Dec 2016"
+---
+
+1System of steps of process of perforation of oil wells. Outspread in the direction of Intervención of Wells and various wells of drilling of the Occident of the country. Generate reports and graphs of process of perforation making use of data mining. Technologies: Php,Symfony 2.7 , Subversión, PostgreSQL, HigthChart, Ireport, Boostrap 2, JQuery, HTML,CSS, JavaScript
diff --git a/src/pages/blog/[...page].astro b/src/pages/blog/[...page].astro
@@ -21,7 +21,7 @@ const { page } = Astro.props;
         title={post.data.title}
         img={post.data.heroImage}
         desc={post.data.description}
-        url={"/blog/post/" + post.slug}
+        url={"/blog/posts/" + post.slug}
 		target="_self"
       />
 	  <div class="divider my-0"></div>

diff --git a/src/pages/blog/post/[slug].astro → src/pages/blog/posts/[slug].astro b/src/pages/blog/post/[slug].astro → src/pages/blog/posts/[slug].astro
diff --git a/src/pages/cv.astro b/src/pages/cv.astro
@@ -1,6 +1,10 @@
 ---
 import BaseLayout from "../layouts/BaseLayout.astro";
 import TimeLineElement from "../components/cv/TimeLine.astro";
+import { getCollection } from "astro:content";
+
+const experienceEntries = await getCollection('experience');
+const experienceSorted = experienceEntries.sort( (a, b) => b.data.timeStart.valueOf() - a.data.timeStart.valueOf());
 ---
 
 <BaseLayout title = "Resume">
@@ -20,26 +24,15 @@ import TimeLineElement from "../components/cv/TimeLine.astro";
   </div>
 
   <div class="time-line-container mb-10">
-    <TimeLineElement
-      title="UI Designer and Developer at Integral Access Control System (Thesis)"
-      subtitle="From 2015 at XETID, Habana, Cuba"
-      desc="System multiplatform that includes the steps of a company's personnel, the structure and composition thereof, as well as a powerful designer of credentials and module of control of access. Outspread at the MINFAR and another entities of the country. Technologies: C++, Qt Framework, Subversión, Visual Paradigm, PostgreSQL, Jmeter"
-    />
-    <TimeLineElement
-      title="Web Developer at Integral Oil Drilling System 2.0"
-      subtitle="From 2015 to 2016 at CEDIN, UCI, Habana, Cuba"
-      desc="System of steps of process of perforation of oil wells. Outspread in the direction of Intervención of Wells and various wells of drilling of the Occident of the country. Generate reports and graphs of process of perforation making use of data mining. Technologies: Php,Symfony 2.7 , Subversión, PostgreSQL, HigthChart, Ireport, Boostrap 2, JQuery, HTML,CSS, JavaScript"
-    />
-    <TimeLineElement
-      title="Full Stack Dev, Software Architect and Project Leader at Integral Oil Drilling System 3.0"
-      subtitle="From 2016 to 2017 at CEDIN, UCI, Habana, Cuba"
-      desc="System of steps of process of perforation of oil wells. Outspread in the direction of Intervención of Wells and various wells of drilling of the Occident of the country. Generate reports and graphs of process of perforation making use of data mining. Technologies: Php,Symfony 2.8 , Gitlab, PostgreSQL, HigthChart, Boostrap 2, JQuery, HTML,CSS, JavaScript"
-    />
-    <TimeLineElement
-      title="Full Stack Dev, UI/UX Designer and Software Architect at Primary Information System"
-      subtitle="From 2017 to 2018 at CEDIN, UCI, Habana, Cuba"
-      desc="System of steps of primary information at a company. personnel's steps, control of access, impression of credentials, steps of locales, structure and composition. Technologies: Php,Symfony 3.3 , Gitlab, PostgreSQL, , Boostrap 3, JQuery, HTML,CSS, JavaScript"
+    {experienceSorted.map(experienceEntry => (
+      <TimeLineElement
+      title={experienceEntry.data.title}
+      timeStart={experienceEntry.data.timeStart}
+      timeEnd={experienceEntry.data.timeEnd} 
+      company={experienceEntry.data.company}
+      desc={experienceEntry.body}
     />
+    ))}
   </div>
 
   <div class="mb-5">
@@ -58,21 +51,6 @@ import TimeLineElement from "../components/cv/TimeLine.astro";
   <div class="mb-5">
     <div class="text-3xl w-full font-bold">Skills</div>
   </div>
-
-  <div class="mb-5">
-    <div class="text-3xl w-full font-bold">Education</div>
-  </div>
-
-  <div class="time-line-container grid gap-4 mb-10">
-    <TimeLineElement
-      title="Technician Information-Technology"
-      subtitle="2006 to 2009 at Osvaldo Herrera Polytechnic institute, Habana, Cuba"
-    />
-    <TimeLineElement
-      title="Informatics Science Engineer"
-      subtitle="2010 to 2015 at University of Informatics Science (UCI), Habana, Cuba"
-    />
-  </div>
   <ul class="list-disc md:columns-5 columns-2 mx-6">
     <li>Spanish (Native)</li>
     <li>English (C2)</li>
@@ -111,4 +89,18 @@ import TimeLineElement from "../components/cv/TimeLine.astro";
     <li>Adobe Photoshop</li>
     <li>KdenLive</li>
   </ul>
+  <div class="mb-5">
+    <div class="text-3xl w-full font-bold">Education</div>
+  </div>
+
+  <div class="time-line-container grid gap-4 mb-10">
+    <TimeLineElement
+      title="Technician Information-Technology"
+      subtitle="2006 to 2009 at Osvaldo Herrera Polytechnic institute, Habana, Cuba"
+    />
+    <TimeLineElement
+      title="Informatics Science Engineer"
+      subtitle="2010 to 2015 at University of Informatics Science (UCI), Habana, Cuba"
+    />
+  </div>
 </BaseLayout>
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -16,10 +16,10 @@ const last_posts = posts.slice(0, 3);
       <div class="text-3xl py-3 font-bold">Platform Engineer | Devops | Infrastructure</div>
       <div class="py-2">
         <text class="text-lg">
-          Welcome to my personal space, currently living in São Paulo, Brazil. Working as System Engineer in a platform team. <br/>
-          Interested about Linux; Cloud platforms; Infrastructure as code; Automation; Self hosting; Programming and a lot more. <br/>
-          I do enjoy drinking some beer! Play competitive videogames. Spend time with family and friends. And living life in general! <br/>
-          You can get to know more about me <a class="font-bold" href="/aboutme">here</a>. Want to get in contact with me? Feel free to reach me out:
+          Welcome to my corner of the internet! I am a System Engineer based in São Paulo, Brazil, passionate about technology and all things digital. 
+          I like Linux, cloud platforms, infrastructure as code, automation, self-hosting, programming, and much more. 
+          When I'm not in front of computer, I like to unwind with a cold beer, engage in competitive video gaming, spend quality time with family and friends, and simply enjoy life. 
+          If you'd like to get in touch, please don't hesitate to reach out. If you want to know more about me, <a class="font-bold" href="/aboutme">click here</a>!"
         </text>
       </div>
       <div class="mb-3">
@@ -39,7 +39,7 @@ const last_posts = posts.slice(0, 3);
           title={post.data.title}
           img={post.data.heroImage}
           desc={post.data.description}
-          url={"/blog/post/" + post.slug}
+          url={"/blog/posts/" + post.slug}
           target="_self"
         />
         <div class="divider my-0"></div>

diff --git a/src/pages/rss.xml.js b/src/pages/rss.xml.js
@@ -6,5 +6,5 @@ export const get = () =>
 		title: SITE_TITLE,
 		description: SITE_DESCRIPTION,
 		site: import.meta.env.SITE,
-		items: import.meta.glob('./blog/**/*.md'),
+		items: import.meta.glob('./blog/posts/**/*.md'),
 	});
diff --git a/src/pages/test/[slug].astro b/src/pages/test/[slug].astro
diff --git a/src/pages/test/index.astro b/src/pages/test/index.astro