Codestin Search App

From 55d3bdfc650a8e4401376e3b424cc56a35a03ced Mon Sep 17 00:00:00 2001 From: Rinkit Adhana Date: Thu, 20 Mar 2025 03:24:32 +0530 Subject: [PATCH 1/6] header added on Organization domain page --- .../templates/organization/view_domain.html | 58 +++++++++++-------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/website/templates/organization/view_domain.html b/website/templates/organization/view_domain.html index 178e978efe..05af38d44a 100644 --- a/website/templates/organization/view_domain.html +++ b/website/templates/organization/view_domain.html @@ -1,26 +1,36 @@ - - - - - - - - - - - - - Codestin Search App - - +{% extends "base.html" %} +{% block head %} + Codestin Search App +{% endblock head %} +{% block meta %} + + + + + +{% endblock meta %} +{% block scripts %} + + + +{% endblock scripts %} +{% block styles %} + +{% endblock styles %} +{% block title %} + Codestin Search App +{% endblock title %} +{% block content %} + {% include "includes/sidenav.html" %} +

@@ -432,4 +442,4 @@

Top Testers ({{ top_testers | length }); - +{% endblock content %} From 8354a5c6de51ae8d041ae5b6334ae8e76161dafa Mon Sep 17 00:00:00 2001 From: Rinkit Adhana Date: Thu, 20 Mar 2025 03:31:51 +0530 Subject: [PATCH 2/6] duplicate header removed --- website/templates/organization/view_domain.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/website/templates/organization/view_domain.html b/website/templates/organization/view_domain.html index 05af38d44a..b1309ae053 100644 --- a/website/templates/organization/view_domain.html +++ b/website/templates/organization/view_domain.html @@ -1,6 +1,6 @@ {% extends "base.html" %} {% block head %} - Codestin Search App + Domain Info {% endblock head %} {% block meta %} @@ -25,9 +25,6 @@ crossorigin="anonymous" referrerpolicy="no-referrer" /> {% endblock styles %} -{% block title %} - Codestin Search App -{% endblock title %} {% block content %} {% include "includes/sidenav.html" %}
From d8b5cdc52f2cb3ca79023a0c3ea77e4688ec0cad Mon Sep 17 00:00:00 2001 From: Rinkit Adhana Date: Thu, 20 Mar 2025 03:36:50 +0530 Subject: [PATCH 3/6] body tag removed and structure improved --- website/templates/organization/view_domain.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/templates/organization/view_domain.html b/website/templates/organization/view_domain.html index b1309ae053..58dcafc430 100644 --- a/website/templates/organization/view_domain.html +++ b/website/templates/organization/view_domain.html @@ -398,6 +398,8 @@
Top Testers ({{ top_testers | length

+ {% endblock content %} + {% block scripts %} - -{% endblock content %} + {% endblock scripts %} From b45a78814e569af8f8e116d05673e32a3a6aeb29 Mon Sep 17 00:00:00 2001 From: Rinkit Adhana Date: Thu, 20 Mar 2025 03:45:25 +0530 Subject: [PATCH 4/6] pre-commit error fixed --- website/templates/organization/view_domain.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/website/templates/organization/view_domain.html b/website/templates/organization/view_domain.html index 58dcafc430..d6782f9d9b 100644 --- a/website/templates/organization/view_domain.html +++ b/website/templates/organization/view_domain.html @@ -398,9 +398,10 @@

Top Testers ({{ top_testers | length - {% endblock content %} - {% block scripts %} - - {% endblock scripts %} + +{% endblock scripts %} From 33faad7a02bf98075ca26a9a239127782b0e17d6 Mon Sep 17 00:00:00 2001 From: Rinkit Adhana Date: Thu, 20 Mar 2025 03:52:37 +0530 Subject: [PATCH 5/6] code structure improved --- .../templates/organization/view_domain.html | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/website/templates/organization/view_domain.html b/website/templates/organization/view_domain.html index d6782f9d9b..0c290f82ad 100644 --- a/website/templates/organization/view_domain.html +++ b/website/templates/organization/view_domain.html @@ -2,29 +2,12 @@ {% block head %} Domain Info {% endblock head %} -{% block meta %} - - - - - -{% endblock meta %} -{% block scripts %} - - - -{% endblock scripts %} -{% block styles %} - -{% endblock styles %} +{% block description %} + View domain details, including domain name, URL, organization information, and social media links. Keep track of all your domains easily. +{% endblock description %} +{% block keywords %} + view domain, domain details, domain information, domain URL, organization information, social media links +{% endblock keywords %} {% block content %} {% include "includes/sidenav.html" %}
From f5b02f115c4d5a194e6076f30df760d9c31a2e4c Mon Sep 17 00:00:00 2001 From: Rinkit Adhana Date: Thu, 20 Mar 2025 06:29:27 +0530 Subject: [PATCH 6/6] removed email restrictions for creating new organization --- website/views/company.py | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/website/views/company.py b/website/views/company.py index 60ea4b1887..5d9fd287b2 100644 --- a/website/views/company.py +++ b/website/views/company.py @@ -40,19 +40,6 @@ logger = logging.getLogger("slack_bolt") logger.setLevel(logging.WARNING) -restricted_domain = [ - "gmail.com", - "hotmail.com", - "outlook.com", - "yahoo.com", - "proton.com", -] - - -def get_email_domain(email): - domain = email.split("@")[-1] - return domain - def validate_organization_user(func): def wrapper(self, request, id, *args, **kwargs): @@ -95,15 +82,9 @@ def Organization_view(request, *args, **kwargs): return redirect("/") if isinstance(user, AnonymousUser): - messages.error(request, "Login with organization or domain-provided email.") + messages.error(request, "Please login to access your organization.") return redirect("/accounts/login/") - domain = get_email_domain(user.email) - - if domain in restricted_domain: - messages.error(request, "Login with organization or domain provided email.") - return redirect("/") - user_organizations = Organization.objects.filter(Q(admin=user) | Q(managers=user)) if not user_organizations.exists(): # Check if the user is a manager of any domain @@ -137,17 +118,9 @@ def post(self, request, *args, **kwargs): messages.error(request, "Login to create organization") return redirect("/accounts/login/") - user_domain = get_email_domain(user.email) organization_name = data.get("organization_name", "") organization_url = data.get("organization_url", "") - if user_domain in restricted_domain: - messages.error( - request, - "Login with organization email in order to create the organization.", - ) - return redirect("/") - if organization_name == "" or Organization.objects.filter(name=organization_name).exists(): messages.error(request, "organization name is invalid or already exists.") return redirect("register_organization")