Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b3fb95b
fix: like/follow routes
larrylaa Apr 5, 2025
9f03a5a
Merge branch 'main' of https://github.com/CPP-BitByBit/BitMatch into dev
larrylaa Apr 5, 2025
b02100a
feat: Rebeccals onboard (#43)
Rebeccals1 Apr 12, 2025
657c2b7
chore: drop db to fix everything
larrylaa Apr 12, 2025
fd06781
feat: profile page (#44)
larrylaa Apr 13, 2025
b6a224b
feat: onboarding flow + user auth basics (#45)
larrylaa Apr 14, 2025
5a4f57f
feat: added the match score algorithm
ColumnSkunky Apr 18, 2025
36753a4
feat: student profile backend (#46)
larrylaa Apr 18, 2025
57cba28
Merge branch 'dev' of https://github.com/CPP-BitByBit/BitMatch into m…
larrylaa Apr 18, 2025
93a4558
chore: pull data and pass into matchscoreutils
larrylaa Apr 18, 2025
149a767
chore: add for home page also
larrylaa Apr 18, 2025
c431335
chore: abstract user error msg
larrylaa Apr 18, 2025
c882e2d
fix: MatchScoreUtils.js to calculate new user values as well as corre…
ColumnSkunky Apr 20, 2025
edae24e
feat: new calculation logic
larrylaa Apr 20, 2025
009aff4
chore: make tags be added on project creation
larrylaa Apr 20, 2025
f37f882
chore: make score sseem more natural
larrylaa Apr 20, 2025
d1d0d9f
fix: page error on empty tags
larrylaa Apr 20, 2025
35cae3e
Merge pull request #47 from CPP-BitByBit/Match_Score_Updates
ColumnSkunky Apr 20, 2025
dc7cce5
fix: sizing broke
larrylaa Apr 20, 2025
642e0fb
Merge branch 'main' of https://github.com/CPP-BitByBit/BitMatch into dev
larrylaa Apr 20, 2025
a5c2433
feat: about page (#49)
Rebeccals1 Apr 20, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "*"
pull_request:
branches:
- "*"
- main

jobs:
terraform:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/django-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- "*"
pull_request:
branches:
- "*"
- main
workflow_dispatch:

jobs:
Expand Down
3 changes: 2 additions & 1 deletion backend/bitmatch/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
urlpatterns = [
path('', views.home),
path('admin/', admin.site.urls),
path('projects/', include('projects.urls'))
path('projects/', include('projects.urls')),
path('userauth/', include('userauth.urls')),
]
37 changes: 30 additions & 7 deletions backend/projects/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Generated by Django 5.1.6 on 2025-03-04 06:58
# Generated by Django 5.1.7 on 2025-04-12 20:52

import django.contrib.postgres.fields
import uuid
from django.db import migrations, models


Expand All @@ -12,18 +14,39 @@ class Migration(migrations.Migration):

operations = [
migrations.CreateModel(
name='Project',
name='Follow',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
],
),
migrations.CreateModel(
name='Like',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('group', models.CharField(max_length=255)),
('match_percentage', models.FloatField()),
],
),
migrations.CreateModel(
name='Project',
fields=[
('id', models.CharField(default=uuid.uuid4, editable=False, max_length=36, primary_key=True, serialize=False)),
('title', models.CharField(max_length=255)),
('institution', models.CharField(max_length=255)),
('description', models.TextField()),
('followers', models.IntegerField(default=0)),
('likes', models.IntegerField(default=0)),
('positions', models.JSONField(default=list)),
('image_url', models.URLField(blank=True, null=True)),
('image_url', models.ImageField(upload_to='projects/')),
('group', models.CharField(blank=True, max_length=255, null=True)),
('followers_count', models.IntegerField(default=0)),
('likes_count', models.IntegerField(default=0)),
('match_percentage', models.FloatField(blank=True, null=True)),
('location', models.JSONField(blank=True, default=list)),
('images', models.JSONField(blank=True, default=list)),
('interest_tags', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=225), blank=True, null=True, size=None)),
('skill_tags', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=225), blank=True, null=True, size=None)),
('full_description', models.CharField(blank=True, max_length=1000, null=True)),
('email', models.EmailField(blank=True, max_length=254, null=True, unique=True)),
('other_contact', models.CharField(blank=True, max_length=225, null=True)),
('updates', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=540), blank=True, null=True, size=None)),
('wanted_description', models.CharField(blank=True, max_length=540, null=True)),
],
),
]
55 changes: 55 additions & 0 deletions backend/projects/migrations/0002_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Generated by Django 5.1.7 on 2025-04-12 20:52

import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
('projects', '0001_initial'),
('userauth', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='follow',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_follows', to='userauth.user'),
),
migrations.AddField(
model_name='like',
name='user',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_likes', to='userauth.user'),
),
migrations.AddField(
model_name='project',
name='members',
field=models.ManyToManyField(blank=True, related_name='member_of_projects', to='userauth.user'),
),
migrations.AddField(
model_name='project',
name='owner',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='owned_projects', to='userauth.user'),
),
migrations.AddField(
model_name='like',
name='project',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_likes', to='projects.project'),
),
migrations.AddField(
model_name='follow',
name='project',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_follows', to='projects.project'),
),
migrations.AlterUniqueTogether(
name='like',
unique_together={('project', 'user')},
),
migrations.AlterUniqueTogether(
name='follow',
unique_together={('project', 'user')},
),
]
18 changes: 0 additions & 18 deletions backend/projects/migrations/0002_project_images.py

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

19 changes: 0 additions & 19 deletions backend/projects/migrations/0006_project_tags.py

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions backend/projects/migrations/0008_populate_uuids.py

This file was deleted.

This file was deleted.

Loading
Loading