[smarcet] - #13404

* bower dependencies to npm dependencies migration

Author: smarcet

.bowerrc

@@ -95,4 +95,6 @@ db.ini
 *.pickle
 *.po
 gettext/Locale/*
-themes/openstack/images
+themes/openstack/images
+npm-debug.log
+*.log

.gitignore

@@ -66,10 +66,9 @@ function init()
     {
         parent::init();
 
+        SweetAlert2Dependencies::renderRequirements();
         Requirements::css('coa/css/coa-verify.css');
         Requirements::javascript('coa/js/coa-verify.js');
-        Requirements::css('themes/openstack/bower_assets/sweetalert/dist/sweetalert.css');
-        Requirements::javascript('themes/openstack/bower_assets/sweetalert/dist/sweetalert.min.js');
     }
 
     public function index(SS_HTTPRequest $request){

bower.json

@@ -44,12 +44,10 @@ function getVerification() {
                     $('#result_cert').text(data.CertificationNumber);
                     $('#result_date').text(data.PassFailDate);
                     $('#result_status').text(data.CertificationStatus);
-
                     $('#cert_verification').slideDown('slow');
-                } else {
-                    $('#cert_empty').show();
+                    return;
                 }
-
+                $('#cert_empty').show();
             }
         }).fail(function (jqXHR, textStatus, errorThrown) {
             var http_code = jqXHR.status;
@@ -59,8 +57,8 @@ function getVerification() {
                 location.reload();
             }
         });
-    } else {
-        swal('Validation Error','Please fill in the required information and accept the Terms of Use.','warning');
+        return;
     }
-
+    // fail validation
+    swal('Validation Error','Please fill in the required information and accept the Terms of Use.','warning');
 }

coa/code/ui/COAVerifyPage.php

@@ -33,23 +33,21 @@ public function __construct($name, $title = null, $value = '', $form = null,$dat
 
     function Field() {
         $this->addExtraClass('DatePickerField');
-        Requirements::block(SAPPHIRE_DIR .'/thirdparty/jquery/jquery.js');
-        Requirements::javascript('themes/openstack/javascript/jquery-2.0.3.min.js');
-        Requirements::javascript('themes/openstack/javascript/jquery-migrate-1.2.1.min.js');
-	    Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
+        JQueryCoreDependencies::renderRequirements();
+        Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
 	    Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
         Requirements::javascript("datepicker/javascript/datepicker.js");
 
-        $attributes = array(
-            'type' => 'text',
-            'class' => 'text' . ($this->extraClass() ? $this->extraClass() : ''),
-            'id' => $this->id(),
-            'name' => $this->Name(),
-            'value' => $this->Value(),
-            'tabindex' => $this->getTabIndex(),
+        $attributes = [
+            'type'      => 'text',
+            'class'     => 'text' . ($this->extraClass() ? $this->extraClass() : ''),
+            'id'        => $this->id(),
+            'name'      => $this->Name(),
+            'value'     => $this->Value(),
+            'tabindex'  => $this->getTabIndex(),
             'maxlength' => ($this->maxLength) ? $this->maxLength : null,
-            'size' => ($this->maxLength) ? min( $this->maxLength, 10 ) : null,
-        );
+            'size'      => ($this->maxLength) ? min( $this->maxLength, 10 ) : null,
+        ];
         if(!empty($this->data_dependant)){
             $attributes["data-dependant-on"] = $this->data_dependant;
         }

coa/js/coa-verify.js

@@ -72,8 +72,7 @@ public function init()
     {
         parent::init();
         Page_Controller::AddRequirements();
-        Requirements::css('themes/openstack/bower_assets/sweetalert2/dist/sweetalert2.min.css');
-        Requirements::javascript('themes/openstack/bower_assets/sweetalert2/dist/sweetalert2.min.js');
+        SweetAlert2Dependencies::renderRequirements();
         Requirements::javascript("marketplace/code/ui/admin/js/utils.js");
     }
     /**

datepicker/code/JQueryUIDatePickerField.php

@@ -58,8 +58,7 @@ public function getRenderUITopExtensions(&$html){
         if($qty > 0){
 
             Requirements::css('dupe_members/css/edit.profile.dupes.member.extension.css');
-            Requirements::css('themes/openstack/bower_assets/sweetalert2/dist/sweetalert2.min.css');
-            Requirements::javascript('themes/openstack/bower_assets/sweetalert2/dist/sweetalert2.min.js');
+            SweetAlert2Dependencies::renderRequirements();
             Requirements::javascript('marketplace/code/ui/admin/js/utils.js');
             Requirements::javascript('dupe_members/javascript/edit.profile.dupes.member.extension.js');
 

dupe_members/code/interfaces/web/DupesMembers_Controller.php

@@ -10,7 +10,7 @@
     <title>404 | OpenStack Open Source Cloud Computing Software</title>
 
     <!-- Bootstrap Core CSS -->
-    <link href="/errors_pages/ui/404/css/bootstrap.min.css" rel="stylesheet">
+    <link href="/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Custom CSS -->
     <link href="/errors_pages/ui/404/css/combined.css" rel="stylesheet">
@@ -60,10 +60,10 @@ <h6>Find another page or just go <a href="https://www.openstack.org">home</a>.</
 
 
     <!-- jQuery Version 1.11.0 -->
-    <script src="/themes/openstack/javascript/jquery.min.js"></script>
+    <script src="/node_modules/jquery/dist/jquery.js"></script>
 
     <!-- Bootstrap Core JavaScript -->
-    <script src="/themes/openstack/javascript/bootstrap.min.js"></script>
+    <script src="/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
 
     <!-- The rest of the JS -->
     <script src="/themes/openstack/javascript/navigation.js"></script>