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: vivekbhagwat/material-ui-credit-card-icons
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: spacecraftinc/material-ui-credit-card-icons
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Sep 26, 2016

  1. Allow AmericanExpress with Spaces

    This is the way brand comes back from Stripe's API (which I imagine is one of the more common data sources), so it'd be a nice convenience.
    vivekbhagwat authored Sep 26, 2016

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    548094d View commit details

Commits on Oct 10, 2016

  1. Merge pull request #3 from vivekbhagwat/patch-1

    Allow AmericanExpress with Spaces
    thelordoftheboards authored Oct 10, 2016
    Copy the full SHA
    0e625f6 View commit details
  2. Copy the full SHA
    04a85db View commit details
  3. Copy the full SHA
    e30b783 View commit details
  4. Version bump

    thelordoftheboards committed Oct 10, 2016
    Copy the full SHA
    6946200 View commit details
  5. Fix description

    thelordoftheboards committed Oct 10, 2016
    Copy the full SHA
    a1d0bb6 View commit details
  6. Fix description

    thelordoftheboards committed Oct 10, 2016
    Copy the full SHA
    7770b54 View commit details
  7. Copy the full SHA
    add1283 View commit details

Commits on Mar 27, 2020

  1. Copy the full SHA
    b676b4d View commit details
  2. Copy the full SHA
    fb69da7 View commit details
  3. add yarn-error to gitignore

    RwwL committed Mar 27, 2020
    Copy the full SHA
    6df00a0 View commit details
  4. add publishConfig

    RwwL committed Mar 27, 2020
    Copy the full SHA
    39aaab2 View commit details
  5. add publishConfig

    RwwL committed Mar 27, 2020
    Copy the full SHA
    87756a6 View commit details
  6. Merge branch 'release/v3.3.0'

    RwwL committed Mar 27, 2020
    Copy the full SHA
    38a9dd3 View commit details
  7. Copy the full SHA
    21d0baf View commit details
  8. add org name to package name

    RwwL committed Mar 27, 2020
    Copy the full SHA
    f846459 View commit details

Commits on Mar 30, 2020

  1. Copy the full SHA
    0ea7bef View commit details

Commits on Oct 19, 2021

  1. Copy the full SHA
    0238585 View commit details

Commits on Oct 20, 2021

  1. remove unused devDependencies

    RwwL committed Oct 20, 2021
    Copy the full SHA
    374496e View commit details
  2. update README and peer deps

    RwwL committed Oct 20, 2021
    Copy the full SHA
    5b6b2ed View commit details
  3. add development note to README

    RwwL committed Oct 20, 2021
    Copy the full SHA
    fa90b99 View commit details
  4. Merge pull request #1 from spacecraftinc/chore/sc-22041-update-materi…

    …al-ui-credit-card-icons-package
    
    chore(CreditCardIcons): update material UI in credit card icons package
    RwwL authored Oct 20, 2021
    Copy the full SHA
    f211680 View commit details
  5. v4.0.0

    RwwL committed Oct 20, 2021
    Copy the full SHA
    c766b49 View commit details

Commits on May 12, 2022

  1. Copy the full SHA
    496240f View commit details
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
lib/
npm-debug.log
yarn-error.log
22 changes: 0 additions & 22 deletions LICENSE-MIT

This file was deleted.

53 changes: 8 additions & 45 deletions README.md
Original file line number Diff line number Diff line change
@@ -3,58 +3,21 @@ material-ui-credit-card-icons

Library with credit card icons for [Material-UI](http://www.material-ui.com/#/). Initially created for use in [Universal Relay Boilerplate](https://github.com/codefoundries/UniversalRelayBoilerplate) by [Code Foundries](http://codefoundries.com/).

## Installation
Forked by Madwire for use in Payments, Backoffice, `mm360v3front`, etc.

```shell
npm install material-ui-credit-card-icons --save
```

## Versions

For React 0.14 and Material-UI 0.14 please use version 2.
For React 15 and Material-UI 0.15 please use version 3 and above.
The package exports seven icon components in `/lib` (six most common brands plus a generic), and a `getCreditCardIconByName` helper function that can be used to dynamically choose an icon based on a prop coming from, e.g., a Stripe `PaymentMethod.card` object.

## Usage

```javascript
import React from 'react';
import IconButton from 'material-ui/lib/icon-button';

import {
Icon_Visa,
Icon_MasterCard
} from 'material-ui-credit-card-icons';

class MyComponent extends React.Component
{
render( )
{
return(
<div>
<IconButton><Icon_Visa /></IconButton>
<IconButton><Icon_MasterCard /></IconButton>
</div>
);
}
}

```
Usage example: [M360 Payments' CreditCardIcon component](https://github.com/spacecraftinc/m360-payments/blob/master/client/components/CreditCardIcon.js).

For more information:
## Developing

* For list of icons refer to [the src folder](src/).
Make changes in `src`, then run `yarn compile` to transpile into `lib`. This gets published in the GitHub Package Registry as `@spacecraftinc/material-ui-credit-card-icons`.

* [Live demo](http://universal-relay-boilerplate.herokuapp.com/mui/icons_credit_cards).

* [Source Code](https://github.com/codefoundries/UniversalRelayBoilerplate/blob/master/units/starter-kit-example-mui/webapp/components/MUI_Icons_CountryFlags.jsx) of live demo.


## Contributing

In lieu of a formal styleguide, take care to maintain the existing coding style.
Check out [existing issues and help wanted](https://github.com/codefoundries/material-ui-credit-card-icons/issues).

## Versions

## Release History
- Package 3.3.0 works with projects that include `@material-ui/core`
- Package 4.x works with projects that include `@mui/material`

[Releases on Github project](https://github.com/codefoundries/material-ui-credit-card-icons/releases/).
2 changes: 1 addition & 1 deletion lib/Icon_AmericanExpress.js

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

2 changes: 1 addition & 1 deletion lib/Icon_CreditCardOutline.js

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

4 changes: 2 additions & 2 deletions lib/Icon_DinersClub.js

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

4 changes: 2 additions & 2 deletions lib/Icon_Discover.js

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

4 changes: 2 additions & 2 deletions lib/Icon_JCB.js

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

6 changes: 3 additions & 3 deletions lib/Icon_MasterCard.js

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

4 changes: 2 additions & 2 deletions lib/Icon_Visa.js

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

2 changes: 1 addition & 1 deletion lib/index.js

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

43 changes: 19 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "material-ui-credit-card-icons",
"version": "3.0.1",
"description": "Country flag icons for Material-UI",
"name": "@madwire/material-ui-credit-card-icons",
"version": "4.0.0",
"description": "Credit Card icons for Material-UI",
"main": "./lib/index.js",
"standalone": "CountryFlags",
"standalone": "CreditCardIcons",
"repository": {
"type": "git",
"url": "git://github.com/codefoundries/material-ui-credit-card-icons.git"
"url": "git://github.com/spacecraftinc/material-ui-credit-card-icons.git"
},
"keywords": [
"material-ui",
@@ -17,33 +17,28 @@
"payment option"
],
"author": "Aleksandar Chalakov <a.chalakov@coefoundries.com> (http://codefoundries.com/)",
"licenses": [
{
"type": "MIT",
"url": "https://github.com/codefoundries/material-ui-credit-card-icons/blob/master/LICENSE-MIT"
}
],
"license": "MIT",
"bugs": {
"url": "https://github.com/codefoundries/material-ui-credit-card-icons/issues"
},
"dependencies": {},
"peerDependencies": {
"@mui/material": "^5.0.4",
"react": "^17.0.2"
},
"devDependencies": {
"babel-cli": "^6.7.7",
"babel-polyfill": "^6.7.4",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-0": "^6.5.0",
"material-ui": "~0.15.0-beta.2",
"react": "~15.0.1",
"react-dom": "~15.0.1",
"react-tap-event-plugin": "^1.0.0",
"tape": "^4.5.1",
"vinyl-source-stream": "^1.1.0"
"babel-cli": "^6.16.0",
"babel-polyfill": "^6.16.0",
"babel-preset-es2015": "^6.16.0",
"babel-preset-react": "^6.16.0",
"babel-preset-stage-0": "^6.16.0"
},
"scripts": {
"compile": "babel -sd lib/ src/",
"prepublish": "npm run compile"
}
"prepublish": "yarn run compile"
},
"files": [
"lib",
"src"
]
}
2 changes: 1 addition & 1 deletion src/Icon_AmericanExpress.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import React from 'react';
import SvgIcon from 'material-ui/SvgIcon';
import SvgIcon from '@mui/material/SvgIcon';

export default function( props )
{
2 changes: 1 addition & 1 deletion src/Icon_CreditCardOutline.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import React from 'react';
import SvgIcon from 'material-ui/SvgIcon';
import SvgIcon from '@mui/material/SvgIcon';

export default function( props )
{
4 changes: 2 additions & 2 deletions src/Icon_DinersClub.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import React from 'react';
import SvgIcon from 'material-ui/SvgIcon';
import SvgIcon from '@mui/material/SvgIcon';

export default function( props )
{
@@ -22,7 +22,7 @@ export default function( props )
<path fill="#089EDA" d="M19.562,20c0,2.727,2.438,5.008,4.438,5.609V14.39C22,14.992,19.562,17.272,19.562,20z"/>
</g>
</g>
<path opacity="0.08" fill="#FFFFFF" enable-background="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
<path opacity="0.08" fill="#FFFFFF" enableBackground="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
c0,1.375-0.562,2.625-1.469,3.531C57.624,39.438,56.375,40,55,40H30H5c-1.375,0-2.625-0.562-3.531-1.469L58.531,1.469z"/>
<g>
<path fill="#F7F8F9" d="M55,1c2.206,0,4,1.794,4,4v30c0,2.206-1.794,4-4,4H5c-2.206,0-4-1.794-4-4V5c0-2.206,1.794-4,4-4H55
4 changes: 2 additions & 2 deletions src/Icon_Discover.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import React from 'react';
import SvgIcon from 'material-ui/SvgIcon';
import SvgIcon from '@mui/material/SvgIcon';

export default function( props )
{
@@ -40,7 +40,7 @@ export default function( props )
</g>
<path fill="#E6A226" d="M60,27.5V35c0,0.688-0.141,1.344-0.395,1.941c-0.256,0.597-0.621,1.137-1.074,1.59s-0.992,0.818-1.59,1.074
C56.342,39.859,55.688,40,55,40H32.543H10.086L60,27.5z"/>
<path opacity="0.08" fill="#FFFFFF" enable-background="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
<path opacity="0.08" fill="#FFFFFF" enableBackground="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
c0,1.375-0.562,2.625-1.469,3.531C57.624,39.438,56.375,40,55,40H30H5c-1.375,0-2.625-0.562-3.531-1.469L58.531,1.469z"/>
<g>
<path fill="#F7F5F2" d="M55,1c2.206,0,4,1.794,4,4v30c0,2.206-1.794,4-4,4H5c-2.206,0-4-1.794-4-4V5c0-2.206,1.794-4,4-4H55 M55,0
4 changes: 2 additions & 2 deletions src/Icon_JCB.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import React from 'react';
import SvgIcon from 'material-ui/SvgIcon';
import SvgIcon from '@mui/material/SvgIcon';

export default function( props )
{
@@ -16,7 +16,7 @@ export default function( props )
<path fill="#EA574C" d="M31,30h-8V15c0-2.762,3.238-5,6-5h6v15C35,27.762,33.762,30,31,30z"/>
<path fill="#9ACD77" d="M45,30h-8V15c0-2.762,3.238-5,6-5h6v15C49,27.762,47.762,30,45,30z"/>
</g>
<path opacity="0.08" fill="#FFFFFF" enable-background="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
<path opacity="0.08" fill="#FFFFFF" enableBackground="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
c0,1.375-0.562,2.625-1.469,3.531C57.624,39.438,56.375,40,55,40H30H5c-1.375,0-2.625-0.562-3.531-1.469L58.531,1.469z"/>
<g>
<path fill="#F7F8F9" d="M55,1c2.206,0,4,1.794,4,4v30c0,2.206-1.794,4-4,4H5c-2.206,0-4-1.794-4-4V5c0-2.206,1.794-4,4-4H55
4 changes: 2 additions & 2 deletions src/Icon_Mastercard.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
'use strict';

import React from 'react';
import SvgIcon from 'material-ui/SvgIcon';
import SvgIcon from '@mui/material/SvgIcon';

export default function( props )
{
return(
<SvgIcon viewBox="0 0 60 40" {...props}>
<g>
<path fill="#5666AF" d="M60,35c0,2.75-2.25,5-5,5H5c-2.75,0-5-2.25-5-5V5c0-2.75,2.25-5,5-5h50c2.75,0,5,2.25,5,5V35z"/>
<path opacity="0.04" fill="#FFFFFF" enable-background="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
<path opacity="0.04" fill="#FFFFFF" enableBackground="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
c0,1.375-0.562,2.625-1.469,3.531C57.624,39.438,56.375,40,55,40H30H5c-1.375,0-2.625-0.562-3.531-1.469L58.531,1.469z"/>
<path fill="#57B1D9" d="M30,0"/>
<g>
4 changes: 2 additions & 2 deletions src/Icon_Visa.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import React from 'react';
import SvgIcon from 'material-ui/SvgIcon';
import SvgIcon from '@mui/material/SvgIcon';

export default function( props )
{
@@ -28,7 +28,7 @@ export default function( props )
z"/>
</g>
<path fill="#FFFFFF" d="M30,0"/>
<path opacity="0.04" fill="#FFFFFF" enable-background="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
<path opacity="0.04" fill="#FFFFFF" enableBackground="new " d="M58.531,1.469C59.438,2.375,60,3.625,60,5v15v15
c0,1.375-0.562,2.625-1.469,3.531C57.624,39.438,56.375,40,55,40H30H5c-1.375,0-2.625-0.562-3.531-1.469L58.531,1.469z"/>
<g>
<path fill="#F7F8F9" d="M55,1c2.206,0,4,1.794,4,4v30c0,2.206-1.794,4-4,4H5c-2.206,0-4-1.794-4-4V5c0-2.206,1.794-4,4-4H55 M55,0
Loading