Merge branch 'last-working'

small-nav
Mimi Momo 4 years ago
commit f751f1a7dd

@ -61,7 +61,7 @@ apache, automation, css, html, jenkins, nginx, php, server, website<br>
<br> <br>
<li>design the website</li> <li>design the website</li>
<li>prototype of website running on the server</li> <li>prototype of website running on the server</li>
<li><span class="J">set up automation with Jenkins + Ansible</span></li> <li>J set up automation with Jenkins + Ansible</li>
</ul> </ul>
<br> <br>
<h2>thursday, august 6</h2> <h2>thursday, august 6</h2>
@ -83,6 +83,7 @@ apache, automation, css, html, jenkins, nginx, php, server, website<br>
<li>added images to live site <a href="200808.html">despite conflicts with Linux's security</a></li> <li>added images to live site <a href="200808.html">despite conflicts with Linux's security</a></li>
</ul> </ul>
<br> <br>
</div> </div>
<!--right column--> <!--right column-->

@ -9,12 +9,11 @@ def file_to_string(f):
return text return text
def fill_text(f): def fill_text(f):
return file_to_string('../res/head.txt') + file_to_string(f) + file_to_string('../res/tail.txt') return file_to_string('res/head.txt') + file_to_string(f) + file_to_string('res/tail.txt')
def create_files(files, directory): def create_files(files, directory):
for f in files: for f in files:
print(f) print(f)
# t = open(f, "r")
n = open(directory + '/' + os.path.basename(f), "w") n = open(directory + '/' + os.path.basename(f), "w")
n.write(fill_text(f)) n.write(fill_text(f))
n.close() n.close()
@ -23,18 +22,13 @@ def collect_raw(d):
return glob.glob(d) return glob.glob(d)
def clear_articles(): def clear_articles():
files = glob.glob('../../feature/*') files = glob.glob('../*.html')
for f in files: for f in files:
os.remove(f) os.remove(f)
files = glob.glob('../../weekly/*')
for w in files:
os.remove(w)
def main(): def main():
clear_articles() clear_articles()
create_files(collect_raw('../feature/*'), '../../feature') create_files(collect_raw('entries/*.html'), '..')
create_files(collect_raw('../weekly/*'), '../../weekly')
## Start Program ## ## Start Program ##

@ -0,0 +1,35 @@
<h1>weekly roundup</h1>
august 4-8, 2020
css, html, php, server, website<br>
<br>
<h2>tuesday, august 4</h2>
<ul>
<li>CentOS VPS obtained through OVH. Yay! We've always wanted a server.</li>
</ul>
<h2>wednesday, august 5</h2>
<ul>
<br>
<li>design the website</li>
<li>prototype of website running on the server</li>
<li>J set up automation with Jenkins + Ansible</li>
</ul>
<br>
<h2>thursday, august 6</h2>
<ul>
<li>create some placeholder graphics, articles + css</li>
<li>add a <a href="https://publish.twitter.com/#">Twitter timeline embed</a></li>
</ul>
<br>
<h2>friday, august 7</h2>
<ul>
<li>decide to use PHP for manage blessfrey's blog</li>
<li>set up a local Apache server for practice. <a href="200807.html">It was a little confusing!</a></li>
<li>wrote a vaguely functioning Hello, World! script in PHP
</ul>
<br>
<h2>saturday, august 8</h2>
<ul>
<li>forgot to bid on the Skull of Death in the <a href="http://www.verpets.com/auctions/">Auction House</a>...aw man...</li>
<li>added images to live site <a href="200808.html">despite conflicts with Linux's security</a></li>
</ul>
<br>

@ -12,7 +12,7 @@ apache, automation, css, html, jenkins, nginx, php, server, website<br>
<br> <br>
<li>design the website</li> <li>design the website</li>
<li>prototype of website running on the server</li> <li>prototype of website running on the server</li>
<li><span class="J">set up automation with Jenkins + Ansible</span></li> <li>J set up automation with Jenkins + Ansible</li>
</ul> </ul>
<br> <br>
<h2>thursday, august 6</h2> <h2>thursday, august 6</h2>
@ -34,3 +34,4 @@ apache, automation, css, html, jenkins, nginx, php, server, website<br>
<li>added images to live site <a href="200808.html">despite conflicts with Linux's security</a></li> <li>added images to live site <a href="200808.html">despite conflicts with Linux's security</a></li>
</ul> </ul>
<br> <br>

