diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..bb712443a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ + [submodule "console"] + path = app/console + url = https://github.com/appwrite/console.git + branch = main \ No newline at end of file diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php index ff36be94d..8001a58d0 100644 --- a/app/controllers/web/console.php +++ b/app/controllers/web/console.php @@ -3,50 +3,17 @@ use Appwrite\Utopia\Response; use Utopia\App; -$fallbackRoute = function (Response $response) { - $fallback = file_get_contents(__DIR__ . '/../../../console/index.html'); - $response->html($fallback); -}; - App::get('/') + ->alias('/console/*') + ->alias('/invite') + ->alias('/login') + ->alias('/recover') + ->alias('/register') ->groups(['web']) ->label('permission', 'public') ->label('scope', 'home') ->inject('response') - ->action($fallbackRoute); - -App::get('/console/*') - ->groups(['web']) - ->label('permission', 'public') - ->label('scope', 'home') - ->inject('response') - ->action($fallbackRoute); - -App::get('/invite') - ->groups(['web']) - ->label('permission', 'public') - ->label('scope', 'home') - ->inject('response') - ->action($fallbackRoute); - -App::get('/login') - ->groups(['web']) - ->label('permission', 'public') - ->label('scope', 'home') - ->inject('response') - ->action($fallbackRoute); - -App::get('/recover') - ->groups(['web']) - ->label('permission', 'public') - ->label('scope', 'home') - ->inject('response') - ->action($fallbackRoute); - -App::get('/register') - ->groups(['web']) - ->label('permission', 'public') - ->label('scope', 'home') - ->inject('response') - ->action($fallbackRoute); - + ->action(function (Response $response) { + $fallback = file_get_contents(__DIR__ . '/../../../console/index.html'); + $response->html($fallback); + }); diff --git a/composer.json b/composer.json index 4ee7392ef..334120958 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "utopia-php/database": "0.26.*", "utopia-php/preloader": "0.2.*", "utopia-php/domains": "1.1.*", - "utopia-php/framework": "0.22.*", + "utopia-php/framework": "dev-feat-multiple-aliases as 0.22.9", "utopia-php/image": "0.5.*", "utopia-php/locale": "0.4.*", "utopia-php/logger": "0.3.*", diff --git a/composer.lock b/composer.lock index de7d1042c..128532594 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fa760a49c4911c4a1a4ae0b8881738aa", + "content-hash": "d8785bcc235caa7fe9312614f053d0cd", "packages": [ { "name": "adhocore/jwt", @@ -2172,16 +2172,16 @@ }, { "name": "utopia-php/framework", - "version": "0.22.1", + "version": "dev-feat-multiple-aliases", "source": { "type": "git", "url": "https://github.com/utopia-php/framework.git", - "reference": "9f35d36ed4b8fa1c92962c77ef02b49c2f5919df" + "reference": "37637cb22a30e6660a0886befef4d6a5e657fc48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/utopia-php/framework/zipball/9f35d36ed4b8fa1c92962c77ef02b49c2f5919df", - "reference": "9f35d36ed4b8fa1c92962c77ef02b49c2f5919df", + "url": "https://api.github.com/repos/utopia-php/framework/zipball/37637cb22a30e6660a0886befef4d6a5e657fc48", + "reference": "37637cb22a30e6660a0886befef4d6a5e657fc48", "shasum": "" }, "require": { @@ -2201,12 +2201,6 @@ "license": [ "MIT" ], - "authors": [ - { - "name": "Eldad Fux", - "email": "eldad@appwrite.io" - } - ], "description": "A simple, light and advanced PHP framework", "keywords": [ "framework", @@ -2215,9 +2209,9 @@ ], "support": { "issues": "https://github.com/utopia-php/framework/issues", - "source": "https://github.com/utopia-php/framework/tree/0.22.1" + "source": "https://github.com/utopia-php/framework/tree/feat-multiple-aliases" }, - "time": "2022-10-07T14:51:40+00:00" + "time": "2022-10-20T21:06:21+00:00" }, { "name": "utopia-php/image", @@ -5411,9 +5405,18 @@ "time": "2022-09-28T08:42:51+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "utopia-php/framework", + "version": "dev-feat-multiple-aliases", + "alias": "0.22.9", + "alias_normalized": "0.22.9.0" + } + ], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "utopia-php/framework": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": {