Backend: Fixing education sql file. Frontend: Fixing json parsing not working on production.

backend/db/3_education.sql

@@ -9,9 +9,6 @@ CREATE TABLE public.education (
 	start_year date NULL,
 	end_year date NULL,
 	school text NULL,
-	speciality text NULL,
-	school_location text NULL,
-	school_options text NULL,
 	picture_url text NULL,
 	CONSTRAINT education_pkey PRIMARY KEY (id)
 );

frontend/src/routes/lang=[lang]/+page.js

@@ -1,4 +1,4 @@
-import {json} from '@sveltejs/kit';
+import { json } from '@sveltejs/kit';
 
 export async function load(context) {
   async function fetchData(data) {
@@ -21,17 +21,14 @@ export async function load(context) {
 
   async function fetchJSON(lang) {
     try {
-      const url = (import.meta.env.MODE === 'development') ? `lang/${lang}.json` :`static/lang/${lang}.json`;
-      const resTemp = await context.fetch(url);
-      if (resTemp.ok == false) {
+      const data = import.meta.glob('/src/lib/lang/*.json');
+      const file = data[`/src/lib/lang/${lang}.json`];
+      const jsonData = (await file()).default;
       return {
-          status: resTemp.status,
+        status: 0,
+        data: jsonData
       }
-      }
-      return {
-        status: 0, data: await resTemp.json(),
-      }
-    } catch (error) {
+    } catch {
       return {
         status: 500,
       }
@@ -40,10 +37,24 @@ export async function load(context) {
 
   // Gathering the language
   const lang = context.params.lang;
-  const lang_id = (await fetchData(`get_lang_id/${lang}`)).data.id;
+  let lang_id;
+  const res = (await fetchData(`get_lang_id/${lang}`));
+  if (res.status == 500) return {
+    status: res.status
+  }
+  else {
+    lang_id = res.data.id;
+  }
 
   // Gathering texts for languages
-  const text = (await fetchJSON(lang)).data;
+  let text;
+  const jsonData = await fetchJSON(lang);
+  if (jsonData.status == 0) text = jsonData.data;
+  else {
+    return {
+      status: res.status
+    }
+  }
 
   // Gathering data from databse
   const infos = [];

frontend/src/routes/lang=[lang]/+page.svelte

@@ -32,14 +32,17 @@
   export let data;
   // Database
   const cv = data.status == 0 ? processData(data) : undefined;
+
   // Language specifications
   const text = data.text;
   let flag;
   let otherlang;
+  if (data.status == 0) {
     for (const lang of cv.skills.languages) {
       if (lang.url_name == data.lang) flag = lang.icon_alpha;
       else otherlang = lang.url_name;
     }
+  }
 
   // Sidebar
   let containerCv;