Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FOLIO-1547 Use stripes 1.0 #32

Merged
merged 2 commits into from Oct 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
@@ -1,11 +1,13 @@
# Change history for ui-myprofile

## [1.1.0](https://github.com/folio-org/ui-myprofile/tree/v1.1.0) (IN PROGRESS)
## [1.1.0](https://github.com/folio-org/ui-myprofile/tree/v1.1.0) (2018-10-04)
[Full Changelog](https://github.com/folio-org/ui-myprofile/compare/v1.0.0...v1.1.0)

* Change `handleChangePasswordError` method (UIMPROF-13).
* Add password strength meter integration (UIMPROF-20).
* Add validation for new password input field (UIMPROF-12).
* Change API url for change password (MODLOGIN-53).
* Use `stripes` framework v1.0.0

## [1.0.0](https://github.com/folio-org/ui-myprofile/tree/v1.0.0) (2018-09-18)

Expand Down
10 changes: 3 additions & 7 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "@folio/myprofile",
"version": "1.0.0",
"version": "1.1.0",
"description": "My profile",
"repository": "folio-org/ui-myprofile",
"publishConfig": {
Expand Down Expand Up @@ -62,10 +62,9 @@
"@bigtest/mocha": "^0.5.0",
"@bigtest/react": "^0.1.2",
"@folio/eslint-config-stripes": "^3.2.0",
"@folio/stripes": "^1.0.0",
"@folio/stripes-cli": "^1.4.0",
"@folio/stripes-connect": "^3.3.0",
"@folio/stripes-core": "^2.15.1",
"@folio/stripes-logger": "^1.0.0",
"babel-eslint": "^9.0.0",
"babel-polyfill": "^6.26.0",
"chai": "^4.0.2",
Expand All @@ -84,16 +83,13 @@
"dependencies": {
"@folio/react-intl-safe-html": "^1.0.1",
"@folio/stripes-cli": "^1.4.0",
"@folio/stripes-components": "^4.0.0",
"@folio/stripes-form": "^1.1.0",
"@folio/stripes-smart-components": "^1.9.0",
"prop-types": "^15.6.0",
"react-intl": "^2.3.0",
"react-router-dom": "^4.1.1",
"redux-form": "^7.0.3"
},
"peerDependencies": {
"@folio/stripes-core": "^2.15.0",
"@folio/stripes": "^1.0.0",
"react": "*"
}
}
6 changes: 3 additions & 3 deletions settings/ChangePassword/ChangePassword.js
Expand Up @@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
import { Field, SubmissionError } from 'redux-form';
import { FormattedMessage } from 'react-intl';
import SafeHTMLMessage from '@folio/react-intl-safe-html';
import { TextField, Callout, Button, Row, Col } from '@folio/stripes-components';
import { stripesShape } from '@folio/stripes-core/src/Stripes'; // eslint-disable-line import/no-unresolved
import { PasswordStrength, PasswordValidationField } from '@folio/stripes-smart-components';
import { TextField, Callout, Button, Row, Col } from '@folio/stripes/components';
import { stripesShape } from '@folio/stripes/core';
import { PasswordStrength, PasswordValidationField } from '@folio/stripes/smart-components';

import ChangePasswordForm from './ChangePasswordForm';

Expand Down
5 changes: 2 additions & 3 deletions settings/ChangePassword/ChangePasswordForm.js
@@ -1,8 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import Button from '@folio/stripes-components/lib/Button';
import Pane from '@folio/stripes-components/lib/Pane';
import stripesForm from '@folio/stripes-form';
import { Button, Pane } from '@folio/stripes/components';
import stripesForm from '@folio/stripes/form';

const ChangePasswordForm = (props) => {
const {
Expand Down
4 changes: 2 additions & 2 deletions settings/index.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import { Settings } from '@folio/stripes-smart-components';
import { stripesShape } from '@folio/stripes-core/src/Stripes';
import { Settings } from '@folio/stripes/smart-components';
import { stripesShape } from '@folio/stripes/core';

import ChangePassword from './ChangePassword';

Expand Down