Updated files to UF4.1

Ekwav · Jun 30, 2017 · 6fba60e · 6fba60e
1 parent f9a5006
commit 6fba60e
Show file tree

Hide file tree

Showing 25 changed files with 500 additions and 353 deletions.
diff --git a/bundle.config.json → asset-bundles.json b/bundle.config.json → asset-bundles.json
diff --git a/locale/de_DE/translation.php b/locale/de_DE/translation.php
@@ -10,10 +10,10 @@
 			"ALLOWED" => "Erlaubt",
 			"DENIED" => "Verweigert"
 		],
-		
+
 		"PERMISSION" => "Berechtigung",
-		
-		
+
+
 		"ERROR" => [
 			"@TRANSLATION" => "Im Autentificationsprozess ist etwas schief gelaufen.",
 			"TITLE" => "Authetificationsfehler",
@@ -23,7 +23,7 @@
 			"NO_CLIENT" => "Es wurde keine AppID angegeben. Bitte gib einen Wert für 'client_id' an.",
 			"REDIRECT" => "Klicke <a href='{{redirect}}'>hier</a> um in die App zurückzukommen."
 		],
-		
+
 		"SCOPE" => [
 			"EMAIL" => [
 				"@TRANSLATION" => "E-mail",
@@ -67,7 +67,7 @@
 			"REDIRECT_URI" => [
 				"@TRANSLATION" => "Weiterleitungs-URI",
 				"EXAMPLE" => "https://example.com/oauth2callback",
-				"HELP" => "Nach dem aktzeptieren der Berechtigungen wird der Nutzer zu diesem Link weitergeleitet."
+				"HELP" => "Nach dem akzeptieren der Berechtigungen wird der Nutzer zu diesem Link weitergeleitet."
 			],
 			"DESCRIPTION" => [
 				"@TRANSLATION" => "Produktbeschreibung",
@@ -83,4 +83,4 @@
 	],
 );
 
-?>
+?>
diff --git a/locale/en_US/translation.php b/locale/en_US/translation.php
@@ -10,10 +10,10 @@
 			"ALLOWED" => "Allowed",
 			"DENIED" => "Denied"
 		],
-		
+
 		"PERMISSION" => "Permission",
-		
-		
+
+
 		"ERROR" => [
 			"@TRANSLATION" => "Something went wrong.",
 			"TITLE" => "Authetificationerror",
@@ -23,7 +23,7 @@
 			"NO_CLIENT" => "No AppID. Please provide us with a 'client_id'.",
 			"REDIRECT" => "Klick <a href='{{redirect}}'>here</a> to get back to the App."
 		],
-		
+
 		"SCOPE" => [
 			"EMAIL" => [
 				"@TRANSLATION" => "E-mail",
@@ -49,8 +49,34 @@
 				"@TRANSLATION" => "Basic",
 				"DESCRIPTION" => "Gives acces to your userID, username and CloudSave."
 			]
+		],
+		"CLIENT" => [
+			"NEW" => [
+				"@TRANSLATION" => "New App",
+				"DESCRIPTION" => "Here you can add a new app."
+			],
+			"ICON" => [
+				"@TRANSLATION" => "Productlogo-URL",
+				"EXAMPLE" => "https://example.com/mylogo.png",
+				"HELP" => "This pciture is displayed on the authorisation page."
+			],
+			"REDIRECT_URI" => [
+				"@TRANSLATION" => "Redirect-URI",
+				"EXAMPLE" => "https://example.com/oauth2callback",
+				"HELP" => "After accepting the permissions, the user is redirected to this link."
+			],
+			"DESCRIPTION" => [
+				"@TRANSLATION" => "Product description",
+				"EXAMPLE" => "This App is about ... ",
+				"HELP" => "This will be displayed to the user when he wants more information about your app."
+			],
+			"NAME" => [
+				"@TRANSLATION" => "Product name",
+				"EXAMPLE" => "The best App in the world",
+				"HELP" => "This is the displayed name of your app. It is shown on the authorisation page for example."
+			]
 		]
 	]
 );
 
-?>
+?>
diff --git a/migrations/0.0.1.php b/migrations/0.0.1.php
diff --git a/schema/new_oauth_client.json → schema/requests/new_oauth_client.json b/schema/new_oauth_client.json → schema/requests/new_oauth_client.json
diff --git a/schema/new_oauth_scope.json → schema/requests/new_oauth_scope.json b/schema/new_oauth_scope.json → schema/requests/new_oauth_scope.json
diff --git a/src/Api.php b/src/Api.php
@@ -9,7 +9,7 @@
 namespace UserFrosting\Sprinkle\Api;
 
 use UserFrosting\Sprinkle\Api\ServicesProvider\ServicesProvider;
-use UserFrosting\Sprinkle\Core\Initialize\Sprinkle;
+use UserFrosting\System\Sprinkle\Sprinkle;
 use UserFrosting\Sprinkle\Core\Facades\Debug;
 use UserFrosting\Sprinkle\Core\Controller\SimpleController;
 use League\OAuth2\Server\AuthorizationServer;
@@ -24,13 +24,13 @@
 
 class Api extends Sprinkle
 {
-   
+
      //* Register OAuth2 services.
-     
+
     public function init()
     {
 		$serviceProvider = new ServicesProvider();
         $serviceProvider->register($this->ci);
-		
+
     }
 }