@ -1,35 +0,0 @@
<h1>weekly roundup</h1>
august 4-8, 2020
css, html, php, server, website<br>
<br>
<h2>tuesday, august 4</h2>
<ul>
<li>CentOS VPS obtained through OVH. Yay! We've always wanted a server.</li>
</ul>
<h2>wednesday, august 5</h2>
<ul>
<br>
<li>design the website</li>
<li>prototype of website running on the server</li>
<li>J set up automation with Jenkins + Ansible</li>
</ul>
<br>
<h2>thursday, august 6</h2>
<ul>
<li>create some placeholder graphics, articles + css</li>
<li>add a <a href="https://publish.twitter.com/#">Twitter timeline embed</a></li>
</ul>
<br>
<h2>friday, august 7</h2>
<ul>
<li>decide to use PHP for manage blessfrey's blog</li>
<li>set up a local Apache server for practice. <a href="200807.html">It was a little confusing!</a></li>
<li>wrote a vaguely functioning Hello, World! script in PHP
</ul>
<br>
<h2>saturday, august 8</h2>
<ul>
<li>forgot to bid on the Skull of Death in the <a href="http://www.verpets.com/auctions/">Auction House</a>...aw man...</li>
<li>added images to live site <a href="200808.html">despite conflicts with Linux's security</a></li>
</ul>
<br>

@ -1,6 +1,9 @@
import datetime, os import datetime, os, re
from bottle import error, route, run, static_file, template from bottle import error, route, run, static_file, template
# make article-to-html work with entries
# make index work with entries - later, they can be differentiated into features and weeklies with tags or title or whatever
# write diary # write diary
def build_nav(): def build_nav():
@ -22,17 +25,22 @@ def list_snippets(articles):
result = [] result = []
for article in articles: for article in articles:
path = 'entries/' + article
text = [] text = []
a = [] a = []
length = 0 length = 0
with open('entries/feature/' + article) as f: with open('entries/' + article) as f:
text = f.readlines() text = f.readlines()
length = len(text) length = len(text)
a.append(text[head]) a.append(text[head])
a.append(snip_article(find_content(article, length, head, tail))) content = snip_article(find_content(article, length, head, tail), path)
a.append(text[head + 1])
if content.count('<ul>') > content.count('</ul>'):
content += '</ul>'
a.append(content)
a.append(text[head + 1].replace('<br>',''))
a.append("social") a.append("social")
a.append('entries/feature/' + article) a.append(path)
result.append(a) result.append(a)
return result return result
@ -44,31 +52,34 @@ def count_lines(fname):
def find_content(article, length, head, tail): def find_content(article, length, head, tail):
content = "" content = ""
with open('entries/feature/' + article) as f: with open('entries/' + article) as f:
for pos, line in enumerate(f): for pos, line in enumerate(f):
if pos > head + 1 and pos < length - tail: if pos > head + 1 and pos < length - tail:
content += line content += line
return content return content
def snip_article(article): def clean(result, path):
result = result.replace('<br>','')
result = re.sub(r'<a href=.*?>', '', result)
result = result.replace('</a>','')
result = re.sub(r'<h\d>','',result)
result = re.sub(r'</h\d>','',result)
return result
def snip_article(article, path):
article = clean(article, path)
limit = 300 limit = 300
result = article[0:min(len(article),limit)] result = article[0:min(len(article),limit)]
result = result.replace('<br>','')
result = result.rsplit(' ',1)[0] result = result.rsplit(' ',1)[0]
# cut off after 5 lines, too?
return result + " ... " return result + " ... "
def sort_files(files): def sort_files(files):
sort = files return list(reversed(files))
return sort
def gather_files(): def gather_files():
files = [] files = os.listdir('entries/')
feature = os.listdir('entries/feature/') files.remove('raw')
for f in feature:
files.append('entries/feature/' + f)
weekly = os.listdir('entries/weekly/')
for f in weekly:
files.append('entries/weekly/' + f)
return files return files
# Static # Static

