Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 04c2186
Author: Joe Heffernan <[email protected]>
Date:   Thu Feb 15 16:56:06 2024 -0800

    commit lock file

commit 05bba98
Author: Joe Heffernan <[email protected]>
Date:   Thu Feb 15 09:38:03 2024 -0800

    Squashed commit of the following:

    commit f352762
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Feb 14 17:42:55 2024 -0800

        Fix/bump react (#461)

        * bump react, react-waypoint, react dom, @types/react

        * declare children in sider and upload props for react 18 compatibility

        * bump @types/react-dom

        * use createRoot API to render App

        * commit lock file

        * bump to viewer 3.7.0 with react 18

        * use non-null assertion on container in createRoot call

    commit 39a6f7b
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Jan 29 19:28:31 2024 -0800

        Bump follow-redirects from 1.15.2 to 1.15.4 (#460)

        Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
        - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
        - [Commits](follow-redirects/follow-redirects@v1.15.2...v1.15.4)

        ---
        updated-dependencies:
        - dependency-name: follow-redirects
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 6b26307
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Jan 29 19:28:19 2024 -0800

        Bump plotly.js from 2.20.0 to 2.25.2 (#457)

        Bumps [plotly.js](https://github.com/plotly/plotly.js) from 2.20.0 to 2.25.2.
        - [Release notes](https://github.com/plotly/plotly.js/releases)
        - [Changelog](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md)
        - [Commits](plotly/plotly.js@v2.20.0...v2.25.2)

        ---
        updated-dependencies:
        - dependency-name: plotly.js
          dependency-type: direct:production
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 38dda7c
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jan 4 10:27:17 2024 -0800

        open aics homepage in new tab (#454)

    commit 106935b
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Dec 19 11:51:35 2023 -0800

        Feature/color picker (#432)

        * initial components and styling

        * shrink checkbox to expose swatch

        * shrink chexbox to make swatch clickable

        * pass data into color swatch

        * remove unused styling

        * handleColorChange in picker

        * pass props and helders to color picker modal

        * add colorPicker to color swatch

        * types actions constants selectors for colorChanges

        * selector in viewer panel

        * preserve initial color in swatch

        * style parent swatch when children dont match

        * recent colors into redux

        * change modal to popover

        * update import

        * clean up stylesheets

        * tidy css and imports

        * bump viewer version

        * remove extra ?

        * update viewer

        * viewerpanel selector test update

        * update dependecies

        * add tests for getColorChanges

        * fix type imports in selectors

        * web app version

        * remove comment

        * consolidate colorpicker and popover

        * organize props and style rules

        * pointer on color swatch

        * formatting

        * color picker tooltip color to constant

        * swap replace for slice

        * debounce color selection

        * implement orthographic camera

        * initial styling of camera controls

        * ortho/perspective icons

        * define viewer button color variables

        * focus:hover state on home button

        * playback control styling

        * fix button exceeding border

        * orth/persp icons swapped

        * remove redundant ternary

        * rename set camera

        * audit fix (#437)

        * change check for if a file is shareable (#439)

        * change check for if a file is shareable

        * use constant for trajFileName

        * use selector instead of type guard

        * add unit test

        * remove accidental auto import

        * Update ux_issue.md (#433)

        * menu item and modal

        * removing logs

        * remove unneeded jsx fragment wrappers

        * remove commented code

        * styling update

        * remove comments

        * typo

        * prevent bg color change after click

        * Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

        * fix menus offsets (#440)

        * fix menus offsets

        * move version info

        * update viewer to 3.6.3

        * update viewer and fix types (#445)

        * 0.10.0

        * remove redunant line

        * implement orthographic camera

        * initial styling of camera controls

        * define viewer button color variables

        * focus:hover state on home button

        * playback control styling

        * orth/persp icons swapped

        * remove redundant ternary

        * install new viewer version

        * rename set camera

        * menu item and modal

        * removing logs

        * remove unneeded jsx fragment wrappers

        * remove commented code

        * styling update

        * remove comments

        * typo

        * Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

        * fix menus offsets (#440)

        * fix menus offsets

        * move version info

        * update viewer to 3.6.3

        * update viewer and fix types (#445)

        * pass down actions from model panel to picker

        * add hover state rules

        * pass in debouncedColor

        * [to undo] - local install

        * remove colorChangesMap

        * prevent color assignment on first opening picker

        * fix typing and save all color changes

        * make color change an object

        * install

        * store colors for correct rendering

        * add a done call

        * change interface

        * install viewer

        * update viewer

        * remove old style sheet

        * clean up styles and change order on parents

        * style children selection row

        * style labels

        * style sub menu better

        * clean up styles

        * revert change

        * make sure colors are consistently cased

        * fix imports

        * wip - not have popover move up

        * remove color swatch component and get color picker aligned with swatch

        * flx classnames

        * fix typo

        * fix checkall button

        * fix classname

        * make render functions for colorpicker

        * keep swatch constant until color is set, change label to "previous"

        * adjusting labels

        * Update src/components/CheckBoxTree/style.css

        Co-authored-by: Peyton Lee <[email protected]>

        * rename colors

        * sync children remove log

        * Fix/viewer imports (#453)

        * fix imports to be from the top level

        * update viewer

        * Update src/components/SharedCheckbox/style.css

        Co-authored-by: Cameron Fraser <[email protected]>

        * remove return

        * clean up styling

        * change names of checkboxtree components

        ---------

        Co-authored-by: Megan Riel-Mehan <[email protected]>
        Co-authored-by: Lyndsay <[email protected]>
        Co-authored-by: Blair Lyons <[email protected]>
        Co-authored-by: Peyton Lee <[email protected]>
        Co-authored-by: Cameron Fraser <[email protected]>

    commit 7bfdc1f
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Fri Dec 8 14:21:10 2023 -0800

        Bump @adobe/css-tools from 4.3.1 to 4.3.2 (#449)

        Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2.
        - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
        - [Commits](https://github.com/adobe/css-tools/commits)

        ---
        updated-dependencies:
        - dependency-name: "@adobe/css-tools"
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit 37a5fee
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 14:18:05 2023 -0800

        Update test-coverage.yml

    commit f926754
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 14:15:46 2023 -0800

        Update test-coverage.yml

    commit 16de0a0
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Fri Dec 8 14:03:32 2023 -0800

        Bump axios from 0.21.4 to 1.6.0 (#447)

        Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0.
        - [Release notes](https://github.com/axios/axios/releases)
        - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
        - [Commits](axios/axios@v0.21.4...v1.6.0)

        ---
        updated-dependencies:
        - dependency-name: axios
          dependency-type: direct:production
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
        Co-authored-by: meganrm <[email protected]>

    commit 8fad286
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Dec 8 13:53:25 2023 -0800

        check if it's a dependabot PR (#450)

    commit 4d149c8
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Dec 4 13:35:30 2023 -0800

        Bump @babel/traverse from 7.20.5 to 7.23.2 (#442)

        Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.20.5 to 7.23.2.
        - [Release notes](https://github.com/babel/babel/releases)
        - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
        - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

        ---
        updated-dependencies:
        - dependency-name: "@babel/traverse"
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

    commit b432dff
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Nov 29 13:34:18 2023 -0800

        Fix/share download styling (#448)

        * add color

        * remove pipe and fix button order

        * fix download button styling

        * fix share button styling

        * remove whitespace

        * change hover state selector to sync with tooltip

        * turn functions to boolean constants

        * streamline tooltip constants

        * move btn styles to appheader

    commit c6eaea3
    Author: Blair Lyons <[email protected]>
    Date:   Mon Oct 23 11:06:47 2023 -0700

        0.10.0

    commit f13dcb0
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Fri Oct 20 12:46:48 2023 -0700

        update viewer and fix types (#445)

    commit 4baff29
    Author: Blair Lyons <[email protected]>
    Date:   Thu Oct 19 14:49:46 2023 -0700

        update viewer to 3.6.3

    commit ca5ac24
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Oct 16 10:41:45 2023 -0700

        fix menus offsets (#440)

        * fix menus offsets

        * move version info

    commit 244e726
    Merge: 60326cf 836510a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Oct 11 13:32:07 2023 -0700

        Merge pull request #423 from simularium/feature/version-info

        Feature/version info

    commit 836510a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Oct 11 11:47:54 2023 -0700

        Update src/components/HelpMenu/index.tsx

        Co-authored-by: Megan Riel-Mehan <[email protected]>

    commit caac57b
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Oct 10 12:51:42 2023 -0700

        prevent bg color change after click

    commit 23be0d4
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 15:27:12 2023 -0700

        typo

    commit 141b037
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:34:44 2023 -0700

        remove comments

    commit 8dcccc1
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:34:28 2023 -0700

        styling update

    commit 4c215c7
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:14:01 2023 -0700

        remove commented code

    commit 72c2e8d
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Oct 9 14:10:35 2023 -0700

        remove unneeded jsx fragment wrappers

    commit dcff5c8
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 11:27:55 2023 -0700

        removing logs

    commit 3e9d578
    Author: Joe Heffernan <[email protected]>
    Date:   Tue May 23 10:56:42 2023 -0700

        menu item and modal

    commit 60326cf
    Author: Lyndsay <[email protected]>
    Date:   Mon Oct 9 12:57:20 2023 -0700

        Update ux_issue.md (#433)

    commit 72f1a23
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Oct 9 12:57:08 2023 -0700

        change check for if a file is shareable (#439)

        * change check for if a file is shareable

        * use constant for trajFileName

        * use selector instead of type guard

        * add unit test

        * remove accidental auto import

    commit 67f2f58
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Thu Oct 5 13:28:50 2023 -0700

        audit fix (#437)

    commit af14d01
    Merge: 1314eed a78dee4
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Sep 8 14:50:10 2023 -0700

        Merge pull request #430 from simularium/feature/orthographic-ui

        Feature/orthographic UI

    commit a78dee4
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Sep 8 09:21:09 2023 -0700

        rename set camera

    commit 49598cc
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 28 19:00:29 2023 -0700

        install new viewer version

    commit d5b8440
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 17 16:16:45 2023 -0700

        remove redundant ternary

    commit aa0fc41
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 17 16:15:09 2023 -0700

        orth/persp icons swapped

    commit 1b92d70
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Aug 16 13:50:33 2023 -0700

        fix button exceeding border

    commit 4969ca9
    Merge: 29137a3 1314eed
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Aug 16 13:28:05 2023 -0700

        Merge branch 'main' into feature/orthographic-ui
        merging main

    commit 29137a3
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 14 13:01:55 2023 -0700

        playback control styling

    commit 8756d05
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Aug 14 13:00:59 2023 -0700

        focus:hover state on home button

    commit 4506ce9
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:26:56 2023 -0700

        define viewer button color variables

    commit f3cc830
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:25:50 2023 -0700

        ortho/perspective icons

    commit b23d847
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:25:26 2023 -0700

        initial styling of camera controls

    commit fab1840
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Aug 10 12:23:15 2023 -0700

        implement orthographic camera

    commit 1314eed
    Merge: 2c949aa b9c37b2
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jul 20 16:37:06 2023 -0700

        Merge pull request #424 from simularium/feature/share-time-url

        Feature/share time url

    commit b9c37b2
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jul 20 13:19:13 2023 -0700

        tooltip handler edit, fix alignment on time input

    commit 2c949aa
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Mon Jul 17 14:56:28 2023 -0700

        Update CODEOWNERS

    commit 81bce36
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Tue Jul 11 16:17:20 2023 -0700

        change gh-deploy to be a dev build (#426)

    commit 01468c3
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Tue Jul 11 16:17:03 2023 -0700

        Update CONTRIBUTING.md (#425)

    commit 5ad5660
    Merge: 0b79159 5dda5da
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 17:41:25 2023 -0700

        Merge branch 'feature/share-time-url' of https://github.com/simularium/simularium-website into feature/share-time-url

    commit 0b79159
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 17:41:18 2023 -0700

        reduce annotations

    commit 5dda5da
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 15:13:51 2023 -0700

        update return type receiveTimeChange

    commit 5113dfe
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 13:57:59 2023 -0700

        update test

    commit 1e226e8
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 13:48:29 2023 -0700

        test for editUrlParams and clean up

    commit b93f789
    Author: meganrm <[email protected]>
    Date:   Tue Jun 27 12:19:00 2023 -0700

        changed names of functions

    commit 6dfe513
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:58:00 2023 -0700

        gh actions from ubuntu to macos

    commit 1d1b73a
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:57:14 2023 -0700

        add jest coverage reporters

    commit 9a62549
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:50:41 2023 -0700

        update jest

    commit d58b4c6
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 27 11:48:56 2023 -0700

        update jest coverage

    commit 0da60eb
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Jun 26 12:15:10 2023 -0700

        ternary -> object, styling names, add href

    commit b0f81ce
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 23 15:17:45 2023 -0700

        initial unit test

    commit ecb0b9a
    Merge: fb2a54f 918556c
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:48:15 2023 -0700

        Merge branch 'main' into feature/share-time-url

    commit fb2a54f
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:11:04 2023 -0700

        space share and download buttons

    commit 0245f77
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 13:07:33 2023 -0700

        move tooltip

    commit f929046
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 04deea2
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit ee811e7
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit 9e17781
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit 2166dc1
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 820afca
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit ce60a9d
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit 41ea887
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit 305955e
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 20 15:48:53 2023 -0700

        move tooltip and unessary async

    commit 6b21353
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:06:24 2023 -0700

        remove comment

    commit f794da1
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:41:10 2023 -0700

        removing isDownloading

    commit 70db90b
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:29:04 2023 -0700

        removing styling typo

    commit 5b516c0
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 11:29:15 2023 -0700

        clean up comment

    commit 8c2ac5e
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 10:36:47 2023 -0700

        use viewer getasblob method, bump viewer

    commit a1dfdb1
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Thu May 18 22:23:10 2023 +0000

        use href for direct download if remote file

    commit b2e1bad
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:56:07 2023 -0700

        removing comments

    commit 8ff2ad8
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:51:47 2023 -0700

        disable button during downloading

    commit 4448920
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:04:22 2023 -0700

        cleaning

    commit 2a7b3d1
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:03:06 2023 -0700

        cleanup

    commit 00fcfb4
    Author: Joe Heffernan <[email protected]>
    Date:   Thu May 4 11:53:55 2023 -0700

        styling, adding pipe divider

    commit dbd6322
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 3 14:04:03 2023 -0700

        added download functionality

    commit 13d0057
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 3 09:15:09 2023 -0700

        intial ui components

    commit 918556c
    Merge: 0749f1a f995097
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 09:12:17 2023 -0700

        Merge pull request #422 from simularium/feature/download-trajectory

        Feature/download trajectory

    commit f995097
    Merge: 39a70ca 0749f1a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 21 09:09:55 2023 -0700

        Merge branch 'main' into feature/download-trajectory

    commit 39a70ca
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 8319dc7
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit 054e670
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit cec3e9b
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit bb10334
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 20 15:48:53 2023 -0700

        move tooltip and unessary async

    commit 7993889
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 14 15:24:34 2023 -0700

        remove redundant action from reducer

    commit 67a2a63
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 14 15:22:33 2023 -0700

        remove blue text class

    commit 225ebfd
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 14 14:52:42 2023 -0700

        shift style rules, add light theme, remove buffer

    commit 0749f1a
    Merge: cc135e8 ac22916
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 9 15:58:13 2023 -0700

        Merge pull request #417 from simularium/feature/updated-looping-playback

        looping playback and tooltip styling

    commit 96eca5c
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 9 10:30:15 2023 -0700

        clean up

    commit f2ba682
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 9 10:09:16 2023 -0700

        consolidate redundant functions

    commit 57c1e4e
    Author: Joe Heffernan <[email protected]>
    Date:   Fri Jun 9 09:56:47 2023 -0700

        move clear and rest params to utils

    commit b5a9bbe
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 8 17:37:34 2023 -0700

        clear old params before setting url

    commit 8f668d6
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 8 13:54:24 2023 -0700

        cleaning

    commit 7a954ca
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 8 13:52:52 2023 -0700

        mapping prop to dispatch

    commit 8b8aa1b
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 8 10:22:02 2023 -0700

        update viewer

    commit c8bb399
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:06:24 2023 -0700

        remove comment

    commit 164a6c0
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:02:57 2023 -0700

        remove unused imports

    commit 3a89200
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 08:00:09 2023 -0700

        hover styling

    commit 63013b0
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:17:22 2023 -0700

        nested ternary -> if/else

    commit ac22916
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Jun 7 07:00:08 2023 -0700

        remove unused values, clean up

    commit 903c09e
    Author: Joe Heffernan <[email protected]>
    Date:   Tue Jun 6 16:25:41 2023 -0700

        add util func, move logic trigger to viewer panel

        Co-authored-by: Megan Riel-Mehan <[email protected]>

    commit c1d6364
    Author: Joe Heffernan <[email protected]>
    Date:   Mon Jun 5 09:09:44 2023 -0700

        update viewer version

    commit 48537b5
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:41:10 2023 -0700

        removing isDownloading

    commit e14f332
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 14:29:04 2023 -0700

        removing styling typo

    commit c87f78b
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 11:29:15 2023 -0700

        clean up comment

    commit d2f5691
    Author: Joe Heffernan <[email protected]>
    Date:   Thu Jun 1 10:36:47 2023 -0700

        use viewer getasblob method, bump viewer

    commit 73bba1a
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 31 10:58:46 2023 -0700

        update viewer

    commit e5a1a70
    Author: Joe Heffernan <[email protected]>
    Date:   Tue May 23 15:09:04 2023 -0700

        refactor to use displayTimes

    commit 4391367
    Author: Joe Heffernan <[email protected]>
    Date:   Mon May 22 13:06:31 2023 -0700

        truncating decimals in url

    commit c06702d
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 19 14:53:02 2023 -0700

        rename components and clean up functions

    commit 6a5ed73
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Thu May 18 22:23:10 2023 +0000

        use href for direct download if remote file

    commit 9e50b00
    Author: Joe Heffernan <[email protected]>
    Date:   Thu May 18 13:18:43 2023 -0700

        ui components for share time in url

    commit 12836f5
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:56:07 2023 -0700

        removing comments

    commit d6ebc41
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 10 14:25:29 2023 -0700

        remove redundant actions

    commit 84b3681
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:51:47 2023 -0700

        disable button during downloading

    commit 6a14428
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:04:22 2023 -0700

        cleaning

    commit 2faf8d2
    Author: Joe Heffernan <[email protected]>
    Date:   Fri May 5 11:03:06 2023 -0700

        cleanup

    commit e318c4d
    Author: Joe Heffernan <[email protected]>
    Date:   Thu May 4 11:53:55 2023 -0700

        styling, adding pipe divider

    commit 3538d1f
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 3 14:04:03 2023 -0700

        added download functionality

    commit 57b5c1f
    Author: Joe Heffernan <[email protected]>
    Date:   Wed May 3 09:15:09 2023 -0700

        intial ui components

    commit f320abe
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 13:45:47 2023 -0700

        removing unused imports

    commit 0221067
    Author: Joe Heffernan <[email protected]>
    Date:   Wed Apr 26 12:52:01 2023 -0700

        looping playback and tooltip styling

    commit cc135e8
    Author: ascibisz <[email protected]>
    Date:   Fri Apr 21 13:53:12 2023 -0700

        update version for add-to-project action

    commit ec1b5f0
    Author: Megan Riel-Mehan <[email protected]>
    Date:   Tue Apr 18 12:13:10 2023 -0700

        Update CODEOWNERS

    commit dbe5b58
    Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Date:   Mon Apr 10 11:07:06 2023 -0700

        Bump json5 from 1.0.1 to 1.0.2 (#404)

        Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
        - [Release notes](https://github.com/json5/json5/releases)
        - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
        - [Commits](json5/json5@v1.0.1...v1.0.2)

        ---
        updated-dependencies:
        - dependency-name: json5
          dependency-type: indirect
        ...

        Signed-off-by: dependabot[bot] <[email protected]>
        Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
interim17 committed Feb 16, 2024
1 parent 9ae0195 commit 3dcfdd8
Show file tree
Hide file tree
Showing 6 changed files with 406 additions and 18,861 deletions.
19,240 changes: 390 additions & 18,850 deletions package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
"@types/jest": "^26.0.24",
"@types/jsdom": "12.2.2",
"@types/lodash": "4.14.121",
"@types/react": "^16.9.49",
"@types/react-dom": "^16.9.8",
"@types/react": "^18.2.39",
"@types/react-dom": "^18.2.17",
"@types/react-plotly.js": "^2.2.4",
"@types/react-router-dom": "^5.1.5",
"@types/sinon": "7.0.6",
Expand Down Expand Up @@ -93,7 +93,7 @@
"webpack-dev-server": "^4.10.1"
},
"dependencies": {
"@aics/simularium-viewer": "^3.6.4",
"@aics/simularium-viewer": "^3.7.0",
"@ant-design/css-animation": "^1.7.3",
"@ant-design/icons": "^4.0.6",
"antd": "^4.23.6",
Expand All @@ -103,18 +103,18 @@
"core-js": "2.5.5",
"lodash": "^4.17.20",
"moment": "^2.29.4",
"plotly.js": "^2.20.0",
"plotly.js": "^2.25.2",
"query-string": "^6.13.1",
"raf": "^3.4.1",
"react": "^16.9.0",
"react": "^18.2.0",
"react-colorful": "^5.6.1",
"react-dom": "^16.9.0",
"react-dom": "^18.2.0",
"react-hotkeys-hook": "^3.3.2",
"react-markdown": "^7.0.1",
"react-plotly.js": "^2.5.0",
"react-redux": "^8.0.4",
"react-router-dom": "^5.2.0",
"react-waypoint": "^9.0.3",
"react-waypoint": "^10.3.0",
"redux": "4.2.0",
"redux-logic": "^3.0.3",
"reselect": "4.0.0",
Expand Down
2 changes: 2 additions & 0 deletions src/components/Icons/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export const AicsLogo = <img src={AicsLogoWhite} style={{ width: "140px" }} />;
export const StepForward = <img src={ClockwiseArrow} />;
export const StepBack = <img src={CounterClockwiseArrow} />;
export const BetaTag = <img src={Beta} style={{ width: "42px" }} />;
export const OrthographicCamera = <img src={Orthographic} />;

Check failure on line 50 in src/components/Icons/index.tsx

View workflow job for this annotation

GitHub Actions / Type Check

Cannot redeclare block-scoped variable 'OrthographicCamera'.
export const PerspectiveCamera = <img src={Perspective} />;

Check failure on line 51 in src/components/Icons/index.tsx

View workflow job for this annotation

GitHub Actions / Type Check

Cannot redeclare block-scoped variable 'PerspectiveCamera'.
export const UpRightArrow = <ArrowLeftOutlined rotate={135} />;
export const OrthographicCamera = <img src={Orthographic} />;

Check failure on line 53 in src/components/Icons/index.tsx

View workflow job for this annotation

GitHub Actions / Type Check

Cannot redeclare block-scoped variable 'OrthographicCamera'.
export const PerspectiveCamera = <img src={Perspective} />;

Check failure on line 54 in src/components/Icons/index.tsx

View workflow job for this annotation

GitHub Actions / Type Check

Cannot redeclare block-scoped variable 'PerspectiveCamera'.
Expand Down
1 change: 1 addition & 0 deletions src/components/LocalFileUpload/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ interface FileUploadProps {
maxCount?: number;
multiple?: boolean;
name?: string;
children?: React.ReactNode;
}

/**
Expand Down
1 change: 1 addition & 0 deletions src/components/SideBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import styles from "./style.css";
interface SiderProps {
type: string;
onCollapse: (open: boolean) => void;
children?: React.ReactNode;
}

interface SiderState {
Expand Down
9 changes: 5 additions & 4 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import "core-js/es6/promise";
import "core-js/es6/set";

import React from "react";
import { render } from "react-dom";
import { createRoot } from "react-dom/client";
import { Provider, useDispatch, batch } from "react-redux";
import { Layout } from "antd";
import { BrowserRouter, Switch, Route, useLocation } from "react-router-dom";
Expand Down Expand Up @@ -95,6 +95,7 @@ console.log("Welcome to Simularium " + SIMULARIUM_BUILD_ENVIRONMENT + " build");
console.log("Simularium Website Version " + SIMULARIUM_WEBSITE_VERSION);
console.log("Simularium Viewer Version " + SIMULARIUM_VIEWER_VERSION);

const renderApp = () => render(<App />, document.getElementById(APP_ID));

renderApp();
const container: HTMLElement | null = document.getElementById(APP_ID);
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const root = createRoot(container!);
root.render(<App />);

0 comments on commit 3dcfdd8

Please sign in to comment.