From 902059caef5666269f2c852f1b3e4b7f3d06669b Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Fri, 13 May 2016 21:37:54 +0100
Subject: [PATCH] Cleanup config

---
 .gitignore      |  2 +-
 pelicanconf.py  | 41 ++++++++++++++++++++++++++++++++++++++---
 publishconf.py  | 17 -----------------
 theme/base.html |  6 ++++++
 4 files changed, 45 insertions(+), 21 deletions(-)
 delete mode 100644 publishconf.py
 create mode 100644 theme/base.html

diff --git a/.gitignore b/.gitignore
index 6f5d702..4d230c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,7 +50,7 @@ coverage.xml
 *.log
 collected-static/
 node_modules/
-static/build
+theme/static/build
 
 # Sphinx documentation
 docs/_build/
diff --git a/pelicanconf.py b/pelicanconf.py
index 2b63ae0..8b1db66 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 
 AUTHOR = 'Jake Howard'
 SITENAME = 'TheOrangeOne'
-SITEURL = ''
+SITEURL = 'http://theorangeone.net'
 
 PATH = 'content'
 
@@ -30,6 +30,41 @@ SOCIAL = (('You can add links in your config file', '#'),
           ('Another social link', '#'),)
 
 DEFAULT_PAGINATION = 15
+DELETE_OUTPUT_DIRECTORY = True
 
-# Uncomment following line if you want document-relative URLs when developing
-#RELATIVE_URLS = True
+
+PAGE_PATHS = ["pages"]
+PAGE_SAVE_AS = "{slug}/index.html"
+PAGE_URL = "{slug}"
+
+THEME = "theme"
+THEME_STATIC_DIR = "static"
+THEME_STATIC_PATHS = ['static/build']
+STATIC_PATHS = ["assets", "assets/favicon.ico"]
+EXTRA_PATH_METADATA = {
+    "assets/favicon.ico": {"path": "favicon.ico"}
+}
+
+ARTICLE_PATHS = ["articles"]
+ARTICLE_SAVE_AS = "blog/{slug}/index.html"
+ARTICLE_URL = "/blog/{slug}/"
+
+TAG_URL = "blog/tag/{slug}/"
+TAG_SAVE_AS = "blog/tag/{slug}/index.html"
+
+TAGS_URL = "blog/tags/"
+TAGS_SAVE_AS = "blog/tags/index.html"
+
+AUTHOR_URL = "/blog/author/{slug}/"
+AUTHOR_SAVE_AS = "blog/author/{slug}/index.html"
+
+AUTHORS_URL = "/blog/authors/"
+AUTHORS_SAVE_AS = "blog/authors/index.html"
+
+ARCHIVES_URL = "blog/archive/"
+ARCHIVES_SAVE_AS = "blog/archive/index.html"
+
+CATEGORY_SAVE_AS = False
+CATEGORIES_SAVE_AS = False
+
+PLUGIN_PATHS = ["plugins"]
diff --git a/publishconf.py b/publishconf.py
deleted file mode 100644
index 36be258..0000000
--- a/publishconf.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*- #
-from __future__ import unicode_literals
-
-# This file is only used if you use `make publish` or
-# explicitly specify it as your config file.
-
-import os
-import sys
-sys.path.append(os.curdir)
-from pelicanconf import *
-
-SITEURL = 'http://theorangeone.net'
-RELATIVE_URLS = False
-
-FEED_ALL_ATOM = 'feeds/all.atom.xml'
-CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
diff --git a/theme/base.html b/theme/base.html
new file mode 100644
index 0000000..ad0ae3a
--- /dev/null
+++ b/theme/base.html
@@ -0,0 +1,6 @@
+{% extends "!simple/base.html" %}
+
+{% block head %}
+{{ super() }}
+   <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/theme/css/style.css" />
+{% endblock %}