Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump lodash from 4.17.20 to 4.17.21 in /api #66

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions api/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27,047 changes: 16,122 additions & 10,925 deletions front-end/package-lock.json

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions front-end/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,42 +36,42 @@
"@gov.au/tags": "latest",
"@gov.au/text-inputs": "latest",
"@types/react-responsive": "^8.0.2",
"axios": "^0.19.2",
"gatsby": "^2.21.22",
"gatsby-image": "^2.3.1",
"gatsby-plugin-google-tagmanager": "^2.2.3",
"gatsby-plugin-lodash": "^3.3.1",
"gatsby-plugin-manifest": "^2.3.3",
"gatsby-plugin-offline": "^3.1.2",
"gatsby-plugin-react-helmet": "^3.2.1",
"gatsby-plugin-sass": "^2.2.1",
"gatsby-plugin-sharp": "^2.5.3",
"gatsby-plugin-typescript": "^2.3.1",
"gatsby-source-filesystem": "^2.2.2",
"gatsby-source-graphql": "^2.4.1",
"gatsby-transformer-remark": "^2.7.3",
"gatsby-transformer-sharp": "^2.4.3",
"lodash": "^4.17.15",
"axios": "^0.21.1",
"gatsby": "^2.30.1",
"gatsby-image": "^2.9.0",
"gatsby-plugin-google-tagmanager": "^2.9.0",
"gatsby-plugin-lodash": "^3.8.0",
"gatsby-plugin-manifest": "^2.10.0",
"gatsby-plugin-offline": "^3.8.0",
"gatsby-plugin-react-helmet": "^3.8.0",
"gatsby-plugin-sass": "^2.8.0",
"gatsby-plugin-sharp": "^2.12.0",
"gatsby-plugin-typescript": "^2.10.0",
"gatsby-source-filesystem": "^2.9.0",
"gatsby-source-graphql": "^2.12.0",
"gatsby-transformer-remark": "^2.14.0",
"gatsby-transformer-sharp": "^2.10.0",
"lodash": "^4.17.20",
"node-sass": "^4.14.1",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react": "^16.14.0",
"react-dom": "^16.14.0",
"react-helmet": "^5.2.1",
"react-responsive": "^8.0.3",
"react-responsive": "^8.2.0",
"recharts": "^1.8.5"
},
"devDependencies": {
"@types/recharts": "^1.8.9",
"@typescript-eslint/eslint-plugin": "^2.33.0",
"@typescript-eslint/parser": "^2.33.0",
"eslint": "^7.0.0",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-prettier": "^3.1.3",
"eslint-plugin-react": "^7.20.0",
"node-fetch": "^2.6.0",
"@types/recharts": "^1.8.18",
"@typescript-eslint/eslint-plugin": "^2.34.0",
"@typescript-eslint/parser": "^2.34.0",
"eslint": "^7.17.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-react": "^7.22.0",
"node-fetch": "^2.6.1",
"prettier": "2.0.4",
"typescript": "^3.9.2"
"typescript": "^3.9.7"
},
"browserslist": [
"last 2 versions",
Expand Down
17 changes: 8 additions & 9 deletions front-end/src/components/blocks/dashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import React, { useState } from "react";
import UniqueUsersLineGraph from "./total-unique-users";
import DeviceCategoryVisualisation from "./device-category";
import { AUradio } from "../../auds/react/control-input";
import { AUfieldset, AUlegend } from "../../auds/react/form";
import BrowserMonthly from "./browser-monthly";
import ScreenResVisualisation from "./screen-res";
import DeviceBrandVisualisation from "./device-brand";
import OperatingSysVersionVisualisation from "./operating-system-version";
import OperatingSystemVisualisation from "./operating-system";
import DeviceCategoryVisualisation from "./device-category";
import HourlyViewsVisualisation from "./hourly-views";
import { AUradio } from "../../auds/react/control-input";
import { AUfieldset, AUlegend } from "../../auds/react/form";
import OperatingSystemVisualisation from "./operating-system";
import OperatingSysVersionVisualisation from "./operating-system-version";
import ScreenResVisualisation from "./screen-res";
import UniqueUsersLineGraph from "./total-unique-users";

const AuFieldset: any = AUfieldset;

interface Props {
isTabletOrMobile: boolean;
chartView: boolean;
chartView?: boolean;
}

const AuRadio: any = AUradio;
Expand Down Expand Up @@ -42,7 +42,6 @@ const DashboardHomePage: React.FC<Props> = ({ isTabletOrMobile }) => {
id="radio-chart"
checked={state.chartView}
onChange={() => setstate(() => ({ chartView: true }))}
defaultChecked
/>
<AuRadio
label="Table"
Expand Down
15 changes: 7 additions & 8 deletions front-end/src/components/blocks/device-category.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
/* eslint-disable react/display-name */
import React, { useState, useLayoutEffect } from "react";
import { useFetch } from "../hooks_helpers/use-fetch";
import LineGraph from "../visualisations/line-chart";
import React, { useLayoutEffect, useState } from "react";
import { AxisDomain } from "recharts";
import { Table } from "../hooks_helpers/table";
import { TableCellRowSpanMonthly } from "../hooks_helpers/table-formatter";
import { useFetch } from "../hooks_helpers/use-fetch";
import AxisTickRotate from "../visualisations/formatters/angle-axis-tick";
import PercentageFormatter from "../visualisations/formatters/percentage-formatter";
import DeviceCategoryToolTip from "../visualisations/formatters/devices-tooltip";
import LineLabel from "../visualisations/formatters/line-label";
import { TableCellRowSpanMonthly } from "../hooks_helpers/table-formatter";
import { Table } from "../hooks_helpers/table";
import PercentageFormatter from "../visualisations/formatters/percentage-formatter";
import LineGraph from "../visualisations/line-chart";

interface Props {
isTabletOrMobile: boolean;
Expand Down Expand Up @@ -112,7 +111,7 @@ const DeviceCategoryVisualisation: React.FC<Props> = ({
: { top: 20, right: 10, bottom: 40, left: -10 },
legend: true,
CustomToolTip: DeviceCategoryToolTip,
CustomLabel: LineLabel,
// CustomLabel: LineLabel,
};

const renderView = () => {
Expand Down
15 changes: 1 addition & 14 deletions front-end/src/components/navigation/header.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import React from "react";
import { useStaticQuery, graphql } from "gatsby";
import AUheader, { AUheaderBrand } from "../../auds/react/header";

interface Props {
Expand All @@ -10,18 +9,6 @@ const AUHeader: any = AUheader;
const Brand: any = AUheaderBrand;

const Header: React.FC<Props> = ({ siteTitle }) => {
const data = useStaticQuery(graphql`
query {
placeholderImage: file(relativePath: { eq: "header-logo-agov.png" }) {
childImageSharp {
fluid {
src
}
}
}
}
`);

return (
<>
<AUHeader dark>
Expand All @@ -32,7 +19,7 @@ const Header: React.FC<Props> = ({ siteTitle }) => {
title={siteTitle}
subline="The analytics dashboard for gov.au services"
link="/"
brandImage={data.placeholderImage.childImageSharp.fluid.src}
brandImage={"../../header-logo-agov.png"}
brandImageAlt="The Australian Government Coat of Arms"
/>
</div>
Expand Down
10 changes: 5 additions & 5 deletions front-end/src/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* eslint-disable @typescript-eslint/no-non-null-assertion */
import { graphql, useStaticQuery } from "gatsby";
import React from "react";
import SEO from "../components/seo";
import DefaultLayout from "../components/layouts/default-layout";
import { useStaticQuery, graphql } from "gatsby";
import Section from "../components/layouts/section";
import { useMediaQuery } from "react-responsive";
import Hero from "../components/layouts/hero";
import DashboardHomePage from "../components/blocks/dashboard";
import DefaultLayout from "../components/layouts/default-layout";
import Hero from "../components/layouts/hero";
import Section from "../components/layouts/section";
import SEO from "../components/seo";

const IndexPage = () => {
//get MD content
Expand Down