updated public site

davidmerfield · Dec 7, 2017 · b98c12c · b98c12c
1 parent 69d2c70
commit b98c12c
Show file tree

Hide file tree

Showing 25 changed files with 306 additions and 159 deletions.
diff --git a/app/site/routes/help.js b/app/site/routes/help.js
@@ -3,7 +3,7 @@ module.exports = function(server){
   server.get('/help', function(req, res){
 
     res.setLocals({
-      title: 'Blot - Help',
+      title: 'Help',
       selected: {help: 'selected'},
       tab: {help: 'selected'},
     });
@@ -16,6 +16,14 @@ module.exports = function(server){
     res.render('help/wrapper');
   });
 
+  function capitalize (str) {
+    return str[0].toUpperCase() + str.slice(1);
+  }
+
+  function deslug (slug) {
+    return capitalize(slug.split('-').join(' '));
+  }
+
   server.get('/help/:section', function(req, res){
 
     res.addPartials({
@@ -24,8 +32,8 @@ module.exports = function(server){
     });
 
     res.setLocals({
-      sidebar: true,
-      title: 'Blot - Help - ' + req.params.section,
+      subsection: true,
+      title: deslug(req.params.section),
       selected: {help: 'selected'},
       tab: {help: 'selected'}
     });
@@ -42,4 +50,4 @@ module.exports = function(server){
 
     return res.redirect('/help');
   });
-};
+};
diff --git a/app/site/routes/log-in.js b/app/site/routes/log-in.js
@@ -25,6 +25,11 @@ var limiter = new Brute(store, {
 var login = Express.Router();
 var form = login.route('/');
 
+form.all(function(req, res, next){
+  res.locals.title = 'Log in';
+  next();
+});
+
 form.all(limiter.prevent);
 
 form.get(checkToken, function(req, res){

diff --git a/app/site/routes/sign-up.js b/app/site/routes/sign-up.js
@@ -20,7 +20,7 @@ paymentForm.get(function(req, res){
   if (req.session && req.session.email && req.session.subscription)
     return res.redirect(req.baseUrl + passwordForm.path);
 
-  res.locals.title = 'Sign up for Blot and start your blog';
+  res.locals.title = 'Sign up';
   res.locals.error = req.query.error;
   res.locals.stripe_key = config.stripe.key;
 
@@ -88,6 +88,7 @@ passwordForm.all(function(req, res, next) {
 
 passwordForm.get(function(req, res){
 
+  res.locals.title = 'Sign up';
   res.locals.email = req.session.email;
   res.locals.subscription = !!req.session.subscription;
   res.locals.error = req.query.error;

diff --git a/app/site/routes/static.js b/app/site/routes/static.js
@@ -59,7 +59,7 @@ module.exports = function(server){
 
     res.addLocals({
       partials: {yield: 'contact'},
-      title: 'Contact me',
+      title: 'Contact',
       selected: {contact: 'selected'}
     });
 

diff --git a/app/site/views/_footer.html b/app/site/views/_footer.html
@@ -1,9 +1,14 @@
-<Br />
-<div class="footer nav">
-  <a href="/terms">Terms</a>
-  <a href="/privacy">Privacy</a>
-  <a href="/about">About</a>
-  <a href="/help">Help</a>
-  <a href="/contact">Contact</a>
-</div>
-<br />
+<br><br><br>
+<br><br><br>
+<br><br><br>
+<small>
+<a href="/">Home</a>&nbsp;·
+<a href="/about">About</a>&nbsp;·
+<a href="/terms">Terms of use</a>&nbsp;·
+<a href="/privacy">Privacy policy</a>&nbsp;·
+<a href="/help">Help</a>&nbsp;·
+<a href="/contact">Contact</a>
+<hr>
+<a href="https://github.com/davidmerfield/Blot">Blot’s entire source code is dedicted to the public domain and available to you</a>. All prices are in USD. <a href="/contact">Don't hesitate to contact me if you have any questions</a>.
+</small>
+<br><br><br>
diff --git a/app/site/views/_header.html b/app/site/views/_header.html
@@ -1,9 +1,17 @@
-<br />
-<br />
-<div class="nav">
- <a id="logo" href="/">Blot</a>
- <a href="/sign-up">Sign up</a>
- <a href="/help">Help</a>
- <a href="/log-in">Log in</a>
-</div>
-<Br />
+<!-- <small style="font-size:0.9em">
+<a style="color:black" href="https://github.com/davidmerfield/Blot">Blot turns a folder into a blog</a>.
+<hr>
+<a href="/">Home</a>&nbsp;·
+<a href="/sign-up">Sign up</a>&nbsp;·
+<a href="/about">About</a>&nbsp;·
+<a href="/help">Help</a>&nbsp;·
+<a href="/contact">Contact</a>&nbsp;·
+<a href="/log-in">Log in</a>
+</small>
+<br><br><br>
+ -->
+
+
+<br><br><br>
+<a class="nav" href="/" style="border: none;">Blot</a> <span style="color:#aaa">›</span> {{title}}
+<br><br><br>
diff --git a/app/site/views/about.html b/app/site/views/about.html
@@ -1,5 +1,9 @@
-<h1>About</h1>
+<img src="/images/bullshit.jpg" title="Everything written symbols can say has already passed by. They are like tracks left by animals. That is why the masters of meditation refuse to accept that writings are final. The aim is to reach true being by means of those tracks, those letters, those signs - but reality itself is not a sign, and it leaves no tracks. It doesn’t come to us by way of letters or words. We can go toward it, by following those words and letters back to what they came from. But so long as we are preoccupied with symbols, theories, and opinions, we fail to reach the principle.
 
+But when we give up symbols and opinions, aren’t we left in the utter nothingness of being?
+
+Yes." style="margin-right: -20%" width="80%">
+<br><br>
 <p>Blot is a blogging platform. Blot adds a folder to your Dropbox and publishes files you put inside automatically.</p>
 
 <h2>Why does Blot exist?</h2>

diff --git a/app/site/views/contact.html b/app/site/views/contact.html
@@ -1,4 +1,3 @@
-<h1>Contact</h1>
-<p>You can email me at <a href="mailto:support@blot.im">support@blot.im</a>. For short or less urgent questions feel free to <a href="http://twitter.com/Blot__">contact me on Twitter</a>.</p>
-
-<p>I'm <a href="https://twitter.com/lllIIlIlIl">David</a>, by the way.</p>
+You can email me at <a class="yellow" href="mailto:support@blot.im">support@blot.im</a>. For short or less urgent questions feel free to contact me on <a href="http://twitter.com/Blot__">Twitter</a>.
+<br><br>
+I'm <a href="https://llllll.li">David</a>, by the way.
diff --git a/app/site/views/error.html b/app/site/views/error.html
@@ -3,23 +3,12 @@
   {{> head}}
   <body>
 
-    <Br />
-    <Br />
-    <Br />
-    <Br />
-    <Br />
-    <Br />
-    <Br />
-    <Br />
+   {{> header}}
 
-        <h1>{{title}}</h1>
-        <p>Something has gone wrong. Blot was unable to load this page. Feel free to <a href="{{protocol}}{{host}}/contact">contact me</a> if this keeps happening.</p>
-        <Br />
-        <a href="{{protocol}}{{host}}" class="button">Go to the homepage &rarr;</a>
+    Something has gone wrong. Blot was unable to load this page. Feel free to <a href="{{protocol}}{{host}}/contact">contact me</a> if this keeps happening.
+    <br><br>
+    <a href="{{protocol}}{{host}}" class="button">Go to the homepage &rarr;</a>
 
-        <Br />
-        <Br />
-
-      {{> footer}}
+    {{> footer}}
   </body>
 </html>
diff --git a/app/site/views/help/overview.html b/app/site/views/help/overview.html
@@ -1,7 +1,75 @@
-<h1>Help</h1>
+<div class="help">
+
+
+<ul>
+<a href="/help/publishing-with-blot"><b>Publishing with Blot</b></a><br />
+<hr>
+<li><a href="/help/publishing-with-blot#Files">Files</a></li>
+<li><a href="/help/publishing-with-blot#Folders">Folders</a></li>
+<li><a href="/help/publishing-with-blot#Metadata">Metadata</a></li>
+<li><a href="/help/publishing-with-blot#Dates">Dates</a></li>
+<li><a href="/help/publishing-with-blot#Permalinks">Permalinks</a></li>
+<li><a href="/help/publishing-with-blot#Tags">Tags</a></li>
+<li><a href="/help/publishing-with-blot#thumbnails">thumbnails</a></li>
+</ul>
+<br><br>
+
+
+<ul>
+<a href="/help/setting-up-your-blog"><b>Setting up your blog</b></a><br />
+<hr>
+<li><a href="/help/setting-up-your-blog#Migrating to blot">Migrating to blot</a></li>
+<li><a href="/help/setting-up-your-blog#Personal domains">Personal domains</a></li>
+<li><a href="/help/setting-up-your-blog#Redirects">Redirects</a></li>
+</ul>
+<br><br>
+
+
+<ul>
+<a href="/help/formatting-blog-posts"><b>Formatting blog posts</b></a><br />
+<hr>
+<li><a href="/help/formatting-blog-posts#Introduction">Introduction</a></li>
+<li><a href="/help/formatting-blog-posts#Videos">Videos</a></li>
+<li><a href="/help/formatting-blog-posts#Footnotes">Footnotes</a></li>
+<li><a href="/help/formatting-blog-posts#Layout">Layout</a></li>
+<li><a href="/help/formatting-blog-posts#Bold and italic">Bold and italic</a></li>
+<li><a href="/help/formatting-blog-posts#Strikethrough">Strikethrough</a></li>
+<li><a href="/help/formatting-blog-posts#Lists">Lists</a></li>
+<li><a href="/help/formatting-blog-posts#Links">Links</a></li>
+<li><a href="/help/formatting-blog-posts#Headings">Headings</a></li>
+<li><a href="/help/formatting-blog-posts#Math">Math</a></li>
+<li><a href="/help/formatting-blog-posts#Images">Images</a></li>
+<li><a href="/help/formatting-blog-posts#Code">Code</a></li>
+</ul>
+<br><br>
+
+
+<ul>
+<a href="/help/templates"><b>Templates</b></a><br />
+<hr>
+<li><a href="/help/templates#Introduction">Introduction</a></li>
+<li><a href="/help/templates#Modify existing">Modify existing</a></li>
+<li><a href="/help/templates#Blog variables">Blog variables</a></li>
+<li><a href="/help/templates#Entry variables">Entry variables</a></li>
+<li><a href="/help/templates#Debugging">Debugging</a></li>
+<li><a href="/help/templates#Custom metadata">Custom metadata</a></li>
+<li><a href="/help/templates#Thumbnails">Thumbnails</a></li>
+<li><a href="/help/templates#Robots">Robots</a></li>
+</ul>
+<br><br>
+
+
+<ul>
+<a href="/help/account-and-billing"><b>Account &amp; billing</b></a><br />
+<hr>
+<li><a href="/help/account-and-billing#Payment information">Payment information</a></li>
+<li><a href="/help/account-and-billing#Paypal bitcoin">Paypal bitcoin</a></li>
+<li><a href="/help/account-and-billing#Other syncing mechanisms">Other syncing mechanisms</a></li>
+<li><a href="/help/account-and-billing#Dropbox access">Dropbox access</a></li>
+<li><a href="/help/account-and-billing#Bandwidth usage">Bandwidth usage</a></li>
+<li><a href="/help/account-and-billing#Automatic renewal">Automatic renewal</a></li>
+<li><a href="/help/account-and-billing#Cancel subscription">Cancel subscription</a></li>
+<li><a href="/help/account-and-billing#Delete account">Delete account</a></li>
+</ul>
+<br><br>
 
-<a href="/help/publishing-with-blot">Publishing with Blot</a><br /><br />
-<a href="/help/setting-up-your-blog">Setting up your blog</a><br /><br />
-<a href="/help/formatting-blog-posts">Formatting blog posts</a><br /><br />
-<a href="/help/templates">Templates</a><br /><br />
-<a href="/help/account-and-billing">Account &amp; billing</a><br /><br />
diff --git a/app/site/views/help/overview.src.html b/app/site/views/help/overview.src.html
@@ -1,5 +1,14 @@
-<h1>Help</h1>
+<div class="help">
 
 {{#sections}}
-<a href="/help/{{slug}}">{{title}}</a><br /><br />
+
+<ul>
+<a href="/help/{{slug}}"><b>{{title}}</b></a><br />
+<hr>
+{{#subsections}}
+<li><a href="/help/{{slug}}#{{subsection}}">{{subsection}}</a></li>
+{{/subsections}}
+</ul>
+<br><br>
+
 {{/sections}}
diff --git a/app/site/views/help/sections/account-and-billing.html b/app/site/views/help/sections/account-and-billing.html
@@ -1,4 +1,3 @@
-<h1 id="account-billing">Account &amp; billing</h1>
 <h2 id="does-blot-store-my-payment-information">Does Blot store my payment information?</h2>
 <p>No, your payment information never touches Blot's servers. I use <a href="https://stripe.com/">Stripe</a> to process subscription payments. Blot stores Stripe tokens which can be used to initiate subscription payments. Read more about <a href="https://stripe.com/help/security">Stripe's security</a> on their website.</p>
 <h2 id="do-you-accept-paypalbitcoincash">Do you accept PayPal/Bitcoin/Cash?</h2>

diff --git a/app/site/views/help/sections/formatting-blog-posts.html b/app/site/views/help/sections/formatting-blog-posts.html
@@ -1,4 +1,3 @@
-<h1 id="formatting-blog-posts">Formatting blog posts</h1>
 <p>Blot converts text files from <a href="http://daringfireball.net/projects/markdown/">Markdown</a>. You can use markdown to make text bold, italicized, create lists, links and more. You can mix Markdown and HTML in the same file.</p>
 <h2 id="videos">Videos</h2>
 <p>You can also paste the HTML for a video embed directly into a blog post. Blot also automatically converts plain URLs to Youtube and Vimeo videos into video embeds. To embed a youtube video in your blog post just paste its URL like this:</p>

diff --git a/app/site/views/help/sections/publishing-with-blot.html b/app/site/views/help/sections/publishing-with-blot.html
@@ -1,4 +1,3 @@
-<h1 id="publishing-with-blot">Publishing with Blot</h1>
 <p>Blot creates a folder in your Dropbox and publishes files you put inside. These files become blog posts automatically:</p>
 <ul>
 <li><strong>Text</strong> .txt, .md</li>

diff --git a/app/site/views/help/sections/setting-up-your-blog.html b/app/site/views/help/sections/setting-up-your-blog.html
@@ -1,4 +1,3 @@
-<h1 id="setting-up-your-blog">Setting up your blog</h1>
 <h2 id="migrating-to-blot-from-other-platforms">Migrating to Blot from other platforms</h2>
 <p>I've written scripts to import blog posts from Tumblr, Wordpress, Jekyll and Squarespace. <a href="https://github.com/search?utf8=%E2%9C%93&amp;q=user%3Adavidmerfield+importer%09&amp;type=Repositories&amp;ref=searchresults">These scripts</a> are not yet connected to a web interface but if you <a href="/contact">contact me</a>, I can run them on your blog. The scripts generate a folder of Markdown files.</p>
 <h2 id="using-a-personal-domain">Using a personal domain</h2>

diff --git a/app/site/views/help/sections/templates.html b/app/site/views/help/sections/templates.html
@@ -1,4 +1,3 @@
-<h1 id="templates">Templates</h1>
 <p>Creating a template, or modifying an existing template will require an understanding of HTML, CSS and <a href="https://mustache.github.io/">Mustache</a>. Blot will be familiar to those who have worked with templates on other blogging platforms.</p>
 <p>The best way to learn how to use Blot's template is to clone an existing template and look at its source. Please don't hestitate to <a href="/contact">contact me</a> if you have any questions.</p>
 <h2 id="modify-an-existing-template">Modify an existing template</h2>

diff --git a/app/site/views/help/wrapper.html b/app/site/views/help/wrapper.html
@@ -3,21 +3,26 @@
 {{> head}}
 <body>
 
-{{> header}}
+  {{#subsection}}
+  <br><br><br>
+  <a class="nav" href="/">Blot</a> › <a class="nav" href="/help">Help</a> › {{title}}
+  <br><br><br>
+  {{/subsection}}
 
-<div style="font-size:16px;position:relative;">
+  {{^subsection}}
+  <br><br><br>
+  <a class="nav" href="/">Blot</a> › Help
+  <br><br><br>
+  {{/subsection}}
+
+<span class="box yellow" style="display: block;text-align: center;">Please <a href="/contact">contact me</a> if you have any questions.</span>
+
+<br>
 
-{{#sidebar}}
-{{> sidebar}}
-{{/sidebar}}
 
-<div style="max-width:700px">
 
 {{> yield}}
-</div>
 
-<div class="clear"></div>
-</div>
 {{> footer}}
-  </body>
+</body>
 </html>