Skip to content

Commit 6f2bc39

Browse files
committed
Merge branch 'release-1.0.51'
2 parents 7a9f731 + b6210b2 commit 6f2bc39

File tree

5 files changed

+84
-9
lines changed

5 files changed

+84
-9
lines changed

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "foodoasis-client",
33
"description": "React Client for Food Oasis",
4-
"version": "1.0.50",
4+
"version": "1.0.51",
55
"author": "Hack for LA",
66
"license": "GPL-2.0",
77
"private": true,

client/src/components/Layout/Header.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from "react";
22
import PropTypes from "prop-types";
33
import Menu from "./Menu";
44
import logo from "images/foodoasis.svg";
5-
import logoStacked from "images/foodoasisla.svg";
5+
import logoStacked from "images/logo-food-oasis-stacked.svg";
66
import { AppBar, Toolbar, Typography } from "@material-ui/core";
77
import { makeStyles } from "@material-ui/core/styles";
88
import { tenantName } from "../../helpers/Configuration";

client/src/helpers/Configuration.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ export const tenantName = (() => {
4242
export const defaultCoordinates = (() => {
4343
switch (tenantId) {
4444
case 6:
45-
return { lat: 34.68758, lon: -120.157, zoom: 8.75, radius: 15 };
45+
return { lat: 34.68758, lon: -120.157, zoom: 8.75, radius: 100 };
4646
case 5:
47-
return { lat: 33.216239, lon: -96.65014, zoom: 11, radius: 8 };
47+
return { lat: 33.216239, lon: -96.65014, zoom: 10.5, radius: 100 };
4848
case 4:
49-
return { lat: 45.52445, lon: -122.65066, zoom: 12, radius: 5 };
49+
return { lat: 45.52445, lon: -122.65066, zoom: 8, radius: 300 };
5050
case 3:
51-
return { lat: 21.3101548, lon: -157.8428712, zoom: 12, radius: 5 };
51+
return { lat: 21.4601548, lon: -157.99, zoom: 9.5, radius: 100 };
5252
case 2:
53-
return { lat: 38.3949164, lon: -122.7287326, zoom: 6, radius: 50 };
53+
return { lat: 37.96, lon: -118.87, zoom: 4.5, radius: 450 };
5454
default:
55-
return { lat: 34.0354899, lon: -118.2439235, zoom: 12, radius: 5 };
55+
return { lat: 34.0354899, lon: -118.2439235, zoom: 11, radius: 20 };
5656
}
5757
})();
Lines changed: 75 additions & 0 deletions
Loading

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "foodoasis-web-api",
3-
"version": "1.0.50",
3+
"version": "1.0.51",
44
"author": "Hack for LA",
55
"description": "Web API Server for Food Oasis",
66
"main": "server.js",

0 commit comments

Comments
 (0)