diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..0f663aa33 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,43 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: 'bug' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Instance** +On which BookWyrm instance did you encounter this problem. + +**Additional context** +Add any other context about the problem here. + +--- + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 000000000..bbcbbe7d6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 2cec71540..1d10300e0 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -191,10 +191,6 @@ STATICFILES_FINDERS = [ SASS_PROCESSOR_INCLUDE_FILE_PATTERN = r"^.+\.[s]{0,1}(?:a|c)ss$" SASS_PROCESSOR_ENABLED = True -SASS_PROCESSOR_INCLUDE_DIRS = [ - os.path.join(BASE_DIR, ".css-config-sample"), -] - # minify css is production but not dev if not DEBUG: SASS_OUTPUT_STYLE = "compressed" diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 2f5ddc6dc..a7d1b0d0a 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -1,7 +1,7 @@ {% load layout %} +{% load sass_tags %} {% load i18n %} {% load static %} -{% load sass_tags %} diff --git a/bw-dev b/bw-dev index 649544e24..fbd19dd7f 100755 --- a/bw-dev +++ b/bw-dev @@ -23,8 +23,11 @@ trap showerr EXIT source .env trap - EXIT -# show commands as they're executed -set -x +function clean { + docker-compose stop + docker-compose rm -f +} + function runweb { docker-compose run --rm web "$@" } @@ -263,16 +266,28 @@ case "$CMD" in echo "Unrecognised command. Try:" echo " setup" echo " up [container]" + echo " service_ports_web" echo " initdb" + echo " resetdb" echo " makemigrations [migration]" echo " migrate [migration]" echo " bash" echo " shell" echo " dbshell" echo " restart_celery" + echo " pytest [path]" echo " collectstatic" - echo " compilemessages" + echo " makemessages" + echo " compilemessages [locale]" + echo " update_locales" echo " build" + echo " clean" + echo " black" + echo " prettier" + echo " stylelint" + echo " formatters" + echo " compilescss" + echo " collectstatic_watch" echo " populate_streams [--stream=]" echo " populate_lists_streams" echo " populate_suggestions" diff --git a/complete_bwdev.fish b/complete_bwdev.fish index 53f9e29b1..c1f28dd51 100644 --- a/complete_bwdev.fish +++ b/complete_bwdev.fish @@ -18,6 +18,7 @@ makemessages \ compilemessages \ update_locales \ build \ +clean \ black \ prettier \ stylelint \ @@ -55,6 +56,7 @@ __bw_complete "$commands" "makemessages" "extract all localizable mes __bw_complete "$commands" "compilemessages" "compile .po localization files to .mo" __bw_complete "$commands" "update_locales" "run makemessages and compilemessages for the en_US and additional locales" __bw_complete "$commands" "build" "build the containers" +__bw_complete "$commands" "clean" "bring the cluster down and remove all containers" __bw_complete "$commands" "black" "run Python code formatting tool" __bw_complete "$commands" "prettier" "run JavaScript code formatting tool" __bw_complete "$commands" "stylelint" "run SCSS linting tool" diff --git a/complete_bwdev.sh b/complete_bwdev.sh index 2a30a4c47..5dd025673 100644 --- a/complete_bwdev.sh +++ b/complete_bwdev.sh @@ -15,6 +15,7 @@ makemessages compilemessages update_locales build +clean black prettier stylelint diff --git a/complete_bwdev.zsh b/complete_bwdev.zsh index 65e36dd67..5f7695ee1 100644 --- a/complete_bwdev.zsh +++ b/complete_bwdev.zsh @@ -17,6 +17,7 @@ makemessages compilemessages update_locales build +clean black prettier stylelint