Skip to content

Commit

Permalink
pre on staged changes
Browse files Browse the repository at this point in the history
  • Loading branch information
krrish-sehgal committed Jan 24, 2025
1 parent 3c6cb01 commit 196ab0c
Show file tree
Hide file tree
Showing 17 changed files with 2,072 additions and 779 deletions.
7 changes: 4 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:${POSTGR
#Sentry DSN
SENTRY_DSN=https://[email protected]/0

SLACK_CLIENT_ID=
SLACK_CLIENT_SECRET=

SLACK_ID_CLIENT=your_slack_client_id_here
SLACK_SECRET_CLIENT=your_slack_client_secret_here
SLACK_BOT_TOKEN=your_slack_bot_token_here
SLACK_SIGNING_SECRET=your_slack_signing_secret_here

#BlueSky User Details
BLUESKY_USERNAME=example.bsky.social
Expand Down
14 changes: 4 additions & 10 deletions blt/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,7 @@
UserIssueViewSet,
UserProfileViewSet,
)
from website.views.blog import (
PostCreateView,
PostDeleteView,
PostDetailView,
PostListView,
PostUpdateView,
)
from website.views.blog import PostCreateView, PostDeleteView, PostDetailView, PostListView, PostUpdateView
from website.views.company import (
AddDomainView,
AddHuntView,
Expand Down Expand Up @@ -186,7 +180,7 @@
distribute_bacon,
select_contribution,
)
from website.views.slack_handlers import slack_events
from website.views.slack_handlers import slack_commands, slack_events
from website.views.teams import (
TeamChallenges,
TeamLeaderboard,
Expand Down Expand Up @@ -292,7 +286,8 @@
re_path(r"^auth/github/connect/$", GithubConnect.as_view(), name="github_connect"),
re_path(r"^auth/google/connect/$", GoogleConnect.as_view(), name="google_connect"),
path("auth/github/url/", github_views.oauth2_login),
path("oauth/slack/callback/", SlackCallbackView.as_view(), name="slack_callback"),
path("oauth/slack/callback/", SlackCallbackView.as_view(), name="slack_oauth_callback"),
path("slack/commands/", slack_commands, name="slack_commands"),
path("auth/google/url/", google_views.oauth2_login),
path("auth/facebook/url/", facebook_views.oauth2_callback),
path("socialaccounts/", SocialAccountListView.as_view(), name="social_account_list"),
Expand Down Expand Up @@ -860,7 +855,6 @@
name="similarity_scan",
),
path("projects/create/", create_project, name="create_project"),

path("teams/challenges/", TeamChallenges.as_view(), name="team_challenges"),
path("teams/leaderboard/", TeamLeaderboard.as_view(), name="team_leaderboard"),
path("challenges/", UserChallengeListView.as_view(), name="user_challenges"),
Expand Down
75 changes: 38 additions & 37 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Unidecode = "^1.3.8"
user-agents = "^2.2.0"
whitenoise = "^6.8.2"
django-debug-toolbar = "^4.4.6"
selenium = "^4.27.1"
selenium = "^4.28.1"
pylibmc = "^1.6.1"
psycopg2-binary = "^2.9.10"
boto = "^2.49.0"
Expand All @@ -43,7 +43,7 @@ pytz = "^2024.1"
requests = "^2.32.3"
requests-oauthlib = "^1.3.1"
six = "^1.16.0"
tablib = "^3.2.0"
tablib = "^3.8.0"
ua-parser = "^1.0.0"
djangorestframework = "^3.15.2"
cffi = "^1.17.1"
Expand All @@ -56,7 +56,7 @@ stripe = "^8.4.0"
django-environ = "^0.12.0"
django-humanize = "^0.1.2"
drf-yasg = "^1.21.8"
django-simple-captcha = "^0.6.0"
django-simple-captcha = "^0.6.1"
django-filter = "^24.3"
webdriver-manager = "^4.0.2"
pillow = "^10.4.0"
Expand All @@ -65,7 +65,7 @@ sentry-sdk = "^2.20.0"
bitcash = "^1.0.2"
pydantic = "^2.10.5"
pydantic_core = "^2.18.4"
unstructured = "^0.16.13"
unstructured = "^0.16.15"
Markdown = "^3.6"
faiss-cpu = "^1.8.0"
psutil = "^5.9.8"
Expand All @@ -87,16 +87,16 @@ newrelic = "^10.4.0"
[tool.poetry.group.dev.dependencies]
black = "^24.8.0"
isort = "^5.13.2"
ruff = "^0.9.2"
ruff = "^0.9.3"
pre-commit = "^3.8.0"

[tool.isort]
known_first_party = ["blt"]
line_length = 100
line_length = 120
profile = "black"

[tool.ruff]
line-length = 100
line-length = 120
target-version = "py311"

[tool.ruff.lint]
Expand Down
21 changes: 21 additions & 0 deletions website/migrations/0181_slackintegration_welcome_message.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 5.1.3 on 2025-01-23 18:50

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("website", "0180_rename_project_visit_count_repo_repo_visit_count"),
]

operations = [
migrations.AddField(
model_name="slackintegration",
name="welcome_message",
field=models.TextField(
blank=True,
help_text="Custom welcome message for new members. Use Slack markdown formatting.",
null=True,
),
),
]
27 changes: 27 additions & 0 deletions website/migrations/0182_project_status.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Generated by Django 5.1.4 on 2025-01-24 03:50

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("website", "0181_slackintegration_welcome_message"),
]

operations = [
migrations.AddField(
model_name="project",
name="status",
field=models.CharField(
choices=[
("flagship", "Flagship"),
("production", "Production"),
("incubator", "Incubator"),
("lab", "Lab"),
("inactive", "Inactive"),
],
default="new",
max_length=20,
),
),
]
12 changes: 12 additions & 0 deletions website/migrations/0183_merge_20250124_0618.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Generated by Django 5.1.4 on 2025-01-24 06:18

from django.db import migrations


class Migration(migrations.Migration):
dependencies = [
("website", "0180_merge_0178_merge_20241229_1948_0179_contributorstats"),
("website", "0182_project_status"),
]

operations = []
Loading

0 comments on commit 196ab0c

Please sign in to comment.