From f3f7d6f8a0b32167ee038e700c032fd45a4d73e2 Mon Sep 17 00:00:00 2001 From: chriswebb09 Date: Tue, 2 Jan 2024 13:06:23 -0500 Subject: [PATCH 1/3] update --- .../static/js/account/account_components.js | 61 ++++++++++++------- .../static/js/teamreport/teamreport.js | 32 +++++----- .../js/teamreport/teamreport_components.js | 2 +- 3 files changed, 56 insertions(+), 39 deletions(-) diff --git a/DirectReport/browserview/static/js/account/account_components.js b/DirectReport/browserview/static/js/account/account_components.js index 5cf9f5fa..9053e75d 100644 --- a/DirectReport/browserview/static/js/account/account_components.js +++ b/DirectReport/browserview/static/js/account/account_components.js @@ -4,11 +4,11 @@ const { useState, useEffect } = React; const AccountUserInfo = (userData, reportData) => { return (
-
+
-
-
+
+

FULL NAME: {userData.name}

@@ -19,49 +19,64 @@ const AccountUserInfo = (userData, reportData) => { USER NAME: {userData.username}

-
-

- NUMBER OF REPORTS SAVED: +

+
+
+

+ NUMBER OF REPORTS SAVED: {reportData.length}

-

- LAST REPORT: +

+ LAST REPORT: DEC 12, 2021

-

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

-

- SELECTED REPO: - DirectReport +

+ LAST REPORT: + DEC 12, 2021

+
-
+
-

+

CONNECT ACCOUNT

+

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

+

+ SELECTED REPO: + DirectReport +

+
- )}
+
+
-
+

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 ( -
+
From 51824ca0d4fbfca846f0b9d2c80ad41519fe45fc Mon Sep 17 00:00:00 2001 From: chriswebb09 Date: Tue, 2 Jan 2024 13:10:15 -0500 Subject: [PATCH 2/3] update --- .../static/js/account/account_components.js | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/DirectReport/browserview/static/js/account/account_components.js b/DirectReport/browserview/static/js/account/account_components.js index 9053e75d..6e694a95 100644 --- a/DirectReport/browserview/static/js/account/account_components.js +++ b/DirectReport/browserview/static/js/account/account_components.js @@ -59,15 +59,23 @@ const AccountUserInfo = (userData, reportData) => { CONNECT ACCOUNT
+
+
    +
  • +

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

    +
  • + +

    + SELECTED REPO: + DirectReport +

    +
    +
+
-

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

-

- SELECTED REPO: - DirectReport -