Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Added logos to project pages, still need to fix styles #56

Merged
merged 5 commits into from
Aug 8, 2020
Merged

Added logos to project pages, still need to fix styles #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
297c313
added logos to project pages, still need to fix styles
prashmalyala Aug 7, 2020
391ebd3
resized logos and added them to remaining pages as needed
prashmalyala Aug 8, 2020
57f4a07
Resize groot logo on splash and navbar
juliasliu Aug 8, 2020
1847669
resolved style inconsistencies for logo in users pages
prashmalyala Aug 8, 2020
b5c5fcd
Some groups script code got erased in SplashPage merge conflict, twea…
juliasliu Aug 8, 2020
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
### The [STEP intern](https://buildyourfuture.withgoogle.com/programs/step/) project for Google's AC Admin SRE team.
Welcome to GRoot - Admin Console Visualizer!

<img src="src/Screenshot-Groot.png">

GRoot helps you to better visualize the structure and relationships for organizational units, groups, and users. You could also perform admin
operations, such as adding, deleting, editing, smoothly with our interative interface.

Expand Down
Binary file added src/Screenshot-Groot.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/webapp/images/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added src/main/webapp/images/groot-full-on-blue.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/webapp/images/groot-full-on-white.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/webapp/images/groot-logo-white.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions src/main/webapp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="../images/favicon.ico" />
<title>gRoot</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
Expand All @@ -18,7 +19,9 @@

<body onload="loginStatus();">
<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top hidden" id="login-navbar">
<a class="navbar-brand" href="/">gRoot</a>
<a class="navbar-brand" href="/">
<img class="groot-logo" src="images/groot-full-on-white.png">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand All @@ -44,7 +47,9 @@
</div>
</nav>
<nav class="navbar navbar-expand-lg hidden" id="header-navbar">
<a class="navbar-brand" href="/">gRoot</a>
<a class="navbar-brand" href="/">
<img class="groot-logo" src="images/groot-full-on-blue.png">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down Expand Up @@ -85,10 +90,11 @@
<div class="container h-100">
<div class="row h-100 align-items-center">
<div class="col-5 masthead-text">
<img class="groot-main-logo" src="images/groot-logo-white.png">
<h1 class="font-weight-light masthead-title">gRoot Admin Console Visualizer</h1>
<p class="lead masthead-caption">
Interactively displays organizational units, groups, and users within a G Suite domain.
Allows creation, modification,and deletion of G Suite Admin Console data.
Allows creation, modification, and deletion of G Suite Admin Console data.
</p>
</div>
</div>
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/pages/groupdetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="../images/favicon.ico" />
<title>Group</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
Expand All @@ -23,7 +24,9 @@

<body onload="onloadGroupDetails();">
<nav class="navbar navbar-expand-lg" id="header-navbar">
<a class="navbar-brand" href="/">gRoot</a>
<a class="navbar-brand" href="/">
<img class="groot-logo" src="../images/groot-full-on-blue.png">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/pages/groups.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="../images/favicon.ico" />
<title>Groups</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
Expand All @@ -22,7 +23,9 @@

<body onload="onloadGroupsPage();">
<nav class="navbar navbar-expand-lg" id="header-navbar">
<a class="navbar-brand" href="/">gRoot</a>
<a class="navbar-brand" href="/">
<img class="groot-logo" src="../images/groot-full-on-blue.png">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/pages/ou.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="../images/favicon.ico" />
<title>Org Units</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
Expand All @@ -27,7 +28,9 @@

