Skip to content

Sinatra thru Wave 3 #35

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.

Sign up for GitHub

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

Open
knaydee wants to merge 7 commits into
base: mmr/master
Choose a base branch
from
Open

Sinatra thru Wave 3 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6983cf5
Add suggestions from Wave 1 comments
knaydee Oct 28, 2015
a148ab2
Add CSS links
knaydee Oct 28, 2015
23421cd
Add layout page, various new CSS styles
knaydee Oct 30, 2015
6b65106
Add final requirements
knaydee Oct 30, 2015
df5e54b
Remove meta tags
knaydee Nov 6, 2015
23fb8d2
Remove padding from header
knaydee Nov 6, 2015
26f5d23
Addmissing ; to style.css
knaydee Nov 6, 2015
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
13 changes: 13 additions & 0 deletions my-site.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,32 @@

class MySite < Sinatra::Base

get "/" do
erb :index
end

get "/index.html" do
@h1 = "Welcome to Meighs' Page"
@h4 = "A website all about me, mine, and myself."
erb :index
end

get "/about.html" do
@h1 = "About Meighan"
@h4 = "Here's some stuff you should know about me..."
@days_at_ada = (Date.today - Date.parse("2015-09-22")).to_i
erb :about
end

get "/blog.html" do
@h1 = "Meighan's Blog"
@h4 = "A few things I have to say..."
erb :blog
end

get "/projects.html" do
@h1 = "Meighan's Projects"
@h4 = "A few things I've been tinkering around with..."
erb :projects
end
end
Binary file added public/1446260371_mail.png
View file
Open in desktop
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 public/clover.ico
View file
Open in desktop
Binary file not shown.
110 changes: 110 additions & 0 deletions public/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
body {
margin: 0 auto;
width: 960px;
font-family: 'Montserrat' sans-serif;
}

header {
text-align: center;
color: #333333;
background-color: #679CBE;
padding-bottom: 5px;
}

h1 {
margin: 0;
}

h4 {
font-style: italic;
}

#copyleft {
text-align: left;
font-size: 9px;
}

#pblog {
text-align: left;
}

div {
text-align: center;
margin: 45px auto;
}

#image1 {
height: 150px;
width: 200px;
}

#image2 {
height: 150px;
width: 100px;
}

.image3 {
height: 200px;
width: 150px;
}

table {
text-align: center;
margin: 45px auto;
}

nav {
text-align: center;
padding-top: 10px;
}

footer {
text-align: center;
color: #333333;
background-color: #679CBE;
padding-top: 5px;
}

ul {
list-style: none;
text-align: center;
}
#ada {
width: 200px;
height: 100px;
}

#fiona {
width: 150px;
height: 100px;
}

.dwsh {
width: 100px;
height: 100px;
}

img:hover {
-webkit-filter: grayscale(100%);
-webkit-transition: .5s ease-in-out;
transform: scale(1.1);
}

#mainheader {
padding-bottom: 10px;
font-size: 20px;
}
.bheader {
border-bottom: 1px solid black;
padding-bottom: 5px;
}

td {
padding-top: 10px;
}

#daycount {
font-size: 12px;
text-align: center;
margin: 0;
}
Binary file added public/shamrock-1.ico
View file
Open in desktop
Binary file not shown.
92 changes: 34 additions & 58 deletions views/about.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,36 @@
<html>
<head>
<title>"Meighs' Page"</title>
<meta name="viewport" content="width=device width">
</head>
<body>
<header><center>
<h1>About Me</h1>
<p>Here's some stuff you should know about me...</p>
<img src = "./image1.jpg" width = "200" height = "150">
</center></header><br>
<div>
<img id="image1" src="./image1.jpg">
</div>

<nav><center>
<a href = "./index.html">Main Page</a>
<a href = "./projects.html">My Projects</a>
<a href = "./blog.html">My Blog</a>
<a href = "./about.html">About Me</a>
</center></nav><br>
<section>
<ul>
<li>Student at Ada Developers' Academy</li>
<p id="daycount">* Currently on day <%= @days_at_ada %> of 365</p>
<li>A companion of the Doctor</li>
<li>Seattle Seahawks fan</li>
<li>Parent to puppy dog, Fiona</li>
</ul>
</section>

<section>
<ul style="list-style: none;"><center>
<li>Attend Ada Developers' Academy</li>
<li>A companion of the Doctor</li>
<li>Seattle Seahawks fan</li>
<li>Have a puppy dog named Fiona</li>
</center></ul>
</section>

