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

Graph Tab added #1

Open
wants to merge 42 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
82e3cbf
reorganized folder structure
erinoconnor17 May 3, 2020
2921997
working map
erinoconnor17 May 3, 2020
61d9420
renamed project
erinoconnor17 May 3, 2020
fcb642b
removed tests
erinoconnor17 May 3, 2020
23eadb5
changed header bg
erinoconnor17 May 3, 2020
6b768d1
changed slightly, not loading json yet
May 4, 2020
24ba1dc
working loading
May 4, 2020
d7446e9
working reading JSON data to map
May 4, 2020
f7de08b
working with full data, index filled with json data
May 4, 2020
5208b30
updating with colors and scaling with max
May 8, 2020
e6f2d91
cleanup of html
May 8, 2020
55f6426
starting to figure out connecting front and back ends
channum May 9, 2020
0167df2
stores get request as json
channum May 10, 2020
9f701f3
map
jmaloyjr May 11, 2020
cfec6c5
working d3 map in angular component.
jmaloyjr May 11, 2020
e2086f7
map uses covid data
channum May 11, 2020
961811e
hover over now displays data
channum May 12, 2020
6c0088c
added dropdown, script not working yet
erinoconnor17 May 12, 2020
b5c0568
empty graph under register
May 12, 2020
e595159
working graph under register
May 12, 2020
993658d
code cleanup
May 12, 2020
6b12ef6
added graph tags to X-axis and font change
May 13, 2020
c5a8320
semi-working dropdown
erinoconnor17 May 13, 2020
1d236e2
small changes in trying to add bootstrap
crnishant May 13, 2020
7fcaf6b
Merge branch 'connect-attempt' of https://github.com/crnishant/COVID1…
crnishant May 13, 2020
572378b
got rid of card component
crnishant May 13, 2020
96022ce
fixed toolbar
May 13, 2020
d4695bb
fixing merge conflicts before pull request."
jmaloyjr May 13, 2020
804802f
Merge branch 'master' into connect-attempt
jmaloyjr May 13, 2020
10e4795
Merge pull request #1 from crnishant/connect-attempt
jmaloyjr May 13, 2020
b8872a6
fixed merge conflict
crnishant May 13, 2020
74f67db
empty code in home component, was unused.
jmaloyjr May 13, 2020
73a96c2
routed to proper graph page
May 13, 2020
2f1a886
removed unneccessary files and pages from site
channum May 13, 2020
fd2fbd8
added data for dropdown states
crnishant May 13, 2020
150d92f
added date
crnishant May 13, 2020
0dce1d4
resolved merge conflict
crnishant May 13, 2020
3d26894
fixed page loading
May 13, 2020
add51c3
fixed date error
May 13, 2020
269f691
merged with master
May 13, 2020
172e539
state graph added
May 15, 2020
c51750f
fixed component spec
May 16, 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
File renamed without changes.
155 changes: 46 additions & 109 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,109 +1,46 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Output
out/**/*.js
out/**/*.map
out

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

# parcel-bundler cache (https://parceljs.org/)
.cache

# Next.js build output
.next

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and *not* Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out

# dependencies
/node_modules

# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*

# misc
/.sass-cache
/connect.lock
/coverage
/libpeerconnection.log
npm-debug.log
yarn-error.log
testem.log
/typings

# System Files
.DS_Store
Thumbs.db
File renamed without changes.
18 changes: 0 additions & 18 deletions ExampleApi/.vscode/launch.json

This file was deleted.

14 changes: 0 additions & 14 deletions ExampleApi/.vscode/tasks.json

This file was deleted.

Loading