From 854d2ee955c07f78264166192e54279efc18e42b Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 31 Dec 2017 11:08:46 +0200 Subject: [PATCH] Change from .dev to .test --- .env.example | 2 +- .env.travis | 2 +- app/Http/Controllers/BaseAPIController.php | 2 +- app/Libraries/Utils.php | 2 +- docs/api.rst | 28 +++++++++++----------- docs/configure.rst | 2 +- tests/functional.suite.yml | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.env.example b/.env.example index 42be9899d2..68366256a6 100644 --- a/.env.example +++ b/.env.example @@ -48,7 +48,7 @@ API_SECRET=password #GOOGLE_CLIENT_ID= #GOOGLE_CLIENT_SECRET= -#GOOGLE_OAUTH_REDIRECT=http://ninja.dev/auth/google +#GOOGLE_OAUTH_REDIRECT=http://ninja.test/auth/google GOOGLE_MAPS_ENABLED=true #GOOGLE_MAPS_API_KEY= diff --git a/.env.travis b/.env.travis index e7ea720c59..3a18a2ca50 100644 --- a/.env.travis +++ b/.env.travis @@ -1,6 +1,6 @@ APP_ENV=development APP_DEBUG=false -APP_URL=http://ninja.dev +APP_URL=http://ninja.test APP_KEY=SomeRandomStringSomeRandomString APP_CIPHER=AES-256-CBC APP_LOCALE=en diff --git a/app/Http/Controllers/BaseAPIController.php b/app/Http/Controllers/BaseAPIController.php index 4747346746..d57cf2cc18 100644 --- a/app/Http/Controllers/BaseAPIController.php +++ b/app/Http/Controllers/BaseAPIController.php @@ -18,7 +18,7 @@ use Utils; /** * @SWG\Swagger( * schemes={"http","https"}, - * host="ninja.dev", + * host="ninja.test", * basePath="/api/v1", * produces={"application/json"}, * @SWG\Info( diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php index e9470253f0..80ac648fe1 100644 --- a/app/Libraries/Utils.php +++ b/app/Libraries/Utils.php @@ -96,7 +96,7 @@ class Utils public static function requireHTTPS() { - if (in_array(Request::root(), ['http://ninja.dev', 'http://ninja.dev:8000', 'http://www.ninja.test'])) { + if (in_array(Request::root(), ['http://www.ninja.test', 'http://www.ninja.test:8000'])) { return false; } diff --git a/docs/api.rst b/docs/api.rst index 0b2e0f7791..0b828f1eeb 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -10,7 +10,7 @@ To access the API you first need to create a token using the "API Tokens” page - **PHP SDK**: https://github.com/invoiceninja/sdk-php - **Zend Framework**: https://github.com/alexz707/InvoiceNinjaModule -.. NOTE:: Replace ninja.dev with https://app.invoiceninja.com to access a hosted account. +.. NOTE:: Replace ninja.test with https://app.invoiceninja.com to access a hosted account. Reading Data """""""""""" @@ -19,39 +19,39 @@ Here’s an example of reading the list of clients using cURL from the command l .. code-block:: shell - curl -X GET ninja.dev/api/v1/clients -H "X-Ninja-Token: TOKEN" + curl -X GET ninja.test/api/v1/clients -H "X-Ninja-Token: TOKEN" For invoices, quotes, tasks and payments simply change the object type. .. code-block:: shell - curl -X GET ninja.dev/api/v1/invoices -H "X-Ninja-Token: TOKEN" + curl -X GET ninja.test/api/v1/invoices -H "X-Ninja-Token: TOKEN" You can search clients by their email address or id number and invoices by their invoice number. .. code-block:: shell - curl -X GET ninja.dev/api/v1/clients?email= -H "X-Ninja-Token: TOKEN" - curl -X GET ninja.dev/api/v1/clients?id_number= -H "X-Ninja-Token: TOKEN" - curl -X GET ninja.dev/api/v1/invoices?invoice_number= -H "X-Ninja-Token: TOKEN" + curl -X GET ninja.test/api/v1/clients?email= -H "X-Ninja-Token: TOKEN" + curl -X GET ninja.test/api/v1/clients?id_number= -H "X-Ninja-Token: TOKEN" + curl -X GET ninja.test/api/v1/invoices?invoice_number= -H "X-Ninja-Token: TOKEN" To load a single record specify the Id in the URL. .. code-block:: shell - curl -X GET ninja.dev/api/v1/invoices/1 -H "X-Ninja-Token: TOKEN" + curl -X GET ninja.test/api/v1/invoices/1 -H "X-Ninja-Token: TOKEN" You can specify additional relationships to load using the ``include`` parameter. .. code-block:: shell - curl -X GET ninja.dev/api/v1/clients/1?include=invoices.invitations -H "X-Ninja-Token: TOKEN" + curl -X GET ninja.test/api/v1/clients/1?include=invoices.invitations -H "X-Ninja-Token: TOKEN" You can download a PDF using the following URL .. code-block:: shell - curl -X GET ninja.dev/api/v1/download/1 -H "X-Ninja-Token: TOKEN" + curl -X GET ninja.test/api/v1/download/1 -H "X-Ninja-Token: TOKEN" Optional Settings """"""""""""""""" @@ -74,14 +74,14 @@ Here’s an example of creating a client. Note that email address is a property .. code-block:: shell - curl -X POST ninja.dev/api/v1/clients -H "Content-Type:application/json" \ + curl -X POST ninja.test/api/v1/clients -H "Content-Type:application/json" \ -d '{"name":"Client","contact":{"email":"test@example.com"}}' -H "X-Ninja-Token: TOKEN" You can also update a client by specifying a value for ‘id’. Next, here’s an example of creating an invoice. .. code-block:: shell - curl -X POST ninja.dev/api/v1/invoices -H "Content-Type:application/json" \ + curl -X POST ninja.test/api/v1/invoices -H "Content-Type:application/json" \ -d '{"client_id":"1", "invoice_items":[{"product_key": "ITEM", "notes":"Test", "cost":10, "qty":1}]}' \ -H "X-Ninja-Token: TOKEN" @@ -104,7 +104,7 @@ Updating Data .. code-block:: shell - curl -X PUT ninja.dev/api/v1/clients/1 -H "Content-Type:application/json" \ + curl -X PUT ninja.test/api/v1/clients/1 -H "Content-Type:application/json" \ -d '{"name":"test", "contacts":[{"id": 1, "first_name": "test"}]}' \ -H "X-Ninja-Token: TOKEN" @@ -112,7 +112,7 @@ You can archive, delete or restore an entity by setting ``action`` in the reques .. code-block:: shell - curl -X PUT ninja.dev/api/v1/invoices/1?action=archive \ + curl -X PUT ninja.test/api/v1/invoices/1?action=archive \ -H "X-Ninja-Token: TOKEN" .. TIP:: For invoices use `mark_sent` to manually mark the invoice as sent @@ -124,5 +124,5 @@ To email an invoice use the email_invoice command passing the id of the invoice. .. code-block:: shell - curl -X POST ninja.dev/api/v1/email_invoice -d '{"id":1}' \ + curl -X POST ninja.test/api/v1/email_invoice -d '{"id":1}' \ -H "Content-Type:application/json" -H "X-Ninja-Token: TOKEN" diff --git a/docs/configure.rst b/docs/configure.rst index 413b51321a..72948c47d6 100644 --- a/docs/configure.rst +++ b/docs/configure.rst @@ -44,7 +44,7 @@ Create an application in either Google, Facebook, GitHub or LinkedIn and then se GOOGLE_CLIENT_ID= GOOGLE_CLIENT_SECRET= - GOOGLE_OAUTH_REDIRECT=http://ninja.dev/auth/google + GOOGLE_OAUTH_REDIRECT=http://ninja.test/auth/google PhantomJS """"""""" diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml index 9efc759882..ceaf820abe 100644 --- a/tests/functional.suite.yml +++ b/tests/functional.suite.yml @@ -9,7 +9,7 @@ modules: enabled: - \Helper\Functional - PhpBrowser: - url: 'http://ninja.dev:8000' + url: 'http://ninja.test:8000' curl: CURLOPT_RETURNTRANSFER: true - Laravel5: