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

Jump to bottom

Feature/company dashboard #1262

Merged
merged 17 commits into from Jun 27, 2023
Merged

Feature/company dashboard #1262

merged 17 commits into from Jun 27, 2023

Conversation

AtmegaBuzz
Copy link
Collaborator

@AtmegaBuzz AtmegaBuzz commented Jun 8, 2023 •
edited

Completed

  • Company dashboard sidebar and navbar init design
  • Analytics page UI + Backend logic
  • Domain:
    • delete domain: done
    • add_domain: done
    • list_domain: done
    • validation logic for domain creation only by domain email
    • only domain emails can be added as domain managers logic

@AtmegaBuzz AtmegaBuzz marked this pull request as draft June 8, 2023 18:49
@AtmegaBuzz AtmegaBuzz marked this pull request as ready for review June 10, 2023 16:43
@AtmegaBuzz
Copy link
Collaborator Author

@DonnieBLT you can merge it to prod for testing

DonnieBLT
DonnieBLT requested changes Jun 21, 2023
View reviewed changes
Copy link
Collaborator

@DonnieBLT DonnieBLT left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

two small issues

blt/settings.py Outdated Show resolved Hide resolved
website/alternative_views.py Show resolved Hide resolved
professorabhay and others added 7 commits June 27, 2023 23:53
@professorabhay @AtmegaBuzz
Update Website (#1275)
eee7f10
@shubham-200315 @AtmegaBuzz
fix: Top hunts UI error message is not at center of screen for small …
ffda2b3 
…screens #1267 (#1270)

* add stylesheet to avoid breaking UI

* add style for No ongoing hunt found broken UI

* fix No Ongoing Hunt Found breaking UI

* Undo changes in style.css
@AtmegaBuzz @DonnieBLT
Update README.md (#1272)
260f7cb 
* Update README.md

Added all figma designs for new contributors reference

* Update README.md

---------

Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
@AtmegaBuzz
init feature bughunts route
37b2356
@AtmegaBuzz
created login register company page
03b4e5a
@AtmegaBuzz
revert static root changes
94fef3c
@AtmegaBuzz
Merge branch 'main' into feature/company-dashboard
0b5216a
@DonnieBLT DonnieBLT enabled auto-merge June 27, 2023 18:28
@DonnieBLT
Copy link
Collaborator

nice work!

@DonnieBLT DonnieBLT added this pull request to the merge queue Jun 27, 2023
Merged via the queue into OWASP-BLT:main with commit 5c42456 Jun 27, 2023
2 checks passed
DonnieBLT added a commit that referenced this pull request Aug 12, 2023
@AtmegaBuzz @professorabhay
@shubham-200315 @DonnieBLT
Feature/company dashboard (#1262)
e7d9446 
* company dashboard init

* added manage domains and routes

* add domain from company dashboard

* company validation added

* integrated graph analytics to backend

* completed company analytics dashboard

* completed add domain backend logic

* view domain completed

* implemented delete domain logic

* added feature view roles and add roles to domain integrated with backend

* Update Website (#1275)

* fix: Top hunts UI error message is not at center of screen for small screens #1267 (#1270)

* add stylesheet to avoid breaking UI

* add style for No ongoing hunt found broken UI

* fix No Ongoing Hunt Found breaking UI

* Undo changes in style.css

* Update README.md (#1272)

* Update README.md

Added all figma designs for new contributors reference

* Update README.md

---------

Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>

* init feature bughunts route

* created login register company page

* revert static root changes

---------

Co-authored-by: Abhay Kumar Gupta <abhayetwup123@gmail.com>
Co-authored-by: Shubham Jaiswal <105916104+shubham-200315@users.noreply.github.com>
Co-authored-by: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DonnieBLT DonnieBLT DonnieBLT approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@AtmegaBuzz @DonnieBLT @professorabhay @shubham-200315