diff --git a/DirectReport/browserview/static/js/account/account_components.js b/DirectReport/browserview/static/js/account/account_components.js index 5cf9f5fa..9d02c83a 100644 --- a/DirectReport/browserview/static/js/account/account_components.js +++ b/DirectReport/browserview/static/js/account/account_components.js @@ -4,64 +4,87 @@ const { useState, useEffect } = React; const AccountUserInfo = (userData, reportData) => { return (
-
-
+
+
-
-
+
+

- FULL NAME: {userData.name} + FULL NAME: {userData.name}

- EMAIL ADDRESS: {userData.userid} + EMAIL ADDRESS: {userData.userid}

- USER NAME: {userData.username} + USER NAME: {userData.username}

-
-

+

+
+
+

NUMBER OF REPORTS SAVED: {reportData.length}

-

- LAST REPORT: - DEC 12, 2021 -

-

- GITHUB ACOUNT USERNAME: - {userData.github_username} +

+ DATE STARTED TRACKING: + DEC 12, 2018

-

- SELECTED REPO: - DirectReport +

+ LAST REPORT CREATED: + DEC 12, 2021

+
-
+
-

+

CONNECT ACCOUNT

+
+
    +
  • +

    + GITHUB ACOUNT USERNAME: + {userData.github_username} +

    +
  • + +

    + SELECTED REPO: + DirectReport +

    +
    +
+
+ -
- diff --git a/DirectReport/browserview/static/js/teamreport/teamreport.js b/DirectReport/browserview/static/js/teamreport/teamreport.js index 1ab8d17f..e6301b36 100644 --- a/DirectReport/browserview/static/js/teamreport/teamreport.js +++ b/DirectReport/browserview/static/js/teamreport/teamreport.js @@ -167,15 +167,19 @@ class TeamReport extends React.Component { render() { return (
+

Generate Team Report From Metadata

+ {repoPopoverUI()} +
-
+
+

- Github + Github Data

{this.state.commits.length > 0 && ( @@ -191,30 +195,29 @@ class TeamReport extends React.Component { })}
)} +
{this.state.repos.length > 0 && ( - )}
+
+
-
+

Summary

{this.state.teamData.length > 0 && ( -
+
{ShowSummary(this.state.reportData)} {ShowHighlights(this.state.reportData)}
@@ -222,18 +225,17 @@ class TeamReport extends React.Component {
+
+ className="pb-6 pt-2 bg-blue-600 rounded-3xl px-4 mb-2 shadow-[1.0px_1.0px_5.0px_0.0px_rgba(0,0,0,0.58)]">

Team

{PopoverUI(closePopover)} {this.state.teamData.length > 0 && (
{ShowTeamList(this.state.teamData)}
- )} -
diff --git a/DirectReport/browserview/static/js/teamreport/teamreport_components.js b/DirectReport/browserview/static/js/teamreport/teamreport_components.js index f91c2a89..f258cb0e 100644 --- a/DirectReport/browserview/static/js/teamreport/teamreport_components.js +++ b/DirectReport/browserview/static/js/teamreport/teamreport_components.js @@ -90,7 +90,7 @@ class GraphDiv extends React.Component { render() { return ( -
+