<body onload="onloadOUPage();">
<nav class="navbar navbar-expand-lg" id="header-navbar">
<a class="navbar-brand" href="/">gRoot</a>
<a class="navbar-brand" href="/">
<img class="groot-logo" src="../images/groot-full-on-blue.png">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/pages/user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="../images/favicon.ico" />
<title>Users</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
Expand All @@ -20,7 +21,9 @@
</head>
<body onload="userOnload();">
<nav class="navbar navbar-expand-lg" id="header-navbar">
<a class="navbar-brand" href="/">gRoot</a>
<a class="navbar-brand" href="/">
<img class="groot-logo groot-logo-nav" src="../images/groot-full-on-blue.png">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/pages/userdetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="shortcut icon" href="../images/favicon.ico" />
<title>User</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
Expand All @@ -20,7 +21,9 @@
</head>
<body onload="userdetailOnload()">
<nav class="navbar navbar-expand-lg" id="header-navbar">
<a class="navbar-brand" href="/">gRoot</a>
<a class="navbar-brand" href="/">
<img class="groot-logo groot-logo-nav" src="../images/groot-full-on-blue.png">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
28 changes: 16 additions & 12 deletions src/main/webapp/scripts/groups-script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,33 +296,37 @@ function visualize() {
.classed("link", true)
.text("Click to view more")

tooltipRemove = tooltip
tooltipButtons = tooltip
.append("div")
.classed("flex", true)

tooltipAddMember = tooltipButtons
.append("button")
.classed("btn", true)
.classed("btn-collapse", true)
.attr("id", "remove-btn")
.attr("id", "add-member-btn")

var tooltipRemoveSpan = tooltipRemove
var tooltipAddMemberSpan = tooltipAddMember
.append("span")
.attr("data-hover", "Remove member")
var tooltipRemoveIcon = tooltipRemoveSpan
.attr("data-hover", "Add member")
var tooltipAddMemberIcon = tooltipAddMemberSpan
.append("i")
.classed("fa", true)
.classed("fa-times", true)
.classed("fa-user-plus", true)

tooltipAddMember = tooltip
tooltipRemove = tooltipButtons
.append("button")
.classed("btn", true)
.classed("btn-collapse", true)
.attr("id", "add-member-btn")
.attr("id", "remove-btn")

var tooltipAddMemberSpan = tooltipAddMember
var tooltipRemoveSpan = tooltipRemove
.append("span")
.attr("data-hover", "Add member")
var tooltipAddMemberIcon = tooltipAddMemberSpan
.attr("data-hover", "Remove member")
var tooltipRemoveIcon = tooltipRemoveSpan
.append("i")
.classed("fa", true)
.classed("fa-user-plus", true)
.classed("fa-times", true)

const root = pack(data);
var focus = root;
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/styles/group-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
#remove-btn {
background: #e35f5f;
width: 40px;
margin-bottom: 0;
}
#remove-btn:hover {
background: #d44444;
Expand All @@ -60,6 +61,7 @@
#add-member-btn {
background: #97b0cc;
width: 50px;
margin-bottom: 0;
}
#add-member-btn:hover {
background: #607fa1;
Expand Down
17 changes: 15 additions & 2 deletions src/main/webapp/styles/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ th {
background: rgba(51,103,214,1);
color: #fff;
width: 100%;
max-height: 75px;
padding: .5rem 5rem;
box-shadow: 0 8px 10px -9px rgba(0,0,0,.05), 0 3px 14px 2px rgba(0,0,0,.01), 0 5px 5px -3px rgba(0,0,0,.05);
}
Expand Down Expand Up @@ -153,12 +154,15 @@ th {
font-weight: 400;
}

.section-subtitle {
.section-subtitle, .form-check-label {
color: black;
margin-top: 10px;
font-weight: 400;
}

.section-subtitle {
margin-top: 10px;
}

.sidenav .sidenav-section p,
.section-text {
margin: 0;
Expand Down Expand Up @@ -385,3 +389,12 @@ th {
justify-content: center;
align-items: center;
}

.groot-logo {
height: 40px;
}

.groot-main-logo {
padding-bottom: 20px;
width: 100px;
}
5 changes: 5 additions & 0 deletions src/main/webapp/styles/user-style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,9 @@ img {

a .card-body .icon {
padding: 0px 5px;
}

.groot-logo-nav {
border-radius: 0%;
margin-top: 0px;
}