From 73180e94f03cb892f2b9d9dc90e5fa08e2d650e7 Mon Sep 17 00:00:00 2001 From: chriswebb09 Date: Tue, 2 Jan 2024 04:42:04 -0500 Subject: [PATCH] update gitignore --- .gitignore | 1 + .../static/js/account/account_components.js | 20 ++++--- .../static/js/teamreport/teamreport.js | 53 +++++++++++++++---- 3 files changed, 57 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 78d6f368..5a1a2408 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ share/python-wheels/ *.egg-info/ .installed.cfg *.egg +*.DS_Store MANIFEST # PyInstaller diff --git a/DirectReport/browserview/static/js/account/account_components.js b/DirectReport/browserview/static/js/account/account_components.js index e1fe8c5d..c716a754 100644 --- a/DirectReport/browserview/static/js/account/account_components.js +++ b/DirectReport/browserview/static/js/account/account_components.js @@ -19,7 +19,7 @@ const AccountUserInfo = (userData, reportData) => { USER NAME: {userData.username}

-
@@ -43,22 +43,28 @@ const AccountUserInfo = (userData, reportData) => {

+
+

+ CONNECT ACCOUNT +

+
+
-
diff --git a/DirectReport/browserview/static/js/teamreport/teamreport.js b/DirectReport/browserview/static/js/teamreport/teamreport.js index b0606cb1..4c6180eb 100644 --- a/DirectReport/browserview/static/js/teamreport/teamreport.js +++ b/DirectReport/browserview/static/js/teamreport/teamreport.js @@ -117,7 +117,7 @@ class TeamReport extends React.Component { return { 'message': commit['commit']['message'], 'name': commit['commit']['author']['name'], - 'authur_url': commit['author']['html_url'], + 'author_url': commit['author']['html_url'], 'author_name': commit['author']['login'], 'commit_author_email': commit['commit']['author']['email'], 'commit_author_name': commit['commit']['author']['name'], @@ -176,7 +176,7 @@ class TeamReport extends React.Component {
{this.state.repos.length > 0 && (

- Github Repo For Report + Github Report

)} {this.state.repos.length <= 0 && ( @@ -200,16 +200,48 @@ class TeamReport extends React.Component {
{this.state.repos.length > 0 && ( - + + //
+ //

+ // Select Repo To Report On + //

+ //
+ // + //
+ // + //
)} {this.state.repos.length <= 0 && ( - )}
@@ -217,7 +249,8 @@ class TeamReport extends React.Component {
-
+

Summary

{this.state.teamData.length > 0 && ( @@ -246,7 +279,7 @@ class TeamReport extends React.Component {
- {this.state.teamData.length <= 0 && ( + {this.state.teamData.length <= 0 && (
)}