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.

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

Port threads app to Django template syntax #1430

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cb4163d
Add fields used thread template to models
gorkemarslan Oct 12, 2022
c5d9153
Create ThreadDetailView
gorkemarslan Oct 12, 2022
99360a1
Port thread to Django template syntax
gorkemarslan Oct 12, 2022
3595f18
Add scrollbar
gorkemarslan Oct 12, 2022
038d25b
Fix voting
gorkemarslan Oct 12, 2022
3aa5dde
Fix issue outline
gorkemarslan Oct 12, 2022
55e0910
Fix linting
gorkemarslan Oct 12, 2022
caa14a8
added makemigrations.py
simar5244 Sep 29, 2022
ca0cbb6
Added makemigrations.py
simar5244 Sep 29, 2022
e4a17c5
Delete readme.py.txt
simar5244 Sep 29, 2022
2829e9f
Issue #1351
simar5244 Sep 29, 2022
2267f38
update README.md [skip ci]
allcontributors[bot] Oct 5, 2022
78657c9
update .all-contributorsrc [skip ci]
allcontributors[bot] Oct 5, 2022
bf5b00f
Update black from 22.8.0 to 22.10.0
pyup-bot Oct 7, 2022
5b71af5
Add pre-commit dev dependency
brylie Oct 7, 2022
e69db0d
Add pytest configuration file
gorkemarslan Oct 7, 2022
f62af1e
Collect static files before the tests
gorkemarslan Oct 7, 2022
7b144bc
Reformat code
gorkemarslan Oct 7, 2022
ab8c118
docs: update README.md [skip ci]
allcontributors[bot] Oct 7, 2022
e26576a
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Oct 7, 2022
bc8459e
Adding mypy in our pre-commit settings by adding mirrors-mypy.
Anuj-Kumar-AJ Oct 7, 2022
aca73ca
Update psycopg2-binary from 2.9.3 to 2.9.4
pyup-bot Oct 9, 2022
c228f32
add poetry caching in main workflow
didiermichel Oct 6, 2022
78b72bd
docs: update README.md [skip ci]
allcontributors[bot] Oct 9, 2022
08faed8
docs: update .all-contributorsrc [skip ci]
allcontributors[bot] Oct 9, 2022
dfa11e8
Port thread template to Django template syntax
gorkemarslan Oct 12, 2022
41683e7
Refactor code
gorkemarslan Oct 12, 2022
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
18 changes: 15 additions & 3 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,8 @@
"profile": "https://github.com/gorkemarslan",
"contributions": [
"code",
"test"
"test",
"infra"
]
},
{
Expand Down Expand Up @@ -866,7 +867,8 @@
"avatar_url": "https://avatars.githubusercontent.com/u/9488079?v=4",
"profile": "https://github.com/didiermichel",
"contributions": [
"doc"
"doc",
"infra"
]
},
{
Expand All @@ -886,6 +888,15 @@
"contributions": [
"doc"
]
},
{
"login": "simar5244",
"name": "Simarjot Singh (Monga)",
"avatar_url": "https://avatars.githubusercontent.com/u/22258411?v=4",
"profile": "http://about.me/Simarjot",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand All @@ -894,5 +905,6 @@
"projectOwner": "CiviWiki",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true
"skipCi": true,
"commitConvention": "angular"
}
7 changes: 7 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: "^3.9"
- name: Load cached Poetry installation
uses: actions/cache@v2
with:
path: ~/.local # the path depends on the OS
key: dotlocal-${{ runner.os }}-${{ hashFiles('.github/workflows/main.yml') }}
- name: Install Poetry
uses: snok/install-poetry@v1
with:
Expand All @@ -37,6 +42,8 @@ jobs:
run: poetry install --no-interaction --no-root
- name: Run migrations
run: poetry run python project/manage.py migrate
- name: Collect static files
run: poetry run python project/manage.py collectstatic --no-input
- name: Run tests
env:
CIVIWIKI_LOCAL_NAME: True
Expand Down
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,10 @@ repos:
rev: v0.13.1
hooks:
- id: curlylint

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.981
hooks:
- id: mypy
args: [--no-strict-optional, --ignore-missing-imports]

