Skip to content

Commit

Permalink
Merge pull request #77 from CIAT-DAPA/develop
Browse files Browse the repository at this point in the history
add some features in map, profile and waterpoint profile
  • Loading branch information
CarlosNasayo authored Oct 17, 2024
2 parents 48e3805 + b945150 commit 5f7b83b
Show file tree
Hide file tree
Showing 6 changed files with 290 additions and 346 deletions.
10 changes: 1 addition & 9 deletions src/src/components/legend/Legend.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,7 @@ function Legend({ setFilter, filter }) {
<img src={redImg} alt="" className="me-1" />
<p className="m-0">{t("monitoring.near")}</p>
</div>
<div
className={`d-flex align-items-center mb-1 ${
filter.gray ? "" : "text-decoration-line-through opacity-75"
}`}
onClick={() => setFilter({ ...filter, gray: !filter.gray })}
>
<img src={grayImg} alt="" className="me-1" />
<p className="m-0">{t("monitoring.seasonally")}</p>
</div>

</div>
);
}
Expand Down
4 changes: 0 additions & 4 deletions src/src/components/simpleLegend/Simplelegend.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ function Simplelegend() {
<img src={redImg} alt="" className="me-1" />
<p className="m-0">{t("monitoring.near")}</p>
</div>
<div className="d-flex align-items-center mb-1">
<img src={grayImg} alt="" className="me-1" />
<p className="m-0">{t("monitoring.seasonally")}</p>
</div>
</div>
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/src/conf/Configuration.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const WP_API_BASE = "http://127.0.0.1:5000/api/v1";
const WP_API_BASE = "https://webapi.waterpointsmonitoring.net/api/v1";
const ACLIMATE_API = "https://webapi.aclimate.org/api";
const GEOSERVER_URL = "http://localhost:8080/geoserver/wp/wms";
const GRAPHHOPPER_URL = "https://graphhopper.com/api/1";
Expand All @@ -7,7 +7,7 @@ const GEOSERVER_PRODUCTION_URL =
"https://geo.aclimate.org/geoserver/waterpoints_et/wms";
const GEOSERVER_ADM_LEVEL_PRODUCTION_URL = "https://geo.aclimate.org/geoserver/administrative/wms";
const KEYCLOAK_URL = "http://localhost:5004";
const KEYCLOAK_URL_PRODUCTION = process.env.REACT_APP_KEYCLOAK_URL_PRODUCTION;
const KEYCLOAK_URL_PRODUCTION = "https://users.waterpointsmonitoring.net/auth";
const KEYCLOAK_REALM = "waterpoints-monitoring";
const KEYCLOAK_CLIENT = "frontWp";

Expand Down
Loading

0 comments on commit 5f7b83b

Please sign in to comment.