Merge pull request #751 from CorrelAid/747-projects-db-make-all-cards…

…-clickable-remove-sub-page-field-etc

close #747

src/lib/components/ProjectsCard.svelte

@@ -4,8 +4,6 @@
   import ProjectLinks from '$lib/components/ProjectLinks.svelte';
   import Tag from './Tag.svelte';
   import Html from '$lib/components/Html.svelte';
-  import {t} from '$lib/stores/i18n';
-  import Cursor from '$lib/svg/Cursor.svelte';
 
   export let title;
   export let dataTypes;
@@ -26,7 +24,7 @@
     class="absolute inset-x-0 bottom-0 h-2 bg-gradient-to-r from-primary to-secondary opacity-75"
   />
 
-  {#if href}
+  <!-- {#if href}
     <a
       check
       {href}
@@ -38,7 +36,7 @@
         <Cursor width={29} height={29} /></span
       >
     </a>
-  {/if}
+  {/if} -->
 
   <div class="px-4 pb-6 pt-6">
     <div class="mb-2 flex items-center pb-2">
@@ -54,19 +52,11 @@
       </h4>
     </div>
 
-    {#if href}
-      <a
-        {href}
-        class="mt-2 text-xl font-semibold text-base-content transition hover:text-primary"
-        >{title}</a
-      >
-    {:else}
-      <h3
-        class=" mt-2 line-clamp-3 block text-xl font-semibold text-base-content transition"
-      >
-        {title}
-      </h3>
-    {/if}
+    <a
+      {href}
+      class="mt-2 text-xl font-semibold text-base-content transition hover:text-primary"
+      >{title}</a
+    >
 
     <div class="mb-4 mt-3">
       {#each projectTypes as tag}

src/lib/js/parsing/processing/cards.js

@@ -95,13 +95,10 @@ export function processEvents(event, locale) {
 export function processProjects(project, locale) {
   const lang = getLang(locale);
 
-  let href;
-  if (project.subpage === true) {
-    href = genWebsiteUrl(
-      translate(locale, 'navbar.using_data.project_database', {}).url,
-      project.project_id,
-    );
-  } else href = void 0;
+  const href = genWebsiteUrl(
+    translate(locale, 'navbar.using_data.project_database', {}).url,
+    project.project_id,
+  );
 
   let sector = void 0;
 

src/lib/js/parsing/schemas/cards.js

@@ -67,7 +67,7 @@ export const projectsSchema = yup.object({
   summary: yup.string().required(),
   procLocalChapters: yup.array().of(localChaptersSchema),
   localChapterNames: yup.array().of(yup.string()),
-  href: yup.string().nullable(),
+  href: yup.string().required(),
   endDate: yup.date().required(),
   organization: yup.string().required(),
   projectOutputs: yup.array().of(

src/routes/[[locale=locale]]/[using_data=using_data]/[project_database=project_database]/queries.js

@@ -2,7 +2,6 @@ export const projectOverviewQuery = `
 query ProjectOverview($language: String = "de-DE", $status: [String] = ["published"]) {
 	Projects(filter: { status: { _in: $status }  } ) {
 		status
-		subpage
 		project_id
 		is_internal
 		end_date

src/routes/[[locale=locale]]/[volunteering=volunteering]/correlaidx/[slug]/queries.js

@@ -39,7 +39,6 @@ query LocalChapterDetails($slug: String, $language: String = "de-DE", $status: [
 				is_internal
 				end_date
 				end_date_predicted
-				subpage
 				project_id
 				Podcast {
 					language

svelte.config.js

@@ -81,7 +81,7 @@ const queries = {
   `,
   projects: `
   query ProjectSlugs($status: [String] = ["published"]) {
-    Projects (filter : {_and: [{subpage : {_eq:true}}, {status: {_in: $status}}]}) {
+    Projects (filter : {status: {_in: $status}}) {
       slug: project_id
     }
   }