diff --git a/.gitmodules b/.gitmodules index e79a668..57d7a45 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "static/fa"] path = static/fa url = https://github.com/FortAwesome/Font-Awesome +[submodule "static/jq"] + path = static/jq + url = https://github.com/jquery/jquery diff --git a/misc/nginx.conf b/misc/nginx.conf index 9111c6f..691ff3a 100644 --- a/misc/nginx.conf +++ b/misc/nginx.conf @@ -26,6 +26,10 @@ server { location /css/ { root /opt/vpnmanager/static/; } + + location /jq/ { + root /opt/vpnmanager/static/; + } location / { uwsgi_pass 127.0.0.1:9360; diff --git a/setup.sh b/setup.sh index acf62f4..52e7152 100644 --- a/setup.sh +++ b/setup.sh @@ -1,7 +1,12 @@ #!/bin/bash -sudo apt install -y python3-pip +sudo apt install -y python3-pip npm sudo pip3 install -U django uwsgi django-two-factor-auth django-bootstrap-form +git submodule init +git submodule update +cd static/jq/ +npm run build +cd ../../ ./manage.py collectstatic ./manage.py migrate sudo cp vpnmanager.service /etc/systemd/system/ diff --git a/static/jq b/static/jq new file mode 160000 index 0000000..543d3d2 --- /dev/null +++ b/static/jq @@ -0,0 +1 @@ +Subproject commit 543d3d24eaefe09c4012171f30267783d51602dc diff --git a/templates/base.html b/templates/base.html index 1e0146b..f7cf5a1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,7 +15,7 @@ - +