20 changes: 9 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
![GitHub labels](https://img.shields.io/github/labels/CiviWiki/OpenCiviWiki/help%20wanted)

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-92-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-93-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

[![ComVer](https://img.shields.io/badge/ComVer-compliant-brightgreen.svg)](https://github.com/staltz/comver)
Expand Down Expand Up @@ -120,51 +120,49 @@ Thanks to these wonderful people ([emoji key](https://allcontributors.org/docs/e
<td align="center"><a href="https://github.com/shiv-aay"><img src="https://avatars.githubusercontent.com/u/58257395?v=4?s=100" width="100px;" alt="Shivaay"/><br /><sub><b>Shivaay</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=shiv-aay" title="Documentation">📖</a></td>
<td align="center"><a href="http://www.linkedin.com/in/shourya-shikhar"><img src="https://avatars.githubusercontent.com/u/55531939?v=4?s=100" width="100px;" alt="Shourya Shikhar"/><br /><sub><b>Shourya Shikhar</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=danger-ahead" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/Shreyas4991"><img src="https://avatars3.githubusercontent.com/u/4014341?v=4?s=100" width="100px;" alt="Shrys"/><br /><sub><b>Shrys</b></sub></a><br /><a href="#ideas-Shreyas4991" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/issues?q=author%3AShreyas4991" title="Bug reports">🐛</a></td>
<td align="center"><a href="https://github.com/SimonDamberg"><img src="https://avatars.githubusercontent.com/u/49840909?v=4?s=100" width="100px;" alt="Simon Damberg"/><br /><sub><b>Simon Damberg</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=SimonDamberg" title="Code">💻</a></td>
<td align="center"><a href="http://about.me/Simarjot"><img src="https://avatars.githubusercontent.com/u/22258411?v=4?s=100" width="100px;" alt="Simarjot Singh (Monga)"/><br /><sub><b>Simarjot Singh (Monga)</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=simar5244" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/SimonDamberg"><img src="https://avatars.githubusercontent.com/u/49840909?v=4?s=100" width="100px;" alt="Simon Damberg"/><br /><sub><b>Simon Damberg</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=SimonDamberg" title="Code">💻</a></td>
<td align="center"><a href="https://soumallyadev.live"><img src="https://avatars.githubusercontent.com/u/55331884?v=4?s=100" width="100px;" alt="Soumallya Dev"/><br /><sub><b>Soumallya Dev</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=soumallyadev07" title="Code">💻</a></td>
<td align="center"><a href="https://stanmd.tk"><img src="https://avatars.githubusercontent.com/u/15629602?v=4?s=100" width="100px;" alt="Stanley Ndagi"/><br /><sub><b>Stanley Ndagi</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=NdagiStanley" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/Sv3nman"><img src="https://avatars0.githubusercontent.com/u/14117015?v=4?s=100" width="100px;" alt="Steven Hitchcock"/><br /><sub><b>Steven Hitchcock</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=Sv3nman" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/Germlord"><img src="https://avatars.githubusercontent.com/u/34950441?v=4?s=100" width="100px;" alt="Steven Hitchcock"/><br /><sub><b>Steven Hitchcock</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=Germlord" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/ssm0801"><img src="https://avatars.githubusercontent.com/u/46257802?v=4?s=100" width="100px;" alt="Sudhanshu Motewar"/><br /><sub><b>Sudhanshu Motewar</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/pulls?q=is%3Apr+reviewed-by%3Assm0801" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="https://github.com/Swanand01"><img src="https://avatars.githubusercontent.com/u/75439077?v=4?s=100" width="100px;" alt="Swanand01"/><br /><sub><b>Swanand01</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=Swanand01" title="Code">💻</a></td>
<td align="center"><a href="http://dev.tomjohnhall.com/"><img src="https://avatars0.githubusercontent.com/u/21244070?v=4?s=100" width="100px;" alt="Tom John Hall"/><br /><sub><b>Tom John Hall</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=tomjohnhall" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="http://dev.tomjohnhall.com/"><img src="https://avatars0.githubusercontent.com/u/21244070?v=4?s=100" width="100px;" alt="Tom John Hall"/><br /><sub><b>Tom John Hall</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=tomjohnhall" title="Code">💻</a></td>
<td align="center"><a href="https://www.linkedin.com/in/tomaszkolek"><img src="https://avatars3.githubusercontent.com/u/5993758?v=4?s=100" width="100px;" alt="Tomasz Kolek"/><br /><sub><b>Tomasz Kolek</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=TomaszKolek" title="Code">💻</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=TomaszKolek" title="Tests">⚠️</a> <a href="#security-TomaszKolek" title="Security">🛡️</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/pulls?q=is%3Apr+reviewed-by%3ATomaszKolek" title="Reviewed Pull Requests">👀</a></td>
<td align="center"><a href="https://github.com/torabshaikh"><img src="https://avatars0.githubusercontent.com/u/18557453?v=4?s=100" width="100px;" alt="Torab Shaikh"/><br /><sub><b>Torab Shaikh</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=torabshaikh" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/tractaylor"><img src="https://avatars0.githubusercontent.com/u/5148702?v=4?s=100" width="100px;" alt="Trac Taylor"/><br /><sub><b>Trac Taylor</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=tractaylor" title="Code">💻</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/issues?q=author%3Atractaylor" title="Bug reports">🐛</a> <a href="#ideas-tractaylor" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://in.linkedin.com/in/umr55766"><img src="https://avatars0.githubusercontent.com/u/16179313?v=4?s=100" width="100px;" alt="UMAIR MOHAMMAD"/><br /><sub><b>UMAIR MOHAMMAD</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=umr55766" title="Code">💻</a></td>
<td align="center"><a href="https://linktr.ee/Vishal_D_A"><img src="https://avatars.githubusercontent.com/u/67089703?v=4?s=100" width="100px;" alt="Vishal D A"/><br /><sub><b>Vishal D A</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=vishalda" title="Code">💻</a> <a href="#content-vishalda" title="Content">🖋</a> <a href="#translation-vishalda" title="Translation">🌍</a></td>
<td align="center"><a href="https://github.com/WCollins3"><img src="https://avatars0.githubusercontent.com/u/10867839?v=4?s=100" width="100px;" alt="WCollins3"/><br /><sub><b>WCollins3</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=WCollins3" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/SunflowerPKU"><img src="https://avatars3.githubusercontent.com/u/23006864?v=4?s=100" width="100px;" alt="Xin Tan"/><br /><sub><b>Xin Tan</b></sub></a><br /><a href="#userTesting-SunflowerPKU" title="User Testing">📓</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/SunflowerPKU"><img src="https://avatars3.githubusercontent.com/u/23006864?v=4?s=100" width="100px;" alt="Xin Tan"/><br /><sub><b>Xin Tan</b></sub></a><br /><a href="#userTesting-SunflowerPKU" title="User Testing">📓</a></td>
<td align="center"><a href="https://github.com/morento101"><img src="https://avatars.githubusercontent.com/u/80165970?v=4?s=100" width="100px;" alt="Yaroslav"/><br /><sub><b>Yaroslav</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=morento101" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/daaavo"><img src="https://avatars.githubusercontent.com/u/108758198?v=4?s=100" width="100px;" alt="daaavo"/><br /><sub><b>daaavo</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=daaavo" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/delta-plus"><img src="https://avatars0.githubusercontent.com/u/25730621?v=4?s=100" width="100px;" alt="delta-plus"/><br /><sub><b>delta-plus</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=delta-plus" title="Code">💻</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/issues?q=author%3Adelta-plus" title="Bug reports">🐛</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=delta-plus" title="Documentation">📖</a> <a href="#ideas-delta-plus" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-delta-plus" title="Answering Questions">💬</a></td>
<td align="center"><a href="https://github.com/didiermichel"><img src="https://avatars.githubusercontent.com/u/9488079?v=4?s=100" width="100px;" alt="didiermichel"/><br /><sub><b>didiermichel</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=didiermichel" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/gorkemarslan"><img src="https://avatars.githubusercontent.com/u/16780927?v=4?s=100" width="100px;" alt="gorkemarslan"/><br /><sub><b>gorkemarslan</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=gorkemarslan" title="Code">💻</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=gorkemarslan" title="Tests">⚠️</a></td>
<td align="center"><a href="https://github.com/didiermichel"><img src="https://avatars.githubusercontent.com/u/9488079?v=4?s=100" width="100px;" alt="didiermichel"/><br /><sub><b>didiermichel</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=didiermichel" title="Documentation">📖</a> <a href="#infra-didiermichel" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
<td align="center"><a href="https://github.com/gorkemarslan"><img src="https://avatars.githubusercontent.com/u/16780927?v=4?s=100" width="100px;" alt="gorkemarslan"/><br /><sub><b>gorkemarslan</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=gorkemarslan" title="Code">💻</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=gorkemarslan" title="Tests">⚠️</a> <a href="#infra-gorkemarslan" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
<td align="center"><a href="https://github.com/gteti"><img src="https://avatars1.githubusercontent.com/u/51110452?v=4?s=100" width="100px;" alt="gteti"/><br /><sub><b>gteti</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=gteti" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/guido97"><img src="https://avatars.githubusercontent.com/u/44304394?v=4?s=100" width="100px;" alt="guido97"/><br /><sub><b>guido97</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=guido97" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/guido97"><img src="https://avatars.githubusercontent.com/u/44304394?v=4?s=100" width="100px;" alt="guido97"/><br /><sub><b>guido97</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=guido97" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/jgbmattos"><img src="https://avatars0.githubusercontent.com/u/10090364?v=4?s=100" width="100px;" alt="jgbmattos"/><br /><sub><b>jgbmattos</b></sub></a><br /><a href="#userTesting-jgbmattos" title="User Testing">📓</a></td>
<td align="center"><a href="https://github.com/jjoseph18"><img src="https://avatars.githubusercontent.com/u/82232960?v=4?s=100" width="100px;" alt="jjoseph18"/><br /><sub><b>jjoseph18</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=jjoseph18" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/max1204"><img src="https://avatars.githubusercontent.com/u/20409353?v=4?s=100" width="100px;" alt="max1204"/><br /><sub><b>max1204</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=max1204" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/earthprelude"><img src="https://avatars.githubusercontent.com/u/75330343?v=4?s=100" width="100px;" alt="prelude"/><br /><sub><b>prelude</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=earthprelude" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/richifuentes"><img src="https://avatars2.githubusercontent.com/u/9931749?v=4?s=100" width="100px;" alt="richifuentes"/><br /><sub><b>richifuentes</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/issues?q=author%3Arichifuentes" title="Bug reports">🐛</a> <a href="#question-richifuentes" title="Answering Questions">💬</a> <a href="#ideas-richifuentes" title="Ideas, Planning, & Feedback">🤔</a></td>
<td align="center"><a href="https://github.com/tberm"><img src="https://avatars.githubusercontent.com/u/49910363?v=4?s=100" width="100px;" alt="tberm"/><br /><sub><b>tberm</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=tberm" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/terrencetuy"><img src="https://avatars3.githubusercontent.com/u/13714060?v=4?s=100" width="100px;" alt="terrencetuy"/><br /><sub><b>terrencetuy</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=terrencetuy" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/terrencetuy"><img src="https://avatars3.githubusercontent.com/u/13714060?v=4?s=100" width="100px;" alt="terrencetuy"/><br /><sub><b>terrencetuy</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=terrencetuy" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/wassafshahzad"><img src="https://avatars.githubusercontent.com/u/25094157?v=4?s=100" width="100px;" alt="wassaf shahzad"/><br /><sub><b>wassaf shahzad</b></sub></a><br /><a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=wassafshahzad" title="Code">💻</a> <a href="https://github.com/CiviWiki/OpenCiviWiki/commits?author=wassafshahzad" title="Tests">⚠️</a> <a href="#infra-wassafshahzad" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
</tr>
</tbody>
<tfoot>

</tfoot>
</table>

<!-- markdownlint-restore -->
Expand Down
Loading