From c47051fa23c00c3bf409bbf3d769e3945915b545 Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Sat, 14 Aug 2021 00:34:45 -0700 Subject: [PATCH] Refactor action bar component (#933) * Got refactored action bar component working * Fixed action bar component * Almost got action bar working in squeak thread item components * Got action component working for squeak thread item in timeline * Create reusable component for squeak list * Add squeak ancestor thread component * Created squeak replies component * Use squeak list component in squeak address page * Update frontend build --- .../DeleteSqueakDialog/DeleteSqueakDialog.js | 14 +- .../MakeSqueakDialog/MakeSqueakDialog.js | 13 +- .../SqueakActionBar/SqueakActionBar.js | 311 ++++++++++++++++++ .../components/SqueakActionBar/package.json | 6 + .../src/components/SqueakActionBar/styles.js | 43 +++ .../SqueakDetailItem/SqueakDetailItem.js | 8 +- .../SqueakDetailsDialog.js | 11 +- .../src/components/SqueakList/SqueakList.js | 106 ++++++ .../src/components/SqueakList/package.json | 6 + frontend/src/components/SqueakList/styles.js | 9 + .../components/SqueakReplies/SqueakReplies.js | 107 ++++++ .../src/components/SqueakReplies/package.json | 6 + .../src/components/SqueakReplies/styles.js | 9 + .../components/SqueakThread/SqueakThread.js | 108 ++++++ .../src/components/SqueakThread/package.json | 6 + .../src/components/SqueakThread/styles.js | 9 + .../SqueakThreadItem/SqueakThreadItem.js | 9 + frontend/src/pages/liked/Liked.js | 51 +-- frontend/src/pages/liked/styles.js | 5 - frontend/src/pages/squeak/Squeak.js | 75 +---- .../src/pages/squeakaddress/SqueakAddress.js | 38 +-- frontend/src/pages/timeline/Timeline.js | 52 +-- frontend/src/pages/timeline/styles.js | 5 - .../webapp/static/build/asset-manifest.json | 22 +- .../admin/webapp/static/build/index.html | 2 +- ...ifest.184ee12ba2fdaeed60b4b1122e7b2a5e.js} | 16 +- .../webapp/static/build/service-worker.js | 2 +- ...a4ba2f0.chunk.css => 2.15110fae.chunk.css} | 2 +- ...chunk.css.map => 2.15110fae.chunk.css.map} | 2 +- .../build/static/js/2.0c6b0365.chunk.js | 3 + ...SE.txt => 2.0c6b0365.chunk.js.LICENSE.txt} | 0 ...a.chunk.js.map => 2.0c6b0365.chunk.js.map} | 2 +- .../build/static/js/2.9730688a.chunk.js | 3 - .../build/static/js/main.034d1d90.chunk.js | 2 + .../static/js/main.034d1d90.chunk.js.map | 1 + .../build/static/js/main.567e5ed0.chunk.js | 2 - .../static/js/main.567e5ed0.chunk.js.map | 1 - 37 files changed, 836 insertions(+), 231 deletions(-) create mode 100644 frontend/src/components/SqueakActionBar/SqueakActionBar.js create mode 100644 frontend/src/components/SqueakActionBar/package.json create mode 100644 frontend/src/components/SqueakActionBar/styles.js create mode 100644 frontend/src/components/SqueakList/SqueakList.js create mode 100644 frontend/src/components/SqueakList/package.json create mode 100644 frontend/src/components/SqueakList/styles.js create mode 100644 frontend/src/components/SqueakReplies/SqueakReplies.js create mode 100644 frontend/src/components/SqueakReplies/package.json create mode 100644 frontend/src/components/SqueakReplies/styles.js create mode 100644 frontend/src/components/SqueakThread/SqueakThread.js create mode 100644 frontend/src/components/SqueakThread/package.json create mode 100644 frontend/src/components/SqueakThread/styles.js rename squeaknode/admin/webapp/static/build/{precache-manifest.5370d5360f994f6a8f6a6f0a5fb965fd.js => precache-manifest.184ee12ba2fdaeed60b4b1122e7b2a5e.js} (75%) rename squeaknode/admin/webapp/static/build/static/css/{2.ea4ba2f0.chunk.css => 2.15110fae.chunk.css} (99%) rename squeaknode/admin/webapp/static/build/static/css/{2.ea4ba2f0.chunk.css.map => 2.15110fae.chunk.css.map} (99%) create mode 100644 squeaknode/admin/webapp/static/build/static/js/2.0c6b0365.chunk.js rename squeaknode/admin/webapp/static/build/static/js/{2.9730688a.chunk.js.LICENSE.txt => 2.0c6b0365.chunk.js.LICENSE.txt} (100%) rename squeaknode/admin/webapp/static/build/static/js/{2.9730688a.chunk.js.map => 2.0c6b0365.chunk.js.map} (55%) delete mode 100644 squeaknode/admin/webapp/static/build/static/js/2.9730688a.chunk.js create mode 100644 squeaknode/admin/webapp/static/build/static/js/main.034d1d90.chunk.js create mode 100644 squeaknode/admin/webapp/static/build/static/js/main.034d1d90.chunk.js.map delete mode 100644 squeaknode/admin/webapp/static/build/static/js/main.567e5ed0.chunk.js delete mode 100644 squeaknode/admin/webapp/static/build/static/js/main.567e5ed0.chunk.js.map diff --git a/frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js b/frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js index 1b86e14c..a3c82b08 100644 --- a/frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js +++ b/frontend/src/components/DeleteSqueakDialog/DeleteSqueakDialog.js @@ -54,6 +54,7 @@ export default function DeleteSqueakDialog({ function handleSubmit(event) { event.preventDefault(); + event.stopPropagation(); console.log( 'squeakToDelete:', squeakToDelete); var squeakHash = squeakToDelete.getSqueakHash(); console.log( 'squeakHash:', squeakHash); @@ -61,10 +62,19 @@ export default function DeleteSqueakDialog({ handleClose(); } + function cancel(event) { + event.stopPropagation(); + handleClose(); + } + + function ignore(event) { + event.stopPropagation(); + } + function MakeCancelButton() { return (