feat(boosted): migration boosted 4 to 5 (+11 squashed commit)

Squashed commit: [7a81d3b] migration boosted 4 to 5 [b3cbf5a] migration boosted 4 to 5 [72c3a37] migration boosted 4 to 5 [d12092d] migration boosted 4 to 5 [22777ee] migration boosted 4 to 5 [79d21fe] migration boosted 4 to 5 [c919b13] migration boosted 4 to 5 [20ba826] migration boosted 4 to 5 [1afe9d9] migration boosted 4 to 5 [0ebb478] migration boosted 4 to 5 [c3995eb] migration boosted 4 to 5
Orange-OpenSource · Jul 21, 2021 · 00311f7 · 00311f7
1 parent 9d2c667
commit 00311f7
Show file tree

Hide file tree

Showing 73 changed files with 522 additions and 1,186 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 
 language: node_js
 node_js:
-  - "10.13.0"
+  - "12.14.0"
 
 addons:
   chrome: stable,
@@ -21,7 +21,7 @@ jobs:
       script:
         - npm run test:lib
     - stage: Npm Release
-      node_js: "10.13.0"
+      node_js: "12.14.0"
       script:
         - echo "Deploying to NPM..."
         - npm run build:lib
@@ -39,7 +39,7 @@ jobs:
           tags: true
           all_branches: true
     - stage: Deploy to Production
-      node_js: "10.13.0"
+      node_js: "12.14.0"
       script:
         - echo "Deploying to gh Page ..."
         - npm run build:lib

diff --git a/angular.json b/angular.json
@@ -34,7 +34,7 @@
             ],
             "scripts": [
               "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/popper.js/dist/umd/popper.js",
+              "node_modules/@popperjs/core/dist/umd/popper.js",
               "node_modules/boosted/dist/js/boosted.min.js"
             ],
             "vendorChunk": true,
