CI updates #1

This commit is contained in:
Darren Clarke 2023-06-20 07:49:52 +00:00 committed by GitHub
parent 59ae833099
commit 5a343c7eb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 707 additions and 652 deletions

View file

@ -1,4 +1,4 @@
import { GetServerSideProps, GetServerSidePropsContext } from "next";
import { NextPage, GetServerSideProps, GetServerSidePropsContext } from "next";
import { useTranslate } from "react-polyglot";
import Head from "next/head";
import Image from "next/legacy/image";
@ -15,15 +15,21 @@ import Globe from "images/globe.png";
import Controls from "images/controls.png";
import CommunityBackground from "images/community-background.png";
import Bicycle from "images/bicycle.png";
import { getEmbedded } from "lib/utils";
const About = () => {
type AboutProps = {
embedded: boolean;
};
const About: NextPage<AboutProps> = ({ embedded }) => {
const t = useTranslate();
const {
colors: { white, leafcutterElectricBlue, cdrLinkOrange },
typography: { h1, h4, p },
} = useAppContext();
return (
<Layout>
<Layout embedded={embedded}>
<Head>
<title>Digital Threat Dashboard Leafcutter</title>
</Head>
@ -165,3 +171,7 @@ const About = () => {
};
export default About;
export const getServerSideProps: GetServerSideProps = async (
context: GetServerSidePropsContext
) => ({ props: { embedded: getEmbedded(context) } });

View file

@ -10,12 +10,14 @@ import { Layout } from "components/Layout";
import { useAppContext } from "components/AppProvider";
import { PageHeader } from "components/PageHeader";
import { VisualizationBuilder } from "components/VisualizationBuilder";
import { getEmbedded } from "lib/utils";
type CreateProps = {
templates: any;
embedded: boolean;
};
const Create: FC<CreateProps> = ({ templates }) => {
const Create: FC<CreateProps> = ({ templates, embedded }) => {
const t = useTranslate();
const {
colors: { cdrLinkOrange },
@ -34,7 +36,7 @@ const Create: FC<CreateProps> = ({ templates }) => {
}, [searchIntroComplete, router, setCookie]);
return (
<Layout>
<Layout embedded={embedded}>
<Head>
<title>Digital Threat Dashboard Leafcutter</title>
</Head>
@ -76,5 +78,5 @@ export const getServerSideProps: GetServerSideProps = async (
) => {
const templates = await getTemplates(100);
return { props: { templates } };
return { props: { templates, embedded: getEmbedded(context) } };
};

View file

@ -1,13 +1,19 @@
import Head from "next/head";
import { useTranslate } from "react-polyglot";
import { NextPage, GetServerSideProps, GetServerSidePropsContext } from "next";
import { Box, Grid } from "@mui/material";
import { Layout } from "components/Layout";
import { PageHeader } from "components/PageHeader";
import { Question } from "components/Question";
import { useAppContext } from "components/AppProvider";
import FaqHeader from "images/faq-header.svg";
import { getEmbedded } from "lib/utils";
const FAQ = () => {
type FAQProps = {
embedded: boolean;
};
const FAQ: NextPage<FAQProps> = ({ embedded }) => {
const t = useTranslate();
const {
colors: { lavender },
@ -64,7 +70,7 @@ const FAQ = () => {
];
return (
<Layout>
<Layout embedded={embedded}>
<Head>
<title>Digital Threat Dashboard Leafcutter</title>
</Head>
@ -104,3 +110,7 @@ const FAQ = () => {
};
export default FAQ;
export const getServerSideProps: GetServerSideProps = async (
context: GetServerSidePropsContext
) => ({ props: { embedded: getEmbedded(context) } });

View file

@ -14,13 +14,16 @@ import { Welcome } from "components/Welcome";
import { WelcomeDialog } from "components/WelcomeDialog";
import { VisualizationCard } from "components/VisualizationCard";
import { useAppContext } from "components/AppProvider";
import { getEmbedded } from "lib/utils";
type MyVisualizationsProps = {
visualizations: any;
embedded: boolean;
};
const MyVisualizations: NextPage<MyVisualizationsProps> = ({
visualizations,
embedded,
}) => {
const router = useRouter();
const cookieName = "homeIntroComplete";
@ -40,7 +43,7 @@ const MyVisualizations: NextPage<MyVisualizationsProps> = ({
}, [homeIntroComplete, router, setCookie]);
return (
<Layout>
<Layout embedded={embedded}>
<Head>
<title>Digital Threat Dashboard Leafcutter</title>
</Head>
@ -116,5 +119,5 @@ export const getServerSideProps: GetServerSideProps = async (
session?.user?.email ?? "none",
20
);
return { props: { visualizations } };
return { props: { visualizations, embedded: getEmbedded(context) } };
};

View file

@ -1,6 +1,5 @@
import { FC } from "react";
/* eslint-disable no-underscore-dangle */
import { GetServerSideProps, GetServerSidePropsContext } from "next";
// import { Client } from "@opensearch-project/opensearch";
import { RawDataViewer } from "components/RawDataViewer";
import { VisualizationDetail } from "components/VisualizationDetail";
@ -24,6 +23,7 @@ const Preview: FC<PreviewProps> = ({
);
export default Preview;
/*
export const getServerSideProps: GetServerSideProps = async (
context: GetServerSidePropsContext

View file

@ -7,12 +7,14 @@ import { getTrends } from "lib/opensearch";
import { PageHeader } from "components/PageHeader";
import { VisualizationCard } from "components/VisualizationCard";
import { useAppContext } from "components/AppProvider";
import { getEmbedded } from "lib/utils";
type TrendsProps = {
visualizations: any;
embedded: boolean;
};
const Trends: NextPage<TrendsProps> = ({ visualizations }) => {
const Trends: NextPage<TrendsProps> = ({ visualizations, embedded }) => {
const t = useTranslate();
const {
colors: { cdrLinkOrange },
@ -20,7 +22,7 @@ const Trends: NextPage<TrendsProps> = ({ visualizations }) => {
} = useAppContext();
return (
<Layout>
<Layout embedded={embedded}>
<Head>
<title>Digital Threat Dashboard Leafcutter</title>
</Head>
@ -82,5 +84,5 @@ export const getServerSideProps: GetServerSideProps = async (
) => {
const visualizations = await getTrends(25);
return { props: { visualizations } };
return { props: { visualizations, embedded: getEmbedded(context) } };
};

View file

@ -4,13 +4,18 @@ import { Client } from "@opensearch-project/opensearch";
import Head from "next/head";
import { Layout } from "components/Layout";
import { VisualizationDetail } from "components/VisualizationDetail";
import { getEmbedded } from "lib/utils";
type VisualizationProps = {
visualization: any;
embedded: boolean;
};
const Visualization: NextPage<VisualizationProps> = ({ visualization }) => (
<Layout>
const Visualization: NextPage<VisualizationProps> = ({
visualization,
embedded,
}) => (
<Layout embedded={embedded}>
<Head>
<title>Digital Threat Dashboard Leafcutter</title>
</Head>
@ -53,5 +58,5 @@ export const getServerSideProps: GetServerSideProps = async (
}?embed=true`,
};
return { props: { visualization } };
return { props: { visualization, embedded: getEmbedded(context) } };
};