feat: Restructure project

Author: Aqudi

.editorconfig

@@ -14,7 +14,7 @@ indent_size = 4
 
 [*.py]
 line_length = 88
-known_first_party = algo_sports_api,config
+known_first_party = algo_sports,config
 multi_line_output = 3
 default_section = THIRDPARTY
 recursive = true

.envs/.local/.postgres

@@ -2,6 +2,6 @@
 # ------------------------------------------------------------------------------
 POSTGRES_HOST=postgres
 POSTGRES_PORT=5432
-POSTGRES_DB=algo_sports_api
+POSTGRES_DB=algo_sports
 POSTGRES_USER=debug
 POSTGRES_PASSWORD=debug

.gitignore

@@ -267,7 +267,7 @@ tags
 
 ### Project template
 
-algo_sports_api/media/
+algo_sports/media/
 
 .pytest_cache/
 

README.md

@@ -1,7 +1,7 @@
 import pytest
 
-from algo_sports_api.users.models import User
-from algo_sports_api.users.tests.factories import UserFactory
+from algo_sports.users.models import User
+from algo_sports.users.tests.factories import UserFactory
 
 
 @pytest.fixture(autouse=True)

README.rst

@@ -14,7 +14,7 @@ def update_site_forward(apps, schema_editor):
         id=settings.SITE_ID,
         defaults={
             "domain": "algosports.com",
-            "name": "algo_sports_api",
+            "name": "algo_sports",
         },
     )
 

algo_sports_api/__init__.py renamed to algo_sports/__init__.py

@@ -9,5 +9,3 @@ <h3>Looks like something went wrong!</h3>
 
 <p>We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.</p>
 {% endblock content %}
-
-

algo_sports_api/conftest.py renamed to algo_sports/conftest.py

@@ -9,4 +9,3 @@ <h1>{% trans "Account Inactive" %}</h1>
 
 <p>{% trans "This account is inactive." %}</p>
 {% endblock %}
-

algo_sports_api/contrib/__init__.py renamed to algo_sports/contrib/__init__.py

@@ -77,4 +77,3 @@ <h2>{% trans "Add E-mail Address" %}</h2>
 $('.form-group').removeClass('row');
 </script>
 {% endblock %}
-

algo_sports_api/contrib/sites/__init__.py renamed to algo_sports/contrib/sites/__init__.py

@@ -29,4 +29,3 @@ <h1>{% trans "Confirm E-mail Address" %}</h1>
 {% endif %}
 
 {% endblock %}
-

algo_sports_api/contrib/sites/migrations/0001_initial.py renamed to algo_sports/contrib/sites/migrations/0001_initial.py

@@ -45,4 +45,3 @@ <h1>{% trans "Sign In" %}</h1>
 </form>
 
 {% endblock %}
-

algo_sports_api/contrib/sites/migrations/0002_alter_domain_unique.py renamed to algo_sports/contrib/sites/migrations/0002_alter_domain_unique.py

@@ -19,4 +19,3 @@ <h1>{% trans "Sign Out" %}</h1>
 
 
 {% endblock %}
-

algo_sports_api/contrib/sites/migrations/0003_set_site_domain_and_name.py renamed to algo_sports/contrib/sites/migrations/0003_set_site_domain_and_name.py

@@ -14,4 +14,3 @@ <h1>{% trans "Change Password" %}</h1>
         <button class="btn btn-primary" type="submit" name="action">{% trans "Change Password" %}</button>
     </form>
 {% endblock %}
-

algo_sports_api/contrib/sites/migrations/__init__.py renamed to algo_sports/contrib/sites/migrations/__init__.py

@@ -23,4 +23,3 @@ <h1>{% trans "Password Reset" %}</h1>
 
     <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
 {% endblock %}
-

algo_sports_api/static/css/project.css renamed to algo_sports/static/css/project.css

@@ -0,0 +1,17 @@
+{% extends "account/base.html" %}
+
+{% load i18n %}
+{% load account %}
+
+{% block head_title %}{% trans "Password Reset" %}{% endblock %}
+
+{% block inner %}
+<h1>{% trans "Password Reset" %}</h1>
+
+{% if user.is_authenticated %}
+{% include "account/snippets/already_logged_in.html" %}
+{% endif %}
+
+<p>{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few
+  minutes.{% endblocktrans %}</p>
+{% endblock %}

algo_sports_api/static/fonts/.gitkeep renamed to algo_sports/static/fonts/.gitkeep

@@ -22,4 +22,3 @@ <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Passwor
         {% endif %}
     {% endif %}
 {% endblock %}
-

algo_sports_api/static/images/favicons/favicon.ico renamed to algo_sports/static/images/favicons/favicon.ico

@@ -7,4 +7,3 @@
     <h1>{% trans "Change Password" %}</h1>
     <p>{% trans 'Your password is now changed.' %}</p>
 {% endblock %}
-

algo_sports_api/static/js/project.js renamed to algo_sports/static/js/project.js

@@ -14,4 +14,3 @@ <h1>{% trans "Set Password" %}</h1>
         <input class="btn btn-primary" type="submit" name="action" value="{% trans 'Set Password' %}"/>
     </form>
 {% endblock %}
-

algo_sports_api/static/sass/custom_bootstrap_vars.scss renamed to algo_sports/static/sass/custom_bootstrap_vars.scss

@@ -20,4 +20,3 @@ <h1>{% trans "Sign Up" %}</h1>
 </form>
 
 {% endblock %}
-

algo_sports_api/static/sass/project.scss renamed to algo_sports/static/sass/project.scss

@@ -9,4 +9,3 @@ <h1>{% trans "Sign Up Closed" %}</h1>
 
 <p>{% trans "We are sorry, but the sign up is currently closed." %}</p>
 {% endblock %}
-

algo_sports_api/templates/403.html renamed to algo_sports/templates/403.html

@@ -10,4 +10,3 @@ <h1>{% trans "Verify Your E-mail Address" %}</h1>
     <p>{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
 
 {% endblock %}
-

algo_sports_api/templates/404.html renamed to algo_sports/templates/404.html

@@ -21,4 +21,3 @@ <h1>{% trans "Verify Your E-mail Address" %}</h1>
 
 
 {% endblock %}
-

algo_sports_api/templates/500.html renamed to algo_sports/templates/500.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>{% block title %}algo_sports_api{% endblock title %}</title>
+    <title>{% block title %}algo_sports{% endblock title %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="Backend server for Algo sports">
     <meta name="author" content="Taejung Heo">
@@ -16,17 +16,17 @@
     <link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">
 
     {% block css %}
-    
+
     <!-- Latest compiled and minified Bootstrap CSS -->
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    
+
 
     <!-- Your stuff: Third-party CSS libraries go here -->
     {% compress css %}
     <!-- This file stores project-specific CSS -->
-    
+
     <link href="{% static 'css/project.css' %}" rel="stylesheet">
-    
+
     {% endcompress %}
     {% endblock %}
 
@@ -39,7 +39,7 @@
         <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
-        <a class="navbar-brand" href="{% url 'home' %}">algo_sports_api</a>
+        <a class="navbar-brand" href="{% url 'home' %}">algo_sports</a>
 
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
           <ul class="navbar-nav mr-auto">
@@ -94,14 +94,14 @@
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
     {% block javascript %}
-      
+
       <!-- Bootstrap JS and its dependencies-->
       <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
       <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
       <!-- Your stuff: Third-party javascript libraries go here -->
-      
+
 
       <!-- place project specific Javascript in this file -->
       {% compress js %}
@@ -111,4 +111,3 @@
     {% endblock javascript %}
   </body>
 </html>
- 

algo_sports_api/templates/account/account_inactive.html renamed to algo_sports/templates/account/account_inactive.html

@@ -0,0 +1 @@
+{% extends "base.html" %}

algo_sports_api/templates/account/base.html renamed to algo_sports/templates/account/base.html

@@ -0,0 +1 @@
+{% extends "base.html" %}

algo_sports_api/templates/account/email.html renamed to algo_sports/templates/account/email.html

@@ -33,4 +33,3 @@ <h2>{{ object.username }}</h2>
 
 </div>
 {% endblock content %}
-

algo_sports_api/templates/account/email_confirm.html renamed to algo_sports/templates/account/email_confirm.html

@@ -2,7 +2,7 @@
 from django.contrib.auth import admin as auth_admin
 from django.contrib.auth import get_user_model
 
-from algo_sports_api.users.forms import UserChangeForm, UserCreationForm
+from algo_sports.users.forms import UserChangeForm, UserCreationForm
 
 User = get_user_model()
 

algo_sports_api/templates/account/login.html renamed to algo_sports/templates/account/login.html

@@ -3,11 +3,11 @@
 
 
 class UsersConfig(AppConfig):
-    name = "algo_sports_api.users"
+    name = "algo_sports.users"
     verbose_name = _("Users")
 
     def ready(self):
         try:
-            import algo_sports_api.users.signals  # noqa F401
+            import algo_sports.users.signals  # noqa F401
         except ImportError:
             pass

algo_sports_api/templates/account/logout.html renamed to algo_sports/templates/account/logout.html

@@ -5,7 +5,7 @@
 
 
 class User(AbstractUser):
-    """Default user for algo_sports_api."""
+    """Default user for algo_sports."""
 
     #: First and last name do not cover name patterns around the globe
     name = CharField(_("Name of User"), blank=True, max_length=255)

algo_sports_api/templates/account/password_change.html renamed to algo_sports/templates/account/password_change.html

@@ -1,7 +1,7 @@
 import pytest
 from django.urls import resolve, reverse
 
-from algo_sports_api.users.models import User
+from algo_sports.users.models import User
 
 pytestmark = pytest.mark.django_db
 

algo_sports_api/templates/account/password_reset.html renamed to algo_sports/templates/account/password_reset.html

@@ -1,8 +1,8 @@
 import pytest
 from django.test import RequestFactory
 
-from algo_sports_api.users.api.views import UserViewSet
-from algo_sports_api.users.models import User
+from algo_sports.users.api.views import UserViewSet
+from algo_sports.users.models import User
 
 pytestmark = pytest.mark.django_db
 

algo_sports/templates/account/password_reset_done.html

@@ -1,7 +1,7 @@
 import pytest
 
-from algo_sports_api.users.forms import UserCreationForm
-from algo_sports_api.users.tests.factories import UserFactory
+from algo_sports.users.forms import UserCreationForm
+from algo_sports.users.tests.factories import UserFactory
 
 pytestmark = pytest.mark.django_db
 

algo_sports_api/templates/account/password_reset_from_key.html renamed to algo_sports/templates/account/password_reset_from_key.html

@@ -1,6 +1,6 @@
 import pytest
 
-from algo_sports_api.users.models import User
+from algo_sports.users.models import User
 
 pytestmark = pytest.mark.django_db