Skip to content

Commit

Permalink
Merge pull request #543 from farridav/hotfix/update_ci
Browse files Browse the repository at this point in the history
Hotfix/update ci
  • Loading branch information
farridav authored Mar 23, 2024
2 parents b2a32a8 + 029e7bf commit cde3216
Show file tree
Hide file tree
Showing 12 changed files with 772 additions and 767 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ jobs:

- name: Deploy to testpypi.org
run: |
poetry config repositories.testpypi https://test.pypi.org/legacy/
poetry publish --build -r testpypi --username ${{ secrets.TESTPYPI_USERNAME }} --password ${{ secrets.TESTPYPI_PASSWORD }} || :
poetry config repositories.test_pypi https://test.pypi.org/legacy/
poetry publish --build -r test_pypi --username __token__ --password ${{ secrets.TEST_PYPI_TOKEN }}
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@ jobs:
run: python -m pip install --upgrade pip poetry

- name: Deploy to pypi.org
env:
POETRY_PYPI_TOKEN_PYPI: ${{ secrets.PYPI_TOKEN }}
run: poetry publish --build
run: |
poetry publish --build --username __token__ --password ${{ secrets.PYPI_TOKEN }}
21 changes: 13 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@

# Django jazzmin (Jazzy Admin)

## Project Status
This project is being actively maintained, though with a reduced feature set, we are looking for contributors to help
maintain and improve the project, please get in touch if you would like to help.

Help needed with:
- Triaging issues
- Frontend fixes and UI improvements
- Testing
- Documentation

Pull requests are welcome, though ive been pre-occupied with other projects lately, so have not been able to review
them as quickly as I would like, but im trying to get through them all now, hopefully with some outside help.

[![Docs](https://readthedocs.org/projects/django-jazzmin/badge/?version=latest)](https://django-jazzmin.readthedocs.io)
![PyPI download month](https://img.shields.io/pypi/dm/django-jazzmin.svg)
[![PyPI version](https://badge.fury.io/py/django-jazzmin.svg)](https://pypi.python.org/pypi/django-jazzmin/)
Expand All @@ -18,14 +31,6 @@ pip install django-jazzmin
## Documentation
See [Documentation](https://django-jazzmin.readthedocs.io) or [Test App](https://github.com/farridav/django-jazzmin/tree/master/tests/test_app/library/settings.py)

## Demo
Live demo https://django-jazzmin.herokuapp.com/admin

**Username**: [email protected]

**Password**: test

*Note: Data resets nightly*

## Features
- Drop-in admin skin, all configuration optional
Expand Down
11 changes: 5 additions & 6 deletions docs/bugs_and_features.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ When reporting bugs, or compatibility issues, here is a general guide on the bes
First of all, ask yourself these questions:

1. Does your app behave as expected if `jazzmin` is commented out of your `INSTALLED_APPS`?
2. Can you easily demonstrate the problem without code changes in our live test app https://django-jazzmin.herokuapp.com/admin/ ?
3. Can you reproduce the problem locally in our test app, and submit it as a Pull request for us to work against (see [development.md](./development.md)) ?
4. Can you add a failing test for the problem (see [development.md](./development.md))?
5. Can you screenshot the issue and attach it to an issue or pull request?
6. Can you solve the problem (and not introduce other issues) by changing HTML, or CSS, or JS
2. Can you reproduce the problem locally in our test app, and submit it as a Pull request for us to work against (see [development.md](./development.md)) ?
3. Can you add a failing test for the problem (see [development.md](./development.md))?
4. Can you screenshot the issue and attach it to an issue or pull request?
5. Can you solve the problem (and not introduce other issues) by changing HTML, or CSS, or JS

If you can solve the problem using CSS/JS then you can temporarily use "custom CSS/JS" within jazzmin settings, see [configuration.md](./configuration.md) until we have the fix released

Expand All @@ -31,7 +30,7 @@ We welcome new features, here is a list of guidelines to consider:

When making changes, see if you can achieve your goal by removing code, failing that, try changing code, failing that, add new code

We prefer to use HTML first, failing that, use CSS, failing that, use JavaScript (This approach helps with maintainability)
We prefer to use HTML first, failing that, use CSS, failing that, use JavaScript (This approach helps with maintainability)


Some useful links for feature development:
Expand Down
19 changes: 10 additions & 9 deletions docs/index.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Jazzmin

Welcome to Jazzmin, intended as a drop-in app to jazz up your django admin site, with plenty of things you can easily
customise, including a built-in UI customizer
Welcome to Jazzmin, intended as a drop-in app to jazz up your django admin site, with plenty of things you can easily
customise, including a built-in UI customizer

## Features

Expand All @@ -18,13 +18,14 @@ customise, including a built-in UI customizer
- Based on the latest [adminlte](https://adminlte.io/) + [bootstrap](https://getbootstrap.com/)

## Demo
Live demo [https://django-jazzmin.herokuapp.com/admin](https://django-jazzmin.herokuapp.com/admin)

> **Username**: [email protected]
> **Password**: test
*Note: Data resets nightly*
You can view the demo app by cloning the repository, and running the following commands:

```bash
poetry install
./tests/test_app/manage.py migrate
./tests/test_app/manage.py reset
./tests/test_app/manage.py runserver_plus
```

## Screenshots

Expand Down
Loading

0 comments on commit cde3216

Please sign in to comment.