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

230 transcripts #100

Merged
merged 23 commits into from
May 19, 2021
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
88de4d8
Install react-dom & add babel plugin
tamsingreen Mar 30, 2021
f29ed8b
Move react-dom to peer deps and remove others which are already in deps
tamsingreen Apr 1, 2021
c6ae48a
Remove react deps when running npm run linked
tamsingreen Apr 12, 2021
644e764
Update README.md
tamsingreen Apr 12, 2021
0cd716e
feat: #222 bump Bootstrap
aniablaziak May 6, 2021
627241f
feat: #222 style Transcription Row layout
aniablaziak May 6, 2021
c8532b9
feat: #222 style Projects Row layout
aniablaziak May 6, 2021
d4cfb66
Merge branch 'master' of https://github.com/bbc/digital-paper-edit-st…
aniablaziak May 10, 2021
a954ab1
refactor(transcripts): #230 WIP Updates transcripts in project view
allishultes May 12, 2021
15c370e
chore(transcirpts): #230 Merge with master
allishultes May 12, 2021
132e56a
refactor(transcripts): #230 Separate row elements into new file
allishultes May 13, 2021
0ed4af4
feat(transcripts): #230 Update duration format
allishultes May 14, 2021
833ec1f
refactor(transcripts): #230 Simplify message code
allishultes May 14, 2021
4e63acb
feat(transcripts): #230 Fixes TranscriptRow stories and props
allishultes May 14, 2021
992c476
chore(transcripts): #230 Update PropTypes
allishultes May 14, 2021
147d7e5
feat(transcripts): #230 Adjusts styling on in-progress card
allishultes May 14, 2021
c3a8be0
refactor(transcripts): #230 Clean up return statement as per PR review
allishultes May 17, 2021
7f7e0b3
Merge branch 'master' into 230-transcripts
allishultes May 17, 2021
9db6fc1
refactor(transcripts): #230 Update created field for transcript items
allishultes May 17, 2021
c68026c
chore(transcripts): #230 Update version number and changelog
allishultes May 17, 2021
4755668
Delete package.dist.json
allishultes May 18, 2021
06810b3
refactor(transcripts): #230 Replaces momentjs
allishultes May 18, 2021
7eeb4b6
Merge branch '230-transcripts' of github.com:bbc/digital-paper-edit-s…
allishultes May 18, 2021
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
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- I91 Replaced postinstall script in the dist folder

## [ 1.23.2 ] - 2021-05-12
- I91 Removed postinstall script in the dist folder
- I91 Removed postinstall script in the dist folder

## [ 1.24.0 ]
- I222 Updated design of the workspace: List, ProjectRow and TranscriptRow components

## [ 1.25.0 ]
- I230 Updated design of the workspace: TranscriptRow component
1,279 changes: 1,055 additions & 224 deletions package-lock.json

Large diffs are not rendered by default.

