Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1b07a00
add timeline view
fiskenslakt Sep 3, 2020
6b692e9
add timeline template
fiskenslakt Sep 3, 2020
e138286
add static timeline assets
fiskenslakt Sep 3, 2020
929a93d
Merge branch 'master' into feat/timeline
jb3 Oct 10, 2020
4006c73
Update page title
jb3 Oct 10, 2020
ec488e6
Prettify CSS
jb3 Oct 10, 2020
abb69b9
Major fixes to timeline CSS to prevent overriding our CSS
jb3 Oct 10, 2020
fbeda53
Rename timeline CSS file for easier finding
jb3 Oct 10, 2020
f7fe7c8
Enable animate in JS
jb3 Oct 10, 2020
b42094d
Add media query for heading scaling on mobile devices
jb3 Oct 10, 2020
960748e
Reindent HTML
jb3 Oct 10, 2020
392be62
Remove read more buttons
jb3 Oct 10, 2020
e982e28
Add copy from lemon
jb3 Oct 11, 2020
de3b67c
Remove pointless comments
jb3 Oct 11, 2020
c0e9af6
Remove flake8-annotations timeline item
jb3 Oct 11, 2020
059f6c0
Add logo to new logo timeline item
jb3 Oct 11, 2020
410bfd8
Responsively size YouTube embeds
jb3 Oct 11, 2020
30ceab5
Merge branch 'master' into feat/timeline
jb3 Oct 11, 2020
74992b4
Add fontawesome icons to every timeline event
jb3 Oct 11, 2020
914614e
Better scale YouTube videos
jb3 Oct 11, 2020
1da259d
Update default picture to community logo
jb3 Oct 11, 2020
479624e
Add unit test for timeline page
jb3 Oct 12, 2020
aa1bd99
Fix linting in tests file
jb3 Oct 12, 2020
4cb6b5a
Update missed icon
jb3 Oct 12, 2020
59a29dc
Fix line endings
jb3 Oct 12, 2020
0ad7450
Hyperlink stats page
jb3 Oct 12, 2020
31ce101
Update privacy policy icon
jb3 Oct 12, 2020
8a9337e
Use bigger icon for timeline items
jb3 Oct 12, 2020
f3c2839
Use logo with text for new logo timeline itemm
jb3 Oct 12, 2020
d309d8e
Use different colours for each category
jb3 Oct 12, 2020
53e1a64
Add Ves joining timeline itemm
jb3 Oct 12, 2020
e1cd121
Make dark blue darker to separate from blurple
jb3 Oct 12, 2020
96860be
Fix line endings
jb3 Oct 12, 2020
924f54a
Align server icons better
jb3 Oct 12, 2020
26274d5
Update font sizing
jb3 Oct 12, 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
8 changes: 8 additions & 0 deletions pydis_site/apps/home/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,14 @@ def test_index_returns_200(self):
self.assertEqual(resp.status_code, 200)


class TestTimelineReturns200(TestCase):
def test_timeline_returns_200(self):
"""Check that the timeline page returns a HTTP 200 response."""
url = reverse('timeline')
resp = self.client.get(url)
self.assertEqual(resp.status_code, 200)


class TestLoginCancelledReturns302(TestCase):
def test_login_cancelled_returns_302(self):
"""Check that the login cancelled redirect returns a HTTP 302 response."""
Expand Down
3 changes: 2 additions & 1 deletion pydis_site/apps/home/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.urls import include, path

from pydis_site.utils.views import MessageRedirectView
from .views import AccountDeleteView, AccountSettingsView, HomeView
from .views import AccountDeleteView, AccountSettingsView, HomeView, timeline

app_name = 'home'
urlpatterns = [
Expand Down Expand Up @@ -38,4 +38,5 @@

path('admin/', admin.site.urls),
path('notifications/', include('django_nyt.urls')),
path('timeline/', timeline, name="timeline"),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
4 changes: 2 additions & 2 deletions pydis_site/apps/home/views/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from .account import DeleteView as AccountDeleteView, SettingsView as AccountSettingsView
from .home import HomeView
from .home import HomeView, timeline

__all__ = ["AccountDeleteView", "AccountSettingsView", "HomeView"]
__all__ = ["AccountDeleteView", "AccountSettingsView", "HomeView", "timeline"]
5 changes: 5 additions & 0 deletions pydis_site/apps/home/views/home.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,8 @@ def get(self, request: WSGIRequest) -> HttpResponse:
"""Collect repo data and render the homepage view."""
repo_data = self._get_repo_data()
return render(request, "home/index.html", {"repo_data": repo_data})


def timeline(request: WSGIRequest) -> HttpResponse:
"""Render timeline view."""
return render(request, 'home/timeline.html')
Loading