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

Ui tweaks #36

Merged
merged 57 commits into from
Jul 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
550c81a
fix: client was not receiving data from server in local dev
Jun 24, 2019
b5f02d2
improved programme script btn options
Jun 25, 2019
846e978
Refactor programme script btns
Jul 3, 2019
e3a9668
adjusted size of play/stop btn for videoContext preview component
Jul 3, 2019
e12642f
Added reorder
Jul 3, 2019
443449e
added sortable to programme script elements
Jul 4, 2019
93b41bf
added possibility to delete
Jul 4, 2019
c4ddff0
Merge branch 'master' into ui-tweaks
Jul 4, 2019
f7bc5ff
adding try catch around get projects
Jul 4, 2019
667c34d
adding credentials include in fetch request options
Jul 4, 2019
dbedc38
credentials omit
Jul 4, 2019
9be5837
Remove omit
Jul 4, 2019
1751420
added export for txt and json
Jul 4, 2019
e966bc7
tweaked hide /show transcript/programme script btns
Jul 4, 2019
79e4efc
Added support for programme script elements
Jul 4, 2019
cd1af43
added possibility to edit programme script elements
Jul 4, 2019
af6cce0
can now add items at a specific insert point
Jul 4, 2019
9f08634
can use insert point for other programme script elements
Jul 4, 2019
e32ef1d
can now select mutiple paragraphs to add to programme script
Jul 6, 2019
c0ae32d
adjusted layout + ui
Jul 6, 2019
eb69303
added annotations to transcript/programme script view
Jul 7, 2019
fe85e66
changed transcript to correct only
Jul 7, 2019
41ada18
fix edit/create labels
Jul 7, 2019
058feca
refactored programmeScriptJsonToText
Jul 7, 2019
477881d
removed warnings
Jul 7, 2019
cd09dc3
changed highlight to be on word level
Jul 8, 2019
f9e79c7
quick fix in project list link
Jul 12, 2019
f8b0808
fixed projects delete response
Jul 12, 2019
139a8f6
Added programme script save
Jul 13, 2019
902609f
if not programme script in list don't show search option
Jul 13, 2019
6212063
ApiWrapper electron refactor
Jul 13, 2019
84d132b
Added index to papercuts
Jul 13, 2019
b7d0bb1
added word highlights
Jul 13, 2019
f4fa797
renamed search text
Jul 13, 2019
cf2cf13
added word highlight to annotated view
Jul 13, 2019
8ca0162
switch ApiWrapper for ElectronWrapper if in electron ENV
Jul 14, 2019
b727797
removed uncessary console.log
Jul 14, 2019
a27f27b
added logic to switch between API wrapper and electron wrapper
Jul 14, 2019
9f12ea5
fixed typo
Jul 14, 2019
4f08840
added logic to import file in electron when creating new transcript
Jul 14, 2019
c2dd503
Refactor electron wrapper integration
Jul 15, 2019
729dfcc
removed unecessary console.log + fixed typos
Jul 15, 2019
8d8f786
upgraded adl module
Jul 16, 2019
b418c5b
fixed preserving paragraphs when grouping words by speakers
Jul 16, 2019
db54161
Removed some uncessary console.log
Jul 16, 2019
351aa1f
Demo app for github pages (#40)
Jul 19, 2019
0e67ed7
updated demo alert message
Jul 19, 2019
eb1df4e
modified demo message
Jul 19, 2019
9994d0a
replaced bootstrap
Jul 23, 2019
419eaa9
adding metadata info in programme script
Jul 23, 2019
34df38d
adding metadata info in programme script
Jul 23, 2019
a194c4b
fixed annotations and added timer to transcripts list
Jul 25, 2019
a376690
fixed conflict
Jul 25, 2019
01a036e
Added default var for ADL/EDL values
Jul 25, 2019
6f7108f
Transcript progress timer (#42)
Jul 26, 2019
1cdc55a
removed transcript annotation standalone view
Jul 26, 2019
96c2ba4
added react components repo link to README
Jul 26, 2019
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
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# App name used in browser title and navbar
REACT_APP_NAME="Digital Paper Edit"
REACT_APP_NAME=""
REACT_APP_NODE_ENV="development"
REACT_APP_SERVER_URL="http://localhost:8080"
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ It's a React, Express, Electron, Adobe CEP, AWS stack to be able to deploy one m
The project is organised across these repository

- [`bbc/digital-paper-edit-client`](https://github.com/bbc/digital-paper-edit-client) - React Client - [npm](https://www.npmjs.com/package/@bbc/digital-paper-edit-client)
- [`bbc/digital-paper-edit-react-components`](https://github.com/bbc/digital-paper-edit-react-components) - React Storybook for Client components - `npm`.
- [`bbc/digital-paper-edit-api`](https://github.com/bbc/digital-paper-edit-api) - Express server API - [npm](https://www.npmjs.com/package/@bbc/digital-paper-edit-api)
- [`bbc/digital-paper-edit-infrastructure`](https://github.com/bbc/digital-paper-edit-infrastructure) - AWS infrastructure for API server and Client.
- [`bbc/digital-paper-edit-electron`](https://github.com/bbc/digital-paper-edit-electron) - Electron, Cross Platform Desktop app - Mac, Windows, Linux
Expand Down
52 changes: 46 additions & 6 deletions package-lock.json

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

11 changes: 8 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
"description": "Digital paper edit application, using transcriptions from automated STT, to do text based video editing on audio and video interviews. Modular architecture with - React - Express - Electron - Adobe CEP",
"main": "index.js",
"dependencies": {
"@bbc/aes31-adl-composer": "^1.0.1",
"@bbc/fcpx-xml-composer": "^1.0.0",
"@bbc/react-transcript-editor": "^1.0.4",
"@fortawesome/fontawesome-svg-core": "^1.2.15",
"@fortawesome/free-solid-svg-icons": "^5.7.2",
"@fortawesome/react-fontawesome": "^0.1.4",
"bootstrap": "^4.3.1",
"array-move": "^2.1.0",
"bootstrap-css-only": "^4.3.1",
"chroma-js": "^2.0.3",
"css-color-names": "^1.0.1",
"cuid": "^2.1.6",
Expand All @@ -25,7 +28,8 @@
"react-router-dom": "^4.3.1",
"react-scripts": "3.0.1",
"react-select": "^2.4.3",
"videocontext": "^0.53.0"
"react-sortable-hoc": "^1.9.1",
"videocontext": "^0.53.1"
},
"author": "Pietro Passarelli CC0 BBC 2019",
"contributors": [
Expand All @@ -49,7 +53,8 @@
"eject": "react-scripts eject",
"clean:cache": "npm cache clean --force",
"deploy:ghpages": "rimraf build && cross-env REACT_APP_NODE_ENV=demo npm run build && gh-pages -d build",
"publish:public": "npm run build && cp package.json ./build/package.json && cp README.md ./build/README.md && npm publish build --access public",
"publish:prep": "npm run build && cp package.json ./build/package.json && cp README.md ./build/README.md && rimraf ./build/db",
"publish:public": "npm run publish:prep && npm publish build --access public",
"spec": "speculate --release ${BUILD_NUMBER}"
},
"eslintConfig": {
Expand Down
1 change: 1 addition & 0 deletions public/db/annotations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":246.58,"end":249.34,"labelId":"cb10e79c20af4a7f8b3fe8a4c789d43e","note":"example note on this annotation","_id":"72d4ac9d0f16481eac83946a0384d12d","id":"72d4ac9d0f16481eac83946a0384d12d"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":585.66,"end":596.03,"labelId":"cb10e79c20af4a7f8b3fe8a4c789d43e","note":"","_id":"4de867b1f8694235b01f64e4b5628cc1"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":13.86,"end":19.58,"labelId":"cb10e79c20af4a7f8b3fe8a4c789d43e","note":"","_id":"ac440b482b5842a2aa36050ed74cc132"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"29cjw29xii80000ird74yb19swa","start":19.3,"end":24.3,"labelId":"920fa8f97acc43b5bc0694b2e5648080","note":"","_id":"9d78e7fa69274497956f2efbd39351c6"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":116.26,"end":122.62,"labelId":"default","note":"","_id":"c75da56b01aa4f2ab571abcec8b9da92"},{"projectId":"10046281c4ad4938b7d0ae6fa9899bec","transcriptId":"1000cjw29xii80000ird74yb19swa","start":9.48,"end":13.72,"labelId":"default","note":"","_id":"00dd43dbcdd8419e9177784158aac9fa"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":109.41,"end":119.2,"labelId":"default","note":"","_id":"1de06f64ea5a4dd4a7f4b68dfb917d53"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":366.26,"end":368.95,"labelId":"cb10e79c20af4a7f8b3fe8a4c789d43e","note":"","_id":"ef8a71a6ec684c9295b97ded19ebd383"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":55.36,"end":66.47,"labelId":"920fa8f97acc43b5bc0694b2e5648080","note":"","_id":"5c48fb82cfa9416baf480b5bab432521"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":89.86,"end":101.84,"labelId":"920fa8f97acc43b5bc0694b2e5648080","note":"","_id":"139d1ecc3c1c496892955cab9d8d0714"},{"projectId":"94346281c4ad4938b7d0ae6fa9899bec","transcriptId":"19cjw29xii80000ird74yb19swa","start":86.66,"end":100.87,"labelId":"db055983fabd40ef84dc35fbd3dfb40b","note":"","_id":"2a3e18369d9f497289730ad291ba34b8"}]
65 changes: 65 additions & 0 deletions public/db/labels.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
[
{
"_id": "default",
"id": "default",
"projectId": "default",
"value": "default",
"label": "Default",
"color": "orange",
"description": "A default label"
},
{
"value": "darkblue",
"label": "Computer vision",
"color": "darkblue",
"description": "Talking about computer vision in robotics",
"projectId": "94346281c4ad4938b7d0ae6fa9899bec",
"_id": "db055983fabd40ef84dc35fbd3dfb40b",
"id": "db055983fabd40ef84dc35fbd3dfb40b"
},
{
"value": "greenyellow",
"label": "Bacteria",
"color": "greenyellow",
"description": "Talking about Bacteria and technology",
"projectId": "94346281c4ad4938b7d0ae6fa9899bec",
"_id": "920fa8f97acc43b5bc0694b2e5648080",
"id": "920fa8f97acc43b5bc0694b2e5648080"
},
{
"value": "deepskyblue",
"label": "Test",
"color": "deepskyblue",
"description": "Test blue",
"projectId": "54bae8166afc4b379de5d4e10b77218d",
"_id": "64b071fefa394b5b968c56f8b14149b7",
"id": "64b071fefa394b5b968c56f8b14149b7"
},
{
"value": "crimson",
"label": "Robotics",
"color": "crimson",
"description": "when they speak about robotics",
"projectId": "94346281c4ad4938b7d0ae6fa9899bec",
"_id": "cb10e79c20af4a7f8b3fe8a4c789d43e",
"id": "cb10e79c20af4a7f8b3fe8a4c789d43e"
},
{
"value": "yellow",
"label": "D",
"color": "yellow",
"description": "",
"projectId": "10046281c4ad4938b7d0ae6fa9899bec",
"_id": "eab94271d5894c3a8800ee59cc03d7be",
"id": "eab94271d5894c3a8800ee59cc03d7be"
},
{
"value": "yellow",
"label": "Test",
"color": "yellow",
"description": "",
"projectId": "94346281c4ad4938b7d0ae6fa9899bec",
"_id": "bddffe16cf024b2dbe74be4d64eb0ed4",
"id": "bddffe16cf024b2dbe74be4d64eb0ed4"
}
]
1 change: 1 addition & 0 deletions public/db/paperedits.json

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions public/db/projects.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"title": "Ted Talks",
"description": "Ted Talks - sample project",
"_id": "94346281c4ad4938b7d0ae6fa9899bec"
},
{
"title": "PBS Frontline - The Facebook Dilemma",
"description": "Interviews from PBS Frontline documentary, The Facebook Dilemma - sample project.",
"_id": "10046281c4ad4938b7d0ae6fa9899bec"
}
]
Loading