Merge branch 'development' into newui

.gitignore

@@ -125,7 +125,6 @@ dmypy.json
 # End of https://www.gitignore.io/api/python
 0
 config.backup.json
-create_db.sql
 uwsgi.ini
 installer.log
 pyshelf_nginx.conf

Dockerfile

@@ -0,0 +1,20 @@
+FROM archlinux:latest
+RUN pacman -Syy
+RUN pacman -Syu --noconfirm
+RUN pacman -S --noconfirm python python-pip git postgresql sudo gcc
+RUN sudo -u postgres initdb --locale=en_US.UTF-8 -E UTF8 -D /var/lib/postgres/data
+RUN useradd pyshelf && chpasswd pyshelf:pyshelf
+#RUN mkdir -p /srv/Books && mkdir -p /srv/http && mkdir -p /srv/logs/ && mkdir -p /run/postgresql && \
+#    touch /srv/logs/pgsql.log && chown postgres.postgres /run/postgresql && \
+#    chown http.pyshelf /srv/Books && chown http.pyshelf /srv/http && chown postgres.postgres /srv/logs/pgsql.log
+VOLUME /srv/Books ./Books
+VOLUME /srv/http .
+VOLUME /srv/logs ./logs
+VOLUME /var/lib/postgres/data ./pgdata
+RUN sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start
+RUN sudo -u postgres psql -f create_db.sql
+ENV PYTHONUNBUFFERED=1
+WORKDIR /srv/http
+RUN pip install -r requirements.txt
+EXPOSE 80 8000
+CMD ["sh", "-c","/srv/http/entry.sh"]

README.md

@@ -4,8 +4,7 @@
 <p align="center">Having used Calibre for hosting my eBook collection in the past, I found myself frustrated having to install X on my server, or manage my library externally, Thus I have decided to spin up my own.</p>
 <p align="center"><a href="https://pyshelf.com">https://pyshelf.com</a></p>
 
-![pyShelf 0.6.0 newui](https://github.com/th3r00t/pyShelf/raw/newui/src/interface/static/img/pyShelf_frontend_0_2_0.png)
-
+![pyShelf 0.6.0 newui](https://github.com/th3r00t/pyShelf/raw/development/src/interface/static/img/pyShelf_frontend_0_2_0.png)
 
 
 ### You dont need a X server to host a website, or your Movie & Tv collection, so why should you need one to host ebooks?
@@ -39,7 +38,7 @@ Follow or influence development @ <p align="center"><b> <a href="https://discord
     * More intuitive, less intrusive, & stays out of the way. <i>caveat: I need to rework the placement of the next & previous page controls. While they do remain usable, I intend to have them follow the users</i>
         position on the page in future releases.
 
-![pyShelf 0.6.0 navbar](https://github.com/th3r00t/pyShelf/raw/newui/src/interface/static/img/navbar.png)
+![pyShelf 0.6.0 navbar](https://github.com/th3r00t/pyShelf/raw/development/src/interface/static/img/navbar.png)
 
 * New controls
     * Sort
@@ -50,6 +49,11 @@ Follow or influence development @ <p align="center"><b> <a href="https://discord
         * [ ] Control panel
         * [ ] Book details
         * Whatever else :)
+## Installation Example
+<a href="https://vimeo.com/382292764" target="_blank">pyShelf Installation Video</a>
+
+## Further Installation & Support Information
+* [SUPPORT.md](https://github.com/th3r00t/pyShelf/blob/development/.github/SUPPORT.md)
 
 ### Pre-req Dependencies
 * gcc -- This will be installed by the new pre-installer script if its binary is not detected at /usr/bin/gcc

config.json

@@ -1 +1 @@
-{"TITLE": "pyShelf E-Book Server", "VERSION": "0.5.0", "BOOKPATH": "/home/raelon/Books", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"}
+{"TITLE": "pyShelf E-Book Server", "VERSION": "0.6.0", "BOOKPATH": "", "DB_HOST": "localhost", "DB_PORT": "5432", "DATABASE": "pyshelf", "USER": "pyshelf", "PASSWORD": "pyshelf", "BOOKSHELF": "data/shelf.json", "ALLOWED_HOSTS": "*", "hostname": "localhost", "webport": "8000", "wsgiport": "8001"}

create_db.sql

@@ -0,0 +1,3 @@
+CREATE USER pyshelf WITH PASSWORD 'pyshelf';
+CREATE DATABASE pyshelf;
+GRANT ALL PRIVILEGES ON DATABASE pyshelf TO pyshelf;

database.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start &&
+sudo -u postgres psql -f create_db.sql &&
+rm /srv/http/database.sh &&
+echo "sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/lgsql.log start" > /srv/http/database.sh &&
+chmod +x /srv/http/database.sh &&
+cd src && \
+    python manage.py makemigrations && \
+    python manage.py makemigrations interface && \
+    python manage.py migrate && \
+    python manage.py migrate interface && \
+cd ..
+echo "pyShelf Env Started"

entry.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+#sh /srv/http/database.sh
+sudo -u postgres pg_ctl -D /var/lib/postgres/data -l /srv/logs/pgsql.log start &&
+#gunicorn pyShelf.wsgi 8000:8000

requirements.txt

@@ -19,4 +19,4 @@ psutil
 pyfiglet
 mobi-python
 pudb
-jsonpickle
+jsonpickle