From d6c1970cbc533d300592e1ee1d2b7bc340044595 Mon Sep 17 00:00:00 2001
From: Yohan Boujon <yo.boujon@gmail.com>
Date: Wed, 14 Feb 2024 21:50:44 +0100
Subject: [PATCH] Frontend: Fixed Pill not rendering correctly. Backend: Fixed
 database issues. Updated README.

---
 backend/README.md                                 |  9 +++++++++
 backend/db/3_skills.sql                           |  2 +-
 frontend/src/lib/components/pill.svelte           |  2 +-
 frontend/src/lib/components/projects-popup.svelte | 10 +++++-----
 frontend/src/lib/css/pill.css                     |  2 +-
 frontend/src/lib/misc/special_tooltip.json        |  3 ++-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/backend/README.md b/backend/README.md
index a966599..4954a6a 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -18,9 +18,18 @@ sudo /usr/bin/postgresql-setup --initdb
 
 ### ⚠️ Be sure to modify your config file to access the postgres database ⚠️
 
+#### For Fedora/CentOS Based Linux
+
 ```bash
 sudo nano /var/lib/pgsql/data/pg_hba.conf
 ```
+
+#### For Debian Based Linux
+
+```bash
+sudo nano /etc/postgresql/13/main/pg_hba.conf
+```
+
 Then check if those lines are correct:
 ```
 # IPv4 local connections:
diff --git a/backend/db/3_skills.sql b/backend/db/3_skills.sql
index 7c77d5e..d230b14 100644
--- a/backend/db/3_skills.sql
+++ b/backend/db/3_skills.sql
@@ -6,7 +6,7 @@
 
 CREATE TABLE public.skills (
 	id serial4 NOT NULL,
-	category_id int4 DEFAULT nextval('skills_category_seq'::regclass) NOT NULL,
+	category_id int4 NOT NULL,
 	skill text NULL,
 	icon text NULL,
 	type_icon text NULL,
diff --git a/frontend/src/lib/components/pill.svelte b/frontend/src/lib/components/pill.svelte
index 1c9a0f3..493770d 100644
--- a/frontend/src/lib/components/pill.svelte
+++ b/frontend/src/lib/components/pill.svelte
@@ -18,7 +18,7 @@
   // Special data on pill
   import st_misc from "$lib/misc/special_tooltip.json";
   for (const st in st_misc) {
-    if (st == name)
+    if (st == name && show_tooltip)
       tooltip_data.push({
         title: text[st_misc[st]],
       });
diff --git a/frontend/src/lib/components/projects-popup.svelte b/frontend/src/lib/components/projects-popup.svelte
index da585e8..822e665 100644
--- a/frontend/src/lib/components/projects-popup.svelte
+++ b/frontend/src/lib/components/projects-popup.svelte
@@ -44,7 +44,7 @@
   let report_link;
   let github_link;
   let archive_link;
-  let application_link;
+  let app_link;
   let id = 0;
 
   async function popupShowed(data) {
@@ -66,7 +66,7 @@
       report_link = data.report_link;
       github_link = data.github_link;
       archive_link = data.archive_link;
-      application_link = data.application_link;
+      app_link = data.app_link;
       filteredTags = filterTag(tags, id);
 
       // Active set to true after the await to avoid conflict when clicking outside while the popup hasn't showed yet.
@@ -157,7 +157,7 @@
         </div>
       {/if}
       <!-- Links -->
-      {#if report_link != null || github_link != null || archive_link != null || application_link != null}
+      {#if report_link != null || github_link != null || archive_link != null || app_link != null}
         <div class="popup-subtitle-container">
           <SvgIcon size="35" path={mdiLink} type="mdi" />
           <p class="slide-subtitle slide-aftericon">{text.popup_links}</p>
@@ -193,10 +193,10 @@
               <p>{text.popup_dl_arc}</p>
             </a>
           {/if}
-          {#if application_link != null}
+          {#if app_link != null}
             <a
               class="project-popup-download project-popup-application"
-              href={application_link}
+              href={app_link}
               target="_blank"
             >
               <SvgIcon size="20" path={mdiDownload} type="mdi" />
diff --git a/frontend/src/lib/css/pill.css b/frontend/src/lib/css/pill.css
index b44d311..5c89355 100644
--- a/frontend/src/lib/css/pill.css
+++ b/frontend/src/lib/css/pill.css
@@ -48,7 +48,7 @@
     background-color: #ffffff00;
     visibility: hidden;
     display: flex;
-    margin-bottom: 4rem;
+    margin-bottom: 9rem;
     min-width: 10rem;
 }
 
diff --git a/frontend/src/lib/misc/special_tooltip.json b/frontend/src/lib/misc/special_tooltip.json
index d73cd3c..20fae19 100644
--- a/frontend/src/lib/misc/special_tooltip.json
+++ b/frontend/src/lib/misc/special_tooltip.json
@@ -7,5 +7,6 @@
     "JavaScript": "frontend",
     "VS Codium": "frontend",
     "Github": "frontend",
-    "DBeaver": "backend"
+    "DBeaver": "backend",
+    "Nginx": "backend"
 }
\ No newline at end of file