Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions cl8/templates/_profile.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ <h3>{{ tag_group }}</h3>
<p>
{% for tag_dict in tags %}
<button type="button"
class="badge tags-view text-black hover:text-white text-sm my-2 mx-1 p-3 {% if tag_dict.tag.id in active_tag_ids %}bg-blue-500{% endif %}"
class=" tagsClass badge tags-view text-black hover:text-white text-sm my-2 mx-1 p-3 {% if tag_dict.tag.id in active_tag_ids %}bg-blue-500{% endif %}"
data-tag-name="{{ tag_dict.name }}"
data-tag-group="{{ tag_group }}"
data-tag-id="{{ tag_dict.tag.id }}">{{ tag_dict.name }}</button>
Expand All @@ -83,7 +83,7 @@ <h3>{{ tag_group }}</h3>
<p>
{% for tag_dict in ungrouped_tags %}
<button type="button"
class="badge tags-view text-black hover:text-white text-xs my-2 mx-1 p-3 {% if tag_dict.tag.id in active_tag_ids %}bg-blue-500{% endif %}"
class=" tagsClass badge tags-view text-black hover:text-white text-xs my-2 mx-1 p-3 {% if tag_dict.tag.id in active_tag_ids %}bg-blue-500{% endif %}"
data-tag-name="{{ tag_dict.name }}"
data-tag-group="{{ tag_group }}"
data-tag-id="{{ tag_dict.tag.id }}">{{ tag_dict.name }}</button>
Expand Down Expand Up @@ -131,4 +131,17 @@ <h3>{{ tag_group }}</h3>
})
})

document.querySelectorAll('.tagsClass').forEach(item => {

// Get the tag name from the data attribute
const tagName = item.getAttribute('data-tag-name');
// Check if the tag name contains 'ibm' (case-sensitive)
if (tagName.indexOf('IB1') !== -1) {
// Apply the outline style
item.style.border = '1px solid #ff4d11';
item.style.outline = 'none'; // Optional: remove default outline if necessary
}

})

</script>
7 changes: 7 additions & 0 deletions cl8/templates/_profile_edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@
</button>

<p class="text-sm px-3 m-auto">When 'visible' is checked, your profile will show up in searches</p>

<!-- Profile delete button -->
<a href="{% url 'account_delete' form.instance.user.id %}">
<button class="btn delete-btn border-[#ff4d11] bg-[#ff4d11] mt-5 mb-4" type="button">
Delete
</button>
</a>
</div>

<!-- Form Section -->
Expand Down
35 changes: 35 additions & 0 deletions cl8/templates/account/account_delete.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{% extends "account/base.html" %}
{% load i18n %}
{% load account %}
{% block head_title %} {% trans "Delete Account" %} {% endblock %} {% block inner %}
<div class="mt-4 p-5 flex justify-center items-center">
<div class="card w-[22rem] md:w-[25rem" style="border: 1px solid gray">
<div class="card-body">
<h1 class="text-lg">{% trans "Permanently delete account" %}</h1>
<!-- {% if user.is_authenticated %} {% include "account/snippets/already_logged_in.html" %} {% endif %} -->
<div class="prose mt-4">
<p class="text-black">
{% trans "This will permanently delete your account. If you want to rejoin, we will have to re-invite you." %}
</p>
<form method="POST" action="{% url 'account_delete' profile.user.id %}" class="password_reset">
{% csrf_token %}
<a href="">
<input class="btn border-[#ff4d11] bg-[#ff4d11] w-full mt-4" type="submit"
value="{% trans 'Permanently delete my account' %}" />
</a>
<a href="{% url 'account_invisible' profile.user.id %}">
<input class="btn border-[#8bc34a] bg-[#8bc34a] w-full mt-4" type="button"
name="is_visible" value="{% trans 'Just make me invisible for now' %}" />
</a>
<a href="{% url 'profile-edit' profile.short_id %}">
<input class="btn border-[#c8d4de] bg-[#c8d4de] w-full mt-4" type="button" value="{% trans 'Go back' %}" />
</a>
</form>
<p class="text-xs">
{% blocktrans %}Please contact us if you would like to discuss anything{% endblocktrans %}
</p>
</div>
</div>
</div>
</div>
{% endblock %}
59 changes: 59 additions & 0 deletions cl8/templates/account/account_delete_message.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{% extends "account/base.html" %}
{% load i18n %}
{% load account %}
{% block head_title %} {% trans "Delete Message" %} {% endblock %} {% block inner %}