<section>
<center><table>
<thead>
<th colspan="4">
</th>
<tr>
<td>
<a href="https://adadevelopersacademy.org"><img src="AdaLogo.png" width="200" height="100"></a>
</td>
<td>
<a href="http://www.dogtemperament.com/wp-content/uploads/2012/12/maltipoo-3.jpg"><img src="fiona.png" width="150" height="100"></a>
</td>
<td>
<a href="http://www.bbc.co.uk/programmes/b006q2x0"><img src="dw.jpg" width="100" height="100"></a>
</td>
<td>
<a href="http://www.seahawks.com/"><img src="seahawks.jpg" width="100" height="100"></a>
</td>
</tr>
</thead>
</table></center><br>
</section>

<footer><center>Feel free to contact me!<br><br>
<a href="http://www.facebook.com/meighan.rasley"><img alt="follow me on facebook" src="https://c866088.ssl.cf3.rackcdn.com/assets/facebook40x40.png" border=0></a>
<a href="http://www.twitter.com/knaydee"><img alt="follow me on twitter" src="https://c866088.ssl.cf3.rackcdn.com/assets/twiiter40x40.png" border=0></a>
<a href="https://google.com/+MeighanRasley"><img alt="follow me on google plus" src="https://c866088.ssl.cf3.rackcdn.com/assets/googleplus40x40.png" border=0></a>
<a href="http://www.pinterest.com/meighanrasley"><img alt="follow me on pinterest" src="https://c866088.ssl.cf3.rackcdn.com/assets/pinterest40x40.png" border=0></a>
<a href="http://github.com/knaydee"><img alt="follow me on github" src="githubsrc.png" height="40" width="40" border=0></a>
</center></footer>
</body>
</html>
<section>
<table>
<thead>
<th colspan="4">
</th>
<tr>
<td id="ada">
<a href="https://adadevelopersacademy.org"><img src="AdaLogo.png" width="200" height="100"></a>
</td>
<td id="fiona">
<a href="http://www.dogtemperament.com/wp-content/uploads/2012/12/maltipoo-3.jpg"><img src="fiona.png" width="150" height="100"></a>
</td>
<td class="dwsh">
<a href="http://www.bbc.co.uk/programmes/b006q2x0"><img src="dw.jpg" width="100" height="100"></a>
</td>
<td>
<a href="http://www.seahawks.com/"><img src="seahawks.jpg" width="100" height="100"></a>
</td>
</tr>
</thead>
</table>
</section>
45 changes: 8 additions & 37 deletions views/blog.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,9 @@
<head>
<title>"Meighs' Page"</title>
<meta name="viewport" content="width=device width">
</head>
<body>
<section>
<center><header>
<h1>My Blog</h1>
<p>A few things I have to say...<p>
<img src = "http://sd.keepcalm-o-matic.co.uk/i/shut-up-and-listen-to-pearl-jam.png" width = "150" height = "200">
</header></center><br>
</section>
<div>
<img class="image3" src="http://sd.keepcalm-o-matic.co.uk/i/shut-up-and-listen-to-pearl-jam.png">
</div>

<section>
<center><nav>
<a href = "./index.html">Main Page</a>
<a href = "./projects.html">My Projects</a>
<a href = "./blog.html">My Blog</a>
<a href = "./about.html">About Me</a>
</nav></center><br>
</section>

<section>
<h3>Blogging to be blogging</h3>
<h4>October 26th, 2015</h4>
<p>Rain, rain go away, come again another day. JK! I missed you... I can now officially get into the Fall spirit. Did you enjoy your vacation? Where did you wander off to this time? I heard you made a pit stop in South Carolina. Got relatives there? Anyway, hope you stick around for a bit.</p>
</section>

