-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Set required font-family/size via uswds class * Use uswds margin classes instead of `smart-hub--*` classes * Wrap group of `await` calls in `Promise.all` inside resource migration * Remove File `attachmentType` field * Change trashcan icon's color to black to match other trashcan icons
- Loading branch information
1 parent
9438d3f
commit 64db2a9
Showing
21 changed files
with
71 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| .smart-hub--form-required { | ||
| font-family: SourceSansPro; | ||
| font-size: 16px; | ||
| color: #d42240; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 18 additions & 14 deletions
32
src/migrations/20210302170502-add-resources-to-activity-report.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,29 @@ | ||
| module.exports = { | ||
| up: async (queryInterface, Sequelize) => { | ||
| queryInterface.sequelize.transaction(async (transaction) => { | ||
| await queryInterface.addColumn('ActivityReports', | ||
| 'nonECLKCResourcesUsed', | ||
| { | ||
| type: Sequelize.ARRAY(Sequelize.STRING), | ||
| }, { transaction }); | ||
| await queryInterface.removeColumn('ActivityReports', 'resourcesUsed', { transaction }); | ||
| await queryInterface.addColumn('ActivityReports', | ||
| 'ECLKCResourcesUsed', | ||
| { | ||
| type: Sequelize.ARRAY(Sequelize.STRING), | ||
| }, { transaction }); | ||
| await Promise.all([ | ||
| queryInterface.addColumn('ActivityReports', | ||
| 'nonECLKCResourcesUsed', | ||
| { | ||
| type: Sequelize.ARRAY(Sequelize.STRING), | ||
| }, { transaction }), | ||
| queryInterface.removeColumn('ActivityReports', 'resourcesUsed', { transaction }), | ||
| queryInterface.addColumn('ActivityReports', | ||
| 'ECLKCResourcesUsed', | ||
| { | ||
| type: Sequelize.ARRAY(Sequelize.STRING), | ||
| }, { transaction }), | ||
| ]); | ||
| }); | ||
| }, | ||
|
|
||
| down: async (queryInterface, Sequelize) => { | ||
| queryInterface.sequelize.transaction(async (transaction) => { | ||
| await queryInterface.removeColumn('ActivityReports', 'nonECLKCResourcesUsed', { transaction }); | ||
| await queryInterface.removeColumn('ActivityReports', 'ECLKCResourcesUsed', { transaction }); | ||
| await queryInterface.addColumn('ActivityReports', 'resourcesUsed', { type: Sequelize.TEXT }, { transaction }); | ||
| await Promise.all([ | ||
| queryInterface.removeColumn('ActivityReports', 'nonECLKCResourcesUsed', { transaction }), | ||
| queryInterface.removeColumn('ActivityReports', 'ECLKCResourcesUsed', { transaction }), | ||
| queryInterface.addColumn('ActivityReports', 'resourcesUsed', { type: Sequelize.TEXT }, { transaction }), | ||
| ]); | ||
| }); | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| module.exports = { | ||
| up: async (queryInterface) => { | ||
| queryInterface.sequelize.transaction((t) => Promise.all([ | ||
| queryInterface.removeColumn('Files', 'attachmentType', { transaction: t }), | ||
| queryInterface.sequelize.query('DROP TYPE public."enum_Files_attachmentType";', { transaction: t }), | ||
| ])); | ||
| }, | ||
|
|
||
| down: async (queryInterface, Sequelize) => { | ||
| queryInterface.addColumn( | ||
| 'Files', | ||
| 'attachmentType', | ||
| { | ||
| type: Sequelize.DataTypes.ENUM(['ATTACHMENT', 'RESOURCE']), | ||
| }, | ||
| ); | ||
| }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.