Merge pull request #136 from Aletheia-Data/development

release v1.3.0
Aletheia-Data · Jul 4, 2022 · 9445131 · 9445131
2 parents 95ac566 + 19e794b
commit 9445131
Show file tree

Hide file tree

Showing 10 changed files with 279 additions and 178 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "App-Aletheia-data",
-  "version": "1.2.8",
+  "version": "1.3.0",
   "homepage": "/",
   "repository": {
     "type": "git",

diff --git a/public/index.html b/public/index.html
@@ -4,10 +4,24 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
+    <!-- Primary Meta Tags -->
+    <title>Aletheia Data | We make public information usable</title>
+    <meta name="title" content="Aletheia Data | We make public information usable">
+    <meta name="description" content="Aletheia is an Open Source project that seeks to encourage both public and private entities to facilitate access to public information, so that it can have a more relevant social impact.">
+
+    <!-- Open Graph / Facebook -->
+    <meta property="og:type" content="website">
+    <meta property="og:url" content="https://aletheiadata.org/">
+    <meta property="og:title" content="Aletheia Data | We make public information usable">
+    <meta property="og:description" content="Aletheia is an Open Source project that seeks to encourage both public and private entities to facilitate access to public information, so that it can have a more relevant social impact.">
+    <meta property="og:image" content="https://bafybeicogujduqaplq5kjtynb5b4jj6ohtcfgyjsg6pdcmujfojf2ayukq.ipfs.dweb.link/meta-tags-img.png">
+
+    <!-- Twitter -->
+    <meta property="twitter:card" content="summary_large_image">
+    <meta property="twitter:url" content="https://aletheiadata.org/">
+    <meta property="twitter:title" content="Aletheia Data | We make public information usable">
+    <meta property="twitter:description" content="Aletheia is an Open Source project that seeks to encourage both public and private entities to facilitate access to public information, so that it can have a more relevant social impact.">
+    <meta property="twitter:image" content="https://bafybeicogujduqaplq5kjtynb5b4jj6ohtcfgyjsg6pdcmujfojf2ayukq.ipfs.dweb.link/meta-tags-img.png">
     <link
       href="//fonts.googleapis.com/css?family=Poppins:300,400,500,600,700"
       rel="stylesheet"

diff --git a/src/_start/assets/sass/components/_banner.scss b/src/_start/assets/sass/components/_banner.scss
@@ -0,0 +1,19 @@
+.banner{
+    text-align: center;
+    padding: 0 20px;
+
+    h3 {
+        font-size: small;
+        color: $primary-light;
+        margin: 0;
+    }
+
+    a {
+        color: $primary-light;
+        text-decoration: underline;
+    }
+
+    a:hover {
+        text-decoration: none;
+     }
+}
diff --git a/src/_start/assets/sass/components/components.scss b/src/_start/assets/sass/components/components.scss
@@ -1,6 +1,7 @@
 //
 // Components
 @import "./_clipboard";
+@import "_banner";
 //
 
 // Import Dependencies

diff --git a/src/_start/helpers/GetCollectionPageColumns.tsx b/src/_start/helpers/GetCollectionPageColumns.tsx
@@ -23,7 +23,11 @@ export const getCollectionPageColumns = (
             className={`text-gray-800 fw-bolder text-hover-primary fs-6 ${
               recordItem.cid ? "" : "disabled"
             }`}
-            to={recordItem.cid ? `/${type}/${entity}/${recordItem.cid}?assetId=${recordItem.id}` : "#"}
+            to={
+              recordItem.cid
+                ? `/${type}/${entity}/${recordItem.cid}?assetId=${recordItem.id}`
+                : "#"
+            }
           >
             {recordItem.name || recordItem.title}
           </Link>
@@ -87,18 +91,27 @@ export const getCollectionPageColumns = (
       },
       {
         title: "Action",
-        cells: data?.map((recordItem: Record) => (
-          <Link
-            key={`record-alexandria-${recordItem.cid}`}
-            className="btn btn-icon btn-bg-light  btn-color-muted btn-active-color-primary btn-sm"
-            to={`/${type}/${entity}/${recordItem.cid}?assetId=${recordItem.id}`}
-          >
-            <Ktsvg
-              className="svg-icon-4"
-              path="/media/icons/duotone/General/Attachment1.svg"
-            />
-          </Link>
-        )),
+        cells: data?.map((recordItem: Record) => {
+          console.log(recordItem);
+
+          if (
+            recordItem.status === "on_line" ||
+            recordItem.status === "under_review"
+          ) {
+            return (
+              <Link
+                key={`record-alexandria-${recordItem.cid}`}
+                className="btn btn-icon btn-bg-light  btn-color-muted btn-active-color-primary btn-sm"
+                to={`/${type}/${entity}/${recordItem.cid}?assetId=${recordItem.id}`}
+              >
+                <Ktsvg
+                  className="svg-icon-4"
+                  path="/media/icons/duotone/General/Attachment1.svg"
+                />
+              </Link>
+            );
+          }
+        }),
       },
     ];
   } else {
@@ -111,7 +124,11 @@ export const getCollectionPageColumns = (
             className={`text-gray-800 fw-bolder text-hover-primary fs-6 ${
               recordItem.cid ? "" : "disabled"
             }`}
-            to={recordItem.cid ? `/${type}/${entity}/${recordItem.cid}?assetId=${recordItem.id}` : "#"}
+            to={
+              recordItem.cid
+                ? `/${type}/${entity}/${recordItem.cid}?assetId=${recordItem.id}`
+                : "#"
+            }
           >
             {recordItem.name || recordItem.title}
           </Link>

diff --git a/src/_start/layout/components/header/HeaderBanner.tsx b/src/_start/layout/components/header/HeaderBanner.tsx
@@ -0,0 +1,22 @@
+import React, { useState, FC } from "react";
+
+const HeaderBanner: FC = ({ children }) => {
+  const [showHeader, setShowHeader] = useState(true);
+
+  const handleBanner = () => {
+    setShowHeader(false);
+  };
+
+  return showHeader ? (
+    <div className="d-flex d-inline-flex w-100 bg-dark banner" role="alert">
+      <div className="d-flex w-100 align-items-center justify-content-center">
+        {children}
+      </div>
+      <button className="btn btn-icon align-self-end" onClick={handleBanner}>
+        <i className="fas fa-times text-light"></i>
+      </button>
+    </div>
+  ) : null;
+};
+
+export default HeaderBanner;
diff --git a/src/_start/layout/components/header/HeaderWrapper.tsx b/src/_start/layout/components/header/HeaderWrapper.tsx
@@ -2,6 +2,7 @@
 import React from "react";
 import { IThemeCSSClasses, useTheme } from "../../core";
 import { Header } from "./Header";
+import HeaderBanner from "./HeaderBanner";
 
 type Props = {
   classes: IThemeCSSClasses;
@@ -54,6 +55,19 @@ export function HeaderWrapper() {
   const { header } = config;
   return (
     <>
+      <HeaderBanner>
+        <h3>
+          Please note that this is a beta version of our system. Don't forget to
+          support our effort on{" "}
+          <a
+            href="https://opencollective.com/aletheia-data"
+            target="_blank"
+            rel="noreferrer"
+          >
+            Open Collective
+          </a>
+        </h3>
+      </HeaderBanner>
       {header.fixed.desktop && header.fixed.tabletAndMobile && (
         <HeaderDesktopFixedTabletFixed classes={classes} />
       )}