mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-03-28 14:15:31 +00:00
Code Issues Projects Releases Wiki Activity

Copies main branch files to prod

Browse source 
Resolves some divergences caused by merges, and copies over some files
that aren't needed in prod but aren't harmful
This commit is contained in:
Mouse Reeve 2022-08-04 10:08:19 -07:00
parent 8ba1ccadcc
commit 618c7bbeec
8 changed files with 86 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View file

@ -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]

20
.github/ISSUE_TEMPLATE/feature_request.md vendored Normal file
View file

@ -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.

4
bookwyrm/settings.py
View file

@ -191,10 +191,6 @@ STATICFILES_FINDERS = [
SASS_PROCESSOR_INCLUDE_FILE_PATTERN = r"^.+\.[s]{0,1}(?:a|c)ss$" SASS_PROCESSOR_INCLUDE_FILE_PATTERN = r"^.+\.[s]{0,1}(?:a|c)ss$"
SASS_PROCESSOR_ENABLED = True SASS_PROCESSOR_ENABLED = True
SASS_PROCESSOR_INCLUDE_DIRS = [
os.path.join(BASE_DIR, ".css-config-sample"),
]
# minify css is production but not dev # minify css is production but not dev
if not DEBUG: if not DEBUG:
SASS_OUTPUT_STYLE = "compressed" SASS_OUTPUT_STYLE = "compressed"

2
bookwyrm/templates/layout.html
View file

@ -1,7 +1,7 @@
{% load layout %} {% load layout %}
{% load sass_tags %}
{% load i18n %} {% load i18n %}
{% load static %} {% load static %}
{% load sass_tags %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{% get_lang %}"> <html lang="{% get_lang %}">

21
bw-dev
View file

@ -23,8 +23,11 @@ trap showerr EXIT
source .env source .env
trap - EXIT trap - EXIT
# show commands as they're executed function clean {
set -x docker-compose stop
docker-compose rm -f
}
function runweb { function runweb {
docker-compose run --rm web "$@" docker-compose run --rm web "$@"
} }
@ -263,16 +266,28 @@ case "$CMD" in
echo "Unrecognised command. Try:" echo "Unrecognised command. Try:"
echo " setup" echo " setup"
echo " up [container]" echo " up [container]"
echo " service_ports_web"
echo " initdb" echo " initdb"
echo " resetdb"
echo " makemigrations [migration]" echo " makemigrations [migration]"
echo " migrate [migration]" echo " migrate [migration]"
echo " bash" echo " bash"
echo " shell" echo " shell"
echo " dbshell" echo " dbshell"
echo " restart_celery" echo " restart_celery"
echo " pytest [path]"
echo " collectstatic" echo " collectstatic"
echo " compilemessages" echo " makemessages"
echo " compilemessages [locale]"
echo " update_locales"
echo " build" echo " build"
echo " clean"
echo " black"
echo " prettier"
echo " stylelint"
echo " formatters"
echo " compilescss"
echo " collectstatic_watch"
echo " populate_streams [--stream=<stream name>]" echo " populate_streams [--stream=<stream name>]"
echo " populate_lists_streams" echo " populate_lists_streams"
echo " populate_suggestions" echo " populate_suggestions"

2
complete_bwdev.fish
View file

@ -18,6 +18,7 @@ makemessages \
compilemessages \ compilemessages \
update_locales \ update_locales \
build \ build \
clean \
black \ black \
prettier \ prettier \
stylelint \ 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" "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" "update_locales" "run makemessages and compilemessages for the en_US and additional locales"
__bw_complete "$commands" "build" "build the containers" __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" "black" "run Python code formatting tool"
__bw_complete "$commands" "prettier" "run JavaScript code formatting tool" __bw_complete "$commands" "prettier" "run JavaScript code formatting tool"
__bw_complete "$commands" "stylelint" "run SCSS linting tool" __bw_complete "$commands" "stylelint" "run SCSS linting tool"

1
complete_bwdev.sh
View file

@ -15,6 +15,7 @@ makemessages
compilemessages compilemessages
update_locales update_locales
build build
clean
black black
prettier prettier
stylelint stylelint

1
complete_bwdev.zsh
View file

@ -17,6 +17,7 @@ makemessages
compilemessages compilemessages
update_locales update_locales
build build
clean
black black
prettier prettier
stylelint stylelint