From d8d9fd19618f5747d14558f80af939f4a9223630 Mon Sep 17 00:00:00 2001 From: Jordon R Date: Thu, 1 Feb 2018 17:45:50 -0600 Subject: [PATCH 1/2] Push of 5 components used --- public/ActivityFeed.js | 3 +++ public/App.js | 12 ++++++++++-- public/Header.js | 3 +++ public/Logo.js | 7 +++++++ public/Main.js | 3 --- public/NavBar.js | 10 ++++++++++ public/SearchBar.js | 7 +++++++ public/Trends.js | 3 +++ public/Tweet.js | 3 +++ public/UserProfile.js | 0 public/Video.js | 3 +++ public/WhoToFollow.js | 3 +++ public/index.html | 17 +++++++++++++---- src/App.css | 19 +++++++++++++++++++ src/App.js | 3 +-- 15 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 public/ActivityFeed.js create mode 100644 public/Header.js create mode 100644 public/Logo.js delete mode 100644 public/Main.js create mode 100644 public/NavBar.js create mode 100644 public/SearchBar.js create mode 100644 public/Trends.js create mode 100644 public/Tweet.js create mode 100644 public/UserProfile.js create mode 100644 public/Video.js create mode 100644 public/WhoToFollow.js diff --git a/public/ActivityFeed.js b/public/ActivityFeed.js new file mode 100644 index 0000000..08ef52d --- /dev/null +++ b/public/ActivityFeed.js @@ -0,0 +1,3 @@ +import React from "react"; + +function diff --git a/public/App.js b/public/App.js index a46a147..dd0ebfc 100644 --- a/public/App.js +++ b/public/App.js @@ -1,3 +1,11 @@ function App(){ - return
-} \ No newline at end of file + return ( +
+ + + + +
+
+ ); +} diff --git a/public/Header.js b/public/Header.js new file mode 100644 index 0000000..49bba2f --- /dev/null +++ b/public/Header.js @@ -0,0 +1,3 @@ +function Header() { + return

stuff

+} diff --git a/public/Logo.js b/public/Logo.js new file mode 100644 index 0000000..346adff --- /dev/null +++ b/public/Logo.js @@ -0,0 +1,7 @@ +function Logo() { + return ( +
+

Logo

+
+ ); +} diff --git a/public/Main.js b/public/Main.js deleted file mode 100644 index cb7c512..0000000 --- a/public/Main.js +++ /dev/null @@ -1,3 +0,0 @@ -function Main(){ - return
Hello
-} \ No newline at end of file diff --git a/public/NavBar.js b/public/NavBar.js new file mode 100644 index 0000000..146d9ce --- /dev/null +++ b/public/NavBar.js @@ -0,0 +1,10 @@ +function NavBar() { + return ( +
+ + + + +
+ ); +} diff --git a/public/SearchBar.js b/public/SearchBar.js new file mode 100644 index 0000000..48f8b73 --- /dev/null +++ b/public/SearchBar.js @@ -0,0 +1,7 @@ +function SearchBar() { + return ( +
+

Search Bar

+
+ ); +} diff --git a/public/Trends.js b/public/Trends.js new file mode 100644 index 0000000..1503f84 --- /dev/null +++ b/public/Trends.js @@ -0,0 +1,3 @@ +function Trends() { + return

These are the latest trends!

+} diff --git a/public/Tweet.js b/public/Tweet.js new file mode 100644 index 0000000..79edf36 --- /dev/null +++ b/public/Tweet.js @@ -0,0 +1,3 @@ +import React from "react"; + +function diff --git a/public/UserProfile.js b/public/UserProfile.js new file mode 100644 index 0000000..e69de29 diff --git a/public/Video.js b/public/Video.js new file mode 100644 index 0000000..79edf36 --- /dev/null +++ b/public/Video.js @@ -0,0 +1,3 @@ +import React from "react"; + +function diff --git a/public/WhoToFollow.js b/public/WhoToFollow.js new file mode 100644 index 0000000..79edf36 --- /dev/null +++ b/public/WhoToFollow.js @@ -0,0 +1,3 @@ +import React from "react"; + +function diff --git a/public/index.html b/public/index.html index 460ce2f..722b686 100644 --- a/public/index.html +++ b/public/index.html @@ -27,11 +27,11 @@ "I just saw a movie that changed my life", "shirts are 50% of at Macy's today" ]; - + @@ -55,6 +55,15 @@ To begin the development, run `npm start`. To create a production bundle, use `npm run build`. --> - + + + + + + + + + + diff --git a/src/App.css b/src/App.css index 15adfdc..6a18a38 100644 --- a/src/App.css +++ b/src/App.css @@ -22,3 +22,22 @@ from { transform: rotate(0deg); } to { transform: rotate(360deg); } } + +.NavBar { + border: 1px solid red; + float: left; +} + +.SearchBar { + border: 1px solid red; + float: right; +} + +.Logo { + border: 1px solid red; + float: left; +} + +.Trends { + border: 1px solid red; +} diff --git a/src/App.js b/src/App.js index d7bd2a7..49e94da 100644 --- a/src/App.js +++ b/src/App.js @@ -4,8 +4,7 @@ import './App.css'; function App(){ return ( -
- +
); } From ef0d7217508811d2be8ebce2a545cd34d9ac06b0 Mon Sep 17 00:00:00 2001 From: Jordon R Date: Thu, 1 Feb 2018 17:57:44 -0600 Subject: [PATCH 2/2] Add 7 components with no styling --- public/App.js | 2 ++ public/Tweet.js | 10 +++++++--- public/UserProfile.js | 3 +++ public/index.html | 4 ++-- src/App.css | 12 ++++++++++++ 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/public/App.js b/public/App.js index dd0ebfc..0363933 100644 --- a/public/App.js +++ b/public/App.js @@ -4,6 +4,8 @@ function App(){ + +
diff --git a/public/Tweet.js b/public/Tweet.js index 79edf36..ee462b2 100644 --- a/public/Tweet.js +++ b/public/Tweet.js @@ -1,3 +1,7 @@ -import React from "react"; - -function +function Tweet() { + return ( +
+

This is where you type a tweet

+
+ ) +} diff --git a/public/UserProfile.js b/public/UserProfile.js index e69de29..9db81f8 100644 --- a/public/UserProfile.js +++ b/public/UserProfile.js @@ -0,0 +1,3 @@ +function UserProfile() { + return

UserProfile

+} diff --git a/public/index.html b/public/index.html index 722b686..72d7b33 100644 --- a/public/index.html +++ b/public/index.html @@ -55,8 +55,8 @@ To begin the development, run `npm start`. To create a production bundle, use `npm run build`. --> - - + + diff --git a/src/App.css b/src/App.css index 6a18a38..64a31eb 100644 --- a/src/App.css +++ b/src/App.css @@ -36,8 +36,20 @@ .Logo { border: 1px solid red; float: left; + height: 20px; + width: 500px; } .Trends { border: 1px solid red; + align-items: center; + width: 150px; + height: 150px; +} + +.Tweet { + border: 1px solid red; + float: right; + width: 300px; + height: 700px; }