Merge branch 'master' of gitlab.eecs.umich.edu:tspuller/eecs493

src/containers/LinkedIn/Data/Contacts.csv

+Source,FirstName,LastName,Companies,Title,Emails,PhoneNumbers,CreatedAt,Addresses,Sites,InstantMessageHandles,FullName,Birthday,Location,BookmarkedAt,Profiles
+ESAYA,lisa,loschiavo,null,,llbubblesattack@gmail.com,,"1/9/18, 1:32 PM",,,,,,,,

src/containers/LinkedIn/Data/Profile.csv

+First Name,Last Name,Maiden Name,Address,Birth Date,Headline,Summary,Industry,Zip Code,Geo Location,Twitter Handles,Websites,Instant Messengers
+Taylor,Lansey,,,,"Incoming Software Engineer at JPMorgan Chase & Co. CEO & Founder, CenterSpot LLC","Fourth year student at the University of Michigan College of Literature, Science and the Arts pursuing a BS degree in Computer Science with a minor in Business and a minor in Entrepreneurship.",Computer Software,07648,New York City Metropolitan Area,,,

src/containers/LinkedIn/Data/Recommendations Given.csv

+First Name,Last Name,Company,Job Title,Text,Creation Date,Status
+Joshua,Brodbine,Northwestern Mutual,Financial Advisor,"I had the privilege of working alongside Josh in a group project turned small business. Josh's easy demeanor, attention to detail and quick learning skills made him a pleasure to have around and a great resource in challenging situations. I am excited to see what Josh will bring in the future and have great confidence that he will be an asset to any team he works on.","12/24/18, 12:29 PM",
+Mark,Fonte,Amazon Web Services (AWS),Software Engineer,"Having the privilege of watching Mark grow and acquire new programming skills, I also learned a lot about myself and the way I tackle problems. Mark has the ability to learn quickly while inspiring those around him to learn alongside him. In addition, as the project we are working on continues to progress, Mark becomes more and more passionate about his work. I have the utmost confidence in Mark's ability to work on cross functional teams, deliver on challenging tasks, and exceed expectations in the workplace.","12/24/18, 12:27 PM",

src/containers/LinkedIn/Data/Recommendations Received.csv

+First Name,Last Name,Company,Job Title,Text,Creation Date,Status
+Joshua,Brodbine,Northwestern Mutual,Financial Advisor,"Taylor and I were both part of team that formed into a small business. Through it all, I had the privilege to watch Taylor not only grow, but thoroughly succeed as a leader. Her excellent work ethic and demeanor were inspiring, and without her, we would be nowhere near where we are today.   ","1/4/19, 2:01 PM",VISIBLE
+Mark,Fonte,Amazon Web Services (AWS),Software Engineer,"Taylor is as passionate of a leader as I have ever seen. She completely unafraid to throw everything she has into a project just because she wants to make life easier for her teammates. In working with her on our Spotlight application, I have had the pleasure of working with her to make a product that we all truly believe in. From ideation to design to leadership and management, there is nothing outside of the realm of Taylor Lansey. I cannot wait to see what she does next! ","12/15/18, 9:40 PM",VISIBLE

src/containers/LinkedIn/Data/Registration.csv

+Registered At,Registration Ip,Subscription Types
+"1/9/18, 1:29 PM",35.1.191.173,

src/containers/Spotify/Components/TotalSongsByDayLine/config.js

@@ -19,7 +19,7 @@ UserData.forEach(function(song) {
     }
     
 });
-console.log(totalSongsPerDay);
+
 dates = Object.keys(totalSongsPerDay);
 var totalSongs = Object.values(totalSongsPerDay);
 

src/containers/Spotify/Data.js

+import React, { Component } from 'react';
+import { Row, Col } from 'antd';
+
+import PageHeader from '@imd/components/utility/pageHeader';
+import Box from '@imd/components/utility/box';
+import LayoutWrapper from '@imd/components/utility/layoutWrapper';
+import ContentHolder from '@imd/components/utility/contentHolder';
+
+import basicStyle from '@imd/assets/styles/constants';
+import IsoWidgetsWrapper from '@imd/containers/Widgets/WidgetsWrapper';
+import TotalSongsByDayLine from './Components/TotalSongsByDayLine/TotalSongsByDayLine';
+import CardWidget from '@imd/containers/Widgets/Card/CardWidget';
+import UserData from './Data/StreamingHistory0.json';
+
+export default class extends Component {
+
+  render() {
+
+    let songs = UserData;
+
+    const { rowStyle, colStyle, gutter } = basicStyle;
+
+    return (
+      <LayoutWrapper>
+        <PageHeader>Data</PageHeader>
+
+        {UserData.map((song, idx) => (
+            <Col lg={6} md={12} sm={12} xs={24} style={colStyle}>
+                <Box>
+                    <h1>{song.trackName}</h1>
+                    <div>Artist: {song.artistName}</div>
+                    <div>{song.endTime}</div>
+                </Box>
+            </Col>
+         ))}
+      </LayoutWrapper>
+    );
+  };
+}

src/containers/Spotify/Import.js

@@ -81,14 +81,14 @@ export default class extends Component {
         <PageHeader>Import</PageHeader>
         <Row style={rowStyle} gutter={gutter} justify="start">
             <Col span={24} style={colStyle}>
-            <Box
-                title={"How to download your Spotify data"}
-                subtitle={""}
-            >
-                <ContentHolder>
-                    <div>1. Step 1</div>
-                    <div>2. Step 2</div>
-                </ContentHolder>
+            <Box>
+              <u>How To Download Your Spotify Data:</u> <br></br>
+              1. Log in to <a href="https://www.spotify.com/us/">spotify.com</a> <br></br>
+              2. Click <b>Log In</b> and enter your credentials <br></br>
+              3. Select <b>Privacy Settings</b> from the left-hand navigation<br></br>
+              4. Scroll down to <b>Download Your Data</b> and select <b>Request</b><br></br>
+              5. Go to your email to confirm your request<br></br>
+              6. Upload your data in the dropbox below<br></br>
             </Box>
             </Col>
         </Row>