rearrange static and template files

apps/authentication/templates/accounts/login.html

@@ -1,4 +1,4 @@
-{% extends "layouts/base.html" %}
+{% extends "base.html" %}
 {% load static %}
 
 {% block title %} - Login {% endblock title %}

apps/home/templates/home/blank.html

@@ -1,10 +1,10 @@
-{% extends "layouts/base.html" %}
+{% extends "base.html" %}
 
 {% block title %} Blank Page {% endblock title %}
 
 <!-- Specific CSS goes HERE  -->
 {% block stylesheets %}
-<link rel="stylesheet" href="{% static 'css/home/main.css' %}">
+<link rel="stylesheet" href="{% static 'home/css/main.css' %}">
 <link rel="stylesheet" href="{% static '/css/select2-bootstrap.min.css' %}">
 {% endblock stylesheets %}
 

apps/home/templates/home/index.html

@@ -1,11 +1,11 @@
-{% extends 'layouts/base.html' %}
+{% extends 'base.html' %}
 
 {% load static %}
 
 {% block title %}{% endblock title %}
 
 {% block stylesheets %}
-<link type="text/css" rel="stylesheet" href="{% static '/css/home/index.css' %}">
+<link type="text/css" rel="stylesheet" href="{% static '/home/css/index.css' %}">
 <link type="text/css" rel="stylesheet" href="{% static '/css/select2.css' %}">
 {% endblock stylesheets %}
 
@@ -154,12 +154,12 @@
     </div>
 </script>
 <script src="{% static 'js/api.js' %}"></script>
-<script src="{% static 'js/home/index.js' %}"></script>
-<script src="{% static 'js/home/servers.js' %}"></script>
-<script src="{% static 'js/home/tabs/subscriptions.js' %}"></script>
+<script src="{% static 'home/js/index.js' %}"></script>
+<script src="{% static 'home/js/servers.js' %}"></script>
+<script src="{% static 'home/js/tabs/subscriptions.js' %}"></script>
 <!-- <script src="{% static 'js/table.js' %}"></script>
-<script src="{% static 'js/home/subscriptions.js' %}"></script>
-<script src="{% static 'js/home/filters.js' %}"></script>
-<script src="{% static 'js/home/content.js' %}"></script>
-<script src="{% static 'js/home/settings.js' %}"></script> -->
+<script src="{% static 'home/js/subscriptions.js' %}"></script>
+<script src="{% static 'home/js/filters.js' %}"></script>
+<script src="{% static 'home/js/content.js' %}"></script>
+<script src="{% static 'home/js/settings.js' %}"></script> -->
 {% endblock javascript %}

core/settings.py

@@ -78,7 +78,7 @@ AUTH_USER_MODEL = "authentication.DiscordUser"
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [BASE_DIR / "apps/templates"],
+        'DIRS': [BASE_DIR / "templates"],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -237,7 +237,7 @@ STATIC_URL = '/static/'
 
 # Extra places for collectstatic to find static files.
 STATICFILES_DIRS = (
-    BASE_DIR / 'apps/static',
+    BASE_DIR / 'static',
 )
 
 # Media Files