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.

Sign up for GitHub

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

Jump to bottom

Fix: Interactive mode switching #878

Merged
merged 64 commits into from
Dec 2, 2024
Merged

Fix: Interactive mode switching #878

merged 64 commits into from
Dec 2, 2024

Conversation

amovar18
Copy link
Collaborator

@amovar18 amovar18 commented Dec 2, 2024 •
edited
Loading

Description

This PR aims to fix the interactive mode switching and adds the following changes to the timeline:

  • Users should be able to go back to the same website node.
  • If a user has already visited a node and the animation has completed, show the down arrow and open the drawn flow
  • As the user visits different websites, show numbers on the nodes in order they visited.
  • Add next/prev button should be added to interactive mode too

Relevant Technical Choices

Testing Instructions

  • Clone this branch.
  • In the terminal run npm i && npm run dev:ee:pa.
  • Now in the canvas try switching between interactive and non interactive mode.

Additional Information:

Screenshot/Screencast

Checklist

  • I have thoroughly tested this code to the best of my abilities.
  • I have reviewed the code myself before requesting a review.
    - [ ] This code is covered by unit tests to verify that it works as intended. N.A
    - [ ] The QA of this PR is done by a member of the QA team (to be checked by QA). N.A

Partially addresses #857

@amovar18 amovar18 self-assigned this Dec 2, 2024
@amovar18 amovar18 added this to the v0.12 milestone Dec 2, 2024
@amovar18 amovar18 changed the base branch from develop to main December 2, 2024 11:43
@amovar18 amovar18 changed the base branch from main to develop December 2, 2024 11:43
amovar18 and others added 26 commits December 2, 2024 17:25
@amovar18
Conifgure webpack to spit dist folder.
5cff780
@amovar18
Add styles to extension.
924c1f9 
Add html of canvas to extension.
@amovar18
Use App exported from index.js
fe6be1e
@amovar18
Remove circular dependency.
e009e38
@amovar18
Fix calculation in bubblr click listener.
60675df
@amovar18
Fix the bubbles calculation for interactive mode.
c5c55ce
@mohdsayed @amovar18
Move explorable explaination tab next to overview
31cf480
@mohdsayed @amovar18
Reduce font size of Interactive mode and multi seller
8aed13d
@amovar18
Calculate height and width of the expanded bubble according to the pa…
3837c21 
…rentNode viewport.
@amovar18
Calculate height and width of the expanded bubble according to the pa…
12c8e28 
…rentNode viewport.
@amovar18
Fix returning promise.
5dba46c
@amovar18
Silence errors and handle ending of the loop.
ca3894f
@amovar18
Add reset button to EE.
6674623
@amovar18
Remvove react wrapper.
ee943e3
@amovar18
Fix undefined color error.
195ba86
@amovar18
Disable previous and next button when timeline ends.
5b58af8
@amovar18
Add DSP boxes for bidding.
cb19cbd 
Add boxes for show winning ad.
Fix the date time branch for publisher 2.
@amovar18
Fix bubble generation for interactive mode.
2bf6c85
@amovar18
Add promise queue.
925b575
@amovar18
Implement new promise queue and modify next and previous function.
390c88e
@amovar18
Using window variable.
1d3d327
@amovar18
Fix promise queue.
42d548f
@amovar18
Modify promise queue.
561aa0a
@amovar18
Fix bugs.
c301ca8
@amovar18
Fix errors.
e6b0d07
@amovar18
Fix misc conditions.
a91015c
@amovar18 amovar18 marked this pull request as ready for review December 2, 2024 12:44
mohdsayed
mohdsayed approved these changes Dec 2, 2024
View reviewed changes
Copy link
Collaborator

@mohdsayed mohdsayed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@mohdsayed mohdsayed merged commit 680c087 into develop Dec 2, 2024
6 checks passed
@mohdsayed mohdsayed deleted the fix/bugs-ee branch December 2, 2024 13:30
amovar18 added a commit that referenced this pull request Dec 12, 2024
@amovar18 @mohdsayed
Fix: Interactive mode switching (#878)
a23716e 
* Conifgure webpack to spit dist folder.

* Add styles to extension.
Add html of canvas to extension.

* Use App exported from index.js

* Remove circular dependency.

* Fix calculation in bubblr click listener.

* Fix the bubbles calculation for interactive mode.

* Move explorable explaination tab next to overview

* Reduce font size of Interactive mode and multi seller

* Calculate height and width of the expanded bubble according to the parentNode viewport.

* Calculate height and width of the expanded bubble according to the parentNode viewport.

* Fix returning promise.

* Silence errors and handle ending of the loop.

* Add reset button to EE.

* Remvove react wrapper.

* Fix undefined color error.

* Disable previous and next button when timeline ends.

* Add DSP boxes for bidding.
Add boxes for show winning ad.
Fix the date time branch for publisher 2.

* Fix bubble generation for interactive mode.

* Add promise queue.

* Implement new promise queue and modify next and previous function.

* Using window variable.

* Fix promise queue.

* Modify promise queue.

* Fix bugs.

* Fix errors.

* Fix misc conditions.

* Add mechanism for development mode.

* Fix bugs in development mode.

* Fix bubble generation calls.

* Fix timeline issue of toggling.

* Remove unused config variables.

* Do not disable the previous and next button.

* Fix bug.

* Add index visited.

* Add visited index number.

* Move state controllers to app.

* Fix webpack config.

* Code improvements

* Improve code

* Add comment for utils.disableButtons.

* Fix cursor.

* Fix disableButton call.

* Fix bug post merge.

* Fix reference for circleVisitedIndex.

* Add baseline displaying visited diagram.

* Adjust the number in the visited node.

* Fix auction display on revisit.

* Fix number display in interactive mode.

* Add next and previous button for inteeractive mode.

* Fix logic of displaying flow.

* Fix bug.

* Fix icons displaying on revisiting node.

* Fix post merge conflicts bug.

* Fix post rebase.

* Comment out code.

* Fix failing lint.

* Fix linter

* Change PromiseQueue to promiseQueue.

* Add code improvements.

* Remove artifact.

* Fix file name.

* Fix mode switching.

* Add .js to file imports.

* Rename file.

---------

Co-authored-by: sayedtaqui <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mohdsayed mohdsayed mohdsayed approved these changes

@mayan-000 mayan-000 Awaiting requested review from mayan-000

Assignees

@amovar18 amovar18

Labels
None yet
Projects
PS Analysis Tool
Status: Done
Milestone
v0.12
Development

Successfully merging this pull request may close these issues.
2 participants
@amovar18 @mohdsayed