organize career and projects sections

Signed-off-by: Daniel Jr <dan@danielmrcl.dev>

diff --git a/assets/scss/partial/index.scss b/assets/scss/partial/index.scss
index 4ae763939c97158d34b43d8d1c98948ace452a20..90bc2a7573e3fa7798b1191856a450fe444c6030 100644 (file)
--- a/assets/scss/partial/index.scss
+++ b/assets/scss/partial/index.scss
@@ -37,4 +37,15 @@
       display: inline;
     }
   }
-}
\ No newline at end of file
+}
+.career-list {
+  padding: 0;
+  list-style: none;
+
+  .career-item {
+    margin-bottom: 5px;
+    p {
+      display: inline;
+    }
+  }
+}

diff --git a/data/career.json b/data/career.json
new file mode 100644 (file)
index 0000000..5fe7083
--- /dev/null
+++ b/data/career.json
@@ -0,0 +1,24 @@
+{
+       "list": [
+               {
+                       "name": "Onnibank",
+                       "url": "https://click.danielmrcl.dev/onnibank-k9Uw",
+                       "tags": [
+                               { "name": "#SpringBoot", "color": "#83a598" },
+                               { "name": "#Quarkus", "color": "#83a598" },
+                               { "name": "#Kafka", "color": "#83a598" }
+                       ],
+                       "desc": "HR solution to manage payroll and benefits for employees."
+               },
+               {
+                       "name": "Justa",
+                       "url": "https://click.danielmrcl.dev/justa-Oo7g",
+                       "tags": [
+                               { "name": "#PlayFramework", "color": "#83a598" },
+                               { "name": "#SpringBoot", "color": "#83a598" },
+                               { "name": "#NestJS", "color": "#83a598" }
+                       ],
+                       "desc": "B2B payment solutions fintech."
+               }
+       ]
+}

diff --git a/data/projects.json b/data/projects.json
index 385e4eab03cb460fe69525fc71de96b4fa921581..61d5f83aa65cbba1c09e32bc79239d73142a58c2 100644 (file)
--- a/data/projects.json
+++ b/data/projects.json
@@ -1,36 +1,23 @@
 {
        "list": [
-               {
-                       "name": "Onnibank",
-                       "url": "https://click.danielmrcl.dev/onnibank-k9Uw",
-                       "tags": [
-                               { "name": "job", "color": "#fb4934" }
-                       ],
-                       "desc": "HR solution to manage payroll and benefits for employees. #SpringBoot #Quarkus #Kafka"
-               },
                {
                        "name": "EncURL",
                        "url": "https://click.danielmrcl.dev/gitlab-2bCe",
                        "tags": [
-                               { "name": "proj", "color": "#83a598" }
-                       ],
-                       "desc": "Link shortener with some extra features. #VueJS #CSharp"
-               },
-               {
-                       "name": "Justa",
-                       "url": "https://click.danielmrcl.dev/justa-Oo7g",
-                       "tags": [
-                               { "name": "job", "color": "#fb4934" }
+                               { "name": "#VueJS", "color": "#83a598" },
+                               { "name": "#CSharp", "color": "#83a598" }
                        ],
-                       "desc": "B2B payment solutions fintech. #PlayFramework #SpringBoot #NestJS"
+                       "desc": "Link shortener with some extra features."
                },
                {
                        "name": "ArtDigital",
                        "url": "https://click.danielmrcl.dev/github-4OO7",
                        "tags": [
-                               { "name": "proj", "color": "#83a598" }
+                               { "name": "#JavaEE", "color": "#83a598" },
+                               { "name": "#JSP", "color": "#83a598" },
+                               { "name": "#WebServlets", "color": "#83a598" }
                        ],
-                       "desc": "E-commerce that simplifies sale of products in the handcraft sector. #JavaEE #JSP #WebServlets"
+                       "desc": "E-commerce that simplifies sale of products in the handcraft sector."
                }
        ]
 }

diff --git a/layouts/index.html b/layouts/index.html
index 8a86a509d88c66e8ce89c1eed9156e9f9dbc80a0..000db1a59138f46c5e0131fd5f708e834f4bbeaf 100644 (file)
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -37,29 +37,30 @@
   {{ partial "optional-about.html" . }}
   </section>
 
-  {{ $showProjectsList := false }}
-  {{ if (isset .Site.Params "showprojectslist") }}
-    {{ $showProjectsList = .Site.Params.showProjectsList }}
-  {{ else if .Site.Data.projects }}
-    {{ $showProjectsList = true }}
-  {{ end }}
-  {{ if $showProjectsList }}
-    {{ $projectsUrl := "#" }}
-    {{ if isset .Site.Params "projectsurl" }}
-      {{ $projectsUrl = .Site.Params.projectsUrl }}
-    {{ end }}
   <section id="projects">
-    <span class="h1"><a href="{{ $projectsUrl }}">Career</a></span>
+    <span class="h2">Projects</span>
     <ul class="project-list">
         {{ range .Site.Data.projects.list }}
         <li class="project-item">
+                       <a href="{{ .url }}">{{ .name }}</a>: {{ .desc | markdownify }}
                        {{ range .tags }}
-                               <span style="font-size: 10px; color: {{ .color }}; font-weight: bold; background-color: #282828;">{{ .name }}</span>
+                       <span style="font-size: 10px; color: {{ .color }}; font-weight: bold; background-color: #282828;">{{ .name }}</span>
                        {{ end }}
+        </li>
+        {{ end }}
+    </ul>
+  </section>
+  <section id="career">
+    <span class="h2">Career</span>
+    <ul class="career-list">
+        {{ range .Site.Data.career.list }}
+        <li class="career-item">
                        <a href="{{ .url }}">{{ .name }}</a>: {{ .desc | markdownify }}
+                       {{ range .tags }}
+                       <span style="font-size: 10px; color: {{ .color }}; font-weight: bold; background-color: #282828;">{{ .name }}</span>
+                       {{ end }}
         </li>
         {{ end }}
     </ul>
   </section>
-  {{ end }}
 {{ end }}