Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prod server #2259

Closed
wants to merge 59 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
ce811b0
perf(register): reduce number of queries executed
aswanthabam Sep 26, 2024
9897455
Merge branch 'dev' into perf-register
aswanthabam Sep 26, 2024
713b716
perf: rank calculation optimization
aswanthabam Sep 26, 2024
f213818
Merge branch 'dev' into perf-register
aswanthabam Sep 26, 2024
8c48aca
feat: added interest add and edit apis
aswanthabam Oct 6, 2024
7d8981e
Merge pull request #2233 from aswanthabam/feature-interests
nashnsulthan Oct 6, 2024
cf0ba53
feat: celery task for discord onboarding
aswanthabam Oct 6, 2024
d35920e
fix: discord onboarding
aswanthabam Oct 6, 2024
bb9368b
Merge pull request #2235 from aswanthabam/feature-interests
nashnsulthan Oct 6, 2024
09f646b
feat: added categoery in interest group
muhammedr7025 Oct 6, 2024
756fe2c
Merge pull request #2234 from gtech-mulearn/dev
nashnsulthan Oct 6, 2024
e6c87ba
Merge branch 'gtech-mulearn:dev' into dev
muhammedr7025 Oct 7, 2024
fc8209c
Merge pull request #2232 from aswanthabam/perf-register
nashnsulthan Oct 7, 2024
5126aee
Merge pull request #2236 from muhammedr7025/dev
nashnsulthan Oct 7, 2024
eb7f607
Merge pull request #2237 from gtech-mulearn/dev
nashnsulthan Oct 7, 2024
3dd2e78
feat: add interest selected field in user info api
aswanthabam Oct 8, 2024
546765c
Merge branch 'dev' of https://github.com/aswanthabam/mulearnbackend i…
aswanthabam Oct 8, 2024
fa91ccc
cache register flag
aswanthabam Oct 8, 2024
f9ba1ac
Merge pull request #2238 from aswanthabam/dev
nashnsulthan Oct 8, 2024
2e24a46
fix: rank calculation issue fixed
aswanthabam Oct 8, 2024
08612be
Merge pull request #2240 from aswanthabam/dev
nashnsulthan Oct 8, 2024
3c603b7
Merge pull request #2239 from gtech-mulearn/dev
nashnsulthan Oct 8, 2024
2bbcb4a
perf: optimized profile apis
aswanthabam Oct 10, 2024
1cde7d3
feat: alter 1.55
aswanthabam Oct 11, 2024
a3638bd
feat : Alter 1.54
aswanthabam Oct 11, 2024
3847e92
user org link get and post api
muhammedr7025 Oct 11, 2024
d111839
Merge pull request #2241 from muhammedr7025/dev
nashnsulthan Oct 11, 2024
f353900
Merge pull request #2242 from gtech-mulearn/dev
nashnsulthan Oct 11, 2024
8b1f7c6
feat: apis for learning circle meetups
aswanthabam Oct 12, 2024
95a605c
Merge branch 'gtech-mulearn:dev' into dev
aswanthabam Oct 12, 2024
c6c410a
Merge pull request #2243 from aswanthabam/dev
nashnsulthan Oct 12, 2024
00e469c
Merge pull request #2244 from gtech-mulearn/dev
nashnsulthan Oct 12, 2024
345ede2
fix: issue
aswanthabam Oct 12, 2024
16de248
Merge branch 'gtech-mulearn:dev' into dev
aswanthabam Oct 12, 2024
3fc0205
Merge pull request #2245 from aswanthabam/dev
nashnsulthan Oct 12, 2024
d339c55
Merge pull request #2246 from gtech-mulearn/dev
nashnsulthan Oct 12, 2024
e6c1c46
fix: removed alter-1.55
aswanthabam Oct 12, 2024
64c2d33
Merge pull request #2247 from aswanthabam/dev
nashnsulthan Oct 12, 2024
b5d1b03
ig category value change
muhammedr7025 Oct 12, 2024
38640e9
org permistion change
muhammedr7025 Oct 12, 2024
4ddeb22
Merge pull request #2248 from muhammedr7025/dev
nashnsulthan Oct 13, 2024
a2a1726
Merge pull request #2249 from gtech-mulearn/dev
nashnsulthan Oct 13, 2024
24c6a00
feat: assign student role when choosed a college
aswanthabam Oct 13, 2024
3dbf9a4
Merge pull request #2250 from aswanthabam/dev
nashnsulthan Oct 13, 2024
0e00f7b
Merge pull request #2251 from gtech-mulearn/dev
nashnsulthan Oct 13, 2024
8b3bb17
fix: past meetup listing issue fixed
aswanthabam Oct 13, 2024
bcbc077
Merge pull request #2252 from aswanthabam/dev
nashnsulthan Oct 13, 2024
4abb040
Merge pull request #2253 from gtech-mulearn/dev
nashnsulthan Oct 13, 2024
1b03a03
feat: onboard api fixes
aswanthabam Oct 13, 2024
2595c46
feat: added attendees api and minro fixes
aswanthabam Oct 13, 2024
fa78f74
Merge branch 'gtech-mulearn:dev' into dev
aswanthabam Oct 13, 2024
20fb581
Merge pull request #2254 from aswanthabam/dev
nashnsulthan Oct 13, 2024
3f9584a
feat(lc) : Learning circle meetup apis
aswanthabam Oct 20, 2024
5dc85cb
Merge pull request #2255 from aswanthabam/dev
nashnsulthan Oct 20, 2024
4c47ecb
Merge pull request #2256 from gtech-mulearn/dev
nashnsulthan Oct 20, 2024
debcd8b
fix(lc): meetup attendee list api issues fix
aswanthabam Oct 20, 2024
7b8ed55
Merge branch 'gtech-mulearn:dev' into dev
aswanthabam Oct 20, 2024
e9fd70e
Merge pull request #2257 from aswanthabam/dev
nashnsulthan Oct 20, 2024
3c49f5d
Merge pull request #2258 from gtech-mulearn/dev
nashnsulthan Oct 20, 2024
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
7 changes: 6 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,9 @@ PROTECTED_API_KEY =

SYSTEM_ADMIN_ID =

LAUNCHPAD_ADMIN_EMAIL =
LAUNCHPAD_ADMIN_EMAIL =

DISCORD_CLIENT_ID=xxx
DISCORD_CLIENT_SECRET=xxx
DISCORD_GUILD_ID=xxx
DISCORD_BOT_TOKEN=xxx
4 changes: 3 additions & 1 deletion api/dashboard/ig/dash_ig_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ class InterestGroupSerializer(serializers.ModelSerializer):
updated_by = serializers.CharField(source='updated_by.full_name')
created_by = serializers.CharField(source='created_by.full_name')
members = serializers.SerializerMethodField()

category = serializers.ChoiceField(choices=["hardware", "coder", "creative", "manager", "others"])
class Meta:
model = InterestGroup
fields = [
"id",
"name",
"icon",
"code",
"category",
"members",
"updated_by",
"updated_at",
Expand All @@ -35,6 +36,7 @@ class Meta:
fields = [
"name",
"code",
"category",
"icon",
"created_by",
"updated_by"
Expand Down
Loading
Loading