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

Complete task 3 (sensors) and dev task 6 #97

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
51 changes: 36 additions & 15 deletions packages/react-app/src/App.less
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,23 @@ select:focus {
}
}

/* Parcel Info */
.parcel-info {
border-left: 1px solid @gray-4;
padding: 1rem;
}

/* Header */
.search-and-connect-wrapper {
display: flex;
flex-direction: row;
justify-content: space-between;

@media (max-width: 1024px) {
justify-content: initial;
}
}

/* BrowsePlots Layout */
.progress-bar-indicator {
margin-left: 3rem;
Expand Down Expand Up @@ -291,49 +308,47 @@ select:focus {
height: 100%;
display: grid;
grid-template-columns: 400px 1fr;
grid-template-rows: 3rem 4rem 1fr;
grid-template-rows: 4rem 230px 1fr;
grid-column-gap: 0px;
grid-row-gap: 0px;

@media (max-width: 1024px) {
grid-template-columns: 1fr;
grid-template-rows: 3rem repeat(2, 4rem) 300px 4rem 5fr;
grid-template-rows: 0 repeat(2, 4rem) 300px 4rem 5fr;
}

// Responsive for mobile landscape screens
@media (max-height: 500px) {
grid-template-rows: 3rem repeat(2, 4rem) 300px 4rem 600px;
grid-template-rows: 0 repeat(2, 4rem) 300px 4rem 600px;
}
}

.progress-bar {
grid-area: 1 / 1 / 2 / 3;
}
.logo-link {
grid-area: 2 / 1 / 3 / 2;
grid-area: 1 / 1 / 2 / 2;
}
.connect-wallet-section {
grid-area: 2 / 2 / 3 / 3;
grid-area: 1 / 2 / 2 / 3;
border-color: @gray-4;
justify-content: flex-end;
justify-content: space-between;
}
.parcel-info {
grid-area: 2 / 2 / 3 / 3;
}
.plot-detail {
grid-area: 3 / 1 / 4 / 2;
grid-area: 2 / 1 / 4 / 2;
}
.plot-tabs {
grid-area: 3 / 1 / 4 / 2;
grid-area: 2 / 1 / 4 / 2;
width: 100%;
}
.plot-map {
grid-area: 3 / 2 / 4 / 3;
border-left: 1px solid @gray-4;
}

@media (max-width: 1024px) {
.progress-bar {
grid-area: 1 / 1 / 2 / 2;
}
.logo-link {
grid-area: 2 / 1 / 3 / 2;
grid-area: 1 / 1 / 2 / 2;
}
.connect-wallet-section {
grid-area: 3 / 1 / 4 / 2;
Expand All @@ -347,7 +362,13 @@ select:focus {
grid-area: 5 / 1 / 7 / 2;
max-width: 100vw;
}
.parcel-info {
display: none;
}
.plot-detail {
grid-area: 6 / 1 / 7 / 2;
}
.sensor-header-info {
display: none;
}
}
Binary file added packages/react-app/src/assets/images/icon-chart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions packages/react-app/src/assets/images/icon-globe.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 7 additions & 5 deletions packages/react-app/src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import React from "react";
import { ConnectWalletButton, SearchPlots } from ".";

import { ConnectWalletButton, SearchPlots, SensorHeaderInfo } from ".";
interface Props {
connectWallet: () => void;
}
export default function Header({ connectWallet }: Props) {
export default function Header({ connectWallet }: Props): JSX.Element {
return (
<div className="connect-wallet-section header primary-font text-xl bg-gray-1 flex h-16 lg:px-4 border-l-2 border-b-2 items-center">
<SearchPlots />
<ConnectWalletButton onClick={connectWallet} />
<SensorHeaderInfo />
<div className="search-and-connect-wrapper bg-gray-1">
<SearchPlots />
<ConnectWalletButton onClick={connectWallet} />
</div>
</div>
);
}
Loading