Use real qbittorrent in dev (#141)

* docker-compose for qbittorrent

* let qbittorrent serve dev build
- no longer need http prod config
- temp login page is useless now
- simplifies other things

* helpful script for running in dev

* dev container instructions

* bump app ver, cleanup

Author: bill-ahmed

.gitignore

@@ -44,3 +44,9 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+
+
+# qBittorrent dev container
+dev/config
+dev/downloads
+dev/www

README.md

@@ -32,8 +32,6 @@ This app relies on a couple files to work properly.
 Under `src/assets/` there are two files: `config.json` and `config.prod.json`. This will store general configuration, such as the delimeter used when parsing file paths (Unix vs. Windows).
 
 ### HTTP Config
-Under `src/assets/` there are two files: `http_config.json` and `http_config.prod.json`. During the production build, the former is replaced with the latter file. 
-
 If you wish to configure your endpoints and other data for dev/prod, do so here.
 
 

angular.json

@@ -40,10 +40,6 @@
                   "replace": "src/environments/environment.ts",
                   "with": "src/environments/environment.prod.ts"
                 },
-                {
-                  "replace": "src/assets/http_config.json",
-                  "with": "src/assets/http_config.prod.json"
-                },
                 {
                   "replace": "src/assets/config.json",
                   "with": "src/assets/config.prod.json"

dev/README.txt

@@ -0,0 +1,21 @@
+Running qBittorrent in a docker container during development. Allows for more complete and accurate testing, as opposed to the "mock server" originally used.
+
+The folder structure is as follows:
+- "config"
+  - holds qbittorrent configuration files
+- "downloads"
+  - where all the torrent downloads are saved
+- "www"
+  - holds dev builds for both login and the main UI
+
+
+To setup the dev env:
+1. Go to "dev" folder
+2. Run: docker-compose up -d
+3. Open up the default web ui and set desired username/password
+4. Under Web UI settings, set the path to "/www"
+5. Go to project root
+6. Run: npm run dev
+7. Go to http://localhost:8090
+
+Note: If you make any changes to the source code, you will have to hard-reload the page each time (Ctrl + Shift + R on Windows).

dev/docker-compose.yml

@@ -0,0 +1,19 @@
+version: "2.1"
+services:
+  qbittorrent:
+    image: linuxserver/qbittorrent:version-14.3.8.99202110081405-7423-ac5c264e6ubuntu20.04.1
+    container_name: qbit-matUI-dev-container
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=America/New_York
+      - WEBUI_PORT=8090
+    volumes:
+      - ./config:/config
+      - ./downloads:/downloads
+      - ./www:/www
+    ports:
+      - 6881:6881
+      - 6881:6881/udp
+      - 8090:8090
+    restart: unless-stopped

package.json

@@ -3,6 +3,7 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
+    "dev": "ng build --watch --output-path=\"dev/www/private\"",
     "build": "ng build",
     "build_prod": "ng build --prod",
     "test": "ng test",

scripts/builds/build_prod.sh

@@ -65,12 +65,5 @@ echo "Copying login page to existing builds..."
 cp -r "$default_build_path/$login_build" "$default_build_path/$win_build/public"
 cp -r "$default_build_path/$login_build" "$default_build_path/$unix_build/public"
 
-# Step (6) -- Compress both builds into .zip
-# echo "Compressing builds..."
-# pushd "$default_build_path" > /dev/null
-# tar -zcvf "$win_build.zip" "$win_build"
-# tar -zcvf "$unix_build.zip" "$unix_build"
-# popd > /dev/null
-
 echo
 echo "Done!"

src/app/app.config.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.13.0"
+  "version": "1.14.0"
 }

src/app/app.module.ts

@@ -13,7 +13,6 @@ import { AppComponent } from './app.component';
 import { CookieService } from 'ngx-cookie-service';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { TorrentsTableComponent } from './torrents-table/torrents-table.component';
-import { LoginComponent } from './login/login.component';
 import { HomeComponent } from './home/home.component';
 import { environment } from 'src/environments/environment';
 import { MatSortModule } from '@angular/material/sort';
@@ -72,8 +71,7 @@ var appRoutes: Routes;
 // Login page is only needed during development/testing
 if(!environment.production){
   appRoutes = [
-    { path: '', component: LoginComponent},
-    { path: 'home', component: HomeComponent}
+    { path: '', component: HomeComponent}
   ]
 } else {
   appRoutes = [
@@ -85,7 +83,6 @@ if(!environment.production){
   declarations: [
     AppComponent,
     TorrentsTableComponent,
-    LoginComponent,
     HomeComponent,
     AddTorrentDialogComponent,
     DeleteTorrentDialogComponent,