🚑 Hotfix for timeout, apply new branch changes (#183)

* 🎨 update no direct stable commit

* Update README.md

* Update README.md

* 👷 Update ci for new branches

* 🚑 set timeout to 30 seconds for slow api

* 🔖 version bump

* Fix version number

.dockerignore

@@ -6,6 +6,7 @@ data
 dist
 out
 channels
+scripts
 
 npm-debug.log
 .all-contributorsrc

.drone.yml

@@ -15,15 +15,15 @@ steps:
       repo: mauriceo/viewtube
       tags:
         - latest
-        - '0.4.0'
+        - '0.4.1'
         - '0.4'
       username:
         from_secret: docker_username
       password:
         from_secret: docker_password
     when:
       branch:
-        - master
+        - stable
       event:
         - push
 
@@ -39,7 +39,7 @@ steps:
         from_secret: docker_password
     when:
       branch:
-        - dev
+        - main
       event:
         - push
 
@@ -51,7 +51,7 @@ steps:
       to: -1001411660806
     when:
       branch:
-        - master
+        - stable
       event:
         - push
       status:
@@ -60,5 +60,5 @@ steps:
 
 trigger:
   branch:
-    - master
-    - dev
+    - stable
+    - main

CHANGELOG.md

@@ -3,6 +3,12 @@
 This file is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.1] - 2020-10-26
+
+### Fixed
+
+- Set API timeout to 30 seconds [#183](https://github.com/ViewTube/viewtube-vue/pull/183)
+
 ## [0.4.0] - 2020-10-20
 
 ### Added
@@ -70,7 +76,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[unreleased]: https://github.com/viewtube/viewtube-vue/compare/v0.4.0...dev
+[unreleased]: https://github.com/viewtube/viewtube-vue/compare/v0.4.1...main
+[0.4.1]: https://github.com/viewtube/viewtube-vue/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/viewtube/viewtube-vue/compare/v0.3.1...v0.4.0
 [0.3.1]: https://github.com/viewtube/viewtube-vue/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/viewtube/viewtube-vue/compare/v0.2.1...v0.3.0

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">
 <sub>
-<img  src="https://raw.githubusercontent.com/ViewTube/viewtube-vue/master/.github/images/logo.png"
+<img  src="https://raw.githubusercontent.com/ViewTube/viewtube-vue/stable/.github/images/logo.png"
       height="50"
       width="50">
 </sub>
@@ -11,10 +11,10 @@ ViewTube is an alternative YouTube frontend using the [invidio.us](https://githu
 
 It can recommend, play and search for videos. It saves your watch progress and you can subscribe to channels for them to appear in your subscription feed.
 
-[![DeepScan grade](https://deepscan.io/api/teams/11097/projects/14017/branches/250433/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=11097&pid=14017&bid=250433)
+[![DeepScan grade](https://deepscan.io/api/teams/11097/projects/14017/branches/262917/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=11097&pid=14017&bid=262917)
 [![Build Status](https://drone.oeger.li/api/badges/ViewTube/viewtube-vue/status.svg)](https://drone.oeger.li/ViewTube/viewtube-vue)
 [![vue2](https://img.shields.io/badge/vue-2.x-brightgreen.svg)](https://vuejs.org/)
-[![GitHub](https://img.shields.io/github/license/mauriceoegerli/viewtube-vue)](https://github.com/ViewTube/viewtube-vue/blob/master/LICENSE)
+[![GitHub](https://img.shields.io/github/license/mauriceoegerli/viewtube-vue)](https://github.com/ViewTube/viewtube-vue/blob/stable/LICENSE)
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/mauriceo/viewtube/latest?label=docker%20image)
 
 <h2 align="center">

client/plugins/services/viewTubeApi.ts

@@ -6,7 +6,7 @@ export default class {
   constructor(apiUrl: string) {
     this.apiPrototype.request = axios.create({
       baseURL: apiUrl,
-      timeout: 10000
+      timeout: 30000
     });
     this.api = createApi(this.apiPrototype);
   }

package.json

@@ -4,7 +4,7 @@
   "author": "Maurice Oegerli",
   "country": "Switzerland",
   "email": "viewtube@m-o.dev",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "license": "AGPLv3",
   "private": true,
   "scripts": {
@@ -32,7 +32,7 @@
   ],
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged && ./no-master.sh"
+      "pre-commit": "lint-staged && ./scripts/no-master.sh"
     }
   },
   "lint-staged": {

no-master.sh → scripts/no-master.sh

@@ -2,8 +2,8 @@
 
 branch="$(git rev-parse --abbrev-ref HEAD)"
 
-if [ "$branch" = "master" ]; then
-  echo "[ERROR] You shouldn't commit directly to master branch"
+if [ "$branch" = "stable" ]; then
+  echo "[ERROR] You shouldn't commit directly to the stable branch"
   echo "[INFO] If this is intended, use --skip-verify"
   exit 1
 fi