Skip to content

Commit

Permalink
Trimbreuse routing fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Ovsiankina committed Feb 16, 2024
1 parent 6091168 commit b4e1608
Show file tree
Hide file tree
Showing 11 changed files with 7 additions and 433 deletions.
2 changes: 1 addition & 1 deletion app/Config/App.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class App extends BaseConfig
* something else. If you are using mod_rewrite to remove the page set this
* variable so that it is blank.
*/
public string $indexPage = 'index.php';
public string $indexPage = '';

/**
* --------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion app/Config/Routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
/**
* @var RouteCollection $routes
*/
$routes->get('/', '\Welcome\Controllers\Home::index');
$routes->get('/', '\Timbreuse\Controllers\Home::index');
2 changes: 1 addition & 1 deletion app/Config/Routing.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class Routing extends BaseRouting
*
* Default: 'App\Controllers'
*/
public string $defaultNamespace = 'App\Controllers';
public string $defaultNamespace = 'Timbreuse\Controllers';

/**
* The default controller to use when no other controller has been
Expand Down
4 changes: 2 additions & 2 deletions orif/common/Language/fr/common_lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
return[
// Application name
#'app_title' => 'Titre de l\'application',
'app_title' => 'Pointeuse',
'app_title' => 'Timbreuse',

// Page titles
#'page_prefix' => 'Packbase V4',
'page_prefix' => 'Pointeuse',
'page_prefix' => 'Timbreuse',

// Buttons
'btn_admin' => 'Administration',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php

$routes->group('Timbreuse',function($routes){
$routes->group('Timbreuse', function($routes){
$routes->add('home','\Timbreuse\Controllers\Home');
});

Expand Down
2 changes: 1 addition & 1 deletion orif/timbreuse/Controllers/Home.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function index()
#return redirect()->to(current_url() . '../user/auth/login');
return redirect()->to(url_to('login'));
}
return redirect()->to(current_url() . '/PersoLogs/perso_time');
return redirect()->to(base_url() . 'PersoLogs/perso_time');
$data['title'] = "Welcome";

/**
Expand Down
8 changes: 0 additions & 8 deletions orif/welcome/Config/Routes.php

This file was deleted.

65 changes: 0 additions & 65 deletions orif/welcome/Controllers/Home.php

This file was deleted.

Loading

0 comments on commit b4e1608

Please sign in to comment.