diff --git a/index.html b/index.html index f9ba3b5..bb3cd76 100644 --- a/index.html +++ b/index.html @@ -6,33 +6,52 @@ +
+
-
- Email: + +
+ +
+
+ email +
+
+ +
+
+ +
+ +
+
+ password +
+
+ +
+
+ +
+ +
+
- Password: +
-
-
- Age: -
-
- -
-
- City: -
-
>>>>>> parent of 3e059c2... d - function drawChart() { +function drawChart() { +<<<<<<< HEAD var data = google.visualization.arrayToDataTable([ ['Task', 'Amount'], ['Food and Dining', 11], @@ -20,8 +27,24 @@ google.charts.load('current', {'packages':['corechart']}); }; var chart = new google.visualization.PieChart(document.getElementById('piechart')); +======= + var data = google.visualization.arrayToDataTable([ + ['Task', 'Hours per Day'], + ['Food and Dining', 11], + ['Clothing', 2], + ['Entertainment', 2], + ['Transportation', 7], + ['Other', 1] + ]); + var options = { + title: 'My Daily Activities' + }; +>>>>>>> parent of 3e059c2... d + + var chart = new google.visualization.PieChart(document.getElementById('piechart')); chart.draw(data, options); +<<<<<<< HEAD } function drawBarChart() { @@ -47,3 +70,46 @@ google.charts.load('current', {'packages':['corechart']}); chart.draw(data, google.charts.Bar.convertOptions(options)); } +======= + } +}; + +function drawChart() { + var data = google.visualization.arrayToDataTable([ + ['Category', 'You', 'Average 18 Year Old'], + ['Food and Dining', 1000, 400], + ['Utilities', 1170, 460], + ['Clothing', 660, 120], + ['Entertainment', 1030, 540], + ['Transportation', 1030, 540], + ['Other', 1030, 540] + ]); + + var options = { + chart: { + title: 'Comparing Spending Habits', + subtitle: 'Based on other 18 year olds', + }, + bars: 'horizontal', // Required for Material Bar Charts. + hAxis: { + format: 'decimal' + }, + height: 400, + colors: ['#1b9e77', '#d95f02', '#7570b3'] + }; + + var chart = new google.charts.Bar(document.getElementById('chart_div')); + + chart.draw(data, google.charts.Bar.convertOptions(options)); + + var btns = document.getElementById('btn-group'); + + btns.onclick = function(e) { + + if (e.target.tagName === 'BUTTON') { + options.hAxis.format = e.target.id === 'none' ? '' : e.target.id; + chart.draw(data, google.charts.Bar.convertOptions(options)); + } + } +} +>>>>>>> parent of 3e059c2... d diff --git a/profile.html b/profile.html index 6c1e0e3..30131e3 100644 --- a/profile.html +++ b/profile.html @@ -1,4 +1,3 @@ -