Skip to content

Commit 8bf5b69

Browse files
author
Jay Welborn
committed
First Commit from new machine
1 parent ff823ed commit 8bf5b69

File tree

97 files changed

+487
-304
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+487
-304
lines changed

.gitignore

100644100755
+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ migrations
2323
venv/
2424
ENV/
2525
myblogenv/
26+
myblog_env/
2627

2728
# IDE stuff
2829
.idea

myblog/__init__.py

100644100755
File mode changed.

myblog/blog/__init__.py

100644100755
File mode changed.

myblog/blog/apps.py

100644100755
File mode changed.

myblog/blog/models.py

100644100755
+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
from django.utils import timezone
77
from django.urls import reverse
88

9+
from tinymce import HTMLField
10+
911

1012
# Class for blog entries
1113
class Entry(models.Model):
@@ -17,7 +19,7 @@ class Meta:
1719
slug = models.SlugField(max_length=100, unique=True)
1820
header_image = models.ImageField(upload_to='media/%Y/%m/%d', blank=True)
1921
pub_date = models.DateTimeField('date published', default=datetime.now)
20-
body = models.TextField()
22+
body = HTMLField('Body')
2123
tags = models.ManyToManyField('Tag', related_name='entries', blank=True)
2224

2325
def __str__(self):

myblog/blog/static/blog/blog.css

100644100755
+1-15
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
max-width: 800px;
4747
padding: 20px;
4848
font-size: 16px;
49+
margin-bottom: 20px;
4950
}
5051

