diff --git a/Dockerfile b/Dockerfile index d48ad9b..f34bee7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,6 +10,8 @@ RUN pip3 install -r requirements.txt VOLUME /wiki/templates/entry +VOLUME /wiki/static/graphics + EXPOSE 5000 ENTRYPOINT [ "python3" ] diff --git a/README.md b/README.md index 5f5c8e7..0558c3c 100644 --- a/README.md +++ b/README.md @@ -60,12 +60,13 @@ The `config.py` can be found in the `src` folder. Set the following volumes with the -v tag. -| Volume-Name | Container mount | Description | -| ----------- | ------------------------- | ------------------------------------------------------------ | -| config-file | /wiki/config.py | Config file | -| entries | /wiki/templates/entry | Directory for wiki entries | -| css | /wiki/static/css | (optional) Directory for css files | -| html | /wiki/templates | (optional) Directory for templates (entry-volume not needed) | +| Volume-Name | Container mount | Description | +| ------------- | ----------------------- | ------------------------------------------------------------ | +| `config-file` | `/wiki/config.py` | Config file | +| `entries` | `/wiki/templates/entry` | Directory for wiki entries | +| `graphics` | `/wiki/static/graphics` | Directory for images needed for entries | +| `css` | `/wiki/static/css` | (optional) Directory for css files | +| `html` | `/wiki/templates` | (optional) Directory for templates (entry-volume not needed) | #### Ports diff --git a/src/forms.py b/src/forms.py index d4390ab..1ffdf27 100644 --- a/src/forms.py +++ b/src/forms.py @@ -1,11 +1,9 @@ -from flask_wtf import FlaskForm -from flask_wtf import CSRFProtect -from wtforms import TextField, SubmitField, ValidationError, validators +from flask_wtf import CSRFProtect, FlaskForm +from wtforms import StringField, SubmitField, ValidationError, validators csrf = CSRFProtect() class SearchForm(FlaskForm): - query_str = TextField( - "Query", [validators.Required("Please enter the search term")]) - submit = SubmitField("Search") + query_str = StringField("Query", [validators.DataRequired("Please enter the search term")]) + submit = SubmitField("Search") diff --git a/src/requirements.txt b/src/requirements.txt index ccdd930..80b1e0c 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -1,5 +1,5 @@ -Markdown==3.1.1 -WTForms==2.2.1 -Flask==1.1.2 -Flask_WTF==0.14.3 -Whoosh==2.7.4 +Markdown +WTForms +Flask +Flask_WTF +Whoosh diff --git a/src/static/css/style.css b/src/static/css/style.css index 5175c92..b969de6 100644 --- a/src/static/css/style.css +++ b/src/static/css/style.css @@ -165,3 +165,7 @@ ul { right: 0; } } + +figure { + padding:20px; +} diff --git a/src/static/graphics/.gitkeep b/src/static/graphics/.gitkeep new file mode 100644 index 0000000..e69de29