KumiSystems/vpnmanager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add jQuery as submodule

Browse source
This commit is contained in:
Kumi 2019-01-17 20:09:26 +01:00
parent 347f028cd4
commit 6e2726582a
5 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "static/fa"] [submodule "static/fa"]
path = static/fa path = static/fa
url = https://github.com/FortAwesome/Font-Awesome url = https://github.com/FortAwesome/Font-Awesome
[submodule "static/jq"]
path = static/jq
url = https://github.com/jquery/jquery

4
misc/nginx.conf
View file

@ -27,6 +27,10 @@ server {
root /opt/vpnmanager/static/; root /opt/vpnmanager/static/;
} }
location /jq/ {
root /opt/vpnmanager/static/;
}
location / { location / {
uwsgi_pass 127.0.0.1:9360; uwsgi_pass 127.0.0.1:9360;
uwsgi_read_timeout 300; uwsgi_read_timeout 300;

7
setup.sh
View file

@ -1,7 +1,12 @@
#!/bin/bash #!/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 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 collectstatic
./manage.py migrate ./manage.py migrate
sudo cp vpnmanager.service /etc/systemd/system/ sudo cp vpnmanager.service /etc/systemd/system/

1
static/jq Submodule

@ -0,0 +1 @@
Subproject commit 543d3d24eaefe09c4012171f30267783d51602dc

2
templates/base.html
View file

@ -15,7 +15,7 @@
<link href="/bs/dist/css/bootstrap.min.css" rel="stylesheet"> <link href="/bs/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="/fa/css/all.css"> <link rel="stylesheet" href="/fa/css/all.css">
<link rel="stylesheet" href="/css/style.css"> <link rel="stylesheet" href="/css/style.css">
<script src="/js/jquery-3.3.1.min.js"></script> <script src="/jq/dist/jquery.min.js"></script>
<script src="/bs/dist/js/bootstrap.bundle.min.js"></script> <script src="/bs/dist/js/bootstrap.bundle.min.js"></script>
</head> </head>