Skip to content

Commit

Permalink
Merge pull request #9353 from gitcoinco/gitc-301
Browse files Browse the repository at this point in the history
chore: order upcoming by starting date
  • Loading branch information
zlsgh authored Aug 16, 2021
2 parents 86af276 + 9860e23 commit b65194e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -367,15 +367,15 @@
name='hackathon_project_page'
),
path('modal/save_project/', dashboard.views.hackathon_save_project, name='hackathon_save_project'),
# TODO: revisit if we need to keep these urls for legacy links
# re_path(r'^hackathon/?$/?', dashboard.views.hackathon, name='hackathon_idx'),
# re_path(r'^hackathon/(.*)?$', dashboard.views.hackathon, name='hackathon_idx2'),

url(r'^hackathon/<str:hackathon>/?$/?', dashboard.views.hackathon, name='hackathon'),
url(r'^hackathon/<str:hackathon>/<str:panel>/?$/?', dashboard.views.hackathon, name='hackathon'),
path('hackathon-list/', dashboard.views.get_hackathons, name='get_hackathons'),
path('hackathon-list', dashboard.views.get_hackathons, name='get_hackathons2'),
re_path(r'^hackathon/?$', dashboard.views.get_hackathons, name='get_hackathons3'),
re_path(r'^hackathons/?$', dashboard.views.get_hackathons, name='get_hackathons4'),

# list all hackathons
re_path(r'^hackathon-list/?$', dashboard.views.get_hackathons, name='get_hackathons'),
re_path(r'^hackathon/?$', dashboard.views.get_hackathons, name='get_hackathons'),
re_path(r'^hackathons/?$', dashboard.views.get_hackathons, name='get_hackathons'),

url(r'^register_hackathon/', dashboard.views.hackathon_registration, name='hackathon_registration'),
path('api/v0.1/hackathon/<str:hackathon>/save/', dashboard.views.save_hackathon, name='save_hackathon'),
path('api/v1/hackathon/<str:hackathon>/prizes', dashboard.views.hackathon_prizes, name='hackathon_prizes_api'),
Expand Down
2 changes: 1 addition & 1 deletion app/perftools/management/commands/create_page_cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def create_hackathon_list_page_cache():
view = 'hackathons'
keyword = 'hackathons'
current_hackathon_events = HackathonEvent.objects.current().filter(visible=True).order_by('-start_date')
upcoming_hackathon_events = HackathonEvent.objects.upcoming().filter(visible=True).order_by('-start_date')
upcoming_hackathon_events = HackathonEvent.objects.upcoming().filter(visible=True).order_by('start_date')
finished_hackathon_events = HackathonEvent.objects.finished().filter(visible=True).order_by('-start_date')

events = []
Expand Down

0 comments on commit b65194e

Please sign in to comment.