Merge remote-tracking branch 'ibn/master'

bcix · Jul 6, 2021 · 56a583b · 56a583b
2 parents fb4407a + 9f779ed
commit 56a583b
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 41 deletions.
diff --git a/config/ixp_fe.php b/config/ixp_fe.php
@@ -95,6 +95,7 @@
             'net-info'                  => env( 'IXP_FE_FRONTEND_DISABLED_NETINFO',           true ),
             'peering-manager'           => env( 'IXP_FE_FRONTEND_DISABLED_PEERING_MANAGER',   false ),
             'peering-matrix'            => env( 'IXP_FE_FRONTEND_DISABLED_PEERING_MATRIX',    false ),
+            'ripe-atlas'                => true, // not ready for use yet
             'rs-prefixes'               => env( 'IXP_FE_FRONTEND_DISABLED_RS_PREFIXES',       true  ),
         ],
     ],

diff --git a/resources/views/layouts/menu.foil.php b/resources/views/layouts/menu.foil.php
@@ -171,30 +171,33 @@
 
             <?php /**************************************** DOCSTORE ****************************************/ ?>
 
-            <li class="<?= !request()->is( 'ripe-atlas/runs*' ) ?: 'active' ?>" >
-                <a href="<?= route('ripe-atlas/runs@list' ) ?>" class="nav-link">
-                    Ripe Atlas
-                </a>
-            </li>
+            <?php if( !config( 'ixp_fe.frontend.disabled.ripe-atlas' ) ): ?>
+                <li class="<?= !request()->is( 'ripe-atlas/runs*' ) ?: 'active' ?>" >
+                    <a href="<?= route('ripe-atlas/runs@list' ) ?>" class="nav-link">
+                        Ripe Atlas
+                    </a>
+                </li>
 
-            <?php if( request()->is( 'ripe-atlas/*' ) ): ?>
-                <ul>
-                    <li class="nav-sub-menu-item <?= !request()->is( 'ripe-atlas/measurements/*' ) ?: 'active' ?>">
-                        <a class="nav-link" href="<?= route('ripe-atlas/measurements@list' ) ?>">
-                            Measurements
-                        </a>
-                    </li>
-                </ul>
-            <?php endif; ?>
+                <?php if( request()->is( 'ripe-atlas/*' ) ): ?>
+                    <ul>
+                        <li class="nav-sub-menu-item <?= !request()->is( 'ripe-atlas/measurements/*' ) ?: 'active' ?>">
+                            <a class="nav-link" href="<?= route('ripe-atlas/measurements@list' ) ?>">
+                                Measurements
+                            </a>
+                        </li>
+                    </ul>
+                <?php endif; ?>
+
+                <?php if( request()->is( 'ripe-atlas/*' ) ): ?>
+                    <ul>
+                        <li class="nav-sub-menu-item <?= !request()->is( 'ripe-atlas/probes/*' ) ?: 'active' ?>">
+                            <a class="nav-link" href="<?= route('ripe-atlas/probes@list' ) ?>">
+                                Probes
+                            </a>
+                        </li>
+                    </ul>
+                <?php endif; ?>
 
-            <?php if( request()->is( 'ripe-atlas/*' ) ): ?>
-                <ul>
-                    <li class="nav-sub-menu-item <?= !request()->is( 'ripe-atlas/probes/*' ) ?: 'active' ?>">
-                        <a class="nav-link" href="<?= route('ripe-atlas/probes@list' ) ?>">
-                            Probes
-                        </a>
-                    </li>
-                </ul>
             <?php endif; ?>
 
             <li class="<?= !request()->is( 'facility/*' ) ?: 'active' ?>">

diff --git a/routes/web-auth.php b/routes/web-auth.php
@@ -212,18 +212,18 @@
 ///
 /// Rs Filtering
 ///
-Route::get( 'rs-filtering/{cust}', 'RsFilterController@list' )->name( 'rs-filter@list' );
-
-Route::group( [ 'prefix' => 'rs-filter' ], function() {
-    Route::get('create/{cust}',                  'RsFilterController@create'            )->name("rs-filter@create"             );
-    Route::get('edit/{rsf}',                     'RsFilterController@edit'           )->name("rs-filter@edit"            );
-    Route::get('view/{rsf}',                     'RsFilterController@view'           )->name("rs-filter@view"            );
-    Route::get('toogle-enable/{rsf}/{enable}',   'RsFilterController@toggleEnable'   )->name("rs-filter@toggle-enable"   );
-    Route::get('change-order/{rsf}/{up}',        'RsFilterController@changeOrderBy'  )->name("rs-filter@change-order"    );
-
-    Route::post('store',                        'RsFilterController@store'          )->name("rs-filter@store"           );
-    Route::put('update/{rsf}',                  'RsFilterController@update'         )->name("rs-filter@update"          );
-    Route::delete('delete/{rsf}',               'RsFilterController@delete'       )->name("rs-filter@delete"          );
-
-    Route::view( 'grant-cust-user',              'rs-filter/grant-cust-user'        )->name( 'rs-filter@grant-cust-user' );
-});
+//Route::get( 'rs-filtering/{cust}', 'RsFilterController@list' )->name( 'rs-filter@list' );
+//
+//Route::group( [ 'prefix' => 'rs-filter' ], function() {
+//    Route::get('create/{cust}',                  'RsFilterController@create'            )->name("rs-filter@create"             );
+//    Route::get('edit/{rsf}',                     'RsFilterController@edit'           )->name("rs-filter@edit"            );
+//    Route::get('view/{rsf}',                     'RsFilterController@view'           )->name("rs-filter@view"            );
+//    Route::get('toogle-enable/{rsf}/{enable}',   'RsFilterController@toggleEnable'   )->name("rs-filter@toggle-enable"   );
+//    Route::get('change-order/{rsf}/{up}',        'RsFilterController@changeOrderBy'  )->name("rs-filter@change-order"    );
+//
+//    Route::post('store',                        'RsFilterController@store'          )->name("rs-filter@store"           );
+//    Route::put('update/{rsf}',                  'RsFilterController@update'         )->name("rs-filter@update"          );
+//    Route::delete('delete/{rsf}',               'RsFilterController@delete'       )->name("rs-filter@delete"          );
+//
+//    Route::view( 'grant-cust-user',              'rs-filter/grant-cust-user'        )->name( 'rs-filter@grant-cust-user' );
+//});
diff --git a/routes/web-eloquent2frontend.php b/routes/web-eloquent2frontend.php
@@ -43,10 +43,10 @@
 IXP\Http\Controllers\LoginHistoryController::routes();
 IXP\Http\Controllers\MacAddressController::routes();
 IXP\Http\Controllers\NetworkInfoController::routes();
-IXP\Http\Controllers\RipeAtlas\MeasurementController::routes();
-IXP\Http\Controllers\RipeAtlas\ResultController::routes();
-IXP\Http\Controllers\RipeAtlas\RunController::routes();
-IXP\Http\Controllers\RipeAtlas\ProbesController::routes();
+//IXP\Http\Controllers\RipeAtlas\MeasurementController::routes();
+//IXP\Http\Controllers\RipeAtlas\ResultController::routes();
+//IXP\Http\Controllers\RipeAtlas\RunController::routes();
+//IXP\Http\Controllers\RipeAtlas\ProbesController::routes();
 IXP\Http\Controllers\Switches\SwitchController::routes();
 IXP\Http\Controllers\Switches\SwitchPortController::routes();
 IXP\Http\Controllers\User\UserRememberTokenController::routes();