From 89a062e2cda7a81f6475f9ad65fee67261845b23 Mon Sep 17 00:00:00 2001
From: Combatd <combatdstar@gmail.com>
Date: Fri, 6 Dec 2019 10:07:46 -0800
Subject: [PATCH 1/3] random commits

---
 .../chronos-react/src/Components/TimeShow/index.js   | 12 ++++++------
 .../chronos-react/src/Components/TimeShow/style.js   |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/frontend/chronos-react/src/Components/TimeShow/index.js b/frontend/chronos-react/src/Components/TimeShow/index.js
index 692b021..b4dd041 100644
--- a/frontend/chronos-react/src/Components/TimeShow/index.js
+++ b/frontend/chronos-react/src/Components/TimeShow/index.js
@@ -167,20 +167,20 @@ class TimeShow extends Component {
                     <div>
                     <h1>{this.state.timeline.title}</h1>
                     <h4>Created: {this.state.timeline.created_at}</h4>
-                        <button onClick={this.showAddModal}>+ Add Event</button>
-                        <h4>Events</h4>
+                        <StyleButton onClick={this.showAddModal}>+ Add Event</StyleButton>
+                        <h2>Events</h2>
                         <div>
                             <ul>
                                 
                                 {
                                     this.state.events.map( (event) => {
                                     return ( <li>
-                                        {JSON.stringify(event.event_name)}
+                                        <h3>{JSON.stringify(event.event_name)}</h3>
                                         <br/>
-                                        Date: {JSON.stringify(event.event_date)}
+                                        <p>Date: {JSON.stringify(event.event_date)}</p>
                                         <br/>
-                                        {JSON.stringify(event.event_desc)}
-                                        {JSON.stringify(event.event_wiki)}
+                                        <p>{JSON.stringify(event.event_desc)}</p>
+                                        <p>{JSON.stringify(event.event_wiki)}</p>
                                         <br/>
                                         <a href={event.event_option}>YouTube Link</a>
                                         <br/>
diff --git a/frontend/chronos-react/src/Components/TimeShow/style.js b/frontend/chronos-react/src/Components/TimeShow/style.js
index ec905a2..3d45c43 100644
--- a/frontend/chronos-react/src/Components/TimeShow/style.js
+++ b/frontend/chronos-react/src/Components/TimeShow/style.js
@@ -11,6 +11,10 @@ export const ShowDiv = style.div`
     flex: 33%;
     padding: 0 4px;
   }
+
+  p {
+    font-size: 12px;
+  }
 `;
 
 export const Image = style.img`

From b04ec15204bc6f551d5c272b37303d0028979518 Mon Sep 17 00:00:00 2001
From: Combatd <combatdstar@gmail.com>
Date: Sat, 7 Dec 2019 11:21:27 -0800
Subject: [PATCH 2/3] accepting asingerdev changes to TimeShow

---
 .../src/Components/TimeShow/index.js          | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/frontend/chronos-react/src/Components/TimeShow/index.js b/frontend/chronos-react/src/Components/TimeShow/index.js
index 1c4911d..edcfecc 100644
--- a/frontend/chronos-react/src/Components/TimeShow/index.js
+++ b/frontend/chronos-react/src/Components/TimeShow/index.js
@@ -164,38 +164,14 @@ class TimeShow extends Component {
             <React.Fragment>
                 <ShowDiv>
                     <div>
-<<<<<<< HEAD
-                    <h1>{this.state.timeline.title}</h1>
-                    <h4>Created: {this.state.timeline.created_at}</h4>
-                        <StyleButton onClick={this.showAddModal}>+ Add Event</StyleButton>
-                        <h2>Events</h2>
-=======
                         <h1>{this.state.timeline.title}</h1>
                         <h4>Created: {this.state.timeline.created_at}</h4>
                         <button onClick={this.showAddModal}>+ Add Event</button>
                         <h4>Events</h4>
->>>>>>> cb7264dd8f9297ce05bdcefb8821fe8e3582213a
                         <div>
                             <ul>
 
                                 {
-<<<<<<< HEAD
-                                    this.state.events.map( (event) => {
-                                    return ( <li>
-                                        <h3>{JSON.stringify(event.event_name)}</h3>
-                                        <br/>
-                                        <p>Date: {JSON.stringify(event.event_date)}</p>
-                                        <br/>
-                                        <p>{JSON.stringify(event.event_desc)}</p>
-                                        <p>{JSON.stringify(event.event_wiki)}</p>
-                                        <br/>
-                                        <a href={event.event_option}>YouTube Link</a>
-                                        <br/>
-                                        <Image src={event.event_thumbnail} />
-                                        <br/>
-                                        <br/>
-                                        Event Creation: {JSON.stringify(event.created_at)}
-=======
                                     this.state.events.map((event) => {
                                         return (<li>
                                             {JSON.stringify(event.event_name)}
@@ -213,7 +189,6 @@ class TimeShow extends Component {
                                             <input name='search' value={this.state.search} onChange={this.handleChange} />
                                             <button onClick={this.getSummary}>Get event summary</button>
                                             <div>{this.state.event_wiki}</div>
->>>>>>> cb7264dd8f9297ce05bdcefb8821fe8e3582213a
                                         </li>
 
                                         )

From 0efecaf7258f75c9610cc23cd2e4c9a16505ca5e Mon Sep 17 00:00:00 2001
From: Mark Calvelo <combatdstar@gmail.com>
Date: Thu, 20 Aug 2020 16:50:22 -0700
Subject: [PATCH 3/3] Update README.md

---
 README.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2fd5845..9f0cfb2 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,25 @@
-# chronos
\ No newline at end of file
+# Chronos
+
+## Introduction
+
+Chronos is a full-stack React/Flask application where the user is able to create timelines of any event that happened historically. 
+
+## Homepage
+
+On the landing page, users can sign up or log into the site, and they will see all of the existing timelines that have been created by other users. Once logged in, users can view other people's timeline, or create their own timelines to contribute to the community. 
+
+## Timelines
+
+On each timeline's page, users see a list of all the events in that timeline in chronological order. If the user created that timeline, they can add, delete, or edit events on it. 
+
+## Events
+
+Each event includes information not only about the title and date of the event, but also a quick summary and links to videos, pictures or infographics that correspond to the event. 
+
+## Future Versions
+
+In future versions we would like to integrate the MediaWiki API in order to extract summaries of events from Wikipedia to include in the summary section of the events. 
+
+## Technologies Used
+
+React, Flask, Peewee, SQLite, Playhouse, bcrypt, Styled Components