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

graph merge #2023

Closed
wants to merge 77 commits into from
Closed

graph merge #2023

wants to merge 77 commits into from

Conversation

BrandonTrapp88
Copy link

Pull request to add graph to main branch.

ZiYue01 and others added 30 commits February 21, 2024 14:50
@ZiYue01
Making a change to the text to tes
fb4cf14 
t.
@Adilling3654
Added Graph tab to Nexodus homepage
c972b48
@russellb @mamastor
Use 1GB memory for postgres database instance
dbb1e5c 
This is a temporary change while I look at whether we can make this
the default for dev environments everywhere.
@mamastor
UI things
14fcb34
@mamastor
Merge branch 'nexodus-io:main' into main
83a303a
@BrandonTrapp88
Merge branch 'nexodus-io:main' into main
88eecbc
@Adilling3654
Updated dependencies for testing
9c22a1d
@Adilling3654
Add the path to the graph tab as a custom route rather than a resourc…
5996ff0 
…e for testing purposes
getRemap
47912a2
Merge branch 'main' of https://github.com/BrandonTrapp88/nexodusProject
4adb1ab
Added device and relay nodes to Dashboard.tsx to use for Graph.tsx.
8c2f6de
apiChanges
3a12eb5
Merge branch 'main' of https://github.com/BrandonTrapp88/nexodusProject
f099441
@Adilling3654
Added another test graph using ReactFlow
f2ac106
@mamastor
database and status handler
d06e065
@mamastor
more database and status handler
16070c6
migration
d349475
migration
758bb28
updateStatus
bb884dc
updateStatus
543f826
Updated node designs and added two additional columns in the table.
39b1429
Merge branch 'main' of https://github.com/BrandonTrapp88/nexodusProject
29488d3
@mamastor
Merge remote-tracking branch 'upstream/main'
453e681
Status_test
a46ff0a
Merge branch 'main' of https://github.com/BrandonTrapp88/nexodusProject
301c0d4
statusUpdate
030bf78
new api changes
6c8696e
getStatus Commit
3e7ba9b
@Adilling3654
Added ConnectivityProbe function be called every 5-seconds
1b182d1
@Adilling3654
Merge branch 'main' of https://github.com/BrandonTrapp88/nexodusProject
b098c5d
mamastor and others added 20 commits April 1, 2024 18:45
@mamastor
documentation
bdc43f2 
docs 4
@mamastor
Merge pull request #3 from BrandonTrapp88/documentation
30b4ec1 
Documentation
deleteStatusesOperation added
0490cac
@Adilling3654
Removed uneeded scripts,added comments for Graph code & method to con…
4f2d439 
…vert test JSON data to device nodes
@Adilling3654
Merge branch 'main' of https://github.com/BrandonTrapp88/nexodusProject
0688357
deleteStatus error fix
2e6ddf9
@mamastor
FetchStatus
d263409 
Fetch status to graph nodes
nodes connect to central node
c87c964
@Adilling3654
Added test for relay node connections
dfeeea9
moveable nodes
522a08b
Merge branch 'main' of https://github.com/BrandonTrapp88/nexodusProject
71cbff1
@ZiYue01
Added code to change device node border color depending on latency
a549632
@mamastor
fetch timer
4199b09 
fetches every 3 minutes
@mamastor
docs update
47818d4 
more documentation
@mamastor
update docs
3606160 
typos
@mamastor
more mistakes
79b5812 
last one... hopefully
@ZiYue01
Updated latency numbers
e3d1c5e
@Adilling3654
Relay node now shows relevant info + latency
13f1425
@Adilling3654
Merge branch 'main' of https://github.com/BrandonTrapp88/nexodusProject
77fbdf0
@Adilling3654
merge adjustments
69c5b4d
@netlify Netlify
Copy link

netlify bot commented Apr 23, 2024 •
edited
Loading

❌ Deploy Preview for nexodus-docs failed.

Name Link
🔨 Latest commit a667d2e
🔍 Latest deploy log https://app.netlify.com/sites/nexodus-docs/deploys/662812d0a939aa00085212a5

@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 23, 2024

@BrandonTrapp88, this pull request is now in conflict and requires a rebase.

@mergify mergify bot added needs-rebase missing-docs-label missing has-docs or no-docs-needed missing-design-label missing has-design or no-design-needed label missing-tests-label This PR is missing a tests label, has-tests or no-tests-required labels Apr 23, 2024
@mergify mergify bot removed the needs-rebase label Apr 23, 2024
@mergify Mergify
Copy link
Contributor

mergify bot commented Apr 23, 2024

⚠️ The sha of the head commit of this PR conflicts with #2024. Mergify cannot evaluate rules on this PR. ⚠️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
missing-design-label missing has-design or no-design-needed label missing-docs-label missing has-docs or no-docs-needed missing-tests-label This PR is missing a tests label, has-tests or no-tests-required
Projects
Nexodus Board
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@BrandonTrapp88 @ZiYue01 @Adilling3654 @russellb @mamastor