Merge pull request #77 from rubentalstra/develop

Develop version v3.0.0
pterodactyl-app · May 22, 2019 · 5059f23 · 5059f23
2 parents 1639555 + c6f1d2e
commit 5059f23
Show file tree

Hide file tree

Showing 52 changed files with 1,589 additions and 1,874 deletions.
diff --git a/.gitignore b/.gitignore
@@ -68,3 +68,9 @@
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+android/local.properties
+android/gradlew
+ios/Podfile.lock
+ios/Flutter/Generated.xcconfig
+ios/Runner.xcodeproj/project.pbxproj
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ Then you copy this code:
     "action_restart":"Restart",
     "action_kill":"Kill",
     "action_stats": "Stats",
-    "action_file": "File List (coming panel 0.8)",
+    "action_file": "File List",
     "dark_mode":"Dark mode",
     "dark_mode_sub":"Black and Grey Theme",
     "cores":"Cores",
@@ -121,7 +121,11 @@ Then you copy this code:
     "rootadmin": "Root admin:",
     "2fa": "2FA",
     "created_at": "Created at:",
-    "updated_at": "Updated at:"
+    "updated_at": "Updated at:",
+    "admin_actionserver_view_server_info": "View Server info",
+    "admin_actionserver_edit_server_info": "Edit Server info",
+    "utilization_stats_offline": "Server is offline",
+    "utilization_stats_online": "Server is online" 
 }
 ```
 And change to the languge you are working on. 

diff --git a/CREDITS.md b/CREDITS.md
@@ -34,6 +34,7 @@ For all the people who worked with me on this amazing project.
 ###### Flutter Coders:
 
 > - `@appomatrix#9639`
+> - `@Yvan#9877`
 
 
 

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # Pterodactyl Mobile App 🚀
 
