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.

Sign up for GitHub

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

replaced bootsrap with node midules #143

Closed
wants to merge 8 commits into from
Closed

replaced bootsrap with node midules #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f54934
replaced bootsrap with node midules
Dec 16, 2022
9318b3e
added jquery module
Dec 19, 2022
ca87ce7
replaced bootstrap version
Dec 19, 2022
43e761b
test modules
Dec 20, 2022
be838f7
added styles as modules
Dec 20, 2022
9309f03
trying to add sctipts as modules
Dec 20, 2022
140db57
added some scripts as modules
Dec 21, 2022
a941b3c
added some scripts as modules
Dec 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/_data
/vendor
/ftp-deployment
/assets/node_modules
2 changes: 1 addition & 1 deletion app/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public static function boot(): Configurator
{
$configurator = new Configurator();

$configurator->setDebugMode(false);
$configurator->setDebugMode(true);
$configurator->enableTracy(__DIR__ . '/../log');

$configurator->setTimeZone('Europe/Prague');
Expand Down
37 changes: 23 additions & 14 deletions app/templates/@layout.latte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@

<title>{ifset title}{include title|stripHtml} | {/ifset}DataGrid Sandbox</title>

<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/happy-inputs@2.0.4/src/happy.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-datepicker@1.9.0/dist/css/bootstrap-datepicker.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid.css">
{* <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/css/bootstrap.css"> *}
<link rel="stylesheet" type="text/css" href="{$basePath}/dist/main.bc524555.css">

{* <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/happy-inputs@2.0.4/src/happy.css"> *}
{* <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-datepicker@1.9.0/dist/css/bootstrap-datepicker.css"> *}
{* <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid.css"> *}

<!-- Use this css for ajax spinners -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid-spinners.css">
{* <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid-spinners.css"> *}

<!-- Include this css when using FilterMultiSelect (silviomoreto.github.io/bootstrap-select) -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.15/dist/css/bootstrap-select.css">
{* <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.15/dist/css/bootstrap-select.css"> *}

<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">

Expand Down Expand Up @@ -82,26 +84,33 @@
<script src="https://cdn.jsdelivr.net/npm/happy-inputs@2.1.0/src/nomodule-es5-fallback.js"></script>
<script>
var happy = new Happy;

happy.init();
</script>
<script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.js"></script>
<script src="{$basePath}/dist/jquery/jquery.min.js"></script>
<script src="{$basePath}/dist/naja/Naja.min.js"></script>
<script src="{$basePath}/dist/nette-forms/netteForms.min.js"></script>
<script src="{$basePath}/dist/app.1799033b.js"></script>

{* <script src="https://cdn.jsdelivr.net/npm/jquery@3.4.1/dist/jquery.js"></script> *}


<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.4.1/dist/js/bootstrap.bundle.js"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap-datepicker@1.9.0/dist/js/bootstrap-datepicker.js"></script>
<script src="https://cdn.jsdelivr.net/npm/jquery-ui-sortable@1.0.0/jquery-ui.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/nette.ajax.js@2.3.0/nette.ajax.js"></script>
{* <script src="https://cdn.jsdelivr.net/npm/jquery-ui-sortable@1.0.0/jquery-ui.min.js"></script> *}
{* <script src="https://cdn.jsdelivr.net/npm/nette.ajax.js@2.3.0/nette.ajax.js"></script> *}
<!-- <script src="https://cdn.jsdelivr.net/npm/naja@1.8.3/dist/Naja.js"></script>
<script>
document.addEventListener('DOMContentLoaded', naja.initialize.bind(naja));
</script> -->
<script src="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid.js"></script>
<script src="https://cdn.jsdelivr.net/npm/nette-forms@3.0.4/src/assets/netteForms.min.js"></script>

{* <script src="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid.js"></script> *}
{* <script src="https://cdn.jsdelivr.net/npm/nette-forms@3.0.4/src/assets/netteForms.min.js"></script> *}

<!-- It is recommended to include this JS file with just a few bits. It refreshes URL on non ajax request -->
<script src="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid-instant-url-refresh.js"></script>
{* <script src="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid-instant-url-refresh.js"></script> *}

<!-- Use this little extension for ajax spinners -->
<script src="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid-spinners.js"></script>
{* <script src="https://cdn.jsdelivr.net/npm/ublaboo-datagrid@6.2.24/assets/datagrid-spinners.js"></script> *}

<!-- Include bootstrap-select.js when using FilterMultiSelect (silviomoreto.github.io/bootstrap-select) -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.15/dist/js/bootstrap-select.js"></script>
Expand Down
6 changes: 6 additions & 0 deletions assets/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import '~/bootstrap/dist/css/bootstrap.min.css';
@import '~/bootstrap-datepicker/dist/css/bootstrap-datepicker.css';
@import '~/bootstrap-select/dist/css/bootstrap-select.css';
@import '~/ublaboo-datagrid/assets/datagrid.css';
@import '~/ublaboo-datagrid/assets/datagrid-spinners.css';
@import '~/happy-inputs/src/happy.css';
7 changes: 7 additions & 0 deletions assets/js/3rd/nette.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import naja from "naja";
import netteForms from "nette-forms";

export function initNette() {
naja.formsHandler.netteForms = netteForms;
naja.initialize();
}
8 changes: 8 additions & 0 deletions assets/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import '~/ublaboo-datagrid/assets/datagrid.js';
import '~/ublaboo-datagrid/assets/datagrid-spinners.js';
import '~/ublaboo-datagrid/assets/datagrid-instant-url-refresh.js';
import '~/nette.ajax.js/nette.ajax.js';
import '~/jquery-ui-sortable/jquery-ui.min.js';


import './../css/main.css';
Loading