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.

Sign up for GitHub

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

update gitignore #63

Merged
merged 1 commit into from
Jan 2, 2024
+57 −17
Merged

update gitignore #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
*.DS_Store
MANIFEST

# PyInstaller
Expand Down
20 changes: 13 additions & 7 deletions DirectReport/browserview/static/js/account/account_components.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const AccountUserInfo = (userData, reportData) => {
<span className="ml-5 font-black font-mono">USER NAME: </span> {userData.username}
</p>
<div className="rounded-2xl flex items-center justify-center">
<button className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-md font-semibold py-2 px-30 rounded-3xl mt-10" type="button">
<button className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-sm font-semibold py-2 px-30 rounded-3xl mt-10" type="button">
<a className="px-10 py-2 tracking-wide" href='/dashboard/edit'>EDIT PROFILE</a>
</button>
</div>
Expand All @@ -43,22 +43,28 @@ const AccountUserInfo = (userData, reportData) => {
</p>
<div className=" rounded-2xl flex items-center justify-center">
<button
className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-md font-semibold py-2 px-30 rounded-3xl mt-5"
className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide text-sm font-semibold shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 py-2 px-30 rounded-3xl mt-5"
type="button">
<a className="px-10 py-2 tracking-wide" href='/dashboard/reports/new'>NEW
REPORT</a>
<a className="px-10 py-2 tracking-wide" href='/dashboard/reports/new'>NEW REPORT</a>
</button>
</div>
</div>
</div>
</div>
<div className="lg:col-span-1 md:col-span-2 sm:col-span-3 mx-10 lg:px-18 md:px-4 sm:px-0 bg-gray-200 shadow-[1.0px_1.0px_7.0px_0.0px_rgba(0,0,0,0.58)] rounded-b-3xl shadow-[1.0px_1.0px_5.0px_0.0px_rgba(0,0,0,0.58)] ">
<div className="mx-0 min-w-full flex flex-col items-center">
<h1 className="mx-10 pt-5 font-black font-mono tracking-wide text-xl text-sky-800">
CONNECT ACCOUNT
</h1>
</div>

<div className="rounded-2xl flex items-center justify-center">
<button className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.7px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-lg font-semibold py-2 px-10 rounded-3xl mt-8 mb-8" type="button">
<svg xmlns="http://www.w3.org/2000/svg" className="h-7 w-6 inline-block ml-10" fill="currentColor" viewBox="0 0 24 24">
<button className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.7px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-lg font-bold py-4 px-10 rounded-3xl mt-4 mb-8"
type="button">
<svg xmlns="http://www.w3.org/2000/svg" className="h-7 w-6 inline-block ml-5" fill="currentColor" viewBox="0 0 24 24">
<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
</svg>
<a className="px-4 py-8 tracking-wide" href='/authorize/github'>Connect GitHub Account</a>
<a className="px-4 py-10 tracking-wide" href='/authorize/github'>GitHub</a>
</button>
</div>
</div>
Expand Down
53 changes: 43 additions & 10 deletions DirectReport/browserview/static/js/teamreport/teamreport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down Expand Up @@ -176,7 +176,7 @@ class TeamReport extends React.Component {
<div className="py-1 bg-blue-500 rounded-3xl px-6 shadow-[1.0px_1.0px_2.0px_1.0px_rgba(0,0,0,0.58)]">
{this.state.repos.length > 0 && (
<h1 id="title_element" className="self-center text-center text-white text-xl text-center font-bold font-mono mb-1 mt-3 py-2">
Github Repo For Report
Github Report
</h1>
)}
{this.state.repos.length <= 0 && (
Expand All @@ -200,24 +200,57 @@ class TeamReport extends React.Component {
<div className="self-center mb-4 mt-2">
<div className="mx-0 min-w-full flex flex-col items-center">
{this.state.repos.length > 0 && (
<button className="bg-cyan-400 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-md font-bold py-3 px-10 rounded-3xl mt-2 mb-3"
onClick={(e) => this.openRepoPopover(this.state.repos, this.state)}
type="button">
<span className="px-10 py-2 tracking-wide">Select Repo</span>
<button
className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-md font-bold py-3 px-10 rounded-3xl mt-2 mb-3"
onClick={(e) => this.openRepoPopover(this.state.repos, this.state)}
type="button">
<svg xmlns="http://www.w3.org/2000/svg"
className="h-7 w-6 inline-block ml-10" fill="currentColor"
viewBox="0 0 24 24">
<path
d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
</svg>
<span className="px-4 py-2 tracking-wide">Github Repo</span>
</button>

// <div
// className="col-span-2 bg-gray-200 shadow-[1.0px_1.0px_7.0px_0.0px_rgba(0,0,0,0.58)] rounded-3xl py-8 px-5 border-solid border-2 border-gray-400">
// <p className="text-justify mx-10 pt-1 text-md font-mono tracking-wide text-sky-800">
// <span className="mx-5 font-black">Select Repo To Report On</span>
// </p>
// <div className="mx-0 min-w-full flex flex-col items-center">
// <button
// className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-md font-bold py-3 px-10 rounded-3xl mt-2 mb-3"
// onClick={(e) => this.openRepoPopover(this.state.repos, this.state)}
// type="button">
// <svg xmlns="http://www.w3.org/2000/svg"
// className="h-7 w-6 inline-block ml-10" fill="currentColor"
// viewBox="0 0 24 24">
// <path
// d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
// </svg>
// <span className="px-4 py-2 tracking-wide">Github Repo</span>
// </button>
// </div>
//
// </div>
)}
{this.state.repos.length <= 0 && (
<button className="bg-cyan-400 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-md font-bold py-3 px-5 rounded-3xl mt-2 mb-3" type="button" onClick={this.getRepoData}>
<button className="bg-sky-500 hover:bg-slate-100 self-center text-white font-mono tracking-wide shadow-[1.5px_2px_1.0px_0.5px_rgba(0,0,0,0.48)] hover:white hover:text-blue-500 hover:border-gray-200 text-md font-bold py-3 px-5 rounded-3xl mt-2 mb-3" type="button" onClick={this.getRepoData}>
{/*<a className="px-20 py-2 tracking-wide" href='/repos'>Select Repo</a>*/}
Select Repo
<svg xmlns="http://www.w3.org/2000/svg" className="h-7 w-6 inline-block ml-10" fill="currentColor" viewBox="0 0 24 24">
<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
</svg>
<span className="px-4 py-2 tracking-wide">Github Repo</span>
</button>
)}
</div>
</div>
</div>
</div>
<div id="show_summmary_div" className="lg:col-span-1 sm:col-span-3 justify-center">
<div className="pb-6 pt-2 bg-blue-500 rounded-3xl px-30 shadow-[1.0px_1.0px_5.0px_0.0px_rgba(0,0,0,0.58)]">
<div
className="pb-6 pt-2 bg-blue-500 rounded-3xl px-30 shadow-[1.0px_1.0px_5.0px_0.0px_rgba(0,0,0,0.58)]">
<h1 className="self-center text-center text-xl text-white text-center font-bold font-mono mb-1 mt-3 py-2 mt-2 mx-20 px-20">Summary</h1>
<div id="summary" className="px-4 mx-0 mb-1 mt-1">
{this.state.teamData.length > 0 && (
Expand Down Expand Up @@ -246,7 +279,7 @@ class TeamReport extends React.Component {
</div>
</div>
</div>
{this.state.teamData.length <= 0 && (
{this.state.teamData.length <= 0 && (
<div className="pb-[200px] pt-40 mt-30 h-30">
</div>
)}
Expand Down
Loading