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.

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

Pre-show Release #285

Merged
merged 60 commits into from
Nov 30, 2023
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
6b56f5f
adjust how data comes through
King-Mob Nov 8, 2023
ebbbcc3
Merge pull request #259 from DigitalCommons/lx-59-move-boundary-servi…
King-Mob Nov 9, 2023
976c76b
first commit, button component and search request
ms0ur1s Nov 9, 2023
ab38898
Merge branch 'development' into 256-implement-fe-functions-for-landre…
ms0ur1s Nov 9, 2023
712b40d
tidied up basic call
ms0ur1s Nov 9, 2023
265f402
hooked related products up to redux and returning results
ms0ur1s Nov 10, 2023
55a6848
results on related properties panel
ms0ur1s Nov 10, 2023
7519398
highlighted ownership icon
ms0ur1s Nov 15, 2023
954a887
Display unique values
ms0ur1s Nov 15, 2023
fefddbe
basic pagination
ms0ur1s Nov 15, 2023
9df58d5
updated pagination prior to componantisation
ms0ur1s Nov 16, 2023
f93c8af
property search button opens ownership search tray
ms0ur1s Nov 16, 2023
b8e1207
basic result styling
ms0ur1s Nov 17, 2023
956f892
cordinates for selected search property added to state, but no poly s…
ms0ur1s Nov 21, 2023
eefa0c5
propertySection styling and left pane responsiveness
ms0ur1s Nov 21, 2023
b7fb053
left panel styling update and CLEAR_PROPERTIES
ms0ur1s Nov 21, 2023
ebad07f
reverse coordinates
ms0ur1s Nov 21, 2023
f718a48
Thank John the Poly is appearing :)
ms0ur1s Nov 21, 2023
0c1b3a1
setLngLat added RelatedProperties click hander
ms0ur1s Nov 21, 2023
535961d
pagination and property pane update
ms0ur1s Nov 22, 2023
b2fe4da
added selected property and style
ms0ur1s Nov 22, 2023
3b0aae7
loading added to the search panel
ms0ur1s Nov 22, 2023
35d3085
Merge pull request #260 from DigitalCommons/256-implement-fe-function…
King-Mob Nov 23, 2023
bb9c16f
fix coordinate switching bug
King-Mob Nov 23, 2023
59ac543
icon active visible if ownership active and zoomed in
ms0ur1s Nov 24, 2023
5df8a90
proprietorName added to state, for relationship to clear properties
ms0ur1s Nov 24, 2023
542f6cf
removed unnecessary conditions
ms0ur1s Nov 24, 2023
cd1b2f3
name updated to Property Boundaries
ms0ur1s Nov 24, 2023
cb297ed
Merge pull request #268 from DigitalCommons/261-backsearch-only-show-…
King-Mob Nov 27, 2023
ff53a95
Merge pull request #269 from DigitalCommons/266-backsearch-update-the…
King-Mob Nov 27, 2023
958ca21
add terms of use to sign up
King-Mob Nov 28, 2023
7533756
Merge pull request #271 from DigitalCommons/270-terms-of-use
King-Mob Nov 28, 2023
35bce98
add the license
King-Mob Nov 28, 2023
d39bb77
add license info the related properties
King-Mob Nov 28, 2023
89c415a
Merge pull request #272 from DigitalCommons/250-license-on-ownership-…
King-Mob Nov 28, 2023
e9ec937
Merge pull request #273 from DigitalCommons/250-add-license-to-info-p…
King-Mob Nov 28, 2023
99a9af8
add a space
King-Mob Nov 29, 2023
98046bc
add icon and functionality
King-Mob Nov 29, 2023
6c628d7
Merge pull request #274 from DigitalCommons/262-go-to-property-icon
King-Mob Nov 29, 2023
7b1caa6
Updates PropertySearchPoly to Layer and Feature
ms0ur1s Nov 27, 2023
4866a9b
property object added to state on selected property click
ms0ur1s Nov 27, 2023
54d0d21
click event added to poly
ms0ur1s Nov 27, 2023
531ab60
selectProperty opens in info panel
ms0ur1s Nov 27, 2023
d4ef63e
multiple properties selectable, selected properties display in info p…
ms0ur1s Nov 28, 2023
3fae9b6
additions to previous commit
ms0ur1s Nov 28, 2023
cc1ccbc
remove related cleared property from selectedProperties
ms0ur1s Nov 28, 2023
00a9aea
add multiple property selection
King-Mob Nov 29, 2023
2442e78
remove console logs
King-Mob Nov 29, 2023
bd94515
remove comment
King-Mob Nov 29, 2023
5c07a1a
move the arrow to just turning it on
King-Mob Nov 29, 2023
581e9c0
Merge pull request #275 from DigitalCommons/263-backsearch-ownership-…
King-Mob Nov 29, 2023
69ae95d
add clear all button
King-Mob Nov 29, 2023
27ffc10
Merge pull request #276 from DigitalCommons/265-clear-all-info-panel
King-Mob Nov 29, 2023
e13384d
add the new svg icons
King-Mob Nov 30, 2023
8932c29
Merge pull request #281 from DigitalCommons/262-icons
King-Mob Nov 30, 2023
110150b
add select all and clear all
King-Mob Nov 29, 2023
895d02f
comment out select all
King-Mob Nov 30, 2023
076101a
Merge pull request #282 from DigitalCommons/264-select-all-clear-all-…
King-Mob Nov 30, 2023
aaab81f
add a check on ownership
King-Mob Nov 30, 2023
a271fce
Merge pull request #283 from DigitalCommons/277-hide-backsearch-where…
King-Mob Nov 30, 2023
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
Prev Previous commit
Next Next commit
propertySection styling and left pane responsiveness
ms0ur1s committed Nov 21, 2023
commit eefa0c50b65e621889b2b99119d92b39c8288f15
24 changes: 20 additions & 4 deletions src/assets/styles/_left-pane.scss
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@
left: 72px;
position: fixed;
// width: 250px;
width: 400px;
width: calc(100vw - 72px);
bottom: 0;
top: 68px;
// background-color: #f4f5f7;
@@ -97,7 +97,7 @@
width: 100%;
// background-color: #e4e6ea;
// border-bottom: solid 1px #d1d1d1;
border-bottom: 1px solid #EEEEEE;
border-bottom: 1px solid #eeeeee;
}