+[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=102)](https://opensource.org/licenses/gpl-3.0)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/RDTalstra)
 <span class="badge-patreon"><a href="https://www.patreon.com/Pterodactyl_app" title="Donate to this project using Patreon"><img src="https://img.shields.io/badge/Donate-Patreon-green.svg" alt="Patreon donate button" /></a></span>
 [![Codemagic build status](https://api.codemagic.io/apps/5ccaf2ab80113f001c2e4176/5ccaf2ab80113f001c2e4175/status_badge.svg)](https://codemagic.io/apps/5ccaf2ab80113f001c2e4176/5ccaf2ab80113f001c2e4175/latest_build)
@@ -25,6 +26,9 @@ Admin panel
 This project was made possible by everyone who contributed to this project. [CREDITS](https://github.com/rubentalstra/Pterodactyl-app/blob/master/CREDITS.md)
 
 
+### :heart: Found this project useful?
+If you found this project useful, then please consider giving it a :star: on Github and sharing it with your friends via social media.
+
 
 ### Currently available on the Play store.
 
@@ -36,6 +40,12 @@ This project was made possible by everyone who contributed to this project. [CRE
 V1.0 may 6 '19 - Original Release 
 
 
+# Donate
+
+> If you found this project helpful or you learned something from the source code and want to thank me, consider buying me a cup of :coffee:
+>
+> - [PayPal](https://www.paypal.me/RDTalstra)
+
 
 ### License
 
@@ -52,7 +62,7 @@ Facebook:
 
 Instagram: 
 
-Website:
+Website: [Pterodactyl app website](https://pterodactyl-app.com/)
 
 Project Board: [click here](https://trello.com/b/YqCe05Vl/pterodactyl-app)
 
@@ -61,3 +71,20 @@ Project Board: [click here](https://trello.com/b/YqCe05Vl/pterodactyl-app)
 flutter build appbundle --release --target-platform=android-arm
 flutter build appbundle --release --target-platform=android-arm64
 ```
+
+License
+-------
+
+    Copyright 2018 Ruben Talstra
+
+    Licensed under the GNU General Public License v3.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       https://www.gnu.org/licenses/gpl-3.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -13,7 +13,7 @@ if (flutterRoot == null) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '37'
+    flutterVersionCode = '38'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')

diff --git a/android/gradlew b/android/gradlew
diff --git a/android/local.properties b/android/local.properties
diff --git a/assets/lang/de_DE.json b/assets/lang/de_DE.json
@@ -102,7 +102,10 @@
     "updated_at": "Updated at:",
     "admin_actionserver_view_server_info": "View Server info",
     "admin_actionserver_edit_server_info": "Edit Server info",
-    "utilization_stats_offline": "Server is offline",
-    "utilization_stats_online": "Server is online" 
+    "utilization_stats_offline": "Offline",
+    "utilization_stats_online": "Server is online",
+    "utilization_stats_starting": "Server is starting",
+    "utilization_stats_stopping": "Server is stopping",
+    "utilization_stats_Loading": "Retrieving data" 
 
 }
diff --git a/assets/lang/dk_DK.json b/assets/lang/dk_DK.json
@@ -104,6 +104,9 @@
     "updated_at": "Updated at:",
     "admin_actionserver_view_server_info": "View Server info",
     "admin_actionserver_edit_server_info": "Edit Server info",
-    "utilization_stats_offline": "Server is offline",
-    "utilization_stats_online": "Server is online"     
+    "utilization_stats_offline": "Offline",
+    "utilization_stats_online": "Server is online",
+    "utilization_stats_starting": "Server is starting",
+    "utilization_stats_stopping": "Server is stopping",
+    "utilization_stats_Loading": "Retrieving data"      
 }
diff --git a/assets/lang/en_UK.json b/assets/lang/en_UK.json
@@ -6,7 +6,7 @@
     "next":"NEXT",
     "login_error":"username or password \ncan't be empty",
     "login_error_ok":"OK",
-    "login_admin_account": "Do you have a Admin account? tap here then",   
+    "login_admin_account": "Do you have a Admin account? tap here",   
     "dashboard":"Dashboard",
     "logout":"Logout",
     "logout_sub":"Disconnect",
@@ -27,7 +27,7 @@
     "action_restart":"Restart",
     "action_kill":"Kill",
     "action_stats": "Stats",
-    "action_file": "File List (coming panel 0.8)",
+    "action_file": "File List",
     "dark_mode":"Dark mode",
     "dark_mode_sub":"Black and Grey Theme",
     "cores":"Cores",
@@ -104,6 +104,9 @@
     "updated_at": "Updated at:",
     "admin_actionserver_view_server_info": "View Server info",
     "admin_actionserver_edit_server_info": "Edit Server info",
-    "utilization_stats_offline": "Server is offline",
-    "utilization_stats_online": "Server is online"      
+    "utilization_stats_offline": "Offline",
+    "utilization_stats_online": "Server is online",
+    "utilization_stats_starting": "Server is starting",
+    "utilization_stats_stopping": "Server is stopping",
+    "utilization_stats_Loading": "Retrieving data"     
 }
diff --git a/assets/lang/en_US.json b/assets/lang/en_US.json
@@ -6,7 +6,7 @@
     "next":"NEXT",
     "login_error":"username or password \ncan't be empty",
     "login_error_ok":"OK",
-    "login_admin_account": "Do you have a Admin account? tap here then",   
+    "login_admin_account": "Do you have an Admin account? tap here",
     "dashboard":"Dashboard",
     "logout":"Logout",
     "logout_sub":"Disconnect",
@@ -27,7 +27,7 @@
     "action_restart":"Restart",
     "action_kill":"Kill",
     "action_stats": "Stats",
-    "action_file": "File List (coming panel 0.8)",
+    "action_file": "File List",
     "dark_mode":"Dark mode",
     "dark_mode_sub":"Black and Grey Theme",
     "cores":"Cores",
@@ -104,6 +104,9 @@
     "updated_at": "Updated at:",
     "admin_actionserver_view_server_info": "View Server info",
     "admin_actionserver_edit_server_info": "Edit Server info",
-    "utilization_stats_offline": "Server is offline",
-    "utilization_stats_online": "Server is online" 
+    "utilization_stats_offline": "Offline",
+    "utilization_stats_online": "Server is online",
+    "utilization_stats_starting": "Server is starting",
+    "utilization_stats_stopping": "Server is stopping",
+    "utilization_stats_Loading": "Retrieving data"   
 }
diff --git a/assets/lang/fr_FR.json b/assets/lang/fr_FR.json
@@ -104,6 +104,9 @@
     "updated_at": "Updated at:",
     "admin_actionserver_view_server_info": "View Server info",
     "admin_actionserver_edit_server_info": "Edit Server info",
-    "utilization_stats_offline": "Server is offline",
-    "utilization_stats_online": "Server is online"  
+    "utilization_stats_offline": "Offline",
+    "utilization_stats_online": "Server is online",
+    "utilization_stats_starting": "Server is starting",
+    "utilization_stats_stopping": "Server is stopping",
+    "utilization_stats_Loading": "Retrieving data"    
 }
diff --git a/assets/lang/it_IT.json b/assets/lang/it_IT.json
@@ -27,7 +27,7 @@
     "action_restart":"Riavvia",
     "action_kill":"Kill",
     "action_stats": "Statistiche",
-    "action_file": "Lista File (coming panel 0.8)",
+    "action_file": "Lista File",
     "dark_mode":"Dark mode",
     "dark_mode_sub":"Template Nero e Grigio",
     "cores":"Cores",
@@ -104,6 +104,9 @@
     "updated_at": "Updated at:",
     "admin_actionserver_view_server_info": "View Server info",
     "admin_actionserver_edit_server_info": "Edit Server info",
-    "utilization_stats_offline": "Server is offline",
-    "utilization_stats_online": "Server is online"  
+    "utilization_stats_offline": "Offline",
+    "utilization_stats_online": "Server is online",
+    "utilization_stats_starting": "Server is starting",
+    "utilization_stats_stopping": "Server is stopping",
+    "utilization_stats_Loading": "Retrieving data"   
 }