Merge pull request #96 from ACMAS/login_tailwind

Account System + Tailwind Implementation

.github/workflows/super-linter.yml

@@ -25,7 +25,7 @@ jobs:
         uses: github/super-linter@v4
         env:
           DEFAULT_BRANCH: "main"
-          FILTER_REGEX_EXCLUDE: (.*./ACMAS/ACMAS_Web/migrations*|.*./ACMAS/app/ACMAS_Web/static/js*|.*./ACMAS/app/ACMAS_Web/static/styles/bootstrap*)
+          FILTER_REGEX_EXCLUDE: (.*./ACMAS/ACMAS_Web/migrations*|.*./ACMAS/app/ACMAS_Web/static/js*)
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_ALL_CODEBASE: false
           VALIDATE_DOCKERFILE_HADOLINT: false  # Turns off Dockerfile linter.

.gitignore

@@ -3,4 +3,5 @@ __pycache__/
 env
 ACMAS/package-lock.json
 ACMAS/package.json
-ACMAS/app/db.sqlite3
+ACMAS/app/db.sqlite3
+ACMAS/node_modules

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "python.analysis.typeCheckingMode": "off",
+    "liveServer.settings.port": 5501
+}

ACMAS/.env

@@ -1,7 +1,10 @@
 # DO NOT UPLOAD ANY CHANGES TO GITHUB!
 DATABASE=postgres
 DEBUG=1
-DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1] 52.60.213.127 www.acmas.systems acmas.systems
+DJANGO_ALLOWED_HOSTS='localhost 127.0.0.1 [::1] 52.60.213.127 www.acmas.systems acmas.systems'
+DJANGO_EMAIL=[email protected]
+DJANGO_PASS=password
+DJANGO_USER=acmas_admin
 GOOGLE_ADSENSE_ID=INSERT_ID_HERE
 GOOGLE_ADSENSE_URL=https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=
 GOOGLE_ANALYTICS_ID=INSERT_ID_HERE

ACMAS/app/ACMAS/settings.py

@@ -39,6 +39,7 @@
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "ACMAS_Web",
+    "django_components",
 ]
 
 MIDDLEWARE = [
@@ -56,14 +57,23 @@
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": [],
-        "APP_DIRS": True,
         "OPTIONS": {
             "context_processors": [
                 "django.template.context_processors.debug",
                 "django.template.context_processors.request",
                 "django.contrib.auth.context_processors.auth",
                 "django.contrib.messages.context_processors.messages",
             ],
+            "loaders": [
+                (
+                    "django.template.loaders.cached.Loader",
+                    [
+                        "django.template.loaders.filesystem.Loader",
+                        "django.template.loaders.app_directories.Loader",
+                        "django_components.template_loader.Loader",
+                    ],
+                )
+            ],
         },
     },
 ]
@@ -132,3 +142,6 @@
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+LOGIN_REDIRECT_URL = "/"
+LOGOUT_REDIRECT_URL = "/"

ACMAS/app/ACMAS_Web/admin.py

@@ -1,3 +1,13 @@
-# from django.contrib import admin
+from django.contrib import admin
 
-# Register your models here.
+from .models import Course, Question, University, UploadedFile, User
+
+admin.site.register(Question)
+admin.site.register(University)
+admin.site.register(Course)
+admin.site.register(UploadedFile)
+admin.site.register(User)
+
+admin.site.site_header = "ACMAS Admin"
+admin.site.site_title = "ACMAS Admin Portal"
+admin.site.index_title = "Welcome to the ACMAS Administration Portal"

ACMAS/app/ACMAS_Web/components/button/button.html

@@ -0,0 +1,7 @@
+<span class="button-component pt-2">
+    {% if component_type == "primary" %}
+    <button type="submit" class="px-4 py-2 rounded-xl text-white text-semibold text-lg bg-blue-600 hover:bg-blue-700 transition ease-in duration-200" value="{{ value }}" name="{{ name }}">{{ text }}</button>
+    {% elif component_type == "secondary" %}
+    <button type="submit" class="px-4 py-2 rounded-xl text-gray-700 text-semibold border border-gray-300 text-lg bg-white hover:bg-gray-100 transition ease-in duration-200" value="{{ value }}" name="{{ name }}">{{ text }}</button>
+    {% endif %}
+</span>

ACMAS/app/ACMAS_Web/components/button/button.py

@@ -0,0 +1,14 @@
+from django_components import component
+
+
+@component.register("button")
+class Button(component.Component):
+    template_name = "button/button.html"
+
+    def get_context_data(self, text, component_type, value, name=""):
+        return {
+            "text": text,
+            "component_type": component_type,
+            "value": value,
+            "name": name,
+        }

ACMAS/app/ACMAS_Web/components/field/field.html

@@ -0,0 +1,7 @@
+<div class="field-component p-0.5">
+    {% if component_type == "input" %}
+    <input type="file" class="block w-full text-sm text-gray-900 border border-gray-300 rounded-lg cursor-pointer bg-gray-50 dark:text-gray-400 focus:outline-none dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400" name="{{ name }}">
+    {% else %}
+    <input type="text" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" name="{{ name }}" placeholder="{{ placeholder }}">
+    {% endif %}
+</div>

ACMAS/app/ACMAS_Web/components/field/field.py

@@ -0,0 +1,13 @@
+from django_components import component
+
+
+@component.register("field")
+class Field(component.Component):
+    template_name = "field/field.html"
+
+    def get_context_data(self, placeholder, name, component_type):
+        return {
+            "placeholder": placeholder,
+            "name": name,
+            "component_type": component_type,
+        }