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.

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

Merging Chrono 2.0 into the original Chronos #13

Merged
merged 324 commits into from
Jan 15, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
324 commits
Select commit Hold shift + click to select a range
89a5049
Modified to support conditional logic when user is using a SQL database.
mesherrera Oct 2, 2019
2cb318f
Refactored to use setup context.
mesherrera Oct 2, 2019
cd7a3cf
Modified to support conditional redering and setup context
mesherrera Oct 2, 2019
bff4779
Reinstalled mongodb
mesherrera Oct 2, 2019
5f8c391
Merging work completed by Duane and myself.
mesherrera Oct 2, 2019
92e422c
Restoring save file
mesherrera Oct 2, 2019
248b21a
Adjusted webpack configuration for png files.
mesherrera Oct 2, 2019
97dd71b
Successfully querying Mongo communications collection and SQL communi…
mesherrera Oct 2, 2019
e7a6c1a
Implemented IPC communications to support queries for health informat…
mesherrera Oct 2, 2019
9e44a7c
Modularized component logic.
mesherrera Oct 2, 2019
7913096
Added GettingStarted.
mesherrera Oct 2, 2019
49dbba1
Successfully able to return to set up screen.
mesherrera Oct 2, 2019
be93c81
Restored prior IPC channels.
mesherrera Oct 2, 2019
a94ec61
added functinality to services dashboard where user clicks on their d…
Duane11003 Oct 2, 2019
946e590
Merge branch 'electron-react' of https://github.com/oslabs-beta/Chron…
Duane11003 Oct 2, 2019
52796bf
Format changes
mesherrera Oct 2, 2019
f17b0f2
Default settings
mesherrera Oct 2, 2019
f0f5a57
Merge conflicts resolved. Improved organization, styling and function…
mesherrera Oct 2, 2019
98e3f29
adjusted logo to be centered. also adjusted database lists on service…
Duane11003 Oct 3, 2019
d66387a
added functionality so user is required to input data into db name an…
Duane11003 Oct 3, 2019
881e5ce
Modified queries to ensure dynamic results based on the user selected…
mesherrera Oct 3, 2019
aaf4925
Modularized database connections to allow for dynamic querying.
mesherrera Oct 3, 2019
fbc9889
Removed comment
mesherrera Oct 3, 2019
4dac602
Restored default settings
mesherrera Oct 3, 2019
36f227b
Resuable functionality for querying communications database.
mesherrera Oct 3, 2019
c9871a4
Added OverviewContext
mesherrera Oct 3, 2019
951b589
Improved formatting
mesherrera Oct 3, 2019
7c30592
Resolved merge conflicts.
mesherrera Oct 3, 2019
bba63dd
Fixed mongoose connection.
mesherrera Oct 3, 2019
cbb16bb
Merge changes.
mesherrera Oct 3, 2019
264fa2a
Typo fix
mesherrera Oct 3, 2019
8584755
Refactored return.
mesherrera Oct 3, 2019
9da921b
Removed unused import.
mesherrera Oct 3, 2019
5a36aa7
Successfully fetching data. useEffect needs to be refactored.
mesherrera Oct 3, 2019
1371c77
Currently unused. Needs to be refactored.
mesherrera Oct 3, 2019
dc79e9f
this commit is just so i can pull down the latest changest. ignore
Duane11003 Oct 3, 2019
eb38c98
Successfully parsing data to show each service once on the list
mesherrera Oct 3, 2019
2e7565a
Removed unnecessary state change.
mesherrera Oct 3, 2019
8573b98
Successfully importing communication data from OVerview context. IPC …
mesherrera Oct 3, 2019
a9315ef
Implemented on click functions to render details component.
mesherrera Oct 3, 2019
d576ee5
Completed on click functions for buttons.
mesherrera Oct 3, 2019
27c1170
Edited context to share data collected from IPC communications
mesherrera Oct 3, 2019
9264416
Request chart component created using database data.
mesherrera Oct 3, 2019
daab411
Context created to save the results of IPC query response.
mesherrera Oct 3, 2019
8d90c2f
Removed unnecessary package.
mesherrera Oct 3, 2019
cab2f5e
Importing charts components.
mesherrera Oct 3, 2019
6731b72
Corrected typo.
mesherrera Oct 3, 2019
8bffbf3
Completed chart creation component for response codes.
mesherrera Oct 3, 2019
4bd0696
Template for chart creation.
mesherrera Oct 3, 2019
490685b
Fixed error in label organization.
mesherrera Oct 3, 2019
013403e
Added rendering for Response Conde chart.
mesherrera Oct 3, 2019
a9c6838
Added Bar graph to visualize memory
nmczormick Oct 3, 2019
2adf439
Tentative setup for speed chart.
mesherrera Oct 3, 2019
b78d0d2
Removed console.log
mesherrera Oct 3, 2019
a76c2e8
Added console.log statement for debugging.
mesherrera Oct 3, 2019
d471f0b
Removed unused chart logic.
mesherrera Oct 3, 2019
c4d65e3
Removed console.logs from debugging.
mesherrera Oct 3, 2019
459a059
this commit is behind...do not use
Duane11003 Oct 3, 2019
41caa7b
Added math logic.
mesherrera Oct 3, 2019
dd36f79
Removed unnecessary state hook. Fixed how data from IPC DetailsRespon…
mesherrera Oct 3, 2019
d8eb40b
Removed console.logs
mesherrera Oct 3, 2019
92592d9
Reduced scope of context.
mesherrera Oct 3, 2019
70e1248
Refactored chart.js from bar to line graph to display change in memor…
nmczormick Oct 3, 2019
dd14430
Add files via upload
nmczormick Oct 4, 2019
23a742d
Merge pull request #6 from oslabs-beta/npm-package
nmczormick Oct 4, 2019
07468bd
Merge pull request #7 from oslabs-beta/middleware
mesherrera Oct 4, 2019
ddf29d1
Update README.md
mesherrera Oct 4, 2019
8b4c983
Minor Corrections
mesherrera Oct 4, 2019
88e6c3f
Merge branch 'dev' into electron-react
mesherrera Oct 7, 2019
b34f331
Merge pull request #9 from oslabs-beta/electron-react
mesherrera Oct 7, 2019
00e403c
Removed console.logs used for debugging.
mesherrera Oct 14, 2019
4248bb3
Successfully using data from details context.
mesherrera Oct 14, 2019
d43b28d
Moved setDetails and IPC communication to onClick function for each s…
mesherrera Oct 14, 2019
11837e1
Removed unnecessary bulk used for information gathering. Passing props.
mesherrera Oct 14, 2019
ec7c73f
Format adjustments.
mesherrera Oct 14, 2019
7947844
Reorganizing file structure
mesherrera Oct 14, 2019
4925c14
Debugged errors. Needs improved logic for line graph creation.
mesherrera Oct 14, 2019
3955e21
Restored electron package lock.
mesherrera Oct 14, 2019
df1d8f1
Restored electron package lock.
mesherrera Oct 14, 2019
653304e
Middleware package.json. Added file to middleware folder.
mesherrera Oct 14, 2019
9451d3c
Updated template.
mesherrera Oct 16, 2019
50a654d
Removed cemmented out code.
mesherrera Oct 16, 2019
351ca62
old commit
Duane11003 Oct 16, 2019
fd98301
added line chart for latency
Duane11003 Oct 17, 2019
7449232
Fixed formatting
mesherrera Oct 17, 2019
2bb0296
list
mesherrera Oct 17, 2019
e0aff4e
Fixed logic to filter chart data point to only the current service vi…
mesherrera Oct 17, 2019
cace159
Completed chart logic
mesherrera Oct 17, 2019
b106689
Prop drilled to communication charts. Added completed speed chart.
mesherrera Oct 17, 2019
d01695c
latency chart in progress. determingin whether the db is SQL or noSQL
Duane11003 Oct 18, 2019
bc43e25
Completed processes chart using ChartJS.
mesherrera Oct 18, 2019
37187c9
Added props to ensure that charts rendered only have information for …
mesherrera Oct 18, 2019
be153fa
Fixed formatting
mesherrera Oct 18, 2019
2cf6990
Added finished charts.
mesherrera Oct 18, 2019
e193d01
resolving merge conflicts
Duane11003 Oct 18, 2019
cec9fd3
Add back button.
mesherrera Oct 18, 2019
4d27f8e
List updated.
mesherrera Oct 18, 2019
fdfda97
Rexolved merge conflicts
mesherrera Oct 18, 2019
28b0d41
Formatting
mesherrera Oct 18, 2019
caadba4
Added temperature Chart
mohtasim317 Oct 18, 2019
2a17a5b
Added temperature title
mohtasim317 Oct 18, 2019
5796087
we can get rid of this
mohtasim317 Oct 18, 2019
08464e6
Adding temperature chart
mohtasim317 Oct 18, 2019
d304ed9
Merging
mesherrera Oct 18, 2019
ba52019
Removing bundle.
mesherrera Oct 18, 2019
8ac9baa
Removed templates
mesherrera Oct 18, 2019
0adbf38
Formatting.
mesherrera Oct 18, 2019
aebce37
Removed duplicate file.
mesherrera Oct 18, 2019
f043850
Formatting.
mesherrera Oct 18, 2019
dcb526a
Fixed variable declaration.
mesherrera Oct 18, 2019
3af21f9
Commented out unused import.
mesherrera Oct 18, 2019
131df1e
Formatting.
mesherrera Oct 18, 2019
9ea3c22
additional styling on buttons, and h3 headers
Duane11003 Oct 18, 2019
e437cb5
Removed unnecessary useState hook.
mesherrera Oct 18, 2019
15c3011
Formatting.
mesherrera Oct 18, 2019
00eb191
Merge branch 'electron-react' of https://github.com/oslabs-beta/Chron…
mesherrera Oct 18, 2019
3998b65
Button style.
mesherrera Oct 18, 2019
0ab8cbe
Completed memory chart.
mesherrera Oct 21, 2019
2bb68a9
Added memory chart
mesherrera Oct 21, 2019
7d4d379
Commented chart files.
mesherrera Oct 21, 2019
c6bf658
Updated comments on hard coded solutions.;
mesherrera Oct 21, 2019
b3e291b
Added comments on connection functions.
mesherrera Oct 21, 2019
1e5b70f
Default settings.
mesherrera Oct 21, 2019
d62dd8a
Removed unecessary conditional statement. Added comments.
mesherrera Oct 21, 2019
ad6d38a
Removed unecessary conditional statement. Added comments.
mesherrera Oct 21, 2019
618a865
Restored defaults.
mesherrera Oct 21, 2019
a134527
Replaced GettingStarted with AddService.
mesherrera Oct 21, 2019
4379e8e
Removed unnecessary import of GettingStarted
mesherrera Oct 21, 2019
a7de58e
Removed unnecessary component.
mesherrera Oct 21, 2019
da73c1a
Updated import statement and rendered element for Add Database to Add…
mesherrera Oct 21, 2019
2670522
Added comments
mesherrera Oct 21, 2019
3beaac0
Added comments
mesherrera Oct 21, 2019
3ee80bf
Added comments
mesherrera Oct 21, 2019
1d3c334
Added comments.
mesherrera Oct 21, 2019
140a26a
Added comments
mesherrera Oct 21, 2019
2153155
fixed select onchange function so the dbState reflects the right db
jenaepen Dec 16, 2019
ffbf1b8
postgress connection is made and mongoDB is charts is produced
jenaepen Dec 16, 2019
08dc0a0
Merge branch 'electron-react' into dev
Dec 17, 2019
4ba6e98
Merged electron-react into master
Dec 17, 2019
febe894
practing with applications
jenaepen Dec 18, 2019
91ac1c0
Merge pull request #1 from ben-mizel/dev
jenaepen Dec 18, 2019
bac651b
Merge pull request #2 from ben-mizel/master
jenaepen Dec 18, 2019
1457dfa
merging dev into jenae/valid_uri
jenaepen Dec 18, 2019
6386529
put the user settings.json back to what it was
jenaepen Dec 18, 2019
03ba3cd
delete middleware
jenaepen Dec 18, 2019
9dd6cb4
fixing front page bug
jenaepen Dec 18, 2019
48b8d58
Health Info Visualizer Update
robicano22 Dec 21, 2019
a696b8f
added X button and MS name to Modal, slight style fixes
robicano22 Dec 22, 2019
08274be
Merge branch 'chris/fe-health-info' of https://github.com/Chronos2-0/…
jenaepen Dec 24, 2019
e4ddaa6
microservices shows up when the button is pressed instead of an error…
jenaepen Dec 26, 2019
7e3734b
Merge pull request #9 from Chronos2-0/jenae/valid_uri
ben-mizel Dec 30, 2019
040b925
All ousman frontend changes
Dialloousman Dec 30, 2019
8e6e99a
Ousman front end changes
Dialloousman Dec 30, 2019
2712ef5
no change--disregard
Dialloousman Dec 30, 2019
9db5b5b
Update Main.js
Dialloousman Dec 30, 2019
0477021
Update README.md
Dialloousman Dec 31, 2019
da2af38
Update AddService.jsx
Dialloousman Dec 31, 2019
7ec44a1
Update ServiceDetails.jsx
Dialloousman Dec 31, 2019
a0e47f2
Update ServiceOverview.jsx
Dialloousman Dec 31, 2019
a7e0bde
Update index.css
Dialloousman Dec 31, 2019
8f0b977
Update mongoose-connect.js
Dialloousman Dec 31, 2019
d8e6064
Update sql-connect.js
Dialloousman Dec 31, 2019
4874ab6
Update mongoose-connect.js
Dialloousman Dec 31, 2019
ae19630
Update settings.json
Dialloousman Dec 31, 2019
9404f5e
Merge pull request #12 from Chronos2-0/ousman/frontEndChanges
Dialloousman Dec 31, 2019
7315a32
nothing added
jenaepen Dec 31, 2019
744c0d8
nothing added
jenaepen Dec 31, 2019
37c8e5a
nothing added
jenaepen Dec 31, 2019
7bb28ed
removed middleware
jenaepen Dec 31, 2019
07ebda9
add in fake picture
jenaepen Dec 31, 2019
c4a19a3
add in fake picture
jenaepen Dec 31, 2019
e06d3b6
removed fake photos
jenaepen Dec 31, 2019
c9d97c1
removed fake pic
jenaepen Dec 31, 2019
1b7d482
DS Store commit
jenaepen Dec 31, 2019
768b080
added modal and png file back in
jenaepen Dec 31, 2019
ecb329d
final dev changes
jenaepen Dec 31, 2019
4304d7c
Merge pull request #13 from Chronos2-0/devTest
jenaepen Dec 31, 2019
24761bd
Merge branch 'dev' of https://github.com/Chronos2-0/Chronos into dev
jenaepen Dec 31, 2019
f733051
updated route tracer so that it is outside of the health section and …
jenaepen Jan 2, 2020
c996642
Merge pull request #14 from Chronos2-0/jenae/ben/route_with_microserv…
robicano22 Jan 2, 2020
e39a117
Final dev updat
Dialloousman Jan 4, 2020
5626149
Update README.md
ben-mizel Jan 4, 2020
22dfe06
Resolved Conflicts
tim-atapagra Jan 4, 2020
7acad7d
Added
tim-atapagra Jan 4, 2020
f0e2688
Merge pull request #15 from Chronos2-0/ben-mizel-patch-1
tim-atapagra Jan 4, 2020
ad1738f
added MS overview refresh button
Dialloousman Jan 4, 2020
6b57606
Update ServicesDashboard.jsx
Dialloousman Jan 4, 2020
75393dd
Merge pull request #17 from Chronos2-0/ousman/Backbuttonv2
Dialloousman Jan 4, 2020
a71596d
Update README.md
tim-atapagra Jan 4, 2020
24777e6
Added logo
ben-mizel Jan 4, 2020
ceb9533
Update README.md
ben-mizel Jan 4, 2020
8a2f882
fixed button text over flow, repaired partioning background
Dialloousman Jan 4, 2020
4f24fdf
Merge pull request #18 from Chronos2-0/ousman/fixTextOverflow
Dialloousman Jan 4, 2020
b7b7fbd
Updates to dev
tim-atapagra Jan 4, 2020
61b4f6f
redoing changes
robicano22 Jan 4, 2020
061f219
Professionalized
ben-mizel Jan 4, 2020
6e0cf40
Update README.md
ben-mizel Jan 4, 2020
f3f8b38
Update README.md
ben-mizel Jan 4, 2020
6715c4a
added delete button
jenaepen Jan 4, 2020
726adf2
Merge branch 'dev' into jenae/delete_button
jenaepen Jan 4, 2020
406fbcb
Update README.md
ben-mizel Jan 4, 2020
92a6671
Update README.md
ben-mizel Jan 4, 2020
b4a6ff5
Merge pull request #20 from Chronos2-0/jenae/delete_button
jenaepen Jan 4, 2020
e410d27
splash transition update
robicano22 Jan 8, 2020
f7cd0f8
merged with dev
robicano22 Jan 8, 2020
29992e5
Fixed typos
ben-mizel Jan 8, 2020
23c0e25
splash ready, small styling changes
robicano22 Jan 8, 2020
a94ddd8
fixed broken image
robicano22 Jan 8, 2020
1632351
added traffic chart
Dialloousman Jan 8, 2020
854b6f7
inlined communication modals
Dialloousman Jan 8, 2020
a201ac4
fixed MSoverview empty space blocking
Dialloousman Jan 8, 2020
58e8dba
reset settings JSON
Dialloousman Jan 9, 2020
ed9175e
comment delete service
jenaepen Jan 9, 2020
6276a2e
jsdom for electron test
jenaepen Jan 9, 2020
0092716
Merge pull request #25 from Chronos2-0/newDevV2
Dialloousman Jan 9, 2020
105b4d0
Merge pull request #21 from Chronos2-0/ben-mizel-patch-2
Dialloousman Jan 9, 2020
9cb490b
still working on testing
jenaepen Jan 9, 2020
498f437
splash ready. only renders once per session
robicano22 Jan 9, 2020
86bd551
merged with dev, still debugging, need to switch to dev
robicano22 Jan 9, 2020
b710607
saved unsaved file to switch branches
robicano22 Jan 10, 2020
b8b9816
conflicts resolved
robicano22 Jan 10, 2020
f38d116
still trying to test
jenaepen Jan 10, 2020
dac3530
Merge pull request #26 from Chronos2-0/detached
jenaepen Jan 10, 2020
808f6c7
Update README.md
robicano22 Jan 10, 2020
110b7c6
removed unfinish testing
jenaepen Jan 10, 2020
8919d28
merge dev into branch and fix margin on delete button
jenaepen Jan 10, 2020
ea97d07
Merge pull request #29 from Chronos2-0/jenae/comment_clean_up
robicano22 Jan 10, 2020
8c4f5b5
fixed traffic visualization to ping servers properly
Dialloousman Jan 11, 2020
3b2c10c
Merge pull request #30 from Chronos2-0/fixedChartTraffic
Dialloousman Jan 11, 2020
13a502d
health buttons are rendering below microservice details button
robicano22 Jan 11, 2020
1d3012d
tooltips are functional, and overview restructured
robicano22 Jan 12, 2020
e802431
user settings conflict resolved
robicano22 Jan 12, 2020
294056a
fixed z-index bug
robicano22 Jan 13, 2020
11ef6e4
Merge pull request #32 from Chronos2-0/chris/health-button-restructure
tim-atapagra Jan 13, 2020
082bd7d
Index dist removed
tim-atapagra Jan 14, 2020
59d1b86
added clear button logic for sql
robicano22 Jan 14, 2020
7546d72
merging with dev
robicano22 Jan 14, 2020
bc5d7e3
deleted dist folder
robicano22 Jan 14, 2020
c09cde3
Merge pull request #33 from Chronos2-0/chris/health-button-restructure
tim-atapagra Jan 14, 2020
8f9d42b
Few components updated
tim-atapagra Jan 14, 2020
18c6d15
Linter file added
tim-atapagra Jan 14, 2020
4677660
Unecessary files deleted
tim-atapagra Jan 14, 2020
1ed1f8a
Merge pull request #34 from Chronos2-0/cleanup/dev
tim-atapagra Jan 14, 2020
4ba2507
Update README.md
ben-mizel Jan 15, 2020
6023841
add testing to see if the window name is chronos
jenaepen Jan 15, 2020
dbf658d
merge dev into testing file
jenaepen Jan 15, 2020
056ea39
Merge pull request #38 from Chronos2-0/jenae/testing
jenaepen Jan 15, 2020
36e05b9
updated readme to be able to merge with master
jenaepen Jan 15, 2020
41736d3
Merge pull request #39 from Chronos2-0/testDev
jenaepen Jan 15, 2020
04ef4d1
Merge pull request #40 from Chronos2-0/dev
jenaepen Jan 15, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
still working on testing
  • Loading branch information
