diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0ab0283c..18550a89 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Docker Image CI on: push: - branches: [ "main", "dev", "feature/front-setting" ] + branches: [ "main", "dev" ] pull_request: - branches: [ "main", "dev", "feature/front-setting" ] + branches: [ "main", "dev" ] jobs: diff --git a/src/main/java/store/mybooks/front/admin/controller/AdminController.java b/src/main/java/store/mybooks/front/admin/main/controller/AdminController.java similarity index 94% rename from src/main/java/store/mybooks/front/admin/controller/AdminController.java rename to src/main/java/store/mybooks/front/admin/main/controller/AdminController.java index d174b7cc..61b949d9 100644 --- a/src/main/java/store/mybooks/front/admin/controller/AdminController.java +++ b/src/main/java/store/mybooks/front/admin/main/controller/AdminController.java @@ -1,4 +1,4 @@ -package store.mybooks.front.admin.controller; +package store.mybooks.front.admin.main.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; @@ -25,7 +25,7 @@ public class AdminController { */ @GetMapping public String doAdmin() { - + return "admin"; } diff --git a/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptor.java b/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptor.java index 75a00162..2e71c808 100644 --- a/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptor.java +++ b/src/main/java/store/mybooks/front/book_order/adaptor/BookOrderAdaptor.java @@ -17,4 +17,5 @@ public interface BookOrderAdaptor { List test(); + } diff --git a/src/main/resources/Template Main/admin/404.html b/src/main/resources/Template Main/admin/404.html deleted file mode 100644 index 95e22567..00000000 --- a/src/main/resources/Template Main/admin/404.html +++ /dev/null @@ -1,435 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - 404 - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -
-
404
-

Page Not Found

-

It looks like you found a glitch in the matrix...

- ← Back to Dashboard -
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/blank.html b/src/main/resources/Template Main/admin/blank.html deleted file mode 100644 index 683243de..00000000 --- a/src/main/resources/Template Main/admin/blank.html +++ /dev/null @@ -1,429 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Blank - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -

Blank Page

- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/buttons.html b/src/main/resources/Template Main/admin/buttons.html deleted file mode 100644 index 64327aa8..00000000 --- a/src/main/resources/Template Main/admin/buttons.html +++ /dev/null @@ -1,604 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Buttons - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -

Buttons

- -
- -
- - -
-
-
Circle Buttons
-
-
-

Use Font Awesome Icons (included with this theme package) along with the circle - buttons as shown in the examples below!

- -
- .btn-circle -
- - - - - - - - - - - - - - - - -
- .btn-circle .btn-sm -
- - - - - - - - - - - - - - - - -
- .btn-circle .btn-lg -
- - - - - - - - - - - - - - - -
-
- - -
-
-
Brand Buttons
-
-
-

Google and Facebook buttons are available featuring each company's respective - brand color. They are used on the user login and registration pages.

-

You can create more custom buttons by adding a new color variable in the - _variables.scss file and then using the Bootstrap button variant - mixin to create a new style, as demonstrated in the _buttons.scss - file.

- - .btn-google - .btn-facebook - -
-
- -
- -
- -
-
-
Split Buttons with Icon
-
-
-

Works with any button colors, just use the .btn-icon-split class and - the markup in the examples below. The examples below also use the - .text-white-50 helper class on the icons for additional styling, - but it is not required.

- - - - - Split Button Primary - -
- - - - - Split Button Success - -
- - - - - Split Button Info - -
- - - - - Split Button Warning - -
- - - - - Split Button Danger - -
- - - - - Split Button Secondary - -
- - - - - Split Button Light - -
-

Also works with small and large button classes!

- - - - - Split Button Small - -
- - - - - Split Button Large - -
-
- -
- -
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/cards.html b/src/main/resources/Template Main/admin/cards.html deleted file mode 100644 index 15cd7224..00000000 --- a/src/main/resources/Template Main/admin/cards.html +++ /dev/null @@ -1,601 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Cards - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -
-

Cards

-
- -
- - -
-
-
-
-
-
- Earnings (Monthly) -
-
$40,000
-
-
- -
-
-
-
-
- - -
-
-
-
-
-
- Earnings (Annual) -
-
$215,000
-
-
- -
-
-
-
-
- - -
-
-
-
-
-
Tasks -
-
-
-
50%
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
- - -
-
-
-
-
-
- Pending Requests -
-
18
-
-
- -
-
-
-
-
-
- -
- -
- - -
-
- Default Card Example -
-
- This card uses Bootstrap's default styling with no utility classes added. Global - styles are the only things modifying the look and feel of this default card example. -
-
- - -
-
-
Basic Card Example
-
-
- The styling for this basic card example is created by using default Bootstrap - utility classes. By using utility classes, the style of the card component can be - easily modified with no need for any custom CSS! -
-
- -
- -
- - -
- -
-
Dropdown Card Example
-
- -
-
Dropdown Header:
- Action - Another action -
- Something else here -
-
-
- -
- Dropdown menus can be placed in the card header in order to extend the functionality - of a basic card. In this dropdown card example, the Font Awesome vertical ellipsis - icon in the card header can be clicked on in order to toggle a dropdown menu. -
-
- - -
- - -
Collapsable Card Example
- - -
-
- This is a collapsable card example using Bootstrap's built in collapse - functionality. Click on the card header to see the card body - collapse and expand! -
-
-
- -
- -
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/charts.html b/src/main/resources/Template Main/admin/charts.html deleted file mode 100644 index 3c0de8f9..00000000 --- a/src/main/resources/Template Main/admin/charts.html +++ /dev/null @@ -1,497 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Charts - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -

Charts

-

Chart.js is a third party plugin that is used to generate the charts in this theme. - The charts below have been customized - for further customization options, please visit the official Chart.js - documentation.

- - -
- -
- - -
-
-
Area Chart
-
-
-
- -
-
- Styling for the area chart can be found in the - /js/demo/chart-area-demo.js file. -
-
- - -
-
-
Bar Chart
-
-
-
- -
-
- Styling for the bar chart can be found in the - /js/demo/chart-bar-demo.js file. -
-
- -
- - -
-
- -
-
Donut Chart
-
- -
-
- -
-
- Styling for the donut chart can be found in the - /js/demo/chart-pie-demo.js file. -
-
-
-
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/forgot-password.html b/src/main/resources/Template Main/admin/forgot-password.html deleted file mode 100644 index 489bb274..00000000 --- a/src/main/resources/Template Main/admin/forgot-password.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Forgot Password - - - - - - - - - - - - -
- - -
- -
- -
-
- -
-
-
-
-
-

Forgot Your Password?

-

We get it, stuff happens. Just enter your email address below - and we'll send you a link to reset your password!

-
-
-
- -
- - Reset Password - -
-
-
- Create an Account! -
-
- Already have an account? Login! -
-
-
-
-
-
- -
- -
- -
- - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/login.html b/src/main/resources/Template Main/admin/login.html deleted file mode 100644 index 257a7adc..00000000 --- a/src/main/resources/Template Main/admin/login.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Login - - - - - - - - - - - - -
- - -
- -
- -
-
- -
- -
-
-
-

Welcome Back!

-
-
-
- -
-
- -
-
-
- - -
-
- - Login - -
- - Login with Google - - - Login with Facebook - -
-
-
- Forgot Password? -
-
- Create an Account! -
-
-
-
-
-
- -
- -
- -
- - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/register.html b/src/main/resources/Template Main/admin/register.html deleted file mode 100644 index b5a5ef06..00000000 --- a/src/main/resources/Template Main/admin/register.html +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Register - - - - - - - - - - - - -
- -
-
- -
-
-
-
-
-

Create an Account!

-
-
-
-
- -
-
- -
-
-
- -
-
-
- -
-
- -
-
- - Register Account - -
- - Register with Google - - - Register with Facebook - -
-
-
- Forgot Password? -
-
- Already have an account? Login! -
-
-
-
-
-
- -
- - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/tables.html b/src/main/resources/Template Main/admin/tables.html deleted file mode 100644 index bca020a5..00000000 --- a/src/main/resources/Template Main/admin/tables.html +++ /dev/null @@ -1,935 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Tables - - - - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -

Tables

-

DataTables is a third party plugin that is used to generate the demo table below. - For more information about DataTables, please visit the official - DataTables documentation.

- - -
-
-
DataTables Example
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NamePositionOfficeAgeStart dateSalary
NamePositionOfficeAgeStart dateSalary
Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
Garrett WintersAccountantTokyo632011/07/25$170,750
Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
Airi SatouAccountantTokyo332008/11/28$162,700
Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
Jena GainesOffice ManagerLondon302008/12/19$90,560
Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
Michael SilvaMarketing DesignerLondon662012/11/27$198,500
Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
Gloria LittleSystems AdministratorNew York592009/04/10$237,500
Bradley GreerSoftware EngineerLondon412012/10/13$132,000
Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
Caesar VancePre-Sales SupportNew York212011/12/12$106,450
Doris WilderSales AssistantSidney232010/09/20$85,600
Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
Shou ItouRegional MarketingTokyo202011/08/14$163,000
Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
Suki BurksDeveloperLondon532009/10/22$114,500
Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
Hope FuentesSecretarySan Francisco412010/02/12$109,850
Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
Timothy MooneyOffice ManagerLondon372008/12/11$136,200
Jackson BradshawDirectorNew York652008/09/26$645,750
Olivia LiangSupport EngineerSingapore642011/02/03$234,500
Bruno NashSoftware EngineerLondon382011/05/03$163,500
Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
Thor WaltonDeveloperNew York612013/08/11$98,540
Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
Cara StevensSales AssistantNew York462011/12/06$145,600
Hermione ButlerRegional DirectorLondon472011/03/21$356,250
Lael GreerSystems AdministratorLondon212009/02/27$103,500
Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
Donna SniderCustomer SupportNew York272011/01/25$112,000
-
-
-
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/utilities-animation.html b/src/main/resources/Template Main/admin/utilities-animation.html deleted file mode 100644 index 32c12314..00000000 --- a/src/main/resources/Template Main/admin/utilities-animation.html +++ /dev/null @@ -1,529 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Animation Utilities - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -

Animation Utilities

-

Bootstrap's default utility classes can be found on the official Bootstrap Documentation page. The custom utilities - below were created to extend this theme past the default utility classes built into Bootstrap's - framework.

- - -
- - -
- -
-
-
Grow In Animation Utilty
-
-
-
- .animated--grow-in -
-
Navbar Dropdown Example:
- -

Note: This utility animates the CSS transform property, - meaning it will override any existing transforms on an element being animated! - In this theme, the grow in animation is only being used on dropdowns within the - navbar.

-
-
- -
- - -
- -
-
-
Fade In Animation Utilty
-
-
-
- .animated--fade-in -
-
Navbar Dropdown Example:
- -
Dropdown Button Example:
-
- -
- Action - Another action - Something else here -
-
-

Note: This utility animates the CSS opacity property, meaning - it will override any existing opacity on an element being animated!

-
-
- -
- -
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/utilities-border.html b/src/main/resources/Template Main/admin/utilities-border.html deleted file mode 100644 index 6c92d5e6..00000000 --- a/src/main/resources/Template Main/admin/utilities-border.html +++ /dev/null @@ -1,531 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Border Utilities - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -

Border Utilities

-

Bootstrap's default utility classes can be found on the official Bootstrap Documentation page. The custom utilities - below were created to extend this theme past the default utility classes built into Bootstrap's - framework.

- - -
- - -
- -
-
- .border-left-primary -
-
- -
-
- .border-left-secondary -
-
- -
-
- .border-left-success -
-
- -
-
- .border-left-info -
-
- -
-
- .border-left-warning -
-
- -
-
- .border-left-danger -
-
- -
-
- .border-left-dark -
-
- -
- - -
- -
-
- .border-bottom-primary -
-
- -
-
- .border-bottom-secondary -
-
- -
-
- .border-bottom-success -
-
- -
-
- .border-bottom-info -
-
- -
-
- .border-bottom-warning -
-
- -
-
- .border-bottom-danger -
-
- -
-
- .border-bottom-dark -
-
- -
- -
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/utilities-color.html b/src/main/resources/Template Main/admin/utilities-color.html deleted file mode 100644 index a27cf596..00000000 --- a/src/main/resources/Template Main/admin/utilities-color.html +++ /dev/null @@ -1,517 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Color Utilities - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -

Color Utilities

-

Bootstrap's default utility classes can be found on the official Bootstrap Documentation page. The custom utilities - below were created to extend this theme past the default utility classes built into Bootstrap's - framework.

- - -
- - -
- - -
-
-
Custom Text Color Utilities
-
-
-

.text-gray-100

-

.text-gray-200

-

.text-gray-300

-

.text-gray-400

-

.text-gray-500

-

.text-gray-600

-

.text-gray-700

-

.text-gray-800

-

.text-gray-900

-
-
- - -
-
-
Custom Font Size Utilities
-
-
-

.text-xs

-

.text-lg

-
-
- -
- - -
- - -
-
-
Custom Background Gradient Utilities -
-
-
-
.bg-gradient-primary
-
.bg-gradient-secondary
-
.bg-gradient-success
-
.bg-gradient-info
-
.bg-gradient-warning
-
.bg-gradient-danger
-
.bg-gradient-light
-
.bg-gradient-dark
-
-
- -
- - -
- - -
-
-
Custom Grayscale Background Utilities -
-
-
-
.bg-gray-100
-
.bg-gray-200
-
.bg-gray-300
-
.bg-gray-400
-
.bg-gray-500
-
.bg-gray-600
-
.bg-gray-700
-
.bg-gray-800
-
.bg-gray-900
-
-
-
- -
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/admin/utilities-other.html b/src/main/resources/Template Main/admin/utilities-other.html deleted file mode 100644 index 0be72f4a..00000000 --- a/src/main/resources/Template Main/admin/utilities-other.html +++ /dev/null @@ -1,511 +0,0 @@ - - - - - - - - - - - - SB Admin 2 - Other Utilities - - - - - - - - - - - - - -
- - - - - - -
- - -
- - - - - - -
- - -

Other Utilities

-

Bootstrap's default utility classes can be found on the official Bootstrap Documentation page. The custom utilities - below were created to extend this theme past the default utility classes built into Bootstrap's - framework.

- - -
- -
- - -
-
-
Overflow Hidden Utilty
-
-
- Use .o-hidden to set the overflow property of any element to hidden. -
-
- - -
-
-
Progress Small Utility
-
-
-
Normal Progress Bar
-
-
-
-
Small Progress Bar
-
-
-
- Use the .progress-sm class along with .progress -
-
- - -
-
-
Dropdown - No Arrow
-
-
-
- -
- Action - Another action - Something else here -
-
- Add the .no-arrow class alongside the .dropdown -
-
- -
- -
- - -
-
-
Rotation Utilities
-
-
-
.rotate-15 -
-
-
.rotate-n-15 -
-
-
- -
- -
- -
- - -
- - - -
-
-
- Copyright © Your Website 2020 -
-
-
- - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/Template Main/assets/js/demo/chart-area-demo 2.js b/src/main/resources/Template Main/assets/js/demo/chart-area-demo 2.js new file mode 100644 index 00000000..0bb9c4d5 --- /dev/null +++ b/src/main/resources/Template Main/assets/js/demo/chart-area-demo 2.js @@ -0,0 +1,118 @@ +// Set new default font family and font color to mimic Bootstrap's default styling +Chart.defaults.global.defaultFontFamily = 'Nunito', '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif'; +Chart.defaults.global.defaultFontColor = '#858796'; + +function number_format(number, decimals, dec_point, thousands_sep) { + // * example: number_format(1234.56, 2, ',', ' '); + // * return: '1 234,56' + number = (number + '').replace(',', '').replace(' ', ''); + var n = !isFinite(+number) ? 0 : +number, + prec = !isFinite(+decimals) ? 0 : Math.abs(decimals), + sep = (typeof thousands_sep === 'undefined') ? ',' : thousands_sep, + dec = (typeof dec_point === 'undefined') ? '.' : dec_point, + s = '', + toFixedFix = function(n, prec) { + var k = Math.pow(10, prec); + return '' + Math.round(n * k) / k; + }; + // Fix for IE parseFloat(0.55).toFixed(0) = 0; + s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)).split('.'); + if (s[0].length > 3) { + s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep); + } + if ((s[1] || '').length < prec) { + s[1] = s[1] || ''; + s[1] += new Array(prec - s[1].length + 1).join('0'); + } + return s.join(dec); +} + +// Area Chart Example +var ctx = document.getElementById("myAreaChart"); +var myLineChart = new Chart(ctx, { + type: 'line', + data: { + labels: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], + datasets: [{ + label: "Earnings", + lineTension: 0.3, + backgroundColor: "rgba(78, 115, 223, 0.05)", + borderColor: "rgba(78, 115, 223, 1)", + pointRadius: 3, + pointBackgroundColor: "rgba(78, 115, 223, 1)", + pointBorderColor: "rgba(78, 115, 223, 1)", + pointHoverRadius: 3, + pointHoverBackgroundColor: "rgba(78, 115, 223, 1)", + pointHoverBorderColor: "rgba(78, 115, 223, 1)", + pointHitRadius: 10, + pointBorderWidth: 2, + data: [0, 10000, 5000, 15000, 10000, 20000, 15000, 25000, 20000, 30000, 25000, 40000], + }], + }, + options: { + maintainAspectRatio: false, + layout: { + padding: { + left: 10, + right: 25, + top: 25, + bottom: 0 + } + }, + scales: { + xAxes: [{ + time: { + unit: 'date' + }, + gridLines: { + display: false, + drawBorder: false + }, + ticks: { + maxTicksLimit: 7 + } + }], + yAxes: [{ + ticks: { + maxTicksLimit: 5, + padding: 10, + // Include a dollar sign in the ticks + callback: function(value, index, values) { + return '$' + number_format(value); + } + }, + gridLines: { + color: "rgb(234, 236, 244)", + zeroLineColor: "rgb(234, 236, 244)", + drawBorder: false, + borderDash: [2], + zeroLineBorderDash: [2] + } + }], + }, + legend: { + display: false + }, + tooltips: { + backgroundColor: "rgb(255,255,255)", + bodyFontColor: "#858796", + titleMarginBottom: 10, + titleFontColor: '#6e707e', + titleFontSize: 14, + borderColor: '#dddfeb', + borderWidth: 1, + xPadding: 15, + yPadding: 15, + displayColors: false, + intersect: false, + mode: 'index', + caretPadding: 10, + callbacks: { + label: function(tooltipItem, chart) { + var datasetLabel = chart.datasets[tooltipItem.datasetIndex].label || ''; + return datasetLabel + ': $' + number_format(tooltipItem.yLabel); + } + } + } + } +}); diff --git a/src/main/resources/Template Main/assets/js/demo/chart-bar-demo 2.js b/src/main/resources/Template Main/assets/js/demo/chart-bar-demo 2.js new file mode 100644 index 00000000..89ec2dda --- /dev/null +++ b/src/main/resources/Template Main/assets/js/demo/chart-bar-demo 2.js @@ -0,0 +1,111 @@ +// Set new default font family and font color to mimic Bootstrap's default styling +Chart.defaults.global.defaultFontFamily = 'Nunito', '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif'; +Chart.defaults.global.defaultFontColor = '#858796'; + +function number_format(number, decimals, dec_point, thousands_sep) { + // * example: number_format(1234.56, 2, ',', ' '); + // * return: '1 234,56' + number = (number + '').replace(',', '').replace(' ', ''); + var n = !isFinite(+number) ? 0 : +number, + prec = !isFinite(+decimals) ? 0 : Math.abs(decimals), + sep = (typeof thousands_sep === 'undefined') ? ',' : thousands_sep, + dec = (typeof dec_point === 'undefined') ? '.' : dec_point, + s = '', + toFixedFix = function(n, prec) { + var k = Math.pow(10, prec); + return '' + Math.round(n * k) / k; + }; + // Fix for IE parseFloat(0.55).toFixed(0) = 0; + s = (prec ? toFixedFix(n, prec) : '' + Math.round(n)).split('.'); + if (s[0].length > 3) { + s[0] = s[0].replace(/\B(?=(?:\d{3})+(?!\d))/g, sep); + } + if ((s[1] || '').length < prec) { + s[1] = s[1] || ''; + s[1] += new Array(prec - s[1].length + 1).join('0'); + } + return s.join(dec); +} + +// Bar Chart Example +var ctx = document.getElementById("myBarChart"); +var myBarChart = new Chart(ctx, { + type: 'bar', + data: { + labels: ["January", "February", "March", "April", "May", "June"], + datasets: [{ + label: "Revenue", + backgroundColor: "#4e73df", + hoverBackgroundColor: "#2e59d9", + borderColor: "#4e73df", + data: [4215, 5312, 6251, 7841, 9821, 14984], + }], + }, + options: { + maintainAspectRatio: false, + layout: { + padding: { + left: 10, + right: 25, + top: 25, + bottom: 0 + } + }, + scales: { + xAxes: [{ + time: { + unit: 'month' + }, + gridLines: { + display: false, + drawBorder: false + }, + ticks: { + maxTicksLimit: 6 + }, + maxBarThickness: 25, + }], + yAxes: [{ + ticks: { + min: 0, + max: 15000, + maxTicksLimit: 5, + padding: 10, + // Include a dollar sign in the ticks + callback: function(value, index, values) { + return '$' + number_format(value); + } + }, + gridLines: { + color: "rgb(234, 236, 244)", + zeroLineColor: "rgb(234, 236, 244)", + drawBorder: false, + borderDash: [2], + zeroLineBorderDash: [2] + } + }], + }, + legend: { + display: false + }, + tooltips: { + titleMarginBottom: 10, + titleFontColor: '#6e707e', + titleFontSize: 14, + backgroundColor: "rgb(255,255,255)", + bodyFontColor: "#858796", + borderColor: '#dddfeb', + borderWidth: 1, + xPadding: 15, + yPadding: 15, + displayColors: false, + caretPadding: 10, + callbacks: { + label: function(tooltipItem, chart) { + var datasetLabel = chart.datasets[tooltipItem.datasetIndex].label || ''; + return datasetLabel + ': $' + number_format(tooltipItem.yLabel); + } + } + }, + } +}); diff --git a/src/main/resources/Template Main/assets/js/demo/chart-pie-demo 2.js b/src/main/resources/Template Main/assets/js/demo/chart-pie-demo 2.js new file mode 100644 index 00000000..c393ac14 --- /dev/null +++ b/src/main/resources/Template Main/assets/js/demo/chart-pie-demo 2.js @@ -0,0 +1,35 @@ +// Set new default font family and font color to mimic Bootstrap's default styling +Chart.defaults.global.defaultFontFamily = 'Nunito', '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif'; +Chart.defaults.global.defaultFontColor = '#858796'; + +// Pie Chart Example +var ctx = document.getElementById("myPieChart"); +var myPieChart = new Chart(ctx, { + type: 'doughnut', + data: { + labels: ["Direct", "Referral", "Social"], + datasets: [{ + data: [55, 30, 15], + backgroundColor: ['#4e73df', '#1cc88a', '#36b9cc'], + hoverBackgroundColor: ['#2e59d9', '#17a673', '#2c9faf'], + hoverBorderColor: "rgba(234, 236, 244, 1)", + }], + }, + options: { + maintainAspectRatio: false, + tooltips: { + backgroundColor: "rgb(255,255,255)", + bodyFontColor: "#858796", + borderColor: '#dddfeb', + borderWidth: 1, + xPadding: 15, + yPadding: 15, + displayColors: false, + caretPadding: 10, + }, + legend: { + display: false + }, + cutoutPercentage: 80, + }, +}); diff --git a/src/main/resources/Template Main/assets/js/demo/datatables-demo 2.js b/src/main/resources/Template Main/assets/js/demo/datatables-demo 2.js new file mode 100644 index 00000000..f2eecbfe --- /dev/null +++ b/src/main/resources/Template Main/assets/js/demo/datatables-demo 2.js @@ -0,0 +1,4 @@ +// Call the dataTables jQuery plugin +$(document).ready(function() { + $('#dataTable').DataTable(); +}); diff --git a/src/main/resources/Template Main/common/fragment/admin/admin-sidebar.html b/src/main/resources/Template Main/common/fragment/admin/admin-sidebar.html index 1edd4a90..03976212 100644 --- a/src/main/resources/Template Main/common/fragment/admin/admin-sidebar.html +++ b/src/main/resources/Template Main/common/fragment/admin/admin-sidebar.html @@ -5,7 +5,7 @@