Skip to content

Commit ad917f0

Browse files
zoek1thelostone-mc
andauthored
Add events section to hackathons (#7316)
* Add events section to hackathons * Include migration and unescape html for events * Fix migration error * update migration Co-authored-by: Aditya Anand M C <aditya.anandmc@gmail.com>
1 parent 35ddc3f commit ad917f0

15 files changed

Lines changed: 210 additions & 3 deletions

File tree

app/app/settings.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -874,5 +874,7 @@ def callback(request):
874874
PHONE_SALT = env('PHONE_SALT', default='THIS_IS_INSECURE_CHANGE_THIS_PLEASE')
875875

876876
HYPERCHARGE_BOUNTIES_PROFILE_HANDLE = env('HYPERCHARGE_BOUNTIES_PROFILE', default='gitcoinbot')
877+
ADDEVENT_CLIENT_ID = env('ADDEVENT_CLIENT_ID', default='')
878+
ADDEVENT_API_TOKEN = env('ADDEVENT_API_TOKEN', default='')
877879

878-
BRIGHTID_PRIVATE_KEY = env('BRIGHTID_PRIVATE_KEY', default='wrong-private-key')
880+
BRIGHTID_PRIVATE_KEY = env('BRIGHTID_PRIVATE_KEY', default='wrong-private-key')

app/app/urls.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@
293293
path('api/v0.1/hackathon/<str:hackathon>/save/', dashboard.views.save_hackathon, name='save_hackathon'),
294294
path('api/v1/hackathon/<str:hackathon>/prizes', dashboard.views.hackathon_prizes, name='hackathon_prizes_api'),
295295
path('api/v0.1/hackathon/<str:hackathon>/showcase/', dashboard.views.showcase, name='hackathon_showcase'),
296+
path('api/v0.1/hackathon/<str:hackathon>/events/', dashboard.views.events, name='hackathon_events'),
296297
path('api/v0.1/projects/<int:project_id>', dashboard.views.get_project, name='project_context'),
297298
# action URLs
298299
url(r'^funder', retail.views.funder_bounties_redirect, name='funder_bounties_redirect'),
Lines changed: 4 additions & 0 deletions
Loading
961 Bytes
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

app/assets/v2/js/pages/dashboard-hackathon.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,6 +911,9 @@
911911
case 3:
912912
newPathName = 'participants';
913913
break;
914+
case 4:
915+
newPathName = 'events';
916+
break;
914917
case 5:
915918
newPathName = 'showcase';
916919
break;

0 commit comments

Comments
 (0)