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

Sign Up, About, and Friends Pages #162

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a656801
Header with Login Container vertically aligned on the right
cvanert Mar 4, 2018
25a6ce8
Login border removed
cvanert Mar 4, 2018
aecc440
Attract users decently sized
cvanert Mar 4, 2018
7c81daf
Sign up area better aligned
cvanert Mar 4, 2018
04a570d
Footer added and styled
cvanert Mar 4, 2018
0102b17
Cover Photo and Profile Picture showing with Link Bar; Horrible layout
cvanert Mar 13, 2018
a3547bc
About Section Beginning Formatting
cvanert Mar 14, 2018
e748c42
Picture/Name area set
cvanert Mar 14, 2018
fb6672e
About logo bar colored and margin-ed
cvanert Mar 14, 2018
87a666b
Borders added to About section
cvanert Mar 14, 2018
d40a800
About page complete
cvanert Mar 14, 2018
0a8c462
Start of Friends page
cvanert Mar 14, 2018
2c3bb83
About section of About page aligned better
cvanert Mar 14, 2018
5082c98
Left part of About section moved right
cvanert Mar 14, 2018
bdea1c7
One friend
cvanert Mar 14, 2018
527221a
Two friends
cvanert Mar 14, 2018
2918612
Six friends
cvanert Mar 14, 2018
cada4ec
Updated class for navbar when logged in
cvanert Mar 14, 2018
04689a5
Navbar updated
cvanert Mar 14, 2018
248fd9f
Images
cvanert Mar 14, 2018
48900aa
Facebook CSS; no preprocessing
cvanert Mar 15, 2018
6859bbd
Sign Up Page refactored
cvanert Mar 17, 2018
26118b7
Cover Photo area corrected
cvanert Mar 17, 2018
46d01ee
Index, About, Friends cleaned up; Newsfeed started
cvanert Mar 18, 2018
e64f0c2
Reverted incorrect commit. Index, Friends, About cleaned up. Newsfeed…
cvanert Mar 18, 2018
f6ddd04
Attempting to remove bad commit
cvanert Mar 18, 2018
f01df85
Cleaning up the disaster after trying to correct pushing from the wro…
cvanert Mar 18, 2018
61e156d
Attempted to correct movement on page resize
cvanert Mar 18, 2018
4c4f993
Addressed object shifting on page resize
cvanert Mar 18, 2018
52e872e
Add files via upload
cvanert Mar 18, 2018
343b6e1
Add files via upload
cvanert Mar 18, 2018
f2fc7cd
Adding changes made on flight
cvanert Mar 24, 2018
a98ee69
Make Comment
cvanert Mar 25, 2018
26474b8
Completed Newsfeed
cvanert Mar 25, 2018
959f8a6
Trying to sync with master
cvanert Mar 25, 2018
bf43b64
no idea
cvanert Mar 25, 2018
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
Binary file added .DS_Store
Binary file not shown.
Binary file added Images/Cover Photo.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Navbar Picture.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Profile Picture.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/Sir Charles Winston VII.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/noun_1394913_cc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/noun_160685_cc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/noun_253004_cc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
109 changes: 109 additions & 0 deletions about.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
<!DOCTYPE html>
<html>

<head>
<title>Facebook About</title>
<link rel="stylesheet" type="text/css" href="reset.css">
<link rel="stylesheet" type="text/css" href="styles.css">
</head>

<main>
<body>

<header class="logged-in-navbar">
<div class="navbar-left">
<img class="navbar-picture" src="Images/Navbar Picture.jpeg" alt="Navbar Picture">
<h1 class="facebook-logo">facebook</h1>
</div>
<div class="navbar-search">
<input class="navbar-search-input" type="text" placeholder="Search for users">
</div>
<div class="navbar-name">
<h4>Herman</h4>
</div>
</header>

<div class="top container">
<div class="user-profile">
<div class="background-components">

<div class="cover-photo">
<img id="cover-photo" src="Images/Cover Photo.jpeg" alt="Cover Photo">
</div>
<nav class="link-bar">
<ul>
<li><a class="timeline-link" href="#">Timeline</a></li>
<li><a class="about-link" href="#">About</a></li>
<li><a class="friends-link" href="#">Friends</a></li>
<li><a class="photos-link" href="#">Photos</a></li>
<li style="float:right"><a class="edit-profile" href="#">Edit Profile</a></li>
</ul>
</nav>
<img class="profile-picture" src="Images/Profile Picture.jpeg" alt="Profile Picture">
<div class="about-name">
<h3>Herman</h3>
</div>
</div>
</div>
</div>

<div class="about-bar">
<div class="about-title-container">
<h2 class="about-title">About</h2>
</div>
<div class="edit-button-container">
<input class="edit-button" type="submit" value="Edit Your Profile">
</div>
</div>