@ -22,6 +22,7 @@ mark {
background-color: #900C3F; background-color: #900C3F;
color: hotpink; color: hotpink;
} }
ul { list-style-position: inside; }
.grid { .grid {
display: grid; display: grid;
@ -68,7 +69,6 @@ mark {
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
background-image: url(../img/ele/navbar.png); background-image: url(../img/ele/navbar.png);
height: 86px; height: 86px;
width: 800px; width: 800px;
@ -78,7 +78,6 @@ mark {
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-game { .nav-game {
@ -86,7 +85,6 @@ mark {
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-diary { .nav-diary {
@ -94,7 +92,6 @@ mark {
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-presskit { .nav-presskit {
@ -102,7 +99,6 @@ mark {
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
@ -194,11 +190,10 @@ mark {
.footer-row { .footer-row {
grid-area: 8 / 1 / 9 / 5; grid-area: 8 / 1 / 9 / 5;
background-color: #A8577E; background-color: #A8577E;
text-align: center;
} }
.footer { .footer-content {
background-color: #5c374c; background-color: pink;
padding-top: 5px; padding-top: 5px;
padding-right: 25px; padding-right: 25px;
box-shadow: 0 100vh 0 100vh #581845; box-shadow: 0 100vh 0 100vh #581845;

@ -29,8 +29,6 @@ ul { list-style-position: inside; }
} }
.grid { .grid {
height: 100vh;
width: 100vw;
display: grid; display: grid;
grid-template-columns: auto 800px auto; grid-template-columns: auto 800px auto;
grid-template-rows: 25px 90px 1fr 100px; grid-template-rows: 25px 90px 1fr 100px;
@ -75,7 +73,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
background-image: url(../img/ele/navbar.png); background-image: url(../img/ele/navbar.png);
height: 86px; height: 86px;
width: 800px; width: 800px;
@ -85,7 +82,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-game { .nav-game {
@ -93,7 +89,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-diary { .nav-diary {
@ -101,7 +96,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-presskit { .nav-presskit {
@ -109,7 +103,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
@ -178,12 +171,13 @@ ul { list-style-position: inside; }
.footer-row { .footer-row {
grid-area: 4 / 1 / 5 / 4; grid-area: 4 / 1 / 5 / 4;
background-color: #EC424A; background-color: green;
text-align: right;
padding-top: 5px;
padding-right: 25px;
} }
.footer { .footer-content {
background-color: #060d1a; background-color: pink;
padding-top: 5px;
text-align: right;
overflow: hidden;
box-shadow: 0 100vh 0 100vh #581845;
} }

@ -67,7 +67,6 @@ mark {
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
background-image: url(../img/ele/navbar.png); background-image: url(../img/ele/navbar.png);
height: 86px; height: 86px;
width: 800px; width: 800px;
@ -77,7 +76,6 @@ mark {
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-game { .nav-game {
@ -85,7 +83,6 @@ mark {
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-diary { .nav-diary {
@ -93,7 +90,6 @@ mark {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-end; justify-content: flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-presskit { .nav-presskit {
@ -101,7 +97,6 @@ mark {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: flex-end; justify-content: flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
@ -150,7 +145,7 @@ mark {
.bg { .bg {
grid-area: 3 / 3 / 4 / 6; grid-area: 3 / 3 / 4 / 6;
background-color: #C70039; background-color: #C70039;
background-image: url(http://images.verpets.com/pets/peesh/peesh_viral_2.png); background-image: url(../img/bg/homeBG.png);
width: 650px; width: 650px;
height: 457px; height: 457px;
} }
@ -196,11 +191,10 @@ mark {
padding-left: 1px; padding-left: 1px;
} }
.footer { .footer-content {
background-color: #581845; background-color: #581845;
padding-top: 5px; padding-top: 5px;
padding-right: 25px;
box-shadow: 0 100vh 0 100vh #581845;
text-align: right; text-align: right;
overflow: hidden; overflow: hidden;
box-shadow: 0 100vh 0 100vh #581845;
} }

@ -29,8 +29,6 @@ ul { list-style-position: inside; }
} }
.grid { .grid {
height: 100vh;
width: 100vw;
display: grid; display: grid;
grid-template-columns: auto 800px auto; grid-template-columns: auto 800px auto;
grid-template-rows: 25px 90px 1fr 100px; grid-template-rows: 25px 90px 1fr 100px;
@ -75,7 +73,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
background-image: url(../img/ele/navbar.png); background-image: url(../img/ele/navbar.png);
height: 86px; height: 86px;
width: 800px; width: 800px;
@ -85,7 +82,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-game { .nav-game {
@ -93,7 +89,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-diary { .nav-diary {
@ -101,7 +96,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
.nav-presskit { .nav-presskit {
@ -109,7 +103,6 @@ ul { list-style-position: inside; }
display: flex; display: flex;
flex-direction:column; flex-direction:column;
justify-content:flex-end; justify-content:flex-end;
align-items: bottom;
padding-bottom: 3px; padding-bottom: 3px;
} }
@ -145,7 +138,7 @@ ul { list-style-position: inside; }
.body-row { .body-row {
grid-area: 3 / 1 / 4 / 4; grid-area: 3 / 1 / 4 / 4;
background-color: #d08d11; background-color: orange;
} }
.pages { .pages {
@ -200,12 +193,13 @@ ul { list-style-position: inside; }
.footer-row { .footer-row {
grid-area: 4 / 1 / 5 / 4; grid-area: 4 / 1 / 5 / 4;
background-color: #EC424A; background-color: green;
text-align: right;
padding-top: 5px;
padding-right: 25px;
} }
.footer { .footer-content {
background-color: #060d1a; background-color: pink;
padding-top: 5px;
text-align: right;
overflow: hidden;
box-shadow: 0 100vh 0 100vh #581845;
} }

@ -1,4 +1,3 @@
<!DOCTYPE html>
% rebase('frame.tpl') % rebase('frame.tpl')
<div class="diary-dir"> </div> <div class="diary-dir"> </div>

@ -1,8 +1,6 @@
<!--Footer--> <!--Footer-->
<footer> <footer>
<div class="footer"> <div class="footer-content">
<footer> &#169; chimchooree {{year}}<br>
&#169 chimchooree {{year}}<br>
</footer>
</div> </div>
</footer> </footer>

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
<head> <head>
% include('header.tpl') % include('header.tpl')
</head> </head>
@ -8,12 +8,8 @@
% include('logo-bar.tpl') % include('logo-bar.tpl')
% include('nav.tpl') % include('nav.tpl')
<div class="body-row"> </div> <div class="body-row"> </div>
{{!base}} {{!base}}
</div> </div>
% include('footer.tpl') % include('footer.tpl')
</body> </body>
</html> </html>

@ -1,4 +1,3 @@
<!DOCTYPE html>
% rebase('frame.tpl') % rebase('frame.tpl')
<!--Content--> <!--Content-->
<div class="pages"> <div class="pages">
@ -8,7 +7,7 @@
<div class="textbox story"> <div class="textbox story">
<h1>Story</h1><br> <h1>Story</h1><br>
<br> <br>
You play as a transfer student to a southern American town. <br> You play as a transfer student to a Deep South town. <br>
<br> <br>
There's a popular rumor that the local shopping center closes early because it's haunted, evidenced by strange noises and lights. <br> There's a popular rumor that the local shopping center closes early because it's haunted, evidenced by strange noises and lights. <br>
<br> <br>

@ -1,3 +1,3 @@
<title>{{title or 'blessfrey.me'}}</title> <title>{{title or 'blessfrey.me'}}</title>
<meta http-equiv="Content-Type" content="text/html; charset="utf-8"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="static/css/{{css}}.css"/> <link rel="stylesheet" type="text/css" href="static/css/{{css}}.css"/>

@ -1,12 +1,9 @@
<!DOCTYPE html>
% rebase('frame.tpl') % rebase('frame.tpl')
<div class="social"> <div class="social">
<a href="https://twitter.com/lilchimchooree"><img class="img-social-ribbon" src="static/img/ele/twitter-ribbon.png"></a> <a href="https://twitter.com/lilchimchooree"><img class="img-social-ribbon" src="static/img/ele/twitter-ribbon.png" alt="link to developer's Twitter"></a>
</div> </div>
<div class="bg"> <div class="bg"> </div>
<img class="img-bg-home">
</div>
<div class="footer-row"> </div> <div class="footer-row"> </div>

@ -1,4 +1,3 @@
<!DOCTYPE html>
<div class="whitespace"> <div class="whitespace">
blessfrey.me<br> blessfrey.me<br>
</div> </div>

@ -1,11 +1,10 @@
<!DOCTYPE html>
% rebase('frame.tpl') % rebase('frame.tpl')
<!--Content--> <!--Content-->
<div class="pages"> <div class="pages">
<div class="textbox fact"> <div class="textbox fact">
<h1>Fact Sheet</h1> <h1>Fact Sheet</h1>
<ul><br> <ul>
<li><b>Description:</b> Build synergies across your skillbar and teammates to survive the local smalltown dungeon.</li> <li><b>Description:</b> Build synergies across your skillbar and teammates to survive the local smalltown dungeon.</li>
<li><b>Developer:</b> chimchooree, US indie dev</li> <li><b>Developer:</b> chimchooree, US indie dev</li>
<li><b>Genre:</b> Singleplayer Action RPG</li> <li><b>Genre:</b> Singleplayer Action RPG</li>
@ -32,7 +31,7 @@ The multiclass and skill system emphasizes player skill, personal expression, an
<div class="textbox features"> <div class="textbox features">
<h1>Features </h1> <h1>Features </h1>
<ul><br> <ul>
<li>Try tens of possible dual-class combinations</li> <li>Try tens of possible dual-class combinations</li>
<li>Experiment with hundreds of possible skillbar combinations</li> <li>Experiment with hundreds of possible skillbar combinations</li>
<li>Freely relocate skill points and swap out skills in safe areas</li> <li>Freely relocate skill points and swap out skills in safe areas</li>
@ -78,7 +77,7 @@ The multiclass and skill system emphasizes player skill, personal expression, an
<div class="textbox credits"> <div class="textbox credits">
<h1>Credits</h1> <h1>Credits</h1>
<ul><br> <ul>
<li>Code: chimchooree</li> <li>Code: chimchooree</li>
<li>Art: chimchooree</li> <li>Art: chimchooree</li>
<li>Design: chimchooree</li> <li>Design: chimchooree</li>

@ -1,4 +1,3 @@
<!DOCTYPE html>
<!--Snippet--> <!--Snippet-->
<div class="snippet"> <div class="snippet">
<div class="snippet-title"> <div class="snippet-title">

Loading…
Cancel
Save