.tray-title {
@@ -183,9 +183,11 @@
}

.tray-item-title {
width: 140px;
// width: 140px;
padding-left: 48px;
cursor: pointer;
width: calc(100% - 97px);
margin-right: 10px;
}
}

@@ -313,7 +315,9 @@
}

.tray-item-title {
width: 140px;
// width: 140px;
width: calc(100% - 97px);
margin-right: 10px;
}

transform-origin: 50% 50% 0px;
@@ -364,3 +368,15 @@ a.mapboxgl-ctrl-logo {
margin-top: 0;
margin-left: 15px;
}

/* Desktop specific, as mobile first */
@media screen and (min-width: 769px) {
.left-pane-tray {
width: 400px;
}

.draggable-item .tray-item-title,
.tray-item .tray-item-title {
width: 302px;
}
}
62 changes: 56 additions & 6 deletions src/assets/styles/_properties.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,58 @@
.property-id-number{
cursor: pointer;
margin: 0;
.property-id-number {
cursor: pointer;
margin: 0;
}

.highlighted{
color: red;
}
.highlighted {
color: red;
}

.property-details {
height: auto;
width: 100%;
padding: 20px;
box-sizing: border-box;
}

.property-details-title {
font-size: 24px;
color: $primaryColor;
margin-bottom: 20px;
}

.property-details-section {
box-sizing: border-box;
border-top: 2px solid $midNeutral2;
padding: 20px 0;
font-size: 18px;
}

.property-details-section__inner {
box-sizing: border-box;
}

.property-details-section__title {
font-size: 18px;
color: $primaryColor;
margin: 0;
}

.property-details-section__value,
.property-details-section__small-print {
color: $darkNeutral;
}

.property-details-section__small-print {
font-size: 14px;
}

/* Desktop specific, as mobile first */
@media screen and (min-width: 769px) {
.property-details-section__inner {
display: flex;

& > div {
width: 50%;
}
}
}
6 changes: 4 additions & 2 deletions src/assets/styles/_variables.scss
Original file line number Diff line number Diff line change
@@ -44,8 +44,10 @@ $toolbarAccent: #e3e3e5;
$trayBackground: #eff0f2;
$trayAccent: #e5e7eb;

$neutral: #E9E7E7;
$midNeutral: #B1B1B1;
$neutral: #e9e7e7;
$darkNeutral: #707070;
$midNeutral: #b1b1b1;
$midNeutral2: #d4d2d2;
$lightNeutral: #f5f5f5;

/** Mixins **/
6 changes: 5 additions & 1 deletion src/components/left-pane/LeftPaneRelatedProperties.js
Original file line number Diff line number Diff line change
@@ -59,7 +59,11 @@ const LeftPaneRelatedProperties = ({ onClose, open, itemsPerPage }) => {
)}
</>
) : (
<div>No Related Properties</div>
<div
style={{ width: "100%", marginTop: "24px", textAlign: "center" }}
>
No Related Properties
</div>
)}
</div>
</LeftPaneTray>
108 changes: 75 additions & 33 deletions src/components/left-pane/PropertySection.js
Original file line number Diff line number Diff line change
@@ -77,43 +77,86 @@ const PropertySection = ({ property, active }) => {
</div>
</div>
{open && (
<div
style={{
height: "auto",
padding: "12px 24px",
borderBottom: "1px solid #ccc",
background: "#78838f",
color: "white",
}}
>
<div className="property-details">
{proprietor_category_1 && (
<>
<p>Property Address: {property_address}</p>
<p>Proprietor Category: {proprietor_category_1}</p>
<p>Proprietor Name: {proprietor_name_1}</p>
<p>Proprietor Address: {proprietor_1_address_1}</p>
<p>Tenure: {tenure}</p>
<p>Date Proprietor Added: {date_proprietor_added}</p>
<span className="horizontal-divider" />
<div className="property-details-title">{property_address}</div>
<div className="property-details-section">
<div className="Property-details-section__title">
Proprietor Name:
</div>
<div className="Property-details-section__value">
{proprietor_name_1}
</div>
</div>
<div className="property-details-section">
<div className="Property-details-section__title">
Proprietor Address:
</div>
<div className="Property-details-section__value">
{proprietor_1_address_1}
</div>
</div>
<div className="property-details-section">
<div className="property-details-section__inner">
<div className="Property-details-section__title">
Proprietor Category:
</div>
<div className="Property-details-section__value">
{proprietor_category_1}
</div>
</div>
<div className="property-details-section__inner">
<div className="Property-details-section__title">Tenure:</div>
<div className="Property-details-section__value">
{tenure}
</div>
</div>
<div className="property-details-section__inner">
<div className="Property-details-section__title">
Date Proprietor Added:
</div>
<div className="Property-details-section__value">
{date_proprietor_added}
</div>
</div>
</div>
</>
)}
<p title="The Title Register gives information on who owns the property or land, and any rights of way">
<b>INSPIRE ID:</b> {poly_id}
</p>
<p title="The Title Plan includes the property or land's location and boundaries">
<b>Title number:</b> {title_no}
</p>
<p>
You can access these documents for a small fee by visiting the{" "}
<a
href="https://search-property-information.service.gov.uk/search/search-by-inspire-id"
target="_blank"
rel="noopener noreferrer"
<div className="property-details-section">
<div className="property-details-section__inner">
<div
className="Property-details-section__title"
title="The Title Register gives information on who owns the property or land, and any rights of way"
>
INSPIRE ID:
</div>
<div className="Property-details-section__value">{poly_id}</div>
</div>
<div
className="property-details-section__inner"
title="The Title Plan includes the property or land's location and boundaries"
>
Land Registry website
</a>{" "}
using the above IDs.
</p>
<div className="Property-details-section__title">
Title Number:
</div>
<div className="Property-details-section__value">{title_no}</div>
</div>
<div className="property-details-section__small-print">
<p>
You can access these documents for a small fee by visiting the{" "}
<a
href="https://search-property-information.service.gov.uk/search/search-by-inspire-id"
target="_blank"
rel="noopener noreferrer"
>
Land Registry website
</a>{" "}
using the above IDs.
</p>
</div>
</div>

<button
onClick={() =>
dispatch({
@@ -124,7 +167,6 @@ const PropertySection = ({ property, active }) => {
>
Clear property
</button>

<div className="check-for-properties">
<Button
buttonClass={"button-new"}