diff --git a/src/app/layout/tabs/tabs.component.scss b/src/app/layout/tabs/tabs.component.scss
index d9cff9a..8d54c8d 100644
--- a/src/app/layout/tabs/tabs.component.scss
+++ b/src/app/layout/tabs/tabs.component.scss
@@ -1,204 +1,5 @@
$header-height: 10rem;
-.navbar {
- display: flex;
- width: 100%;
- height: $header-height;
- align-items: center;
- justify-content: flex-start;
-
- .logo {
- width: 12rem;
- margin: 0 2rem;
-
- img {
- width: 100%;
- height: 100%;
- }
- }
-
- nav {
- margin: 0 2rem;
-
- @media print {
- display: none;
- }
-
- a {
- font-size: 1.6rem;
- letter-spacing: 0.5px;
- color: var(--dark-grey);
- margin-right: 2rem;
-
- &.active {
- text-decoration: underline;
- color: var(--highlight);
- }
-
- &:hover {
- text-decoration: underline;
- }
- }
- }
-
- .search-input {
- position: relative;
- margin-left: auto;
-
- @media print {
- display: none;
- }
-
- input {
- display: block;
- height: 5rem;
- border: 1px solid var(--border-grey);
- border-radius: 4rem;
- padding: 0 2.5rem;
- width: 35rem;
- font-size: 1.5rem;
- font-weight: 300;
-
- &::placeholder {
- color: var(--dark-grey);
- opacity: 0.6;
- }
- }
-
- img {
- position: absolute;
- width: 1.8rem;
- top: 1.5rem;
- right: 1.8rem;
- }
- }
-
-
- .notification-button {
- width: 5rem;
- height: 5rem;
- border-radius: 50%;
- border: none;
- position: relative;
- background-color: white;
- margin-left: 2rem;
-
- @media print {
- display: none;
- }
-
- &.active {
- box-shadow: 0px 0px 10px -3px var(--primary);
-
- img {
- filter: brightness(500%);
- }
-
- .badge {
- transform: scale(0);
- }
-
- &::before {
- background-color: var(--highlight);
- opacity: 1;
- filter: none;
- }
- }
-
- &:hover {
- box-shadow: 0px 0px 10px -3px var(--primary);
- }
-
- .badge {
- background-color: var(--highlight);
- color: white;
- font-size: 1.1rem;
- border-radius: 7px;
- position: absolute;
- right: 0;
- top: -0.5rem;
- width: 2rem;
- height: 2rem;
- border-radius: 50%;
- display: flex;
- align-items: center;
- justify-content: center;
- font-weight: 600;
- transition: transform 0.1s;
- }
-
- &::before {
- content: '';
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- background-color: var(--secondary);
- opacity: 0.3;
- filter: brightness(110%);
- border-radius: 50%;
- }
-
- & > * {
- position: relative;
- }
-
- img {
- width: 40%;
- height: 40%;
- }
- }
-
- .profile-actions {
- margin: 0 2rem;
- display: flex;
- align-items: center;
- justify-content: center;
- height: 5rem;
- border-radius: 4rem;
- padding: 0 2rem;
- position: relative;
- overflow: hidden;
- width: 20rem;
- cursor: pointer;
-
- @media print {
- display: none;
- }
-
- &::before {
- content: '';
- position: absolute;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- background-color: var(--secondary);
- opacity: 0.3;
- filter: brightness(110%);
- }
-
- & > * {
- position: relative;
- }
-
- img {
- width: 1.5rem;
-
- &.logout-icon {
- transform: scale(1.5);
- }
- }
-
- span {
- margin: 0 auto;
- color: var(--primary);
- font-size: 1.4rem;
- }
- }
-}
-
.notifications-window {
position: fixed;
top: calc(#{$header-height} - 1rem);
diff --git a/src/app/pages/dashboard/dashboard.component.html b/src/app/pages/dashboard/dashboard.component.html
index ed4ad39..cc25e2f 100644
--- a/src/app/pages/dashboard/dashboard.component.html
+++ b/src/app/pages/dashboard/dashboard.component.html
@@ -4,83 +4,164 @@
-
- Non compliance - COM/LLPs
- A search module to filter down non compliant entities
-
+
\ No newline at end of file
+
+
+
+
diff --git a/src/app/pages/dashboard/dashboard.component.scss b/src/app/pages/dashboard/dashboard.component.scss
index ec4141d..f87e1cd 100644
--- a/src/app/pages/dashboard/dashboard.component.scss
+++ b/src/app/pages/dashboard/dashboard.component.scss
@@ -1,3 +1,26 @@
+.content-holder {
+ position: relative;
+ display: flex;
+ width: calc(80% - 2rem);
+ margin: 0 auto;
+
+ .sidebar {
+ position: sticky;
+ top: 30px;
+ flex-basis: 250px;
+ margin-right: 30px;
+ height: 80vh;
+ }
+
+ main {
+ flex-grow: 1;
+ }
+}
+
+.filter-card-holder {
+ margin-bottom: 5px;
+}
+
.page-heading {
text-align: center;
line-height: 1.5;
@@ -21,7 +44,6 @@
}
.form-holder {
- width: calc(70% - 2rem);
padding: 4rem;
margin: 0 auto;
}
diff --git a/src/app/pages/dashboard/dashboard.component.ts b/src/app/pages/dashboard/dashboard.component.ts
index e35ccf7..cdda6b5 100644
--- a/src/app/pages/dashboard/dashboard.component.ts
+++ b/src/app/pages/dashboard/dashboard.component.ts
@@ -15,18 +15,21 @@ export class DashboardComponent implements OnInit {
];
categoryOptions = [
+ 'All',
'Green',
'Amber',
'Red',
];
enforcementStatusOptions = [
+ 'All',
'1st Enforcement Letter',
'2nd Enforcement Letter',
'Suppressed',
];
selectedCategory = '';
+ selectedEnforcementStatus = '';
constructor() { }
@@ -38,6 +41,8 @@ export class DashboardComponent implements OnInit {
}
resetSearch() {
+ this.selectedCategory = '';
+ this.selectedEnforcementStatus = '';
this.isShowingResults = false;
}
@@ -45,4 +50,14 @@ export class DashboardComponent implements OnInit {
this.selectedCategory = selectedCategory;
}
+ updateSelectedEnforcementStatus(selectedEnforcementStatus: string) {
+ this.selectedEnforcementStatus = selectedEnforcementStatus;
+ }
+
+ updateSearchOptions(selectedCategory: string, selectedEnforcementStatus: string) {
+ this.selectedCategory = selectedCategory;
+ this.selectedEnforcementStatus = selectedEnforcementStatus;
+ this.isShowingResults = true;
+ }
+
}
diff --git a/src/app/pages/dashboard/filter-view-card/filter-view-card.component.html b/src/app/pages/dashboard/filter-view-card/filter-view-card.component.html
new file mode 100644
index 0000000..983982e
--- /dev/null
+++ b/src/app/pages/dashboard/filter-view-card/filter-view-card.component.html
@@ -0,0 +1,6 @@
+