jenaepen committed Jan 9, 2020
commit 9cb490b02dfcfdba1426087abf6919a7ecb187d1
16 changes: 8 additions & 8 deletions __tests__/enzyme.test.js → __tests__/enzyme.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import React from 'react';
import { configure, shallow } from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
const { JSDOM } = require('jsdom');
const jsdom = new JSDOM('<!doctype html><html><body></body></html>');
const { window } = jsdom;

import DeleteService from '../app/components/DeleteService.jsx'
const expect = require('chai').expect;
//const waitForExpect = require("wait-for-expect");
import DeleteSevice from '../app/components/DeleteService.jsx';
//window.require = ()=>{ return {ipcRenderer: jest.fn()}

console.log('window:', window.require)

configure({ adapter: new Adapter() });

describe('Delete a Service', () => {
beforeAll(() => {
let wrapper = shallow(<DeleteService/>);
});
// beforeAll(() => {
// let wrapper = shallow(<DeleteService/>);
// });

xit('returns a div',()=>{
expect(wrapper.type()).toEqual('div')
Expand Down
107 changes: 8 additions & 99 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"nodemon": "nodemon server/server.js",
"electron": "electron .",
"test": "mocha",
"test-react": "jest enzyme.test.js --verbose",
"test-react": "mocha enzyme.js --verbose",
"both": "webpack-dev-server & electron ."
},
"babel": {
Expand All @@ -27,14 +27,14 @@
"electron": "^6.0.7",
"express": "^4.17.1",
"jest": "^24.9.0",
"jsdom": "^15.2.1",
"mongodb": "^3.3.2",
"mongoose": "^5.7.1",
"nodemon": "^1.19.2",
"pg": "^7.12.1",
"react": "16.10.1",
"react-chartjs-2": "^2.8.0",
"react-dom": "16.10.1"
"react-dom": "16.10.1",
"wait-for-expect": "^3.0.1"
},
"devDependencies": {
"@babel/core": "^7.6.0",
Expand Down