Skip to content

Commit

Permalink
Merge branch 'release-1.0.55'
Browse files Browse the repository at this point in the history
  • Loading branch information
entrotech committed May 15, 2021
2 parents c5bfd9a + dcceec3 commit b7ec348
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "foodoasis-client",
"description": "React Client for Food Oasis",
"version": "1.0.54",
"version": "1.0.55",
"author": "Hack for LA",
"license": "GPL-2.0",
"private": true,
Expand Down
15 changes: 7 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions server/app/services/account-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ const register = async (model) => {
message: "Registration successful.",
};
const sqlRole = `insert into login_tenant (login_id, tenant_id, is_data_entry)
values ($<loginId>, $<tenantid>, true) returning id`;
await db.one(sqlRole, { loginId: row.id, tenantId: Number(tenantId) });
values ($<loginId>, $<tenantId>, true)`;
await db.none(sqlRole, { loginId: row.id, tenantId: Number(tenantId) });

await requestRegistrationConfirmation(email, result, clientUrl);
return result;
Expand Down
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "foodoasis-web-api",
"version": "1.0.54",
"version": "1.0.55",
"author": "Hack for LA",
"description": "Web API Server for Food Oasis",
"main": "server.js",
Expand Down

0 comments on commit b7ec348

Please sign in to comment.