5152
.blog-list {
@@ -237,19 +238,4 @@ hr {
237238
width: 60%;
238239
border-color: #bbb;
239240
padding: 10px;
240-
}
241-
242-
blockquote {
243-
font-size: 14px;
244-
font-style: italic;
245-
font-family: 'Arsenal', serif;
246-
}
247-
248-
ol {
249-
font-family: 'Arsenal', serif;
250-
list-style-type: upper-roman;
251-
}
252-
253-
li {
254-
padding: 3px;
255241
}

myblog/blog/static/blog/cs50x-review-part-1.css

100644100755
File mode changed.

myblog/blog/static/blog/cs50x-review-part-2.css

100644100755
File mode changed.

myblog/blog/static/blog/how-not-write-reddit-bot.css

100644100755
File mode changed.

myblog/blog/static/blog/learn-python-hard-way-review.css

100644100755
File mode changed.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
blockquote {
2+
font-size: 14px;
3+
font-style: italic;
4+
}
5+
6+
ol {
7+
font-family: 'Arsenal', serif;
8+
list-style-type: upper-roman;
9+
}
10+
11+
li {
12+
padding: 3px;
13+
}

myblog/blog/static/blog/welcome.css

100644100755
File mode changed.

myblog/blog/templates/blog/detail.html

100644100755
File mode changed.

myblog/blog/templates/blog/index.html

100644100755
File mode changed.

myblog/blog/templates/blog/tag_detail.html

100644100755
File mode changed.

myblog/blog/templates/blog/tag_list.html

100644100755
File mode changed.

myblog/blog/tests.py

100644100755
File mode changed.

myblog/blog/urls.py

100644100755
File mode changed.

myblog/blog/views.py

100644100755
File mode changed.

myblog/home/__init__.py

100644100755
File mode changed.

myblog/home/apps.py

100644100755
File mode changed.

myblog/home/forms.py

100644100755
File mode changed.

myblog/home/models.py

100644100755
+24-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
from django.utils import timezone
66
from django.db import models
77

8+
# Third Party Imports
9+
from tinymce import HTMLField
10+
11+
12+
# Model to store info about Fresh Start Development
13+
class BrandInfo(models.Model):
14+
15+
class Meta:
16+
verbose_name_plural = 'Brand Information'
17+
18+
title = models.CharField(max_length=30)
19+
sub_header = models.CharField(max_length=120)
20+
description = HTMLField('description')
21+
pub_date = models.DateField(default=timezone.now)
22+
23+
def __str__(self):
24+
return self.title
25+
826

927
# Model to update "About Me" without re-writing html
1028
class About(models.Model):
@@ -14,7 +32,7 @@ class Meta:
1432

1533
title = models.CharField(max_length=30)
1634
name = models.CharField(max_length=30)
17-
bio = models.TextField()
35+
bio = HTMLField('bio')
1836
pub_date = models.DateField(default=timezone.now)
1937

2038
def __str__(self):
@@ -36,8 +54,11 @@ class Meta:
3654
verbose_name_plural = 'Contact'
3755

3856
title = models.CharField(max_length=30)
39-
facebook = models.URLField()
40-
github = models.URLField()
57+
facebook = models.URLField(blank=True)
58+
github = models.URLField(blank=True)
59+
linkedin = models.URLField(blank=True)
60+
twitter = models.URLField(blank=True)
61+
instagram = models.URLField(blank=True)
4162
email = models.EmailField()
4263
pub_date = models.DateField(default=timezone.now)
4364

myblog/home/static/home/css/about.css

100644100755
+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
.navbar {
2+
margin-bottom: 0px;
3+
}
4+
5+
main {
6+
overflow: hidden;
7+
}
8+
9+
.bg {
10+
position: fixed;
11+
width: 150%;
12+
height: 100vh; /*same height as jumbotron */
13+
max-height: 1080px;
14+
top:0;
15+
left:-25%;
16+
z-index: -1;
17+
background-size: cover;
18+
background: url('../../images/blue-angle.jpg') no-repeat center center;
19+
}
20+
21+
#about-me-page {
22+
max-width: 840px;
23+
padding: 40px;
24+
margin-left: auto;
25+
margin-right: auto;
26+
margin-left: auto;
27+
margin-right: auto;
28+
background: rgba(255, 255, 255, 0)
29+
}
30+
31+
#brand-text {
32+
min-height: 25vh;
33+
margin-bottom: 0px;
34+
}
35+
36+
#brand-text h1, #about-text h1 {
37+
margin-top: 0px;
38+
margin-bottom: 0px;
39+
text-align: left;
40+
font-family: 'Ubuntu', sans-serif;
41+
font-size: 6em;
42+
margin-bottom: 40px;
43+
}
44+
45+
#about-text {
46+
max-width: 760px;
47+
margin-left: auto;
48+
margin-right: auto;
49+
margin-top: 50px;
50+
margin-bottom: 50px;
51+
min-height: 25vh;
52+
}
53+
54+
55+
#about-text ul {
56+
width: 60%;
57+
list-style-type: none;
58+
font-family: 'Lora', serif;
59+
padding: 0;
60+
font-size: 1.1em;
61+
}
62+
63+
#about-text ul li {
64+
margin-bottom: 20px;
65+
border-bottom: 1px solid #ddd;
66+
}
67+
68+
#about-text img.portrait {
69+
width: 30%;
70+
float: right;
71+
}
72+
73+
.prompt {
74+
font-weight: bold;
75+
font-style: italic;
76+
display: inline-block;
77+
width: 35%;
78+
margin-right: 5px;
79+
}
80+
81+
.fact {
82+
display: inline-block;
83+
width: 60%;
84+
}
85+
86+
.body-copy {
87+
text-align: left;
88+
font-family: 'Lora', sans-serif;
89+
font-size: 1.2em;
90+
}
91+
92+
#bio {
93+
display: block;
94+
width: 60%;
95+
padding-top: 30px;
96+
}
97+
98+
@media screen and (max-width: 600px) {
99+
100+
#brand-text h1, #about-text h1 {
101+
font-size: 350%;
102+
}
103+
#bio {
104+
width: 100%;
105+
}
106+
}

myblog/home/static/home/css/bootstrap-theme.css

100644100755
File mode changed.

myblog/home/static/home/css/bootstrap-theme.css.map

100644100755
File mode changed.

myblog/home/static/home/css/bootstrap-theme.min.css

100644100755
File mode changed.

myblog/home/static/home/css/bootstrap-theme.min.css.map

100644100755
File mode changed.

myblog/home/static/home/css/bootstrap.css

100644100755
File mode changed.

myblog/home/static/home/css/bootstrap.css.map

100644100755
File mode changed.

myblog/home/static/home/css/bootstrap.min.css

100644100755
File mode changed.

myblog/home/static/home/css/bootstrap.min.css.map

100644100755
File mode changed.

0 commit comments

Comments
 (0)