diff --git a/components/Menu.vue b/components/Menu.vue index 84d1b4e3..00489db1 100644 --- a/components/Menu.vue +++ b/components/Menu.vue @@ -31,7 +31,7 @@    - + Logout @@ -54,6 +54,7 @@ export default { try { this.$store.commit('auth/REMOVE_TOKEN') this.$store.commit('auth/UPDATE_IS_LOGIN', false) + this.$router.push('/') } catch (e) { this.formError = e.message } diff --git a/docs/INSTALL.md b/docs/INSTALL.md deleted file mode 100644 index f8be98be..00000000 --- a/docs/INSTALL.md +++ /dev/null @@ -1,16 +0,0 @@ -Installation ------ - -- download latest **..dist** [release](https://github.com/ffplayout/ffplayout-frontend/releases/latest/) -- unpack the dist content to **/var/www/ffplayout-frontend** - -- create symlink for the media folder - - when your media folder is a subfolder (for example `/opt/ffplayout/media`) create the same folder structure under **/var/www/ffplayout-frontend**: - - `mkdir -p /var/www/ffplayout-frontend/opt/ffplayout` - - `ln -s /opt/ffplayout/media /var/www/ffplayout-frontend/opt/ffplayout/` - -Copy **nginx/ffplayout.conf** to **/etc/nginx/sites-available/** and make a symlink: - -`ln -s /etc/nginx/sites-available/ffplayout.conf /etc/nginx/sites-enabled/` - -Change the nginx config and add your ssl configuration. After restarting nginx, you should be able to open to frontend in your browser. diff --git a/docs/README.md b/docs/README.md index 39b3a48d..d9d58ab2 100644 --- a/docs/README.md +++ b/docs/README.md @@ -6,7 +6,7 @@ create `.env`file with `API_URL`, for example: ``` -API_URL="http://localhost:8000" +API_URL="http://localhost:8787" ``` ``` bash diff --git a/docs/srs.conf b/docs/srs.conf deleted file mode 100644 index 11ed0c41..00000000 --- a/docs/srs.conf +++ /dev/null @@ -1,38 +0,0 @@ -# srs HTTP-FLV example - -listen 1935; -max_connections 1000; -daemon off; -srs_log_tank console; -http_server { - enabled on; - listen 127.0.0.1:8080; - dir ./objs/nginx/html; -} - -vhost preview.local { - # needs redirect in /etc/hosts: - # 127.0.0.1 preview.local - http_remux { - enabled on; - mount [vhost]/[app]/[stream].flv; - } - -# low latency: -# tcp_nodelay on -# min_latency on; - -# play { -# gop_cache off; -# queue_length 10; -# mw_latency 100; -# } - -# publish { -# mr off; -# } -} - -vhost __defaultVhost__ { - -} diff --git a/nginx/ffplayout.conf b/nginx/ffplayout.conf deleted file mode 100644 index 551cda67..00000000 --- a/nginx/ffplayout.conf +++ /dev/null @@ -1,77 +0,0 @@ -server { - listen 80; - - server_name ffplayout.local; - - gzip on; - gzip_types text/plain application/xml text/css application/javascript; - gzip_min_length 1000; - - charset utf-8; - - client_max_body_size 7000M; # should be desirable value - - add_header X-Frame-Options SAMEORIGIN; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload" always; - - location / { - if ($http_origin ~ '^https?://(localhost|ffplayout\.local)') { - add_header 'Access-Control-Allow-Origin' "$http_origin" always; - add_header 'Access-Control-Allow-Credentials' 'true' always; - add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Requested-With' always; - } - - if ($request_method = OPTIONS ) { - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - add_header 'Content-Length' 0; - return 204; - } - - root /var/www/ffplayout-frontend/; - - } - - location ~ ^/(api|auth) { - if ($http_origin ~ '^https?://(localhost|ffplayout\.local)') { - add_header 'Access-Control-Allow-Origin' "$http_origin" always; - add_header 'Access-Control-Allow-Credentials' 'true' always; - add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'Accept,Authorization,Cache-Control,Content-Type,DNT,If-Modified-Since,Keep-Alive,Origin,User-Agent,X-Requested-With' always; - } - - add_header Last-Modified $date_gmt; - add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0'; - if_modified_since off; - expires off; - etag off; - - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_read_timeout 36000s; - proxy_connect_timeout 36000s; - proxy_send_timeout 36000s; - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; - send_timeout 36000s; - proxy_no_cache 1; - proxy_pass http://127.0.0.1:8000; - - } - - location /live/ { - alias /var/www/srs/live/; - } - - location /preview/stream.flv { - # HTTP-FLV preview - proxy_pass http://preview.local:8080/live/stream.flv; - } - -} diff --git a/package-lock.json b/package-lock.json index a12247ad..c98e105d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ffplayout-frontend", - "version": "5.2.3", + "version": "5.2.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ffplayout-frontend", - "version": "5.2.3", + "version": "5.2.4", "dependencies": { "@nuxtjs/axios": "^5.13.6", "@nuxtjs/dayjs": "^1.4.1", diff --git a/package.json b/package.json index e8462707..a40a681e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ffplayout-frontend", - "version": "5.2.3", + "version": "5.2.4", "description": "Web GUI for ffplayout", "author": "Jonathan Baecker", "private": true,