Feat/specify multiview layout #16
Merged
Conversation
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
malmen237
force-pushed
the
feat/specify-multiview-layout
branch
from
2551087
to
da70015
Compare
LucasMaupin
approved these changes
Sep 19, 2024
Comment on lines
+176
to
+202
| // <> | ||
| // <button | ||
| // onClick={toggleConfigModal} | ||
| // title={t('preset.configure_layout')} | ||
| // className={`absolute top-0 right-[-10%] min-w-fit`} | ||
| // > | ||
| // <IconSettings className="text-p" /> | ||
| // </button> | ||
| // {modalOpen && ( | ||
| // <div className="absolute top-5 right-[-65%] flex flex-col"> | ||
| // <button | ||
| // type="button" | ||
| // className={`min-w-fit bg-zinc-700 rounded-t-sm p-1 border-b-[1px] border-b-zinc-600 hover:bg-zinc-600`} | ||
| // onClick={() => openConfigModal('create')} | ||
| // > | ||
| // {t('preset.create_layout')} | ||
| // </button> | ||
| // <button | ||
| // type="button" | ||
| // className={`min-w-fit bg-zinc-700 rounded-b-sm p-1 hover:bg-zinc-600`} | ||
| // onClick={() => openConfigModal('edit')} | ||
| // > | ||
| // {t('preset.update_layout')} | ||
| // </button> | ||
| // </div> | ||
| // )} | ||
| // </> |
malmen237
commented
Sep 19, 2024
Comment on lines
+168
to
+202
| // TODO: When possible to edit layout, uncomment the following code and remove the button below | ||
| <button | ||
| onClick={() => openConfigModal('create')} | ||
| title={t('preset.configure_layout')} | ||
| className={`absolute top-0 right-[-10%] min-w-fit`} | ||
| > | ||
| <IconSettings className="text-p" /> | ||
| </button> | ||
| // <> | ||
| // <button | ||
| // onClick={toggleConfigModal} | ||
| // title={t('preset.configure_layout')} | ||
| // className={`absolute top-0 right-[-10%] min-w-fit`} | ||
| // > | ||
| // <IconSettings className="text-p" /> | ||
| // </button> | ||
| // {modalOpen && ( | ||
| // <div className="absolute top-5 right-[-65%] flex flex-col"> | ||
| // <button | ||
| // type="button" | ||
| // className={`min-w-fit bg-zinc-700 rounded-t-sm p-1 border-b-[1px] border-b-zinc-600 hover:bg-zinc-600`} | ||
| // onClick={() => openConfigModal('create')} | ||
| // > | ||
| // {t('preset.create_layout')} | ||
| // </button> | ||
| // <button | ||
| // type="button" | ||
| // className={`min-w-fit bg-zinc-700 rounded-b-sm p-1 hover:bg-zinc-600`} | ||
| // onClick={() => openConfigModal('edit')} | ||
| // > | ||
| // {t('preset.update_layout')} | ||
| // </button> | ||
| // </div> | ||
| // )} | ||
| // </> |
There was a problem hiding this comment.
@LucasMaupin The comment on line 168 is for the entire section.
birme
pushed a commit
that referenced
this pull request
Sep 23, 2024
* feat: added another mv-preset and updated code to be arr instead of single-object * feat: added optional style to be added to the options-dropdown * feat: first draft of a multiview-layout setting * feat: possible to create new layouts as multiview-previews and add it to productions
birme
pushed a commit
that referenced
this pull request
Sep 24, 2024
birme
pushed a commit
that referenced
this pull request
Sep 24, 2024
malmen237
added a commit
that referenced
this pull request
Oct 2, 2024
* feat: added another mv-preset and updated code to be arr instead of single-object * feat: added optional style to be added to the options-dropdown * feat: first draft of a multiview-layout setting * feat: possible to create new layouts as multiview-previews and add it to productions
malmen237
added a commit
that referenced
this pull request
Oct 3, 2024
* feat: add management lock * fix: remove left-over file, has been renamed * Feat/thumbnail fetch (#14) * feat: add additional filtering * fix: handle active + source filter, reduce code * fix: allow multiple source type selection * fix: linting * fixup! * feat: sorting ui * fix: add ingest type to database * feat: add sort based on lastConnected * fix: remove duplicate handleSorting call * fixup! * fix: add date to source card * fixup! * fix: add status-not-gone check * fix: linting error * fix: remove unused function * feat: updated to add additional multiviewers in the production-output-modal * feat: updated the functions on the production-page to handle a multiview-array * fix: changed the interface to have multiview as array * feat: updated to handle multiview-array when fetching server and api * fix: updated to stream-handling, not comfortable with the structure of this part * fix: updated to handle multiview-arr * feat: not possible to add output to same port, will cause visible error * fix: changed find to filter and maped through the results * fix: removed dev-logs * fix: correct filtering * fix: lint test fail * fix: changed to a some-check instead of a map * fix: multiview-arr does individual fetch for all mvs and creates unique ids for each * fix: updated ts-error * fix: adding and removing source from active production is working again * fix: added duplicate-check whenever multiviews-arr update and minor fixes * fix: updated multiview-arr-interface to be called multiviews instead of multiview, and minor fixes * fix: bug solve for incorrect gone assignment * fix: some cleanups * style: redesign SourceListItem Thumbnails * feat: imageComponent and sourceListing cleanup * feat: editView always shows same image as listing thumbnail * feat: general sourceList component and GlobalContext * fix: bad main merge * fix: lint * chore: add refresh images to translate and make modal z-index 50 * fix: use translate for refresh thumbnails and delete duplicated code from merge * fix: remove another duplicated line --------- Co-authored-by: Saelmala <[email protected]> Co-authored-by: malmen237 <[email protected]> Co-authored-by: Linda Malm <[email protected]> * feat: add management lock * fix: use global context instead of state * fix: remove duplicates * Feat/thumbnail fetch (#14) * feat: add additional filtering * fix: handle active + source filter, reduce code * fix: allow multiple source type selection * fix: linting * fixup! * feat: sorting ui * fix: add ingest type to database * feat: add sort based on lastConnected * fix: remove duplicate handleSorting call * fixup! * fix: add date to source card * fixup! * fix: add status-not-gone check * fix: linting error * fix: remove unused function * feat: updated to add additional multiviewers in the production-output-modal * feat: updated the functions on the production-page to handle a multiview-array * fix: changed the interface to have multiview as array * feat: updated to handle multiview-array when fetching server and api * fix: updated to stream-handling, not comfortable with the structure of this part * fix: updated to handle multiview-arr * feat: not possible to add output to same port, will cause visible error * fix: changed find to filter and maped through the results * fix: removed dev-logs * fix: correct filtering * fix: lint test fail * fix: changed to a some-check instead of a map * fix: multiview-arr does individual fetch for all mvs and creates unique ids for each * fix: updated ts-error * fix: adding and removing source from active production is working again * fix: added duplicate-check whenever multiviews-arr update and minor fixes * fix: updated multiview-arr-interface to be called multiviews instead of multiview, and minor fixes * fix: bug solve for incorrect gone assignment * fix: some cleanups * style: redesign SourceListItem Thumbnails * feat: imageComponent and sourceListing cleanup * feat: editView always shows same image as listing thumbnail * feat: general sourceList component and GlobalContext * fix: bad main merge * fix: lint * chore: add refresh images to translate and make modal z-index 50 * fix: use translate for refresh thumbnails and delete duplicated code from merge * fix: remove another duplicated line --------- Co-authored-by: Saelmala <[email protected]> Co-authored-by: malmen237 <[email protected]> Co-authored-by: Linda Malm <[email protected]> * fix: errors after conflict solving * fix: build error * fix: remove leftover file, unused import * fix: update lock * Feat/specify multiview layout when doing production-config(#16) * feat: added another mv-preset and updated code to be arr instead of single-object * feat: added optional style to be added to the options-dropdown * feat: first draft of a multiview-layout setting * feat: possible to create new layouts as multiview-previews and add it to productions * feat: added feedback-streams to input-choice for multiviewer-layout * fix: removed unnecessary undefined * fix: when added a new layout it will be chosen in output-form on save * feat: preview and program is now selectable and restructured the way options handle value * feat: separated db-preset into db-preset and db-layout - 'multiview-preset' and 'multiviews' * fix: a folder had accidentily been made as a file * feat: resolved the remaining issues, so preset is turned into a layout and saved in production * fix: resolved rebase-conflicts * fix: updates due to feedback and some label-fixes --------- Co-authored-by: Saelmala <[email protected]> Co-authored-by: Lucas Maupin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this do?
When preparing a production this allows the user to specify where the inputs will go on a multiview. It is not possible to draw a completely new composition with a different amount of views only direct what will go where.
Navigation
A settings-button directs the user to the layout-setting.
Layout
The preview and program-output is now excepted from being editable.
You can choose which preview to start from and then choose a new name for it. It is not possible at the moment to edit a preview, so the name remains the same but with a new layout.
Choose from a list which source you want to be in that view.
Result
When starting the production the multiview will have the new layout that differs from in which order they are on the main layout.
Multiview:
Main layout:
