Rename project from committee_admissions to admissions

.coveragerc

@@ -15,12 +15,12 @@ exclude_lines =
     if __name__ == .__main__.:
 
 omit =
-    committee_admissions/*/migrations/*
-    committee_admissions/settings/*
-    committee_admissions/*/tests/*
-    committee_admissions/admissions/factories.py
-    committee_admissions/wsgi.py
-    committee_admissions/urls.py
+    admissions/*/migrations/*
+    admissions/settings/*
+    admissions/*/tests/*
+    admissions/admissions/factories.py
+    admissions/wsgi.py
+    admissions/urls.py
 
 show_missing = True
 

.dockerignore

@@ -61,7 +61,7 @@ target/
 *.swp
 
 .env
-committee_admissions/files
+admissions/files
 main.js
 bundles/
 webpack-stats.json

.drone.yml

@@ -94,7 +94,7 @@ steps:
       - coverage
     settings:
       registry: https://registry.webkom.dev
-      repo: registry.webkom.dev/webkom/committee-admissions
+      repo: registry.webkom.dev/webkom/admissions
       username:
         from_secret: docker_username
       password:

.gitignore

@@ -61,7 +61,7 @@ target/
 *.swp
 
 .env
-committee_admissions/files
+admissions/files
 main.js
 bundles/
 webpack-stats.json
@@ -87,6 +87,6 @@ webpack-stats.json
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-committee_admissions/settings/local.py
+admissions/settings/local.py
 package-lock.json
 .vscode

.prettierignore

@@ -61,7 +61,7 @@ target/
 *.swp
 
 .env
-committee_admissions/files
+admissions/files
 main.js
 bundles/
 webpack-stats.json

Makefile

@@ -1,15 +1,15 @@
 help:
-	@echo 'ci_settings            - create a committee_admissions/settings/local.py for ci'
-	@echo 'dev_settings           - create a committee_admissions/settings/local.py for dev'
+	@echo 'ci_settings            - create a admissions/settings/local.py for ci'
+	@echo 'dev_settings           - create a admissions/settings/local.py for dev'
 	@echo 'fixme                  - Fix code formatting'
 
 ci_settings:
-	echo "from .testing import *" > committee_admissions/settings/local.py
+	echo "from .testing import *" > admissions/settings/local.py
 
 dev_settings:
-	echo "from .development import *" > committee_admissions/settings/local.py
+	echo "from .development import *" > admissions/settings/local.py
 
 fixme:
-	docker run --rm -v ${PWD}:/code -it python:3.9-slim "bash" "-c" "cd /code && pip install -r requirements/black.txt -r requirements/isort.txt && isort -rc committee_admissions && black committee_admissions"
+	docker run --rm -v ${PWD}:/code -it python:3.9-slim "bash" "-c" "cd /code && pip install -r requirements/black.txt -r requirements/isort.txt && isort -rc admissions && black admissions"
 
 .PHONY: ci_settings dev_settings

README.md

@@ -1,8 +1,8 @@
-# committee-admissions
+# admissions
 
 #### opptak.abakus.no
 
-Recruitment for Abakom.
+Recruitment for Abakus.
 
 ## Runnings LEGO and this repository in parallel
 
@@ -20,7 +20,7 @@ Run LEGO-WEBAPP by following the [README here](https://github.com/webkom/lego-we
 
 ### Terminal 3
 
-Run the committe_admissions backend by doing the following:
+Run the admissions backend by doing the following:
 
 Running the backend requires Python 3.9 and a `postgresql` database. The frontend requires `Node`. We recommend using
 a virtual environment. Create a `venv` in root using
@@ -50,13 +50,13 @@ $ pip install pip-tools
 $ pip-sync requirements/development.txt
 ```
 
-The `.env` file with secret keys is not included, but an `example.env` file has been provided in `./committe_admissions/settings`, so that you can simply rename the file and fill in the values.
+The `.env` file with secret keys is not included, but an `example.env` file has been provided in `./admissions/settings`, so that you can simply rename the file and fill in the values.
 
 The secrets can be found at **localhost:3000** in the user settings menu after creating an OAuth2 app there. In the form enter `http://127.0.0.1:5000/complete/lego/` as the redirect url.
 
 ```sh
 # Create a copy of the example env file (run from the root of the project)
-$ cp committee_admissions/settings/example.env committee_admissions/settings/.env
+$ cp admissions/settings/example.env admissions/settings/.env
 
 # Edit the file and change the KEY and SECRET
 AUTH_LEGO_KEY="Client ID from OAuth2"
@@ -127,7 +127,7 @@ remove excess packages.
 
 ## Run tests
 
-Run django tests using tox. Note that we point at the committee_admissions database running at :5433 if we are running lego and admissions
+Run django tests using tox. Note that we point at the admissions database running at :5433 if we are running lego and admissions
 in parallel
 
 ```bash

committee-admissions.ini → admissions.ini

@@ -1,5 +1,5 @@
 [uwsgi]
-module = committee_admissions.wsgi:application
+module = admissions.wsgi:application
 master = true
 vacuum = true
 http-socket = :$(PORT)
@@ -9,7 +9,7 @@ enable-threads = true
 disable-logging = true
 processes = 4
 static-map = /media=/app/files/media
-static-map = /static=./committee_admissions/assets/
+static-map = /static=./admissions/assets/
 static-map = /static=./assets/
 
 max-requests = 50000

committee_admissions/admissions/apps.py → admissions/admissions/apps.py

@@ -3,4 +3,4 @@
 
 class AdmissionsConfig(AppConfig):
     default_auto_field = "django.db.models.AutoField"
-    name = "committee_admissions.admissions"
+    name = "admissions.admissions"

committee_admissions/admissions/factories.py → admissions/admissions/factories.py

@@ -2,7 +2,7 @@
 
 import factory
 
-from committee_admissions.admissions.models import (
+from admissions.admissions.models import (
     Admission,
     Group,
     GroupApplication,

committee_admissions/admissions/models.py → admissions/admissions/models.py

@@ -4,8 +4,8 @@
 from django.db.models import Q
 from django.utils import timezone
 
-from committee_admissions.admissions import constants
-from committee_admissions.utils.models import TimeStampModel
+from admissions.admissions import constants
+from admissions.utils.models import TimeStampModel
 
 
 class LegoUser(AbstractUser):

committee_admissions/admissions/serializers.py → admissions/admissions/serializers.py

@@ -1,7 +1,7 @@
 from django.utils import timezone
 from rest_framework import serializers
 
-from committee_admissions.admissions.models import (
+from admissions.admissions.models import (
     Admission,
     Group,
     GroupApplication,

committee_admissions/admissions/tests/test_api.py → admissions/admissions/tests/test_api.py

@@ -5,8 +5,8 @@
 from rest_framework import status
 from rest_framework.test import APITestCase
 
-from committee_admissions.admissions.constants import LEADER, MEMBER, RECRUITING
-from committee_admissions.admissions.models import (
+from admissions.admissions.constants import LEADER, MEMBER, RECRUITING
+from admissions.admissions.models import (
     Admission,
     Group,
     GroupApplication,

committee_admissions/admissions/views.py → admissions/admissions/views.py

@@ -7,14 +7,14 @@
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
-from committee_admissions.admissions.models import (
+from admissions.admissions.models import (
     Admission,
     Group,
     GroupApplication,
     LegoUser,
     UserApplication,
 )
-from committee_admissions.admissions.serializers import (
+from admissions.admissions.serializers import (
     AdminAdmissionSerializer,
     AdmissionListPublicSerializer,
     AdmissionPublicSerializer,

committee_admissions/oauth.py → admissions/oauth.py

@@ -3,8 +3,8 @@
 from six.moves.urllib.parse import urljoin
 from social_core.backends.oauth import BaseOAuth2
 
-from committee_admissions.admissions import constants
-from committee_admissions.admissions.models import Group, Membership
+from admissions.admissions import constants
+from admissions.admissions.models import Group, Membership
 
 
 class LegoOAuth2(BaseOAuth2):

committee_admissions/settings/__init__.py → admissions/settings/__init__.py

@@ -12,6 +12,4 @@
         try:
             from .local import *  # noqa
         except ImportError:
-            raise ImportError(
-                "Couldn't load local settings committee_admissions.settings.local"
-            )
+            raise ImportError("Couldn't load local settings admissions.settings.local")

committee_admissions/settings/base.py → admissions/settings/base.py

@@ -1,5 +1,5 @@
 """
-Django settings for committee_admissions project.
+Django settings for admissions project.
 
 For more information on this file, see
 https://docs.djangoproject.com/en/2.0/topics/settings/
@@ -15,9 +15,7 @@
 
 # GENERAL CONFIGURATION ======================================================
 BASE_PROJECT_DIR = environ.Path(__file__) - 3  # manage.py level
-ROOT_DIR = (
-    environ.Path(__file__) - 2
-)  # (committee_admissions/settings/base.py - 2 = committee_admissions/)
+ROOT_DIR = environ.Path(__file__) - 2  # (admissions/settings/base.py - 2 = admissions/)
 FILES_ROOT = ROOT_DIR.path("files/")
 
 # APP CONFIGURATION ===========================================================
@@ -39,7 +37,7 @@
     "django_vite",
 ]
 
-LOCAL_APPS = ["committee_admissions.utils", "committee_admissions.admissions"]
+LOCAL_APPS = ["admissions.utils", "admissions.admissions"]
 
 INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 
@@ -55,7 +53,7 @@
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "committee_admissions.utils.middleware.LoggingMiddleware",
+    "admissions.utils.middleware.LoggingMiddleware",
 ]
 
 # DJANGO REST FRAMEWORK CONFIGURATION ==========================================
@@ -124,8 +122,8 @@
 MEDIA_URL = "/media/"
 
 # MISC CONFIGURATION ============================================================
-WSGI_APPLICATION = "committee_admissions.wsgi.application"
-ROOT_URLCONF = "committee_admissions.urls"
+WSGI_APPLICATION = "admissions.wsgi.application"
+ROOT_URLCONF = "admissions.urls"
 SHELL_PLUS = "ipython"
 
 LOGIN_REDIRECT_URL = "/"
@@ -156,5 +154,5 @@
     "social_core.pipeline.social_auth.load_extra_data",
     "social_core.pipeline.user.user_details",
     # Custom pipe
-    "committee_admissions.oauth.update_custom_user_details",
+    "admissions.oauth.update_custom_user_details",
 )

committee_admissions/settings/development.py → admissions/settings/development.py

@@ -58,9 +58,7 @@
 
 INTERNAL_IPS = ["127.0.0.1"]
 
-AUTHENTICATION_BACKENDS = [
-    "committee_admissions.oauth.LegoOAuth2"
-] + AUTHENTICATION_BACKENDS
+AUTHENTICATION_BACKENDS = ["admissions.oauth.LegoOAuth2"] + AUTHENTICATION_BACKENDS
 
 SOCIAL_AUTH_LEGO_KEY = env("AUTH_LEGO_KEY", None)
 SOCIAL_AUTH_LEGO_SECRET = env("AUTH_LEGO_SECRET", None)

committee_admissions/settings/production.py → admissions/settings/production.py

@@ -3,7 +3,7 @@
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 
-from committee_admissions.utils.sentry import remove_sensitive_data
+from admissions.utils.sentry import remove_sensitive_data
 
 from .base import *  # noqa
 
@@ -28,7 +28,7 @@
 SOCIAL_AUTH_LEGO_API_URL = env("AUTH_LEGO_API_URL")
 
 AUTHENTICATION_BACKENDS = [
-    "committee_admissions.oauth.LegoOAuth2"
+    "admissions.oauth.LegoOAuth2"
 ] + AUTHENTICATION_BACKENDS  # noqa
 
 # Sentry

committee_admissions/urls.py → admissions/urls.py

@@ -1,4 +1,4 @@
-"""committee_admissions URL Configuration
+"""admissions URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/2.0/topics/http/urls/
@@ -19,7 +19,7 @@
 from django.urls import include, path, re_path
 from rest_framework import routers
 
-from committee_admissions.admissions.views import (
+from admissions.admissions.views import (
     AdmissionViewSet,
     ApplicationViewSet,
     AppView,

committee_admissions/utils/management/commands/create_admission.py → admissions/utils/management/commands/create_admission.py

@@ -3,7 +3,7 @@
 from django.core.management.base import BaseCommand
 from django.utils import timezone
 
-from committee_admissions.admissions.models import Admission
+from admissions.admissions.models import Admission
 
 
 class Command(BaseCommand):

committee_admissions/wsgi.py → admissions/wsgi.py

@@ -1,5 +1,5 @@
 """
-WSGI config for committee_admissions project.
+WSGI config for admissions project.
 
 It exposes the WSGI callable as a module-level variable named ``application``.
 
@@ -13,6 +13,6 @@
 
 from sentry_sdk.integrations.wsgi import SentryWsgiMiddleware
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "committee_admissions.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "admissions.settings")
 
 application = SentryWsgiMiddleware(get_wsgi_application())

manage.py

@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "committee_admissions.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "admissions.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

package.json

@@ -1,10 +1,10 @@
 {
-  "name": "committee-admissions",
+  "name": "admissions",
   "version": "1.0.0",
-  "description": "Committee admission pages for Abakus",
+  "description": "Admission system for Abakus",
   "main": "index.js",
-  "repository": "[email protected]:webkom/committee-admissions.git",
-  "author": "Sigrid Marita Kvamme cherrybeans <[email protected]>",
+  "repository": "[email protected]:webkom/admissions.git",
+  "author": "Webkom <[email protected]>",
   "license": "MIT",
   "scripts": {
     "dev": "vite",

setup.cfg

@@ -6,12 +6,12 @@ force_grid_wrap=0
 use_parentheses=True
 line_length=88
 default_section=THIRDPARTY
-known_first_party=committee_admissions
+known_first_party=admissions
 known_django=django,rest_framework
 sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 
 [flake8]
-exclude = venv/*,.tox/*,committee_admissions/settings/local.py,migrations,wsgi.py
+exclude = venv/*,.tox/*,admissions/settings/local.py,migrations,wsgi.py
 ignore = E203, E266, E501, W503, F403, F405, F401, C901
 max-line-length = 79
 max-complexity = 18