librebudget/settings.py

@@ -34,11 +34,9 @@ INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
-    'django.contrib.sites',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'registration',
+    'librebudget_core'
-    'librebudget_core',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -56,11 +54,6 @@ ROOT_URLCONF = 'librebudget.urls'
 WSGI_APPLICATION = 'librebudget.wsgi.application'
 
 
-# Site
-
-SITE_ID = 1
-
-
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
@@ -89,10 +82,3 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 
 STATIC_URL = '/static/'
-
-
-# Registration
-
-ACCOUNT_ACTIVATION_DAYS = 1
-
-LOGIN_REDIRECT_URL = '/'

librebudget/urls.py

@@ -1,9 +1,7 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
 
-urlpatterns = patterns(
+urlpatterns = patterns('',
-    '',
+    url(r'', include('core.urls')),
-    url(r'', include('librebudget_core.urls')),
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^accounts/', include('registration.urls')),
 )

librebudget_core/static/css/main.css

@@ -1,8 +0,0 @@
-body {
-	padding-top: 50px;
-	padding-bottom: 20px;
-}
-
-nav + .container {
-	margin-top: 16px;
-}

librebudget_core/templates/base.html

@@ -1 +0,0 @@
-{% extends 'librebudget_core/layout.html' %}

librebudget_core/templates/core/index.html

@@ -1,5 +1,23 @@
+{% extends 'core/layout.html' %}
 {% load staticfiles %}
 
+{% block css %}
+	<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.min.css" />
+	<style type="text/css">
+		/* Move down content because we have a fixed navbar that is 50px tall */
+		body {
+			padding-top: 50px;
+			padding-bottom: 20px;
+		}
+		.icon {
+			float: right;
+			width: 32px;
+			margin-left: 8px;
+		}
+	</style>
+{% endblock css %}
+
+{% block main %}
 	<!-- Fork me logo -->
 	<div class="github-fork-ribbon-wrapper right">
 		<div class="github-fork-ribbon">
@@ -33,4 +51,4 @@
 				<p><a class="btn btn-default" href="#" role="button">View details &raquo;</a></p>
 			</div>
 		</div>
-	</div>
+{% endblock main %}

librebudget_core/templates/core/layout.html

@@ -7,7 +7,6 @@
 	<title>LibreBudget</title>
 
 	<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet">
-	<link rel="stylesheet" type="text/css" href="{% static 'css/main.css' %}">
 	{% block css %}{% endblock css %}
 
 	<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
@@ -31,52 +30,29 @@
 				</a>
 			</div>
 			<div id="navbar" class="navbar-collapse collapse">
-				{% if user and user.is_authenticated and user.is_active %}
+				<form class="navbar-form navbar-right">
-				<ul class="nav navbar-nav navbar-right">
-					<li><a href="{% url 'auth_logout' %}">Sign out</a></li>
-				</ul>
-				{% else %}
-				<ul class="nav navbar-nav navbar-right">
-					<li>
-						<p class="navbar-btn">
-							<a class="btn btn-primary" href="{% url 'registration_register' %}">Register</a>
-						</p>
-					</li>
-				</ul>
-				<form class="navbar-form navbar-right" action="{% url 'auth_login' %}" method="POST">
-					{% csrf_token %}
 					<div class="form-group">
-						<input type="text" placeholder="Username" class="form-control" name="username">
+						<input type="text" placeholder="Email" class="form-control">
 					</div>
 					<div class="form-group">
-						<input type="password" placeholder="Password" class="form-control" name="password">
+						<input type="password" placeholder="Password" class="form-control">
 					</div>
 					<button type="submit" class="btn btn-success">Sign in</button>
 				</form>
-				{% endif %}
 			</div><!--/.navbar-collapse -->
 		</div>
 	</nav>
 
 	{% block main %}
-	<div class="container">
-		<div class="row">
-			<div class="col-sm-12">
-				<h1>{%block title %}{% endblock title%}</h1>
-				{% block content %}
-				{% endblock content %}
-			</div>
-		</div>
-	</div>
 	{% endblock main %}
 
 		<hr>
-	<div class="container">
+
 		<footer>
 			<p>Copyright &copy; <a href="//ianonavy.com">Ian Adam Naval</a> 2015. All rights reserved.</p>
 			<div>Icons made by <a href="http://www.flaticon.com/authors/yannick" title="Yannick">Yannick</a>, <a href="http://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="http://www.flaticon.com" title="Flaticon">www.flaticon.com</a>             is licensed by <a href="http://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0">CC BY 3.0</a></div>
 		</footer>
-	</div>
+	</div> <!-- /container -->
 
 	<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
 	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>

librebudget_core/templates/librebudget_core/index.html

@@ -1,22 +0,0 @@
-{% extends 'librebudget_core/layout.html' %}
-{% load staticfiles %}
-
-{% block css %}
-	<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/github-fork-ribbon-css/0.1.1/gh-fork-ribbon.min.css" />
-	<style type="text/css">
-		/* Move down content because we have a fixed navbar that is 50px tall */
-		.icon {
-			float: right;
-			width: 32px;
-			margin-left: 8px;
-		}
-	</style>
-{% endblock css %}
-
-{% block main %}
-	{% if user and user.is_authenticated and user.is_active %}
-	{% include 'librebudget_core/index_member.html' %}
-	{% else %}
-	{% include 'librebudget_core/index_guest.html' %}
-	{% endif %}
-{% endblock main %}

librebudget_core/templates/librebudget_core/index_member.html

@@ -1,8 +0,0 @@
-{% load staticfiles %}
-	<div class="container">
-		<div class="row">
-			<div class="col-md-12">
-				<h1>Account Summary</h1>
-			</div>
-		</div>
-	</div>

librebudget_core/urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns, include, url
+from django.contrib import admin
 
-from librebudget_core import views
+from core import views
 
-urlpatterns = patterns(
+urlpatterns = patterns('',
-    '',
+    url(r'^$', views.home, name='home'),
-    url(r'^$', views.HomeView.as_view(), name="home"),
 )

librebudget_core/views.py

@@ -1,5 +1,5 @@
-from django.views.generic import TemplateView
+from django.shortcuts import render
 
 
-class HomeView(TemplateView):
+def home(request):
-    template_name = "librebudget_core/index.html"
+    return render(request, 'core/index.html')

requirements.txt

@@ -0,0 +1,4 @@
+django==1.8.1
+selenium==2.45.0
+beautifulsoup4==4.3.2
+django-dotenv==1.3.0

setup.py

@@ -1,17 +1,9 @@
 from distutils.core import setup
 
-setup(
+setup(name='librebudget',
-    name='librebudget',
+      version='0.1',
-    version='0.1',
+      description='Free personal finance tool',
-    description='Free personal finance tool',
+      author='Ian Adam Naval',
-    author='Ian Adam Naval',
+      author_email='ianonavy@gmail.com',
-    author_email='ianonavy@gmail.com',
+      url='https://git.ianonavy.com/ianonavy/librebudget',
-    url='https://git.ianonavy.com/ianonavy/librebudget',
+      packages=['librebudget', 'librebudget_core'])
-    install_requires=[
-        "django==1.8.1",
-        "selenium==2.45.0",
-        "beautifulsoup4==4.3.2",
-        "django-dotenv==1.3.0",
-        "django-registration-redux==1.2",
-    ],
-    packages=['librebudget', 'librebudget_core'])