<div class="mt-4 p-5 flex justify-center items-center">
<div class="card w-[20rem] md:w-[25rem]" style="border: 1px solid gray">
<div class="card-body">
<h1 class="text-lg">{% trans "Account deleted" %}</h1>
<!-- {% if user.is_authenticated %} {% include "account/snippets/already_logged_in.html" %} {% endif %} -->
<div class="prose mt-4">
<p class="text-black">
{% trans "Your account has been removed." %}
</p>
<p class="text-black">
{% trans "If you would like to rejoin, just email us" %}
</p>
<!-- <form
method="POST"
action="{% url 'account_reset_password' %}"
class="password_reset"
>
{% csrf_token %}
<div class="form-control w-full">
{% comment %} <label class="label" for="{{ form.email.id_for_label }}">
<span class="label-text">{{ form.email.label }}</span>
</label> {% endcomment %}
<input
type="text"
placeholder="Email"
name="{{ form.email.html_name }}"
class="input input-bordered w-full"
/>
</div>
<input
class="btn border-[#ff4d11] bg-[#ff4d11] w-full mt-4"
type="submit"
value="{% trans 'Permanently delete my account' %}"
/>
<input
class="btn border-[#8bc34a] bg-[#8bc34a] w-full mt-4"
type="submit"
value="{% trans 'Just make me invisible for now' %}"
/>
<input
class="btn border-[#c8d4de] bg-[#c8d4de] w-full mt-4"
type="submit"
value="{% trans 'Go back' %}"
/>
</form> -->
<p class="font-bold text-black">
{% blocktrans %}constellation@ib1.org{% endblocktrans %}
</p>
</div>
</div>
</div>
</div>
{% endblock %}

10 changes: 10 additions & 0 deletions cl8/templates/pages/_paginated_profiles.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ <h4 class="card-title">

document.querySelectorAll('.listButton').forEach(item => {

// Get the tag name from the data attribute
const tagName = item.getAttribute('data-tag-name');
// Check if the tag name contains 'ibm' (case-sensitive)
if (tagName.indexOf('IB1') !== -1) {
// Apply the outline style
item.style.border = '1px solid #ff4d11';
item.style.outline = 'none'; // Optional: remove default outline if necessary
}


item.addEventListener('click', event => {

// we can't just bubble up a 'click' event to the parent elements
Expand Down
2 changes: 1 addition & 1 deletion cl8/users/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ def send_default_email(self, email):

This mail can be safely ignored if you did not initiate this action.

If it was you, please contact us and we can add you.
If it was you, please contatc us and we can add you.

Thank you!

Expand Down
66 changes: 66 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# Main dependencies
pytz
python-slugify
argon2-cffi
whitenoise
psycopg2-binary
django-environ
django-model-utils
django-allauth
djangorestframework
django-taggit
dj-taggit-serializer
django-cors-headers
drfpasswordless
django-storages[boto3]
django-anymail[mailgun]
Pillow
Django~=4.2.0
gunicorn
sentry-sdk
django-stubs
django-extensions
django-mjml
sorl-thumbnail
django-taggit-labels
django-debug-toolbar
slackclient
typing-extensions
pytest-mock
django-upgrade
django-browser-reload
django-tailwind
django-filter
django-autocomplete-light
django-htmx
django-gravatar2
markdown
markdown-it-py
gspread
rich
shortuuid
django-widget-tweaks
ipdb
airtable-python
pyairtable
pytest-watch

# Development dependencies
mypy
pytest
pytest-sugar
pytest-django
pytest-notifier
flake8
flake8-isort
coverage
django-coverage-plugin
pylint-django
pre-commit
factory-boy
black
djlint
pdbpp
pytest-factoryboy
awscli
awscli-plugin-endpoint