@@ -105,7 +105,7 @@
             ],
             "scripts": [
               "node_modules/jquery/dist/jquery.min.js",
-              "node_modules/popper.js/dist/umd/popper.js",
+              "node_modules/@popperjs/core/dist/umd/popper.js",
               "node_modules/boosted/dist/js/boosted.min.js"
             ],
             "assets": [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
     "@angular/platform-browser-dynamic": "~12.1.1",
     "@angular/router": "~12.1.1",
     "@ng-bootstrap/ng-bootstrap": "^11.0.0-beta.2",
+    "@popperjs/core": "^2.9.2",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.8",
     "@types/node": "^14.6.4",
@@ -69,7 +70,6 @@
     "ng-packagr": "^12.1.0",
     "node-forge": "~0.10.0",
     "node-sass": "^4.14.1",
-    "popper.js": "^1.16.1",
     "prismjs": "^1.21.0",
     "prismjs-loader": "^0.0.4",
     "protractor": "~7.0.0",

diff --git a/projects/ng-boosted/src/lib/style/ng-boosted.scss b/projects/ng-boosted/src/lib/style/ng-boosted.scss
@@ -1,16 +1,3 @@
-/*Alert*/
-.close > [aria-hidden="true"]  {
-  display: none;
-}
-
-/*Carousel*/
-.carousel-control-next-icon::before {
-  display: none;
-}
-.carousel-control-prev-icon::before {
-  display: none;
-}
-
 /*Datepicker*/
 ngb-datepicker{
   border-radius: 0 !important;
@@ -36,3 +23,12 @@ ngb-datepicker{
   margin-top: 0;
 }
 
+/*toast*/
+.ngb-toasts {
+  position: fixed;
+  top: 0;
+  right: 0;
+  margin: .5em;
+  z-index: 1200;
+}
+
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -7,12 +7,7 @@ import { DocAccordionComponent } from './docs/accordion.component';
 import { DocBadgeComponent } from './docs/badge.component';
 import { DocCardComponent } from './docs/card.component';
 import { DocFormComponent } from './docs/form.component';
-import { DocJumbotronComponent } from './docs/jumbotron.component';
 import { DocListGroupComponent } from './docs/list-group.component';
-import { DocLocalNavigationComponent } from './docs/local-navigation.component';
-import { DocMediaComponent } from './docs/media.component';
-import { DocOrangeFooterComponent } from './docs/orange-footer.component';
-import { DocOrangeMegamenuComponent } from './docs/orange-megamenu.component';
 import { DocBreadcrumbComponent } from './docs/breadcrumb.component';
 import { DocButtonsComponent } from './docs/buttons.component';
 import { DocOCalendarComponent } from './docs/o-calendar.component';
@@ -33,7 +28,6 @@ import { DocStepbarComponent } from './docs/stepbar.component';
 import { DocCollapseComponent } from './docs/collapse.component';
 import { DocDatepickerComponent } from './docs/datepicker.component';
 import { DocProgressBarComponent } from './docs/progress-bar.component';
-import { DocPriorityNavComponent } from './docs/priority-nav.component';
 import { DocNavbarComponent } from './docs/navbar.component';
 import { DocONavbarComponent } from './docs/o-navbar.component';
 import { DocOScrollTopComponent } from './docs/o-scroll-top.component';
@@ -98,30 +92,10 @@ const routes: Routes = [{
     path: 'documentation/forms',
     component: DocFormComponent
   },
-  {
-    path: 'documentation/jumbotron',
-    component: DocJumbotronComponent
-  },
   {
     path: 'documentation/list-group',
     component: DocListGroupComponent
   },
-  {
-    path: 'documentation/local-navigation',
-    component: DocLocalNavigationComponent
-  },
-  {
-    path: 'documentation/media-object',
-    component: DocMediaComponent
-  },
-  {
-    path: 'documentation/orange-footer',
-    component: DocOrangeFooterComponent
-  },
-  {
-    path: 'documentation/orange-megamenu',
-    component: DocOrangeMegamenuComponent
-  },
   {
     path: 'documentation/tabs',
     component: DocTabsComponent
@@ -167,17 +141,13 @@ const routes: Routes = [{
     component: DocScrollspyComponent
   },
   {
-    path: 'documentation/stepbar',
+    path: 'documentation/stepped-process',
     component: DocStepbarComponent
   },
   {
     path: 'documentation/progress',
     component: DocProgressBarComponent
   },
-  {
-    path: 'documentation/priority-nav',
-    component: DocPriorityNavComponent
-  },
   {
     path: 'documentation/navbar',
     component: DocNavbarComponent
@@ -234,7 +204,7 @@ const routes: Routes = [{
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, {scrollPositionRestoration: 'enabled'})],
+  imports: [RouterModule.forRoot(routes, {scrollPositionRestoration: 'enabled', anchorScrolling: 'enabled'})],
   exports: [RouterModule]
 })
 export class AppRoutingModule { }
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,13 +1,14 @@
-<header role="banner" class="navbar navbar-dark bg-dark navbar-expand-md">
-  <nav role="navigation" class="container-fluid">
+<header role="banner" class="navbar navbar-dark bg-dark navbar-expand-md" id="top">
+  <nav role="navigation" class="container-xxl">
     <a class="navbar-brand" href="#">
       <img src="assets/img/orange_logo.svg" alt="Back to homepage" title="Back to homepage" width="50" height="50">
     </a>
-    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
+    <button class="navbar-toggler collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#navbarContent" aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
       <span class="navbar-toggler-icon"></span>
     </button>
+
     <div class="collapse navbar-collapse" id="navbarContent">
-      <ul class="navbar-nav mr-auto">
+      <ul class="navbar-nav me-auto">
         <li class="nav-item">
           <a class="nav-link" routerLinkActive="active" #ngboostedRouterLink="routerLinkActive" 
           [attr.aria-current]="ngboostedRouterLink.isActive ? 'page': undefined" routerLink="/home">Ng-boosted</a>
@@ -25,7 +26,7 @@
           [attr.aria-current]="boostwatchRouterLink.isActive ? 'page': undefined" routerLink="/boostwatch">Boostwatch</a>
         </li>
       </ul>
-      <ul class="navbar-nav flex-row ml-md-auto d-md-flex align-items-center">
+      <ul class="navbar-nav flex-row ms-md-auto d-md-flex align-items-center">
         <li class="nav-item">
           <a class="nav-link py-2" href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular" target="_blank" rel="noopener" aria-label="GitHub">
             <svg class="navbar-nav-svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 499.36" focusable="false"><title>GitHub</title><path d="M256 0C114.64 0 0 114.61 0 256c0 113.09 73.34 209 175.08 242.9 12.8 2.35 17.47-5.56 17.47-12.34 0-6.08-.22-22.18-.35-43.54-71.2 15.49-86.2-34.34-86.2-34.34-11.64-29.57-28.42-37.45-28.42-37.45-23.27-15.84 1.73-15.55 1.73-15.55 25.69 1.81 39.21 26.38 39.21 26.38 22.84 39.12 59.92 27.82 74.5 21.27 2.33-16.54 8.94-27.82 16.25-34.22-56.84-6.43-116.6-28.43-116.6-126.49 0-27.95 10-50.8 26.35-68.69-2.63-6.48-11.42-32.5 2.51-67.75 0 0 21.49-6.88 70.4 26.24a242.65 242.65 0 0 1 128.18 0c48.87-33.13 70.33-26.24 70.33-26.24 14 35.25 5.18 61.27 2.55 67.75 16.41 17.9 26.31 40.75 26.31 68.69 0 98.35-59.85 120-116.88 126.32 9.19 7.9 17.38 23.53 17.38 47.41 0 34.22-.31 61.83-.31 70.23 0 6.85 4.61 14.81 17.6 12.31C438.72 464.97 512 369.08 512 256.02 512 114.62 397.37 0 256 0z" fill="currentColor" fill-rule="evenodd"></path></svg>
@@ -38,31 +39,30 @@
 
 <router-outlet></router-outlet>
 
-<a class="o-scroll-up" title="back to top" (click)="scroll()">
-  <span class="d-none d-sm-inline-block">Back to top</span>
-</a>
+<nav aria-label="Back to top" class="back-to-top">
+  <a class="back-to-top-link btn btn-icon btn-secondary" (click)="onClick('top')" data-o-label="Back to top">
+      <span class="visually-hidden">Back to top</span>
+  </a>
+</nav>
 
-<div role="contentinfo" class="o-footer mt-0">
-  <h2 class="sr-only">Site map & informations</h2>
-  <div class="o-footer-body py-3">
-      <div class="container">
-        <p class="m-0">Designed and built by the Boosted team.</p>
-        <p class="m-0">Orange modified code licensed <a href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/docs/LICENSE" rel="licence">MIT</a>, original code licensed <a href="https://github.com/ng-bootstrap/ng-bootstrap/blob/master/LICENSE">MIT</a>, docs <a href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/docs/LICENSE">CC BY 3.0</a>.</p>
-      </div>
-  </div>
-  <div class="o-footer-bottom">
-      <div class="container">
-        <div class="row">
-          <ul class="nav">
-              <li class="nav-item"><span class="nav-link">Currently v{{globals.ngBoostedVersion}}</span></li>
-              <li class="nav-item"><a class="nav-link" href="https://ng-boosted.netlify.com" >Pre-release on Netlify</a></li>
-              <li class="nav-item">
-                <a class="nav-link py-0" href="https://www.netlify.com">
-                  <img src="https://www.netlify.com/img/global/badges/netlify-dark.svg" alt="Deploys by Netlify" width="89" height="40">
-                </a>
-              </li>
-          </ul>
-        </div>
-      </div>
-  </div>
+<div class="bd-footer py-3 py-md-4 bg-dark">
+  <div class="container py-1">
+    <div class="row">
+      <p class="m-0">Designed and built by the Boosted team.</p>
+      <p class="m-0 text-white">Orange modified code licensed <a class="link-light" href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/docs/LICENSE" 
+        rel="licence">MIT</a>, original code licensed <a class="link-light" href="https://github.com/ng-bootstrap/ng-bootstrap/blob/master/LICENSE">MIT</a>, docs 
+        <a class="link-light"href="https://github.com/Orange-OpenSource/Orange-Boosted-Angular/blob/master/docs/LICENSE">CC BY 3.0</a>.</p>
+    </div>
+    <div class="row">
+      <ul class="nav">
+          <li class="nav-item"><span class="nav-link text-white">Currently v{{globals.ngBoostedVersion}}</span></li>
+          <li class="nav-item"><a class="nav-link link-light" href="https://ng-boosted.netlify.com" >Pre-release on Netlify</a></li>
+          <li class="nav-item">
+            <a class="nav-link py-0" href="https://www.netlify.com">
+              <img src="https://www.netlify.com/img/global/badges/netlify-dark.svg" alt="Deploys by Netlify" width="89" height="40">
+            </a>
+          </li>
+      </ul>
+    </div>
+    </div>
 </div>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import { Globals } from './directives/global';
+import { ViewportScroller } from '@angular/common';
 
 @Component({
   selector: 'app-root',
@@ -9,8 +10,9 @@ import { Globals } from './directives/global';
 export class AppComponent {
   title = 'Orange-Boosted-Angular';
   public isCollapsed = true;
-  constructor(public globals: Globals) {}
-  scroll() {
-    window.scrollTo(0, 0);
-  }
+  constructor(public globals: Globals, private viewportScroller: ViewportScroller) {}
+
+  public onClick(elementId: string): void { 
+    this.viewportScroller.scrollToAnchor(elementId);
+}
 }
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -16,12 +16,7 @@ import { DemoAccordionComponent } from './demos/accordion.component';
 import { DemoBadgeComponent } from './demos/badge.component';
 import { DemoCardComponent } from './demos/card.component';
 import { DemoFormComponent } from './demos/form.component';
-import { DemoJumbotronComponent } from './demos/jumbotron.component';
-import { DemoMediaComponent } from './demos/media.component';
-import { DemoOrangeFooterComponent } from './demos/orange-footer.component';
-import { DemoOrangeMegamenuComponent } from './demos/orange-megamenu.component';
 import { DemoListGroupComponent } from './demos/list-group.component';
-import { DemoLocalNavigationComponent } from './demos/local-navigation.component';
 import { DemoBreadcrumbComponent } from './demos/breadcrumb.component';
 import { DemoButtonsComponent } from './demos/buttons.component';
 import { DemoModalComponent } from './demos/modal.component';
@@ -36,7 +31,6 @@ import { DemoCarouselComponent } from './demos/carousel.component';
 import { DemoOCalendarComponent } from './demos/o-calendar.component';
 import { DemoCollapseComponent } from './demos/collapse.component';
 import { DemoDatepickerComponent } from './demos/datepicker.component';
-import { DemoPriorityNavComponent } from './demos/priority-nav.component';
 import { DemoProgressBarComponent } from './demos/progress-bar.component';
 import { DemoDropdownComponent } from './demos/dropdown.component';
 import { DemoOSwitchComponent } from './demos/o-switch.component';
@@ -55,12 +49,7 @@ import { DocAccordionComponent } from './docs/accordion.component';
 import { DocBadgeComponent } from './docs/badge.component';
 import { DocCardComponent } from './docs/card.component';
 import { DocFormComponent } from './docs/form.component';
-import { DocJumbotronComponent } from './docs/jumbotron.component';
 import { DocListGroupComponent } from './docs/list-group.component';
-import { DocLocalNavigationComponent } from './docs/local-navigation.component';
-import { DocMediaComponent } from './docs/media.component';
-import { DocOrangeFooterComponent } from './docs/orange-footer.component';
-import { DocOrangeMegamenuComponent } from './docs/orange-megamenu.component';
 import { DocBreadcrumbComponent } from './docs/breadcrumb.component';
 import { DocButtonsComponent } from './docs/buttons.component';
 import { DocOCalendarComponent } from './docs/o-calendar.component';
@@ -81,7 +70,6 @@ import { DocStepbarComponent } from './docs/stepbar.component';
 import { DocCollapseComponent } from './docs/collapse.component';
 import { DocDatepickerComponent } from './docs/datepicker.component';
 import { DocProgressBarComponent } from './docs/progress-bar.component';
-import { DocPriorityNavComponent } from './docs/priority-nav.component';
 import { DocNavbarComponent } from './docs/navbar.component';
 import { DocONavbarComponent } from './docs/o-navbar.component';
 import { DocScrollUpComponent } from './docs/scroll-up.component';
@@ -107,12 +95,7 @@ import { ScrollTopModule } from 'ng-boosted';
     DemoBadgeComponent,
     DemoCardComponent,
     DemoFormComponent,
-    DemoJumbotronComponent,
-    DemoMediaComponent,
-    DemoOrangeFooterComponent,
-    DemoOrangeMegamenuComponent,
     DemoListGroupComponent,
-    DemoLocalNavigationComponent,
     DemoBreadcrumbComponent,
     DemoButtonsComponent,
     DemoCollapseComponent,
@@ -128,7 +111,6 @@ import { ScrollTopModule } from 'ng-boosted';
     DemoOToggleComponent,
     DemoPaginationComponent,
     DemoPopoverComponent,
-    DemoPriorityNavComponent,
     DemoProgressBarComponent,
     DemoRatingComponent,
     DemoScrollspyComponent,
@@ -147,12 +129,7 @@ import { ScrollTopModule } from 'ng-boosted';
     DocBadgeComponent,
     DocCardComponent,
     DocFormComponent,
-    DocJumbotronComponent,
     DocListGroupComponent,
-    DocLocalNavigationComponent,
-    DocMediaComponent,
-    DocOrangeFooterComponent,
-    DocOrangeMegamenuComponent,
     DocBreadcrumbComponent,
     DocAlertComponent,
     DocButtonsComponent,
@@ -173,7 +150,6 @@ import { ScrollTopModule } from 'ng-boosted';
     DocScrollspyComponent,
     DocStepbarComponent,
     DocProgressBarComponent,
-    DocPriorityNavComponent,
     DocNavbarComponent,
     DocONavbarComponent,
     DocOScrollTopComponent,