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

Final merges completed #22

Closed
wants to merge 120 commits into from
Closed

Final merges completed #22

wants to merge 120 commits into from

Conversation

Umius-Brian
Copy link
Contributor

Merging finalized production project into master branch

ajlee12 and others added 30 commits May 6, 2020 13:39
@ajlee12
updated settings after trying the switch from dummy-micrsvc to master.
9bec3a6
@ajlee12
Added time-elapsed data (ms) next to points in RouteTrace rendering.
4420fdc
@ajlee12
Changed some styling to display routeTimeDiff next to routeText (disp…
cb2b7a0 
…lay: flex for .RouteCircle)
@Umius-Brian
Implement first iteration of pie chart
81106df
@ajlee12
Commented out two cnsl.logs in SvcOverview; adding cnsl.logs in route…
b8b3627 
…-trace. Tested taht 3-pt route displays time difference data.
@ajlee12
Changed Date.parse() to new Date() (better practice!)
46998d5
@alon25
revamp2
98b491d
@Umius-Brian
Re-render request, response, and speed charts
2e7a23f
@Umius-Brian
Fix colors on request, response, and speed charts
0925717
@ajlee12
Constructed avgDataObj with counts, totalTime, avgTime of requests tr…
9c9eca6 
…aveling btw routes.
@Umius-Brian
Re-render processes chart
5305df5
@Umius-Brian
Re-render latency chart
77a74a6
@Umius-Brian
Re-render temperature chart
58a0a7d
@ajlee12
Rendered avg-time data in 3 categories (avgTime, totalTime, #of trips…
c956931 
…) inside a scroll-box. Tweaked some styling.
@Umius-Brian
Update legend orientation
2a07ebe
@Umius-Brian
Re-render all charts to friendly UI
56fc2a6
@Umius-Brian
Add tick labels and change temperature bar graph
a18d1a7
@alon25
Modularization
bcf891b
@ajlee12
user settings json updated.
d26f5f0
@alon25
Toggle Services
c60b251
@alon25
setup ADD DELETE
1fdb96e
@alon25
Split CSS
370928e
@alon25
Split Stylesheets
61957a2
@ajlee12
last commit before merging into local master.
e234320
@ajlee12
Merge branch 'time-stamp'
fbcd90e
@alon25
Managing App State
8f37578
@alon25
Fixed MS buttons
47c2ff4
@alon25
Fixed Window Size
ab5028e
@alon25
Graphs
a277819
@alon25
Fixed Add Service Rendering
d0a998e
Umius-Brian and others added 25 commits May 14, 2020 16:10
@Umius-Brian
Merge branch 'staging' of https://github.com/oslabs-beta/Chronos into…
3fe4baf 
… MVP-Features
@Umius-Brian
Updates before MVP presentation
8b19c1e
@briannasookhoo
Merge pull request #18 from Umius-Brian/MVP-Features
beae2ca 
MVP Features
@Umius-Brian
Add TravisCI for testing and deployment
f876cd7
@Umius-Brian
Merge pull request #19 from Umius-Brian/MVP-Features
1cb2025 
Add TravisCI for testing and deployment
@Umius-Brian
Fix yaml file
65f34da
@Umius-Brian
Fix node rule for yaml file
eb623ec
@Umius-Brian
Delete routes component
85f1193
@Umius-Brian
Merge pull request #21 from Umius-Brian/MVP-Features
961c920 
MVP Features
@Umius-Brian
Change darwin OS platform to linux
7da51e4
@Umius-Brian
Change TravisCI rules to regulate only OSX
316633b
@Umius-Brian
Configure to run without allowing failures
c3a6349
@ajlee12
Merge pull request #22 from Umius-Brian/Stretch-Features
7d2de3a 
Stretch Features (added travis.yaml)
@ajlee12
Fixed bug where app crashes when selected svc has no docker data. If …
1dcd580 
…no docker data, box will display alert to user.
@Umius-Brian
Merge pull request #23 from ajlee12/master
02c6d35 
Fixed bug where app crashes when selected svc has no docker data. If …
@Umius-Brian
Change fonts and add labels
2990c6e
@Umius-Brian
Update all chart titles, labels, and ticks
9a4a71c
@Umius-Brian
Completed all graph formatting
f70e23c
@Umius-Brian
Updated all charts with appropriate fonts, labels, and ticks
a317511
@ajlee12
Merge pull request #24 from Umius-Brian/Stretch-Features
74d5e9d 
Added some headers and tweaked font
@Umius-Brian
Remove excess files
00f4306
@Umius-Brian
Fix Docker container stats display
0f7c616
@Umius-Brian
Delete copy of graphs file
223bd7b
@Umius-Brian
Rebuild babel loader module config
f68161e
@ajlee12
Merge pull request #29 from Umius-Brian/Launch
85af74e 
Nice work on fixing docker stats component sizing issue and cleaning up front-end file struct.!
DerekQuoc added a commit that referenced this pull request Feb 4, 2021
@DerekQuoc
Merge pull request #22 from hodesza/Health
0c41f92
jeffreyNa pushed a commit that referenced this pull request Jun 22, 2023
@beezoo10
Merge pull request #22 from oslabs-beta/LucieSeidler-patch-1
a56c108 
Update healthHelpers.js
ZhongyanLiang added a commit that referenced this pull request Jan 11, 2024
@ZhongyanLiang
Merge pull request #22 from oslabs-beta/orders
cf92032 
Orders 2:19PM
mdtagg pushed a commit that referenced this pull request May 16, 2024
@tedpham3
Merge pull request #22 from oslabs-beta/stephenfeature
0cb3058 
Stephenfeature
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Umius-Brian @briannasookhoo @ajlee12 @alon25