Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: netlify/netlify-identity-widget
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.5.4
Choose a base ref
...
head repository: netlify/netlify-identity-widget
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.5.5
Choose a head ref
  • 6 commits
  • 9 files changed
  • 1 contributor

Commits on Jun 4, 2019

  1. Copy the full SHA
    2998060 View commit details
  2. prettifying

    shortdiv committed Jun 4, 2019
    Copy the full SHA
    528cdab View commit details
  3. Copy the full SHA
    c992ce4 View commit details

Commits on Jun 7, 2019

  1. Copy the full SHA
    5b46e0f View commit details
  2. Merge pull request #191 from netlify/development-setting

    fix: ensure dev settings for url is only visible on dev
    shortdiv authored Jun 7, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c104dd1 View commit details
  3. 1.5.5

    shortdiv committed Jun 7, 2019
    Copy the full SHA
    3c9b8fd View commit details
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

## [v1.5.5](https://github.com/netlify/netlify-identity-widget/compare/v1.5.4...v1.5.5) - 2019-06-07

### Merged

- fix: ensure dev settings for url is only visible on dev [`#191`](https://github.com/netlify/netlify-identity-widget/pull/191)

### Commits

- prettifying [`528cdab`](https://github.com/netlify/netlify-identity-widget/commit/528cdab999335d111add757cc0688342790a9a6e)
- fix: extrapolate dev mode check into function that saves to store [`c992ce4`](https://github.com/netlify/netlify-identity-widget/commit/c992ce4b718bac0ab6a78cab9ef6b45fde17c667)
- fix: ensure isLocal boolean is set on init [`5b46e0f`](https://github.com/netlify/netlify-identity-widget/commit/5b46e0fd6be5f65dd99dd9d4ca1f8f71676bf3e8)

## [v1.5.4](https://github.com/netlify/netlify-identity-widget/compare/v1.5.3...v1.5.4) - 2019-05-22

### Commits
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "netlify-identity-widget",
"description": "Netlify Identity widget for easy integration",
"version": "1.5.4",
"version": "1.5.5",
"author": "Matt Biilmann <matt@netlify.com>",
"bugs": {
"url": "https://github.com/netlify/netlify-identity-widget/issues"
2 changes: 1 addition & 1 deletion releases/v1/netlify-identity-widget.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion releases/v1/netlify-identity-widget.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion releases/v1/netlify-identity.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion releases/v1/netlify-identity.js.map

Large diffs are not rendered by default.

18 changes: 15 additions & 3 deletions src/components/app.js
Original file line number Diff line number Diff line change
@@ -91,8 +91,13 @@ class App extends Component {
const page = pages[store.modal.page] || {};
const pageLinkHandler = () => this.handlePage(page.link);

if (!store.gotrue) {
return <SiteURLForm onSiteURL={this.handleSiteURL} />;
if (store.isLocal && store.siteURL === null) {
return (
<SiteURLForm
devMode={store.siteURL != null}
onSiteURL={store.siteURL ? this.clearSiteURL : this.handleSiteURL}
/>
);
}
if (!store.settings) {
return;
@@ -127,7 +132,14 @@ class App extends Component {
{page.link_text}
</button>
)}
<SiteURLForm devMode="true" onSiteURL={this.clearSiteURL} />
{store.isLocal ? (
<SiteURLForm
devMode={store.siteURL != null}
onSiteURL={store.siteURL ? this.clearSiteURL : this.handleSiteURL}
/>
) : (
<div />
)}
</div>
);
}
Loading