From 5ad7a2ffc9cc78b5cb0ca2a089b076a976bd548b Mon Sep 17 00:00:00 2001
From: Brian Schroer
Date: Tue, 23 Apr 2024 18:19:31 -0700
Subject: [PATCH 1/3] 1324 Desktop and mobile styling of collapsed state of
advanced search component
---
app/assets/img/ic-filter-gray.svg | 3 +
.../NavigatorDashboard.module.scss | 73 ++++++++++++++++++-
.../NavigatorDashboard/NavigatorDashboard.tsx | 42 ++++++++---
3 files changed, 107 insertions(+), 11 deletions(-)
create mode 100644 app/assets/img/ic-filter-gray.svg
diff --git a/app/assets/img/ic-filter-gray.svg b/app/assets/img/ic-filter-gray.svg
new file mode 100644
index 000000000..a081e962c
--- /dev/null
+++ b/app/assets/img/ic-filter-gray.svg
@@ -0,0 +1,3 @@
+
+
+
diff --git a/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss b/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
index 15b3dc5df..e17268e98 100644
--- a/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
+++ b/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
@@ -1,11 +1,82 @@
@import "~styles/utils/_helpers.scss";
+// Advanced Search Box Styles
+
.advancedSearchContainer {
width: 85%;
max-width: 1250px;
margin: 90px auto;
+ padding: 42px 60px;
+
+ border: 1px solid #000;
+ box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+ border-radius: 8px;
+ @media screen and (max-width: $min-tablet-p) {
+ padding: 30px;
+ }
}
-.greeting {
+.header {
font-size: 26px;
+ font-weight: 700;
+}
+
+.blurb {
+ margin: 10px 0 20px;
}
+
+.searchBoxContainer {
+ background: #F5F5F5;
+ border-radius: 8px;
+ display: grid;
+ grid-template-areas: "input button filter";
+ grid-template-columns: 66fr 18fr 50px;
+ gap: 35px;
+ padding: 14px 26px;
+ @media screen and (max-width: $break-tablet-p) {
+ grid-template-areas:
+ "input filter"
+ "button button";
+ grid-template-columns: repeat(1, 1fr);
+ row-gap: 7px;
+ column-gap: 4px;
+ }
+}
+
+.searchInput {
+ grid-area: input;
+ border-radius: 8px;
+ background: url("../../assets/img/ic-search-blue.svg") center left 15px no-repeat;
+ padding-left: 45px;
+ height: 43px;
+ background-color: #fff;
+ border: none;
+ &:focus, &:hover {
+ box-shadow: none;
+ border: 1px solid $color-brand;
+ }
+}
+
+.searchButton {
+ height: 43px;
+ max-width: 200px;
+ grid-area: button;
+ @media screen and (max-width: $break-tablet-p) {
+ max-width: none;
+ }
+}
+
+.searchFilterButton {
+ grid-area: filter;
+ border-radius: 8px;
+ height: 43px;
+ width: 43px;
+ padding: 0;
+ background-color: #fff;
+ box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
+ &:active {
+ box-shadow: none;
+ }
+}
+
+// End Advanced Search Box Styles
diff --git a/app/pages/NavigatorDashboard/NavigatorDashboard.tsx b/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
index 226730d17..4263f634d 100644
--- a/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
+++ b/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
@@ -1,19 +1,41 @@
import React from "react";
+import { icon } from "assets";
+import { Button } from "components/ui/inline/Button/Button";
import styles from "./NavigatorDashboard.module.scss";
+
+const AdvancedSearch = () => {
+ return (
+
+
Hi, Navigator :)
+
+ Please use the search bar to find resources for the individuals
+ you're assisting. You can enter keywords such as
+ “shelter,“ “food assistance,“ or
+ “employment support,“ to discover relevant programs and
+ services.
+
+
+
+
+
+
Search
+
+
+
+
+
+ );
+};
+
export const NavigatorDashboard = () => {
return (
-
-
Hi, Case Managers :)
-
- Please use the search bar to find specific resources for the homeless
- individuals you are assisting. You can enter keywords, such as
- “shelter,“ “food assistance,“ or
- “employment support,“ to discover relevant programs and
- services.
-
-
+
);
};
From c69c96f69f8cca7f18e5658930fe44cf56f408cd Mon Sep 17 00:00:00 2001
From: Brian Schroer
Date: Wed, 24 Apr 2024 17:32:50 -0700
Subject: [PATCH 2/3] 1324 Implement mobile styles and search functionality
---
.../NavigatorDashboard.module.scss | 22 ++++++++++------
.../NavigatorDashboard/NavigatorDashboard.tsx | 25 ++++++++++++++++---
2 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss b/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
index e17268e98..d6d540653 100644
--- a/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
+++ b/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
@@ -12,7 +12,12 @@
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
border-radius: 8px;
@media screen and (max-width: $min-tablet-p) {
- padding: 30px;
+ width: 100%;
+ padding: 15px;
+ box-shadow: none;
+ border-left: none;
+ border-right: none;
+ border-radius: 0;
}
}
@@ -25,7 +30,7 @@
margin: 10px 0 20px;
}
-.searchBoxContainer {
+.searchBoxForm {
background: #F5F5F5;
border-radius: 8px;
display: grid;
@@ -40,6 +45,7 @@
grid-template-columns: repeat(1, 1fr);
row-gap: 7px;
column-gap: 4px;
+ padding: 14px 15px;
}
}
@@ -48,17 +54,17 @@
border-radius: 8px;
background: url("../../assets/img/ic-search-blue.svg") center left 15px no-repeat;
padding-left: 45px;
- height: 43px;
+ height: 50px;
background-color: #fff;
- border: none;
+ border: solid 1px transparent;
&:focus, &:hover {
box-shadow: none;
- border: 1px solid $color-brand;
+ border-color: $color-brand;
}
}
.searchButton {
- height: 43px;
+ height: 50px;
max-width: 200px;
grid-area: button;
@media screen and (max-width: $break-tablet-p) {
@@ -69,8 +75,8 @@
.searchFilterButton {
grid-area: filter;
border-radius: 8px;
- height: 43px;
- width: 43px;
+ height: 50px;
+ width: 50px;
padding: 0;
background-color: #fff;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
diff --git a/app/pages/NavigatorDashboard/NavigatorDashboard.tsx b/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
index 4263f634d..1a7e70979 100644
--- a/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
+++ b/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
@@ -1,10 +1,22 @@
import React from "react";
+import qs from "qs";
+import { useHistory } from "react-router-dom";
+
import { icon } from "assets";
import { Button } from "components/ui/inline/Button/Button";
-import styles from "./NavigatorDashboard.module.scss";
+import styles from "./NavigatorDashboard.module.scss";
const AdvancedSearch = () => {
+ const history = useHistory();
+ let searchValue = '';
+ const submitSearch = () => {
+ if (searchValue) {
+ const query = qs.stringify({ query: searchValue });
+ history.push(`/search?${query}`);
+ }
+ };
+
return (
Hi, Navigator :)
@@ -15,19 +27,24 @@ const AdvancedSearch = () => {
“employment support,“ to discover relevant programs and
services.
-
+
);
};
From 3a729f0539cfbdd028ee211a9a29af3b98cb8d8c Mon Sep 17 00:00:00 2001
From: Brian Schroer
Date: Wed, 24 Apr 2024 17:50:35 -0700
Subject: [PATCH 3/3] Prettier
---
.../NavigatorDashboard.module.scss | 13 +++++++------
.../NavigatorDashboard/NavigatorDashboard.tsx | 18 ++++++++++++------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss b/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
index d6d540653..68831f63e 100644
--- a/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
+++ b/app/pages/NavigatorDashboard/NavigatorDashboard.module.scss
@@ -7,7 +7,6 @@
max-width: 1250px;
margin: 90px auto;
padding: 42px 60px;
-
border: 1px solid #000;
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
border-radius: 8px;
@@ -31,7 +30,7 @@
}
.searchBoxForm {
- background: #F5F5F5;
+ background: #f5f5f5;
border-radius: 8px;
display: grid;
grid-template-areas: "input button filter";
@@ -40,8 +39,8 @@
padding: 14px 26px;
@media screen and (max-width: $break-tablet-p) {
grid-template-areas:
- "input filter"
- "button button";
+ "input filter"
+ "button button";
grid-template-columns: repeat(1, 1fr);
row-gap: 7px;
column-gap: 4px;
@@ -52,12 +51,14 @@
.searchInput {
grid-area: input;
border-radius: 8px;
- background: url("../../assets/img/ic-search-blue.svg") center left 15px no-repeat;
+ background: url("../../assets/img/ic-search-blue.svg") center left 15px
+ no-repeat;
padding-left: 45px;
height: 50px;
background-color: #fff;
border: solid 1px transparent;
- &:focus, &:hover {
+ &:focus,
+ &:hover {
box-shadow: none;
border-color: $color-brand;
}
diff --git a/app/pages/NavigatorDashboard/NavigatorDashboard.tsx b/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
index 1a7e70979..2312125cf 100644
--- a/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
+++ b/app/pages/NavigatorDashboard/NavigatorDashboard.tsx
@@ -9,7 +9,7 @@ import styles from "./NavigatorDashboard.module.scss";
const AdvancedSearch = () => {
const history = useHistory();
- let searchValue = '';
+ let searchValue = "";
const submitSearch = () => {
if (searchValue) {
const query = qs.stringify({ query: searchValue });
@@ -27,20 +27,26 @@ const AdvancedSearch = () => {
“employment support,“ to discover relevant programs and
services.
-