Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/trunk' into akarshit-feat-accoun…
Browse files Browse the repository at this point in the history
…t-js-auth

Signed-off-by: Akarshit Wal <[email protected]>
  • Loading branch information
Akarshit committed Aug 25, 2021
2 parents 7a509c9 + 7e6f7e0 commit c860fd1
Show file tree
Hide file tree
Showing 6 changed files with 149 additions and 103 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## [4.1.2](https://github.com/reactioncommerce/example-storefront/compare/v4.1.1...v4.1.2) (2021-08-23)


### Bug Fixes

* snyk vulnerability of apollo client ([9f8fecb](https://github.com/reactioncommerce/example-storefront/commit/9f8fecbef4d852ed2177aa722151e56a711420b1))
* upgrade @apollo/client from 3.0.0-rc.4 to 3.3.21 ([a6f3099](https://github.com/reactioncommerce/example-storefront/commit/a6f3099a4f6ec64083e25ec98b5e1b5d459e4986))

## [4.1.1](https://github.com/reactioncommerce/example-storefront/compare/v4.1.0...v4.1.1) (2021-08-23)


### Bug Fixes

* upgrade graphql from 14.1.1 to 14.7.0 ([3b97799](https://github.com/reactioncommerce/example-storefront/commit/3b977990afd068a72bc13f48bac7382d50fbb3a2))
* upgrade mdi-material-ui from 5.9.0 to 5.33.1 ([323fdff](https://github.com/reactioncommerce/example-storefront/commit/323fdff30afb5a0601f40b7c8c67a97479955bbf))
* upgrade styled-components from 5.1.1 to 5.3.0 ([7672cad](https://github.com/reactioncommerce/example-storefront/commit/7672cad4f37844ae1839a2d90b8bd6a107586b34))
* upgrade swr from 0.1.18 to 0.5.6 ([cb39c7a](https://github.com/reactioncommerce/example-storefront/commit/cb39c7a9b2bd1c625a6096199dac1d128af74e35))

# [4.1.0](https://github.com/reactioncommerce/example-storefront/compare/v4.0.2...v4.1.0) (2021-06-23)


Expand Down
29 changes: 23 additions & 6 deletions components/Entry/SignUp.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,34 @@ export default function SignUp(props) {
</FormControl>
<FormControl>
<InputLabel htmlFor="password">Password</InputLabel>
<Input id="password" aria-describedby="password" onChange={handlePasswordChange} value={password}
<Input
id="password"
aria-describedby="password"
onChange={handlePasswordChange}
value={password}
type="password"
/>
</FormControl>
<Button onClick={registerUser} color="primary" variant="contained" className={classes.signUpButton}
tabIndex="0" role="button"
>Sign Up</Button>
<Button
onClick={registerUser}
color="primary"
variant="contained"
className={classes.signUpButton}
tabIndex="0"
role="button"
>
Sign Up
</Button>
{!!error && <div className={classes.error}>{error}</div>}
<div className={classes.switchEntryMode} onClick={handleOpenLogIn} onKeyDown={handleOpenLogIn} role="button"
<div
className={classes.switchEntryMode}
onClick={handleOpenLogIn}
onKeyDown={handleOpenLogIn}
role="button"
tabIndex={0}
>Already have an account? Log In</div>
>
Already have an account? Log In
</div>
</form>
);
}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ networks:

services:
web:
image: reactioncommerce/example-storefront:4.1.0
image: reactioncommerce/example-storefront:4.1.2
env_file:
- ./.env
networks:
Expand Down
3 changes: 1 addition & 2 deletions lib/accountsServer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ApolloLink } from "apollo-link";
import { ApolloClient, HttpLink } from "@apollo/client";
import { InMemoryCache } from "apollo-cache-inmemory";
import { ApolloClient, HttpLink, InMemoryCache } from "@apollo/client";
import { AccountsClient } from "@accounts/client";
import { AccountsClientPassword } from "@accounts/client-password";
import { AccountsGraphQLClient } from "@accounts/graphql-client";
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-storefront",
"version": "4.1.0",
"version": "4.1.2",
"description": "The Example Storefront serves as a reference for implementing a web based storefront using the Reaction Commerce GraphQL API.",
"keywords": [],
"author": {
Expand Down Expand Up @@ -97,7 +97,7 @@
"@accounts/client": "^0.32.0",
"@accounts/client-password": "^0.32.0",
"@accounts/graphql-client": "^0.32.0",
"@apollo/client": "^3.3.15",
"@apollo/client": "^3.3.21",
"@apollo/link-context": "^2.0.0-beta.3",
"@apollo/link-error": "^2.0.0-beta.3",
"@apollo/react-components": "^3.1.3",
Expand All @@ -118,14 +118,14 @@
"date-fns": "~1.30.1",
"envalid": "~4.2.0",
"express": "~4.16.4",
"graphql": "~14.1.1",
"graphql": "~14.7.0",
"graphql-request": "^2.0.0",
"graphql-tag": "~2.10.1",
"isomorphic-unfetch": "^3.0.0",
"js-cookie": "~2.2.0",
"keymirror": "~0.1.1",
"lodash": "~4.17.20",
"mdi-material-ui": "~5.9.0",
"mdi-material-ui": "~5.33.1",
"next": "9.4.1",
"passport": "~0.4.0",
"passport-oauth2": "~1.4.0",
Expand All @@ -137,9 +137,9 @@
"react-stripe-elements": "~2.0.3",
"react-tracking": "~5.6.0",
"reacto-form": "~1.4.0",
"styled-components": "^5.0.1",
"styled-components": "^5.3.0",
"subscriptions-transport-ws": "~0.9.15",
"swr": "^0.1.18"
"swr": "^0.5.6"
},
"devDependencies": {
"@commitlint/cli": "^11.0.0",
Expand Down
Loading

0 comments on commit c860fd1

Please sign in to comment.