Skip to content

Commit

Permalink
Merge pull request #510 from GSA/test
Browse files Browse the repository at this point in the history
Fixes for #456 & #507
  • Loading branch information
hatfieldjm4 authored Nov 22, 2024
2 parents 5b44001 + bdcf26f commit 75626fe
Show file tree
Hide file tree
Showing 54 changed files with 1,926 additions and 2,340 deletions.
4 changes: 3 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
"node_modules/bootstrap-table/dist/bootstrap-table.min.css",
"node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.min.css",
"node_modules/@ng-select/ng-select/themes/default.theme.css",
"node_modules/@uswds/uswds/dist/css/uswds.css"
"node_modules/@uswds/uswds/dist/css/uswds.css",
"node_modules/primeng/resources/themes/lara-light-blue/theme.css",
"node_modules/primeng/resources/primeng.min.css"
],
"scripts": [
"node_modules/jquery/dist/jquery.min.js",
Expand Down
29 changes: 16 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
"ldapjs": "^2.3.1",
"make-fetch-happen": "^10.1.2",
"mysql2": "^3.9.7",
"ng-sidebar-v3": "^18.0.0",
"ng2-pdf-viewer": "^10.2.2",
"ngx-cookie-service": "^18.0.0",
"node-cron": "^2.0.3",
Expand All @@ -85,6 +84,7 @@
"path": "^0.12.7",
"path-to-regexp": "^0.1.10",
"pdfjs-dist": "^2.16.105",
"primeng": "^17.18.10",
"readline": "^1.3.0",
"rxjs": "~6.5.4",
"sqlstring": "^2.3.3",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ const routes: Routes = [
component: DataDictionaryComponent,
title: 'Data Dictionary',
},

{
// Catch-all Redirect to Home
path: '**',
Expand Down
28 changes: 0 additions & 28 deletions src/app/app.component.css

This file was deleted.

96 changes: 80 additions & 16 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,24 +1,88 @@
<!-- Top Navbar -->
<top-navbar></top-navbar>

<!-- Main Module -->
<div class="container-fluid" id="mainModule">
<div class="row">
<!-- Side Navbar -->
<sidenav>
<!-- Page content is within sidenav component -->
</sidenav>
</div>
</div>
<!-- End Main Module -->
<!-- Sidebar -->
<app-sidebar></app-sidebar>

<div class="page-wrap">
<div class="sidebar-content-wrapper">
<div class="sidebar-icon-container" (mouseenter)="toggleSidebar()" tabindex="0" (keydown)="onSidebarIconsKeyDown($event)">
<div class="sidebar-icon-wrap">
<div class="sidebar-icon it-strategy"><i class="fas fa-puzzle-piece fa-lg fa-fw"></i></div>
<div class="sidebar-icon gsa-enterprise"><i class="fas fa-sitemap fa-lg fa-fw"></i></div>
<div class="sidebar-icon business-systems"><i class="fas fa-laptop fa-lg fa-fw"></i></div>
<div class="sidebar-icon security"><i class="fas fa-shield-alt fa-lg fa-fw"></i></div>
<div class="sidebar-icon technologies"><i class="fas fa-microchip fa-lg fa-fw"></i></div>
<div class="sidebar-icon enterprise-architecture"><i class="fas fa-network-wired fa-lg fa-fw"></i></div>
<div class="icon-break"></div>
<div class="sidebar-icon additional-info"><i class="fab fa-wpforms fa-lg fa-fw"></i></div>
</div>
</div>

<!-- Main Module -->
<div class="container-fluid content-body" id="mainModule">
<div class="w-100 mr-2">
<main role="main">
<div class="container-fluid my-3">
<div class="col-md-12">
<!-- Logged In Notification -->
<div
id="loggedIn"
class="container toast hide rounded-lg w-25"
role="alert"
aria-live="assertive"
aria-atomic="true"
data-delay="3000"
>
<div id="loggedInCollapse" class="collapse">
<div class="toast-header">
<i class="fa fa-sign-in-alt mr-2 fa-fw"></i>
<strong class="mr-auto text-success"
>You have successfully logged into GEAR Manager!</strong
>
</div>
</div>
</div>

<!-- Footer -->
<footer class="footer mt-auto" id="footer">
<div class="container">
<small>GSA Enterprise Architecture 2024, v3.0</small>
<!-- Logged Out Notification -->
<div
id="loggedOut"
class="container toast hide rounded-lg w-25"
role="alert"
aria-live="assertive"
aria-atomic="true"
data-delay="3000"
>
<div id="loggedOutCollapse" class="collapse">
<div class="toast-header">
<i class="fas fa-sign-out-alt mr-2 fa-fw"></i>
<strong class="mr-auto text-warning"
>You have been logged out of GEAR Manager!</strong
>
</div>
</div>
</div>

<!-- Components Content -->
<router-outlet></router-outlet>
</div>
</div>
</main>
</div>
</div>
<!-- End Main Module -->
</div>
</footer>
<!-- End Footer -->

<!-- Footer -->
<footer class="footer mt-auto" id="footer">
<div class="container">
<small>GSA Enterprise Architecture 2024, v3.0</small>
</div>
<!-- USWDS Identifier -->
<app-identifier></app-identifier>
</footer>
<!-- End Footer -->
</div>

<!-- Details Modals -->
<investments-modal></investments-modal>
Expand Down
126 changes: 126 additions & 0 deletions src/app/app.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
.content-body {
min-height: 100%;
display: flex;
justify-content: center;
}

.footer {
color: #9d9d9d;
text-align: center;
background-color: #222;
display: flex;
flex-direction: column;
}

.vertical-center {
z-index: 100;
padding: 10px;
margin: 0;
position: fixed;
top: 50%;
right: -3%;
border: none;
transform: rotate(270deg) translateY(-50%);
cursor: pointer;
background: rgb(35, 120, 195);
font-size: 15px;
font-weight: bold;
color: rgb(255, 255, 255);
border-top-right-radius: 4px;
border-top-left-radius: 4px;
}

.identifier {
position: fixed;
right: 0;
left: 0;
bottom: 0;
}

.sidebar-icon-container {
min-height: 100%;
padding-right: 4.1rem;

& .icon-break {
padding: .78rem;
}
}

.sidebar-content-wrapper {
display: flex;
}

.sidebar-icon-wrap {
position: fixed;
top: 67px;

@media (max-width: 1121px) {
top: 95px;
}
}

.sidebar-icon {
padding: 1.32rem;
font-size: .875rem;
font-weight: 200;
letter-spacing: 1px;
line-height: 1.5;
color: white;
display: flex;
flex-direction: column;

&.it-strategy {
background-color: #14883c;
&:hover {
background-color: #389f5c;
}
}
&.gsa-enterprise {
background-color: #2b60de;
&:hover {
background-color: #214599;
}
}

&.business-systems {
background-color: #ce4844;
&:hover {
background-color: #c9302c;
}
}

&.security {
background-color: #aa6708;
&:hover {
background-color: #ffbe2e;
}
}

&.technologies {
background-color: #008080;
&:hover {
background-color: #076464;
}
}

&.enterprise-architecture {
background-color: #800080;
&:hover {
background-color: #4d024d;
}
}

&.additional-info {
background-color: #027eb2;
&:hover {
background-color: #00bde3;
}
}
}

.page-wrap {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100%;
}
Loading

0 comments on commit 75626fe

Please sign in to comment.