Merge branch 'master' of github.com:mroote/factorio-server-manager

Author: mroote

.gitignore

@@ -2,9 +2,14 @@ node_modules/
 dev/
 bundle.js
 factorio-server-manager
+factorio_server_manager
 auth.leveldb*
 conf.json
 *.exe
 build/
+/mod_packs/*
 npm-debug.log
-ui/package-lock.json
+.idea/
+/ui/package-lock.json
+factorio.auth
+/pkg/

.travis.yml

@@ -1,8 +1,8 @@
 language: go
-go: 
- - 1.5.4
- - 1.6.3
- - 1.7.3
+go:
+ - 1.7.6
+ - 1.8.5
+ - 1.9.2
  - tip
 
 install:
@@ -12,6 +12,7 @@ install:
   - go get github.com/hpcloud/tail
   - go get github.com/gorilla/websocket
   - go get github.com/majormjr/rcon
+  - export GOPATH="$HOME/gopath/src/github.com/mroote/factorio-server-manager/:$GOPATH"
 
 script:
  - go test -v ./...

README.md

@@ -8,7 +8,8 @@ This tool runs on a Factorio server and allows management of the Factorio server
 ## Features
 * Allows control of the Factorio Server, starting and stopping the Factorio binary.
 * Allows the management of save files, upload, download and delete saves.
-* Manage installed mods, upload new ones, delete uneeded mods.  Enable or disable individual mods.
+* Manage installed mods, upload new ones and more
+* Manage modpacks, so it is easier to play with different configurations
 * Allow viewing of the server logs and current configuration.
 * Authentication for protecting against unauthorized users
 * Available as a Docker container
@@ -72,7 +73,10 @@ Example:
 ![Factorio Server Manager Screenshot](http://i.imgur.com/M7kBAhI.png "Factorio Server Manager")
 
 ## Manage mods
-![Factorio Server Manager Screenshot](http://i.imgur.com/L62Yb2W.png "Factorio Server Manager")
+![Factorio Server Manager Screenshot](https://imgur.com/QIb0Kr4.png "Factorio Server Manager")
+
+## Manage modpacks
+![Factorio Server Manager Screenshot](https://imgur.com/O701fB8.png "Factorio Server Manager")
 
 
 
@@ -141,6 +145,8 @@ go get github.com/apexskier/httpauth
 go get github.com/go-ini/ini
 go get github.com/gorilla/mux
 go get github.com/hpcloud/tail
+go get github.com/gorilla/websocket
+go get github.com/majormjr/rcon
 ```
 
 3. Now you will want to go into the src folder for example "C:\FS\factorio-server-manager\src" once there hold down left shift and right click an empty area of the folder. Then click "Open command windows here"

app/dist/dist/css/factorio-server-manager.css

@@ -27,3 +27,47 @@ div.console-prompt-box {
   color: #444; 
   width: 100%;
   max-width: 100%;}
+
+.loader {
+    display: inline-block;
+    border: 5px solid lightgrey;
+    border-radius: 50%;
+    border-top: 5px solid #3498db;
+    width: 20px;
+    height: 20px;
+    -webkit-animation: spin 2s linear infinite;
+    animation: spin 2s linear infinite;
+    margin-right: 7px;
+}
+
+@-webkit-keyframes spin {
+    0% { -webkit-transform: rotate(0deg); }
+    100% { -webkit-transform: rotate(360deg); }
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
+
+.sweet-alert {
+    /*box-sizing : border-box;*/
+    max-height : 80% !important;
+    overflow-y : auto !important;
+    /*padding : 0 17px 17px !important;*/
+    /*width : 512px;*/
+
+    /*remove margins*/
+    /*margin: 0;*/
+}
+
+.sweet-alert input[type=radio] {
+    display: block;
+
+    height: unset;
+    margin: 0;
+}
+
+.sweet-alert table tr:nth-child(even) {
+    background: rgba(68, 68, 68, 0.31);
+}

app/index.html

@@ -21,6 +21,8 @@
     <link rel="stylesheet" href="./dist/dist/css/factorio-server-manager.css">
     <!-- Sweetalert.js stylesheet -->
     <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/sweetalert/1.1.3/sweetalert.min.css">
+    <!-- pretty upload-file-inputs stylesheet -->
+    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-fileinput/4.4.2/css/fileinput.min.css">
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -41,5 +43,7 @@
     <script src="./dist/dist/js/app.min.js"></script>
     <!-- Main application -->
     <script src="./bundle.js"></script>
+    <!-- Pretty upload-file-inputs -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-fileinput/4.4.2/js/fileinput.min.js"></script>
   </body>
 </html>

src/factorio_server_linux.go

@@ -1,6 +1,5 @@
 package main
 
-
 // Stubs for windows-only functions
 
 func sendCtrlCToPid(pid int) {

src/factorio_server_windows.go

@@ -22,10 +22,10 @@ func sendCtrlCToPid(pid int) {
 
 func setCtrlHandlingIsDisabledForThisProcess(disabled bool) {
 	disabledInt := 0
-	if(disabled){
+	if disabled {
 		disabledInt = 1
 	}
-	
+
 	d, e := syscall.LoadDLL("kernel32.dll")
 	if e != nil {
 		log.Fatalf("LoadDLL: %v\n", e)