<div class="about-section">
<div class="about-left-info">
<div class="basic-information">
<h3>Basic Information</h3>
<table class="basic-info">
<tr>
<td class="demo-category">Birthday</td>
<td class="demo-response">November, 4, 2004</td>
</tr>
<tr>
<td class="demo-category">College</td>
<td class="demo-response">...</td>
</tr>
<tr>
<td class="demo-category">Hometome</td>
<td class="demo-response">Wauwatosa, WI</td>
</tr>
<tr>
<td class="demo-category">Current City</td>
<td class-"demo-response">Denver, CO</td>
</tr>
</table>
</div>
<div class="contact-information">
<h3>Contact Information</h3>
<table class="contact-info">
<tr>
<td class="demo-category">Email</td>
<td class="demo-response">[email protected]</td>
</tr>
<tr>
<td class="demo-category">Phone</td>
<td class="demo-response">(555)555-5555</td>
</tr>
</table>
</div>
</div>
<div class="about-right-info">
<div class="words-to-live-by">
<h3>Words to Live By</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
</div>
<div class="about-me">
<h3>About Me</h3>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
</div>
</div>
</div>
</body>
</main>
</html>
122 changes: 122 additions & 0 deletions friends.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<!DOCTYPE html>
<html>

<head>
<title>Facebook Friends</title>
<link rel="stylesheet" type="text/css" href="reset.css">
<link rel="stylesheet" type="text/css" href="styles.css">
</head>

<main>
<body>

<header class="logged-in-navbar">
<div class="navbar-left">
<img class="navbar-picture" src="Images/Navbar Picture.jpeg" alt="Navbar Picture">
<h1 class="facebook-logo">facebook</h1>
</div>
<div class="navbar-search">
<input class="navbar-search-input" type="text" placeholder="Search for users">
</div>
<div class="navbar-name">
<h4>Herman</h4>
</div>
</header>

<div class="user-profile">
<div class="background-components">

<div class="cover-photo">
<img id="cover-photo" src="Images/Cover Photo.jpeg" alt="Cover Photo">
</div>
<nav class="link-bar">
<ul>
<li><a class="timeline-link" href="#">Timeline</a></li>
<li><a class="about-link" href="#">About</a></li>
<li><a class="friends-link" href="#">Friends</a></li>
<li><a class="photos-link" href="#">Photos</a></li>
<li style="float:right"><a class="edit-profile" href="#">Edit Profile</a></li>
</ul>
</nav>
<img class="profile-picture" src="Images/Profile Picture.jpeg" alt="Profile Picture">
<div class="about-name">
<h3>Herman</h3>
</div>
</div>
</div>

<div class="friends-title-container">
<h2 class="friends-title">Friends</h2>
</div>

<div class="friends-section-container">

<div class="friends-section">
<div class="friend">
<img class="friend-picture" src="Images/Sir Charles Winston VII.jpeg" alt="Sir Charles Winston VII">
<div class="friend-info">
<a class="friend-name" href="#">Sir Charles Winston VII</a>
<p class="friend-count">78 Friends</p>
</div>
<div class="unfriend-button-container">
<input class="unfriend-button" type="submit" value="Unfriend">
</div>
</div>

<div class="friend">
<img class="friend-picture" src="Images/Sir Charles Winston VII.jpeg" alt="Sir Charles Winston VII">
<div class="friend-info">
<a class="friend-name" href="#">Sir Charles Winston VII</a>
<p class="friend-count">78 Friends</p>
</div>
<div class="unfriend-button-container">
<input class="unfriend-button" type="submit" value="Unfriend">
</div>
</div>

<div class="friend">
<img class="friend-picture" src="Images/Sir Charles Winston VII.jpeg" alt="Sir Charles Winston VII">
<div class="friend-info">
<a class="friend-name" href="#">Sir Charles Winston VII</a>
<p class="friend-count">78 Friends</p>
</div>
<div class="unfriend-button-container">
<input class="unfriend-button" type="submit" value="Unfriend">
</div>
</div>

<div class="friend">
<img class="friend-picture" src="Images/Sir Charles Winston VII.jpeg" alt="Sir Charles Winston VII">
<div class="friend-info">
<a class="friend-name" href="#">Sir Charles Winston VII</a>
<p class="friend-count">78 Friends</p>
</div>
<div class="unfriend-button-container">
<input class="unfriend-button" type="submit" value="Unfriend">
</div>
</div>

<div class="friend">
<img class="friend-picture" src="Images/Sir Charles Winston VII.jpeg" alt="Sir Charles Winston VII">
<div class="friend-info">
<a class="friend-name" href="#">Sir Charles Winston VII</a>
<p class="friend-count">78 Friends</p>
</div>
<div class="unfriend-button-container">
<input class="unfriend-button" type="submit" value="Unfriend">
</div>
</div>

<div class="friend">
<img class="friend-picture" src="Images/Sir Charles Winston VII.jpeg" alt="Sir Charles Winston VII">
<div class="friend-info">
<a class="friend-name" href="#">Sir Charles Winston VII</a>
<p class="friend-count">78 Friends</p>
</div>
<div class="unfriend-button-container">
<input class="unfriend-button" type="submit" value="Unfriend">
</div>
</div>

</div>
</div>
Loading