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.

Sign up for GitHub

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

Hackathon - Town Square - In Review #6359

Merged
merged 31 commits into from
Apr 13, 2020
Merged

Hackathon - Town Square - In Review #6359

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
6fd338a
Profile Model
androolloyd Mar 17, 2020
663b662
add migrations
androolloyd Mar 18, 2020
b139072
hackathon setup feature now uses sponsor profiles to create company c…
androolloyd Mar 18, 2020
2de1a50
WIP Hackathon Townsquare
androolloyd Mar 31, 2020
6c8dd8e
files added incorrectly
androolloyd Mar 31, 2020
85252a2
new hackathon index page, styles implemented, new learn tab added
androolloyd Mar 31, 2020
230473e
reverts this commit since we've merged the changes into the new index…
androolloyd Mar 31, 2020
06e10c8
WIP, more updates, style and margin changes
androolloyd Apr 1, 2020
5585b80
formatting changes
androolloyd Apr 1, 2020
f9daf00
WIP publish, projects are rendering due to a bug on the json response…
androolloyd Apr 8, 2020
69322d7
WIP
androolloyd Apr 9, 2020
d960c09
Projects Panel
androolloyd Apr 10, 2020
39b5232
Dynamic Hackathon Background enabled,
androolloyd Apr 10, 2020
a33fabe
show project message in ih
danlipert Apr 11, 2020
f304353
Review cleanup
androolloyd Apr 11, 2020
05ed9ef
Merge branch 'feature/hackathon-town-square' of github.com:gitcoinco/…
androolloyd Apr 11, 2020
a28cf4e
Review cleanup
androolloyd Apr 11, 2020
f66504a
removed unused model and admin definitions
androolloyd Apr 11, 2020
7283c70
Review cleanup, and some additional overhead reduction to the hackath…
androolloyd Apr 11, 2020
f400703
fix stylelint
danlipert Apr 12, 2020
9c238a3
Review cleanup
androolloyd Apr 13, 2020
13a33a3
Merge branch 'feature/hackathon-town-square' of github.com:gitcoinco/…
androolloyd Apr 13, 2020
3859923
Merge branch 'master' into feature/hackathon-town-square
danlipert Apr 13, 2020
3767d44
Review Cleanup
androolloyd Apr 13, 2020
70277b6
Merge branch 'feature/hackathon-town-square' of github.com:gitcoinco/…
androolloyd Apr 13, 2020
ed996e9
review cleanup, recreate migrations
androolloyd Apr 13, 2020
1fb3c7b
Review cleanup
androolloyd Apr 13, 2020
d525788
quick css class addition to icons
androolloyd Apr 13, 2020
59e9068
adding bootstrap-vue.css to eslint ignore
androolloyd Apr 13, 2020
0f5f217
moving the ignore definition from eslint to stylelint
androolloyd Apr 13, 2020
071dd02
Allow staff and admins to view a hackathon if not registered
androolloyd Apr 13, 2020
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
3 changes: 2 additions & 1 deletion app/app/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import raven
import sentry_sdk
from sentry_sdk.integrations.django import DjangoIntegration
from sentry_sdk.integrations.celery import CeleryIntegration

from boto3.session import Session
from easy_thumbnails.conf import Settings as easy_thumbnails_defaults
Expand Down Expand Up @@ -289,7 +290,7 @@ def callback(request):
if SENTRY_DSN:
sentry_sdk.init(
SENTRY_DSN,
integrations=[DjangoIntegration()]
integrations=[DjangoIntegration(), CeleryIntegration()]
)
RAVEN_CONFIG = {
'dsn': SENTRY_DSN,
Expand Down
17 changes: 12 additions & 5 deletions app/app/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,10 @@

# Hackathons / special events
path('hackathon/<str:hackathon>/', dashboard.views.hackathon, name='hackathon'),
path('hackathon/onboard/<str:hackathon>/', dashboard.views.hackathon_onboard, name='hackathon_onboard'),
path('hackathon/projects/<str:hackathon>/', dashboard.views.hackathon_projects, name='hackathon_projects'),
path('hackathon/projects/<str:hackathon>', dashboard.views.hackathon_projects, name='hackathon_projects2'),
path('hackathon/<str:hackathon>/<str:panel>/', dashboard.views.hackathon, name='hackathon'),
path('hackathon/<str:hackathon>/onboard', dashboard.views.hackathon_onboard, name='hackathon_onboard'),
path('hackathon/<str:hackathon>/projects/', dashboard.views.hackathon_projects, name='hackathon_projects'),
path('hackathon/<str:hackathon>/prizes/', dashboard.views.hackathon, name='hackathon_prizes'),
path(
'hackathon/projects/<str:hackathon>/<str:project>', dashboard.views.hackathon_project, name='hackathon_project'
),
Expand All @@ -227,8 +228,11 @@
name='hackathon_edit_project'
),
path('modal/save_project/', dashboard.views.hackathon_save_project, name='hackathon_save_project'),
re_path(r'^hackathon/?$/?', dashboard.views.hackathon, name='hackathon_idx'),
re_path(r'^hackathon/(.*)?$', dashboard.views.hackathon, name='hackathon_idx2'),
# TODO: revisit if we need to keep these urls for legacy links
# re_path(r'^hackathon/?$/?', dashboard.views.hackathon, name='hackathon_idx'),
androolloyd marked this conversation as resolved.
Show resolved Hide resolved
# 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'),
Expand Down Expand Up @@ -688,6 +692,9 @@
url(r'^api/v0.1/user_bounties/', dashboard.views.get_user_bounties, name='get_user_bounties'),
url(r'^api/v0.1/users_fetch/', dashboard.views.users_fetch, name='users_fetch'),

#projets
url(r'^api/v0.1/projects_fetch/', dashboard.views.projects_fetch, name='projects_fetch'),

# wiki
path('wiki/notifications/', include('django_nyt.urls')),
]
Expand Down
4 changes: 4 additions & 0 deletions app/assets/v2/css/bootstrap-vue.min.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading