Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add imports for commonly used classes #1829

Merged
merged 51 commits into from
Aug 21, 2022
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
d535d17
minor block style comment CS fixes
mvorisek Aug 21, 2022
2ec12d2
update eslint config
mvorisek Aug 21, 2022
f92de27
conditional optional View::on type
mvorisek Aug 21, 2022
d592b86
fix (although wrong) CS
mvorisek Aug 21, 2022
78491de
some imports
mvorisek Aug 21, 2022
ae5ce42
condensed cs
mvorisek Aug 21, 2022
f60d028
fix import order
mvorisek Aug 21, 2022
d60f2a1
tests imports
mvorisek Aug 21, 2022
5fb6fdb
more imports
mvorisek Aug 21, 2022
9695cbe
src imports
mvorisek Aug 21, 2022
a72f7bc
fix/revert stan ignore
mvorisek Aug 21, 2022
3de6cde
import Label
mvorisek Aug 21, 2022
d3193a8
import Header
mvorisek Aug 21, 2022
65a8486
import Button
mvorisek Aug 21, 2022
907564a
import View
mvorisek Aug 21, 2022
5a64d82
import JsToast
mvorisek Aug 21, 2022
02cc85f
import Text
mvorisek Aug 21, 2022
c56a90c
import Table
mvorisek Aug 21, 2022
017870a
import Crud
mvorisek Aug 21, 2022
d2bd0c6
import JsReload
mvorisek Aug 21, 2022
889a19a
import Message
mvorisek Aug 21, 2022
9122f9a
import Lister
mvorisek Aug 21, 2022
7433657
import LoremIpsum
mvorisek Aug 21, 2022
614dc76
import Modal
mvorisek Aug 21, 2022
9d37c59
import Model
mvorisek Aug 21, 2022
2c12b71
import Field
mvorisek Aug 21, 2022
0aed9a6
import JsExpression
mvorisek Aug 21, 2022
4d1800d
import Form
mvorisek Aug 21, 2022
e1fa321
import Console
mvorisek Aug 21, 2022
4e209ff
import GridLayout
mvorisek Aug 21, 2022
0e8b112
import Grid
mvorisek Aug 21, 2022
194c68f
import Menu
mvorisek Aug 21, 2022
592ba57
import VirtualPage
mvorisek Aug 21, 2022
08fecbe
import JsModal
mvorisek Aug 21, 2022
6809eca
import Columns
mvorisek Aug 21, 2022
180c470
import Card
mvorisek Aug 21, 2022
9029723
import Jquery, Icon
mvorisek Aug 21, 2022
5988fa2
import Paginator, Loader
mvorisek Aug 21, 2022
a778e29
import Layout
mvorisek Aug 21, 2022
a9ca509
use Wizard
mvorisek Aug 21, 2022
5aa07e0
import Image, Tabs
mvorisek Aug 21, 2022
12442c9
import Accordion
mvorisek Aug 21, 2022
e804544
import JsSse
mvorisek Aug 21, 2022
11c0fef
import JsNotify
mvorisek Aug 21, 2022
8b4e8de
misc
mvorisek Aug 21, 2022
bc85a1c
improve stan
mvorisek Aug 21, 2022
cb4d789
remaining imports
mvorisek Aug 21, 2022
f6aea31
rename Component to VueComponent
mvorisek Aug 21, 2022
fb900dc
remove redundant phpdoc
mvorisek Aug 21, 2022
10de936
fix cs import order
mvorisek Aug 21, 2022
cdcb7a0
fix stan
mvorisek Aug 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
import Layout
mvorisek committed Aug 21, 2022
commit a778e292eedbcaa3ef7d9d5c72ccec617b216bfc
5 changes: 3 additions & 2 deletions demos/init-app.php
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@

use Atk4\Data\Persistence;
use Atk4\Ui\Button;
use Atk4\Ui\Layout;

date_default_timezone_set('UTC');

@@ -74,10 +75,10 @@ public static function get_class(\Closure $createAnonymousClassFx): string
$demosUrl = $rootUrl . 'demos/';

// allow custom layout override
$app->initLayout([!isset($_GET['layout']) ? \Atk4\Ui\Layout\Maestro::class : $app->stickyGet('layout')]);
$app->initLayout([!isset($_GET['layout']) ? Layout\Maestro::class : $app->stickyGet('layout')]);

$layout = $app->layout;
if ($layout instanceof \Atk4\Ui\Layout\NavigableInterface) {
if ($layout instanceof Layout\NavigableInterface) {
$layout->addMenuItem(['Welcome to Agile Toolkit', 'icon' => 'gift'], [$demosUrl . 'index']);

$path = $demosUrl . 'layout/';
3 changes: 2 additions & 1 deletion demos/layout/layouts.php
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
namespace Atk4\Ui\Demos;

use Atk4\Ui\Button;
use Atk4\Ui\Layout;
use Atk4\Ui\Text;
use Atk4\Ui\View;

@@ -15,7 +16,7 @@
$buttons = [
['page' => ['layouts_nolayout'], 'title' => 'HTML without layout'],
['page' => ['layouts_manual'], 'title' => 'Manual layout'],
['page' => ['../basic/header', 'layout' => \Atk4\Ui\Layout\Centered::class], 'title' => 'Centered layout'],
['page' => ['../basic/header', 'layout' => Layout\Centered::class], 'title' => 'Centered layout'],
['page' => ['layouts_admin'], 'title' => 'Admin Layout'],
['page' => ['layouts_error'], 'title' => 'Exception Error'],
];
7 changes: 4 additions & 3 deletions demos/layout/layouts_admin.php
Original file line number Diff line number Diff line change
@@ -7,15 +7,16 @@
use Atk4\Data\Model;
use Atk4\Ui\Form;
use Atk4\Ui\Header;
use Atk4\Ui\Layout;

/** @var \Atk4\Ui\App $app */
require_once __DIR__ . '/../init-app.php';

$layout = \Atk4\Ui\Layout\Admin::addTo($app);
$layout = Layout\Admin::addTo($app);

$menu = $layout->menu->addMenu(['Layouts', 'icon' => 'puzzle']);
$menu->addItem(\Atk4\Ui\Layout\Centered::class);
$menu->addItem(\Atk4\Ui\Layout\Admin::class);
$menu->addItem(Layout\Centered::class);
$menu->addItem(Layout\Admin::class);

$menuRight = $layout->menuRight;
$menuRight->addItem(['Warning', 'class.red' => true, 'icon' => 'red warning']);
5 changes: 3 additions & 2 deletions demos/layout/layouts_manual.php
Original file line number Diff line number Diff line change
@@ -4,18 +4,19 @@

namespace Atk4\Ui\Demos;

use Atk4\Ui\Layout;
use Atk4\Ui\Lister;
use Atk4\Ui\Text;

/** @var \Atk4\Ui\App $app */
require_once __DIR__ . '/../init-app.php';

$layout = new \Atk4\Ui\Layout(['defaultTemplate' => __DIR__ . '/templates/layout1.html']);
$layout = new Layout(['defaultTemplate' => __DIR__ . '/templates/layout1.html']);

Lister::addTo($layout, [], ['Report'])
->setModel(new SomeData());

$app->html = null;
$app->initLayout([\Atk4\Ui\Layout::class]);
$app->initLayout([Layout::class]);

Text::addTo($app->layout)->addHtml($layout->render());
3 changes: 2 additions & 1 deletion demos/layout/layouts_nolayout.php
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@

namespace Atk4\Ui\Demos;

use Atk4\Ui\Layout;
use Atk4\Ui\LoremIpsum;
use Atk4\Ui\Text;

@@ -15,6 +16,6 @@
$text = $a->generateLorem(150);

$app->html = null;
$app->initLayout([\Atk4\Ui\Layout::class]);
$app->initLayout([Layout::class]);

Text::addTo($app->layout)->addParagraph($text);