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.

Sign up for GitHub

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

Jump to bottom

Add icons to new design system #1548

Merged
merged 5 commits into from
Nov 24, 2023
Merged

Add icons to new design system #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4bf7724
feat: add Icon component to design system
rosejbon Aug 30, 2023
d10d792
refactor: replace old Icon with new component
rosejbon Sep 19, 2023
fad1115
refactor: remove old Icon component
rosejbon Sep 20, 2023
07488db
test: update e2e test script for new component
rosejbon Sep 19, 2023
d025fd6
refactor: remove fontawesome package and import in _app.page.tsx
rosejbon Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ module.exports = {
docsPage: {
docs: 'automatic',
},
staticDirs: ['../public'],
};
1 change: 1 addition & 0 deletions .storybook/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { MockedProvider } from '@apollo/client/testing';
// Import design system component styles for our Stories.
import '../src/design-system/components/Badge/Badge.css';
import '../src/design-system/components/Button/Button.css';
import '../src/design-system/components/Icon/Icon.css';
import '../src/design-system/components/InputField/InputField.css';
import '../src/design-system/components/RadioInput/RadioInput.css';

Expand Down
10 changes: 5 additions & 5 deletions cypress/e2e/desktop/add.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ describe('Adding new toilets to the platform', () => {
cy.visit('/loos/add');
cy.findByText('Save toilet').click();

cy.get('[data-icon="asterisk"]').should('exist');
cy.get('[data-test="asterisk"]').should('exist');
cy.findByText('Please specify a toilet name').should('exist');

const toiletName = faker.word.adjective() + ' ' + faker.word.noun();
Expand All @@ -101,12 +101,12 @@ describe('Adding new toilets to the platform', () => {
cy.get('[name=monday-is-open').click();

cy.findByText('Save toilet').click();
cy.get('[data-icon="asterisk"]').should('have.length', 2);
cy.get('[data-test="asterisk"]').should('have.length', 2);

cy.get('[name=monday-opens]').type('08:00');

cy.findByText('Save toilet').click();
cy.get('[data-icon="asterisk"]').should('have.length', 1);
cy.get('[data-test="asterisk"]').should('have.length', 1);

cy.get('[name=monday-closes]').type('19:00');
cy.findByText('Save toilet').click();
Expand All @@ -128,12 +128,12 @@ describe('Adding new toilets to the platform', () => {
cy.get('[name=monday-is-open').click();

cy.findByText('Save toilet').click();
cy.get('[data-icon="asterisk"]').should('have.length', 2);
cy.get('[data-test="asterisk"]').should('have.length', 2);

cy.get('[name=monday-opens]').type('08:00');

cy.findByText('Save toilet').click();
cy.get('[data-icon="asterisk"]').should('have.length', 1);
cy.get('[data-test="asterisk"]').should('have.length', 1);

cy.get('[name=monday-closes]').type('19:00');

Expand Down
10 changes: 5 additions & 5 deletions cypress/e2e/mobile/add.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ describe('Adding new toilets to the platform', () => {
cy.visit('/loos/add');
cy.findByText('Save toilet').click();

cy.get('[data-icon="asterisk"]').should('exist');
cy.get('[data-test="asterisk"]').should('exist');
cy.findByText('Please specify a toilet name').should('exist');

const toiletName = faker.word.adjective() + ' ' + faker.word.noun();
Expand All @@ -101,12 +101,12 @@ describe('Adding new toilets to the platform', () => {
cy.get('[name=monday-is-open').click();

cy.findByText('Save toilet').click();
cy.get('[data-icon="asterisk"]').should('have.length', 2);
cy.get('[data-test="asterisk"]').should('have.length', 2);

cy.get('[name=monday-opens]').type('08:00');

cy.findByText('Save toilet').click();
cy.get('[data-icon="asterisk"]').should('have.length', 1);
cy.get('[data-test="asterisk"]').should('have.length', 1);

cy.get('[name=monday-closes]').type('19:00');
cy.findByText('Save toilet').click();
Expand All @@ -128,12 +128,12 @@ describe('Adding new toilets to the platform', () => {
cy.get('[name=monday-is-open').click();

cy.findByText('Save toilet').click();
cy.get('[data-icon="asterisk"]').should('have.length', 2);
cy.get('[data-test="asterisk"]').should('have.length', 2);

cy.get('[name=monday-opens]').type('08:00');

cy.findByText('Save toilet').click();
cy.get('[data-icon="asterisk"]').should('have.length', 1);
cy.get('[data-test="asterisk"]').should('have.length', 1);

cy.get('[name=monday-closes]').type('19:00');

Expand Down
5 changes: 0 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@
"@emotion/is-prop-valid": "^1.2.1",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-regular-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@graphql-tools/schema": "^10.0.0",
"@graphql-tools/utils": "^10.0.6",
"@hookform/error-message": "^2.0.1",
Expand Down
Loading
Loading