Skip to content

Commit ca6a899

Browse files
authored
Merge pull request #267 from OpenSourceCommerce/feature/LOG-12
Feature/LOG-12 enhancement UI in Log-explorer
2 parents 520c6f5 + ce9a539 commit ca6a899

File tree

379 files changed

+78440
-8422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

379 files changed

+78440
-8422
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
- name: Symfony start server
9090
run: |
9191
curl -sS https://get.symfony.com/cli/installer | bash
92-
/home/runner/.symfony/bin/symfony server:start -d
92+
/home/runner/.symfony5/bin/symfony server:start -d
9393
- name: Cypress test
9494
run: CYPRESS_BASE_URL=http://localhost:8000 ./node_modules/.bin/cypress run
9595
- name: Upload test failed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
###> symfony/webpack-encore-bundle ###
2020
/node_modules/
2121
/public/build/
22+
2223
npm-debug.log
2324
yarn-error.log
2425
###< symfony/webpack-encore-bundle ###

assets/app.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@
77

88
// any CSS you import will output into a single css file (app.css in this case)
99
import './styles/app.scss';
10+
import '@fortawesome/fontawesome-free/css/all.min.css';
11+
12+
const $ = require('jquery');
13+
import "./vendor/theme.min.js";
14+
15+
window.bootstrap = require('bootstrap/dist/js/bootstrap.bundle.js');
1016

1117
// Need jQuery? Install it with 'yarn add jquery', then uncomment to import it.
12-
import 'admin-lte/plugins/jquery/jquery';
13-
import 'admin-lte/plugins/jquery-ui/jquery-ui';
18+
// import 'admin-lte/plugins/jquery/jquery';
19+
// import 'admin-lte/plugins/jquery-ui/jquery-ui';
1420

15-
$.widget.bridge('uibutton', $.ui.button);
21+
// $.widget.bridge('uibutton', $.ui.button);
1622

17-
import 'admin-lte/plugins/bootstrap/js/bootstrap.bundle.min';
23+
// import 'admin-lte/plugins/bootstrap/js/bootstrap.bundle.min';
1824
// Import 'admin-lte/plugins/chart.js/Chart.min';
1925
// import Sparkline from 'admin-lte/plugins/sparklines/sparkline';
2026
// window.Sparkline = Sparkline;
@@ -25,9 +31,8 @@ import 'admin-lte/plugins/bootstrap/js/bootstrap.bundle.min';
2531
// import 'admin-lte/plugins/daterangepicker/daterangepicker';
2632
// import 'admin-lte/plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min';
2733
// import 'admin-lte/plugins/summernote/summernote-bs4.min';
28-
import 'admin-lte/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min';
29-
import 'admin-lte/dist/js/adminlte';
34+
// import 'admin-lte/plugins/overlayScrollbars/js/jquery.overlayScrollbars.min';
35+
// import 'admin-lte/dist/js/adminlte';
3036
// Import 'admin-lte/dist/js/pages/dashboard';
3137
// import 'admin-lte/dist/js/demo';
32-
3338
// Console.log('Hello Webpack Encore! Edit me in assets/app.js');
9 KB
Loading
19.7 KB
Loading

assets/images/apple-touch-icon.png

8.37 KB
Loading

assets/images/chevron-right.svg

Lines changed: 3 additions & 0 deletions
Loading

assets/images/empty-widget.png

17.2 KB
Loading

assets/images/favicon-16x16.png

793 Bytes
Loading

assets/images/favicon-32x32.png

1.25 KB
Loading

0 commit comments

Comments
 (0)