Skip to content

Commit

Permalink
Merge branch 'dev' into hahwul-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
hahwul authored Sep 12, 2023
2 parents 5c1f310 + ac88964 commit 67f1ea5
Show file tree
Hide file tree
Showing 49 changed files with 2,710 additions and 155 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
|----------|-----------|-----|--------|-------|--------|----|
| Go | Echo ||||| X |
| Go | Gin ||||| X |
| Python | Django || X | X | X | X |
| Python | Flask || X | X | X | X |
| Python | Django || | | | X |
| Python | Flask || | | | X |
| Ruby | Rails ||||| X |
| Ruby | Sinatra ||||| X |
| Php | ||||| X |
Expand Down
3 changes: 3 additions & 0 deletions spec/functional_test/fixtures/django/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## Notes

This project uses a portion of the source code from [DjangoBlog](https://github.com/liangliangyy/DjangoBlog) for testing purposes. (Djangoblog is released under the MIT License)
18 changes: 0 additions & 18 deletions spec/functional_test/fixtures/django/accounts/urls.py

This file was deleted.

Empty file.
70 changes: 70 additions & 0 deletions spec/functional_test/fixtures/django/blog/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
from django.urls import path
from django.views.decorators.cache import cache_page

from . import views

app_name = "blog"
urlpatterns = [
path(
r'',
views.IndexView.as_view(),
name='index'),
path(
r'page/<int:page>/',
views.IndexView.as_view(),
name='index_page'),
path(
r'article/<int:year>/<int:month>/<int:day>/<int:article_id>.html',
views.ArticleDetailView.as_view(),
name='detailbyid'),
path(
r'category/<slug:category_name>.html',
views.CategoryDetailView.as_view(),
name='category_detail'),
path(
r'category/<slug:category_name>/<int:page>.html',
views.CategoryDetailView.as_view(),
name='category_detail_page'),
path(
r'author/<author_name>.html',
views.AuthorDetailView.as_view(),
name='author_detail'),
path(
r'author/<author_name>/<int:page>.html',
views.AuthorDetailView.as_view(),
name='author_detail_page'),
path(
r'tag/<slug:tag_name>.html',
views.TagDetailView.as_view(),
name='tag_detail'),
path(
r'tag/<slug:tag_name>/<int:page>.html',
views.TagDetailView.as_view(),
name='tag_detail_page'),
path(
'archives.html',
cache_page(
60 * 60)(
views.ArchivesView.as_view()),
name='archives'),
path(
'links.html',
views.LinkListView.as_view(),
name='links'),
path(
r'upload',
views.fileupload,
name='upload'),
path(
r'not_found',
views.page_not_found_view,
name='page_not_found_view'),
path(
r'test',
views.test,
name='test'),
path(
r'delete_test',
views.delete_test,
name='delete_test'),
]
Loading

0 comments on commit 67f1ea5

Please sign in to comment.