diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml deleted file mode 100644 index 1e647e0..0000000 --- a/.github/workflows/phpunit.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: PHPUnit - -on: - pull_request: - branches: - - develop - -jobs: - main: - name: Build and test - - strategy: - matrix: - php-versions: ['7.2', '7.3', '7.4'] - - runs-on: ubuntu-latest - - if: "!contains(github.event.head_commit.message, '[ci skip]')" - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@master - with: - php-version: ${{ matrix.php-versions }} - tools: composer, pecl, phpunit - extensions: intl, json, mbstring, mysqlnd, xdebug, xml, sqlite3 - coverage: xdebug - - - name: Get composer cache directory - id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" - - - name: Cache composer dependencies - uses: actions/cache@v1 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} - restore-keys: ${{ runner.os }}-composer- - - - name: Install dependencies - run: composer install --no-progress --no-suggest --no-interaction --prefer-dist --optimize-autoloader - # To prevent rate limiting you may need to supply an OAuth token in Settings > Secrets - # env: - # https://getcomposer.org/doc/articles/troubleshooting.md#api-rate-limit-and-oauth-tokens - # COMPOSER_AUTH: ${{ secrets.COMPOSER_AUTH }} - - - name: Test with phpunit - run: vendor/bin/phpunit --coverage-text diff --git a/app/Config/App.php b/app/Config/App.php index 5dc9e0b..a522824 100644 --- a/app/Config/App.php +++ b/app/Config/App.php @@ -19,7 +19,7 @@ class App extends BaseConfig * http://example.com/ */ // public string $baseURL = 'http://localhost:8080/'; - public string $baseURL = 'http://localhost/doner_management/'; + public string $baseURL = ''; // public string $baseURL = 'http://localhost/vb_book/public/'; /** diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 3c84dc5..527ebe3 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -65,7 +65,7 @@ abstract class BaseController extends Controller echo "This is a command-line request."; // echo $requestedRoute; } else { - if ($requestedRoute !== '/login' && $requestedRoute !== '/authenticate') { + if ($requestedRoute !== 'login' && $requestedRoute !== 'authenticate') { $this->authData = $this->session_log(); } @@ -98,8 +98,8 @@ abstract class BaseController extends Controller $session_uname = get_logged_name(); if(!is_session_active()) { - header("Location: " . base_url("login")); - exit(); + header("Location: " . base_url("login")); + exit(); } $auth_model = new AuthenticationModel(); diff --git a/doner-DB-Query/DB-Query.txt b/doner-DB-Query/DB-Query.txt deleted file mode 100644 index 871bd44..0000000 --- a/doner-DB-Query/DB-Query.txt +++ /dev/null @@ -1,5 +0,0 @@ -ALTER TABLE `customers` CHANGE `type` `doner_type` VARCHAR(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL; - -ALTER TABLE `customers` ADD `org_name` VARCHAR(256) NOT NULL COMMENT 'Name of The Organization' AFTER `doner_type`, ADD `pan_no` VARCHAR(256) NOT NULL COMMENT 'PAN Card Number' AFTER `org_name`; - -ALTER TABLE `customers` CHANGE `doner_type` `doner_type` VARCHAR(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, CHANGE `org_name` `org_name` VARCHAR(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'Name of The Organization', CHANGE `pan_no` `pan_no` VARCHAR(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'PAN Card Number'; diff --git a/vendor.zip b/vendor.zip deleted file mode 100644 index affe325..0000000 Binary files a/vendor.zip and /dev/null differ