<section>
<center><footer>Feel free to contact me!<br><br>
<a href="http://www.facebook.com/meighan.rasley"><img alt="follow me on facebook" src="https://c866088.ssl.cf3.rackcdn.com/assets/facebook40x40.png" border=0></a>
<a href="http://www.twitter.com/knaydee"><img alt="follow me on twitter" src="https://c866088.ssl.cf3.rackcdn.com/assets/twiiter40x40.png" border=0></a>
<a href="https://google.com/+MeighanRasley"><img alt="follow me on google plus" src="https://c866088.ssl.cf3.rackcdn.com/assets/googleplus40x40.png" border=0></a>
<a href="http://www.pinterest.com/meighanrasley"><img alt="follow me on pinterest" src="https://c866088.ssl.cf3.rackcdn.com/assets/pinterest40x40.png" border=0></a>
<a href="http://github.com/knaydee"><img alt="follow me on github" src="githubsrc.png" height="40" width="40" border=0></a>
</footer></center>
</section>
</body>
<section>
<h3>Rainy Day Blog</h3>
<h4>October 26th, 2015</h4>
<p id="pblog">Rain, rain go away, come again another day. JK! I missed you... I can now officially get into the Fall spirit. Did you enjoy your vacation? Where did you wander off to this time? I heard you made a pit stop in South Carolina. Got relatives there? Anyway, hope you stick around for a bit.</p>
</section>
38 changes: 3 additions & 35 deletions views/index.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,3 @@
<html>
<head>
<title>"Meighs' Page"</title>
<meta name="viewport" content="width=device width">
</head>
<body>
<section>
<center><header>
<h1>Welcome to Meighs' Page</h1>
<p>A website all about me, mine, and myself.</p>
<img src = "./image2.jpg" width = "100" height = "150">
</header></center><br>
</section>

<section>
<center><nav>
<a href = "./index.html">Main Page</a>
<a href = "./projects.html">My Projects</a>
<a href = "./blog.html">My Blog</a>
<a href = "./about.html">About Me</a>
</nav></center><br>
</section>

<section>
<center><footer>Feel free to contact me!<br><br>
<a href="http://www.facebook.com/meighan.rasley"><img alt="follow me on facebook" src="https://c866088.ssl.cf3.rackcdn.com/assets/facebook40x40.png" border=0></a>
<a href="http://www.twitter.com/knaydee"><img alt="follow me on twitter" src="https://c866088.ssl.cf3.rackcdn.com/assets/twiiter40x40.png" border=0></a>
<a href="https://google.com/+MeighanRasley"><img alt="follow me on google plus" src="https://c866088.ssl.cf3.rackcdn.com/assets/googleplus40x40.png" border=0></a>
<a href="http://www.pinterest.com/meighanrasley"><img alt="follow me on pinterest" src="https://c866088.ssl.cf3.rackcdn.com/assets/pinterest40x40.png" border=0></a>
<a href="http://github.com/knaydee"><img alt="follow me on github" src="githubsrc.png" height="40" width="40" border=0></a>
</footer></center>
</section>

</body>
</html>
<div>
<img id="image2" src="./image2.jpg">
</div>
32 changes: 32 additions & 0 deletions views/layout.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<html>
<head>
<title>Meighs' Page</title>
<!-- <meta name="viewport" content="width=device width"> -->
<link href="clover.ico" rel="shortcut icon" type="image/png">
<link href="css/style.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Montserrat" rel="stylesheet" type="text/css">
</head>
<body>
<header>
<h1><%= @h1 %></h1>
<h4><%= @h4 %></h4>
</header>
<nav>
<a href="./index.html">Home</a> |
<a href="./projects.html">Projects</a> |
<a href="./blog.html">Blog</a> |
<a href="./about.html">About</a>
</nav>
<%= yield %>
<footer>
<p>Feel free to follow and contact me!</p>
<a href="http://www.facebook.com/meighan.rasley"><img alt="follow me on facebook" src="https://cdn2.iconfinder.com/data/icons/black-white-social-media/32/online_social_media_facebook-48.png"></a>
<a href="http://www.twitter.com/knaydee"><img alt="follow me on twitter" src="https://cdn2.iconfinder.com/data/icons/black-white-social-media/32/online_social_media_twitter-48.png"></a>
<a href="https://google.com/+MeighanRasley"><img alt="follow me on google plus" src="https://cdn2.iconfinder.com/data/icons/black-white-social-media/32/google_plus_online_social_media-48.png"></a>
<a href="http://www.pinterest.com/meighanrasley"><img alt="follow me on pinterest" src="https://cdn2.iconfinder.com/data/icons/black-white-social-media/32/online_social_media_pinterest-48.png"></a>
<a href="http://github.com/knaydee"><img alt="follow me on github" src="https://cdn3.iconfinder.com/data/icons/free-social-icons/67/github_six_color-48.png"></a>
<a href="mailto:meighanr@gmail.com"><img alt="email me at" src="1446260371_mail.png"></a>
<p id="copyleft">&copy Meighan Rasley <%= DateTime.now.year %></p>
</footer>
</body>
</html>
Loading