121 changes: 121 additions & 0 deletions package.dist.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
{
allishultes marked this conversation as resolved.
Show resolved Hide resolved
"name": "@bbc/digital-paper-edit-storybook",
"version": "1.21.0",
"description": "",
"main": "index.js",
"scripts": {
"start": "npm run storybook",
"test": "jest",
"storybook": "start-storybook -p 6006",
"build": "webpack --config webpack.config.js --mode production",
"dev": "webpack --watch --config webpack.dev.config.js --mode development",
"linked": "npm i && mkdir -p dist && npm run cp && npm run dev",
"buildw": "webpack --config webpack.config.js --watch",
"build-storybook": "build-storybook -s public",
"build-storybook-docs": "build-storybook -s public --docs",
"clean": "rm -rf dist",
"publish-ghpages": "mkdir -p build-storybook && npm run build-storybook && gh-pages -d storybook-static",
"cp": "cp package.json ./dist/package.json && cp README.md ./dist/README.md ",
"preinstall": "rm -rf node_modules",
"prepare": "npm run clean",
"publish-public": "npm run build && npm run cp && npm publish dist --access public",
"publish-dry": "npm run build && npm run cp && npm publish dist --dry-run",
"release": "auto shipit"
},
"eslintConfig": {
"extends": "react-app"
},
"contributors": [
{
"name": "BBC",
"url": "https://github.com/bbc"
}
],
"license": "MIT",
"dependencies": {
"@bbc/react-transcript-editor": "^1.0.4",
"@fortawesome/fontawesome-svg-core": "^1.2.19",
"@fortawesome/free-brands-svg-icons": "^5.8.2",
"@fortawesome/free-solid-svg-icons": "^5.10.1",
"@fortawesome/react-fontawesome": "^0.1.4",
"@storybook/addon-knobs": "^6.1.20",
"array-move": "^2.1.0",
"auto": "^10.16.8",
"bootstrap": "^4.3.1",
"bootstrap-css-only": "^4.3.1",
"chroma-js": "^2.0.3",
"core-js": "^3.3.4",
"css-color-names": "^1.0.1",
"css-loader": "^3.0.0",
"cuid": "^2.1.6",
"downloadjs": "^1.4.7",
"edl_composer": "^1.0.3",
"express": "^4.17.1",
"gel-typography": "^2.0.5",
"node-sass": "^4.13.1",
"polished": "^3.4.1",
"prop-types": "^15.7.2",
"randomcolor": "^0.5.4",
"react-bootstrap": "^1.0.0-beta.11",
"react-color": "^2.17.1",
"react-router-bootstrap": "^0.25.0",
"react-select": "^2.4.3",
"react-sortable-hoc": "^1.10.1",
"sass-loader": "^7.1.0",
"save": "^2.4.0",
"style-loader": "^0.23.1",
"videocontext": "^0.53.0"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-object-rest-spread": "^7.5.5",
"@babel/plugin-transform-react-jsx": "^7.7.4",
"@babel/preset-env": "^7.11.5",
"@babel/preset-react": "^7.9.4",
"@storybook/addon-a11y": "^6.1.20",
"@storybook/addon-actions": "^6.1.20",
"@storybook/addon-links": "^6.0.21",
"@storybook/addon-viewport": "^6.1.20",
"@storybook/addons": "^6.0.21",
"@storybook/react": "^6.1.20",
"@testing-library/jest-dom": "^5.1.1",
"@testing-library/react": "^10.0.1",
"babel-eslint": "^10.0.3",
"babel-jest": "^24.9.0",
"babel-loader": "^8.1.0",
"babel-preset-minify": "^0.5.1",
"eslint": "^6.2.2",
"eslint-plugin-react": "^7.14.3",
"gh-pages": "^2.0.1",
"jest": "^25.1.0",
"prettier": "^1.18.2",
"storybook-react-router": "^1.0.8",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.11"
},
"peerDependencies": {
"react": "^16.12.0",
"react-dom": "^16.12.0",
"react-router": "^5.1.1",
"react-router-dom": "^5.1.1"
},
"jest": {
"transform": {
"^.+\\.jsx?$": "babel-jest"
},
"setupFilesAfterEnv": [
"<rootDir>/config/jest/setup.js"
],
"moduleNameMapper": {
".*\\.(css|scss|sass)$": "<rootDir>/tools/jest/styleMock.js",
".*\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/tools/jest/assetMock.js"
},
"moduleFileExtensions": [
"js",
"jsx",
"json"
],
"verbose": true
}
}
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bbc/digital-paper-edit-storybook",
"version": "1.24.0",
"version": "1.25.0",
"description": "",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -59,6 +59,7 @@
"edl_composer": "^1.0.3",
"express": "^4.17.1",
"gel-typography": "^2.0.5",
"moment": "^2.29.1",
"node-sass": "^4.13.1",
"polished": "^3.4.1",
"prop-types": "^15.7.2",
Expand Down
8 changes: 4 additions & 4 deletions src/ItemForm/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ const ItemForm = (props) => {
onChange={ (e) => setTitle(e.target.value) }
/>
<Form.Text className="text-muted">
Choose a title
Choose a title
</Form.Text>
<Form.Control.Feedback>Looks good!</Form.Control.Feedback>
<Form.Control.Feedback type="invalid">
Please choose a title
Please choose a title
</Form.Control.Feedback>
</Form.Group>

Expand All @@ -72,13 +72,13 @@ const ItemForm = (props) => {
onChange={ (e) => setDescription(e.target.value) }
/>
<Form.Text className="text-muted">
Choose an optional description
Choose an optional description
</Form.Text>
<Form.Control.Feedback>Looks good!</Form.Control.Feedback>
</Form.Group>
<Modal.Footer>
<Button variant="primary" type="submit">
Save
Save
</Button>
</Modal.Footer>
</Form>
Expand Down
9 changes: 5 additions & 4 deletions src/ProgressBar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import React from 'react';
import BSProgressBar from 'react-bootstrap/ProgressBar';

const ProgressBar = ({ progress }) => {

return (
<BSProgressBar
style={ {
width: '100%'
} }
now={ progress }
striped
animated
variant={ 'info' }
label={ `${ progress }%` }
/>
);
Expand All @@ -17,4 +18,4 @@ const areEqual = (prevProps, nextProps) => {
return prevProps.progress === nextProps.progress;
};

export default React.memo(ProgressBar, areEqual);
export default React.memo(ProgressBar, areEqual);
2 changes: 1 addition & 1 deletion src/TranscriptCard/stories/index.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ storiesOf('Transcript Card', module)
<section style={ style }>
<TranscriptCard
{ ...transcriptItems[1] }
message="Fixing up a Martini..."
message="Stripping audio..."
handleEditItem={ transcriptCardActions.handleEdit }
handleDeleteItem={ transcriptCardActions.handleDelete }
/>
Expand Down
Loading