From 1257e0227f856a0738b73c30900cc167345d8968 Mon Sep 17 00:00:00 2001 From: Artur Nowakowski Date: Sat, 30 Nov 2019 22:07:51 +0100 Subject: [PATCH] Moved api to directory --- Jenkinsfile | 2 +- .env.example => api/.env.example | 0 README.md => api/README.md | 0 {app => api/app}/Console/Kernel.php | 0 {app => api/app}/Enums/UserRole.php | 0 {app => api/app}/Exceptions/Handler.php | 0 .../app}/Http/Controllers/Controller.php | 0 .../app}/Http/Controllers/UsersController.php | 0 {app => api/app}/Http/Kernel.php | 1 + .../Middleware/AssignGuardAndAuthenticate.php | 0 .../app}/Http/Middleware/AssignGuardOnly.php | 0 .../app}/Http/Middleware/Authenticate.php | 0 .../Middleware/CheckForMaintenanceMode.php | 0 .../app}/Http/Middleware/EncryptCookies.php | 0 .../Middleware/RedirectIfAuthenticated.php | 0 .../app}/Http/Middleware/TrimStrings.php | 0 .../app}/Http/Middleware/TrustProxies.php | 0 .../app}/Http/Middleware/VerifyCsrfToken.php | 0 .../app}/Http/Requests/LoginRequest.php | 0 .../app}/Http/Requests/RegisterRequest.php | 0 {app => api/app}/Models/User.php | 0 {app => api/app}/Policies/UserPolicy.php | 0 .../app}/Providers/AppServiceProvider.php | 0 .../app}/Providers/AuthServiceProvider.php | 0 .../Providers/BroadcastServiceProvider.php | 0 .../app}/Providers/EventServiceProvider.php | 0 .../Providers/RepositoriesServiceProvider.php | 0 .../app}/Providers/RouteServiceProvider.php | 0 .../app}/Repositories/UsersRepository.php | 0 .../Repositories/UsersRepositoryInterface.php | 0 {app => api/app}/Traits/HasCompositeKey.php | 0 artisan => api/artisan | 0 {bootstrap => api/bootstrap}/app.php | 0 {bootstrap => api/bootstrap}/cache/.gitignore | 0 composer.json => api/composer.json | 1 + composer.lock => api/composer.lock | 116 +++++++++++++++++- {config => api/config}/app.php | 0 {config => api/config}/auth.php | 0 {config => api/config}/broadcasting.php | 0 {config => api/config}/cache.php | 0 {config => api/config}/database.php | 0 {config => api/config}/filesystems.php | 0 {config => api/config}/hashing.php | 0 {config => api/config}/jwt.php | 0 {config => api/config}/logging.php | 0 {config => api/config}/mail.php | 0 {config => api/config}/queue.php | 0 {config => api/config}/services.php | 0 {config => api/config}/session.php | 0 {config => api/config}/view.php | 0 {database => api/database}/.gitignore | 0 .../database}/factories/UsersFactory.php | 0 .../2019_11_30_153826_create_users_table.php | 0 .../database}/seeds/DatabaseSeeder.php | 0 .../database}/seeds/UsersTableSeeder.php | 8 +- phpunit.xml => api/phpunit.xml | 0 {public => api/public}/.htaccess | 0 {public => api/public}/favicon.ico | 0 {public => api/public}/index.php | 0 {public => api/public}/robots.txt | 0 {public => api/public}/web.config | 0 {resources => api/resources}/js/app.js | 0 {resources => api/resources}/js/bootstrap.js | 0 {resources => api/resources}/lang/en/auth.php | 0 .../resources}/lang/en/pagination.php | 0 .../resources}/lang/en/passwords.php | 0 .../resources}/lang/en/validation.php | 0 {resources => api/resources}/sass/app.scss | 0 {routes => api/routes}/api.php | 0 {routes => api/routes}/channels.php | 0 {routes => api/routes}/console.php | 0 {routes => api/routes}/web.php | 0 server.php => api/server.php | 0 {storage => api/storage}/app/.gitignore | 0 .../storage}/app/public/.gitignore | 0 {storage => api/storage}/framework/.gitignore | 0 .../storage}/framework/cache/.gitignore | 0 .../storage}/framework/cache/data/.gitignore | 0 .../storage}/framework/sessions/.gitignore | 0 .../storage}/framework/testing/.gitignore | 0 .../storage}/framework/views/.gitignore | 0 {storage => api/storage}/logs/.gitignore | 0 {tests => api/tests}/CreatesApplication.php | 0 {tests => api/tests}/Feature/UsersTest.php | 0 {tests => api/tests}/TestCase.php | 0 {tests => api/tests}/Unit/UserTest.php | 0 86 files changed, 121 insertions(+), 7 deletions(-) rename .env.example => api/.env.example (100%) rename README.md => api/README.md (100%) rename {app => api/app}/Console/Kernel.php (100%) rename {app => api/app}/Enums/UserRole.php (100%) rename {app => api/app}/Exceptions/Handler.php (100%) rename {app => api/app}/Http/Controllers/Controller.php (100%) rename {app => api/app}/Http/Controllers/UsersController.php (100%) rename {app => api/app}/Http/Kernel.php (98%) rename {app => api/app}/Http/Middleware/AssignGuardAndAuthenticate.php (100%) rename {app => api/app}/Http/Middleware/AssignGuardOnly.php (100%) rename {app => api/app}/Http/Middleware/Authenticate.php (100%) rename {app => api/app}/Http/Middleware/CheckForMaintenanceMode.php (100%) rename {app => api/app}/Http/Middleware/EncryptCookies.php (100%) rename {app => api/app}/Http/Middleware/RedirectIfAuthenticated.php (100%) rename {app => api/app}/Http/Middleware/TrimStrings.php (100%) rename {app => api/app}/Http/Middleware/TrustProxies.php (100%) rename {app => api/app}/Http/Middleware/VerifyCsrfToken.php (100%) rename {app => api/app}/Http/Requests/LoginRequest.php (100%) rename {app => api/app}/Http/Requests/RegisterRequest.php (100%) rename {app => api/app}/Models/User.php (100%) rename {app => api/app}/Policies/UserPolicy.php (100%) rename {app => api/app}/Providers/AppServiceProvider.php (100%) rename {app => api/app}/Providers/AuthServiceProvider.php (100%) rename {app => api/app}/Providers/BroadcastServiceProvider.php (100%) rename {app => api/app}/Providers/EventServiceProvider.php (100%) rename {app => api/app}/Providers/RepositoriesServiceProvider.php (100%) rename {app => api/app}/Providers/RouteServiceProvider.php (100%) rename {app => api/app}/Repositories/UsersRepository.php (100%) rename {app => api/app}/Repositories/UsersRepositoryInterface.php (100%) rename {app => api/app}/Traits/HasCompositeKey.php (100%) rename artisan => api/artisan (100%) rename {bootstrap => api/bootstrap}/app.php (100%) rename {bootstrap => api/bootstrap}/cache/.gitignore (100%) rename composer.json => api/composer.json (97%) rename composer.lock => api/composer.lock (97%) rename {config => api/config}/app.php (100%) rename {config => api/config}/auth.php (100%) rename {config => api/config}/broadcasting.php (100%) rename {config => api/config}/cache.php (100%) rename {config => api/config}/database.php (100%) rename {config => api/config}/filesystems.php (100%) rename {config => api/config}/hashing.php (100%) rename {config => api/config}/jwt.php (100%) rename {config => api/config}/logging.php (100%) rename {config => api/config}/mail.php (100%) rename {config => api/config}/queue.php (100%) rename {config => api/config}/services.php (100%) rename {config => api/config}/session.php (100%) rename {config => api/config}/view.php (100%) rename {database => api/database}/.gitignore (100%) rename {database => api/database}/factories/UsersFactory.php (100%) rename {database => api/database}/migrations/2019_11_30_153826_create_users_table.php (100%) rename {database => api/database}/seeds/DatabaseSeeder.php (100%) rename {database => api/database}/seeds/UsersTableSeeder.php (55%) rename phpunit.xml => api/phpunit.xml (100%) rename {public => api/public}/.htaccess (100%) rename {public => api/public}/favicon.ico (100%) rename {public => api/public}/index.php (100%) rename {public => api/public}/robots.txt (100%) rename {public => api/public}/web.config (100%) rename {resources => api/resources}/js/app.js (100%) rename {resources => api/resources}/js/bootstrap.js (100%) rename {resources => api/resources}/lang/en/auth.php (100%) rename {resources => api/resources}/lang/en/pagination.php (100%) rename {resources => api/resources}/lang/en/passwords.php (100%) rename {resources => api/resources}/lang/en/validation.php (100%) rename {resources => api/resources}/sass/app.scss (100%) rename {routes => api/routes}/api.php (100%) rename {routes => api/routes}/channels.php (100%) rename {routes => api/routes}/console.php (100%) rename {routes => api/routes}/web.php (100%) rename server.php => api/server.php (100%) rename {storage => api/storage}/app/.gitignore (100%) rename {storage => api/storage}/app/public/.gitignore (100%) rename {storage => api/storage}/framework/.gitignore (100%) rename {storage => api/storage}/framework/cache/.gitignore (100%) rename {storage => api/storage}/framework/cache/data/.gitignore (100%) rename {storage => api/storage}/framework/sessions/.gitignore (100%) rename {storage => api/storage}/framework/testing/.gitignore (100%) rename {storage => api/storage}/framework/views/.gitignore (100%) rename {storage => api/storage}/logs/.gitignore (100%) rename {tests => api/tests}/CreatesApplication.php (100%) rename {tests => api/tests}/Feature/UsersTest.php (100%) rename {tests => api/tests}/TestCase.php (100%) rename {tests => api/tests}/Unit/UserTest.php (100%) diff --git a/Jenkinsfile b/Jenkinsfile index ccae9d7..85cfb1d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ node { stage('Checkout') { checkout([$class: 'GitSCM', branches: [[name: '*/master']], browser: [$class: 'GogsGit', repoUrl: 'https://git.wmi.amu.edu.pl/s416138/ClearBowl.git'], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'target']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'jenkins_git.wmi.amu.edu.pl', url: 'git@git.wmi.amu.edu.pl:s416138/ClearBowl.git']]]) } - dir('target'){ + dir('target/api'){ docker.image('mysql:latest').withRun('-e "MYSQL_ROOT_PASSWORD=8fcXUlCgC6JCqpoWX64" -e "MYSQL_DATABASE=clearbowl" -e "MYSQL_USER=api" -e "MYSQL_PASSWORD=R23qarINlcALOk2nDg6LbJelaqk"') { c -> docker.image('mysql:latest').inside("--link ${c.id}:db") { stage("Initialize DB"){ diff --git a/.env.example b/api/.env.example similarity index 100% rename from .env.example rename to api/.env.example diff --git a/README.md b/api/README.md similarity index 100% rename from README.md rename to api/README.md diff --git a/app/Console/Kernel.php b/api/app/Console/Kernel.php similarity index 100% rename from app/Console/Kernel.php rename to api/app/Console/Kernel.php diff --git a/app/Enums/UserRole.php b/api/app/Enums/UserRole.php similarity index 100% rename from app/Enums/UserRole.php rename to api/app/Enums/UserRole.php diff --git a/app/Exceptions/Handler.php b/api/app/Exceptions/Handler.php similarity index 100% rename from app/Exceptions/Handler.php rename to api/app/Exceptions/Handler.php diff --git a/app/Http/Controllers/Controller.php b/api/app/Http/Controllers/Controller.php similarity index 100% rename from app/Http/Controllers/Controller.php rename to api/app/Http/Controllers/Controller.php diff --git a/app/Http/Controllers/UsersController.php b/api/app/Http/Controllers/UsersController.php similarity index 100% rename from app/Http/Controllers/UsersController.php rename to api/app/Http/Controllers/UsersController.php diff --git a/app/Http/Kernel.php b/api/app/Http/Kernel.php similarity index 98% rename from app/Http/Kernel.php rename to api/app/Http/Kernel.php index edd2338..7b38b69 100644 --- a/app/Http/Kernel.php +++ b/api/app/Http/Kernel.php @@ -19,6 +19,7 @@ class Kernel extends HttpKernel \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, + \Barryvdh\Cors\HandleCors::class, ]; /** diff --git a/app/Http/Middleware/AssignGuardAndAuthenticate.php b/api/app/Http/Middleware/AssignGuardAndAuthenticate.php similarity index 100% rename from app/Http/Middleware/AssignGuardAndAuthenticate.php rename to api/app/Http/Middleware/AssignGuardAndAuthenticate.php diff --git a/app/Http/Middleware/AssignGuardOnly.php b/api/app/Http/Middleware/AssignGuardOnly.php similarity index 100% rename from app/Http/Middleware/AssignGuardOnly.php rename to api/app/Http/Middleware/AssignGuardOnly.php diff --git a/app/Http/Middleware/Authenticate.php b/api/app/Http/Middleware/Authenticate.php similarity index 100% rename from app/Http/Middleware/Authenticate.php rename to api/app/Http/Middleware/Authenticate.php diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/api/app/Http/Middleware/CheckForMaintenanceMode.php similarity index 100% rename from app/Http/Middleware/CheckForMaintenanceMode.php rename to api/app/Http/Middleware/CheckForMaintenanceMode.php diff --git a/app/Http/Middleware/EncryptCookies.php b/api/app/Http/Middleware/EncryptCookies.php similarity index 100% rename from app/Http/Middleware/EncryptCookies.php rename to api/app/Http/Middleware/EncryptCookies.php diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/api/app/Http/Middleware/RedirectIfAuthenticated.php similarity index 100% rename from app/Http/Middleware/RedirectIfAuthenticated.php rename to api/app/Http/Middleware/RedirectIfAuthenticated.php diff --git a/app/Http/Middleware/TrimStrings.php b/api/app/Http/Middleware/TrimStrings.php similarity index 100% rename from app/Http/Middleware/TrimStrings.php rename to api/app/Http/Middleware/TrimStrings.php diff --git a/app/Http/Middleware/TrustProxies.php b/api/app/Http/Middleware/TrustProxies.php similarity index 100% rename from app/Http/Middleware/TrustProxies.php rename to api/app/Http/Middleware/TrustProxies.php diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/api/app/Http/Middleware/VerifyCsrfToken.php similarity index 100% rename from app/Http/Middleware/VerifyCsrfToken.php rename to api/app/Http/Middleware/VerifyCsrfToken.php diff --git a/app/Http/Requests/LoginRequest.php b/api/app/Http/Requests/LoginRequest.php similarity index 100% rename from app/Http/Requests/LoginRequest.php rename to api/app/Http/Requests/LoginRequest.php diff --git a/app/Http/Requests/RegisterRequest.php b/api/app/Http/Requests/RegisterRequest.php similarity index 100% rename from app/Http/Requests/RegisterRequest.php rename to api/app/Http/Requests/RegisterRequest.php diff --git a/app/Models/User.php b/api/app/Models/User.php similarity index 100% rename from app/Models/User.php rename to api/app/Models/User.php diff --git a/app/Policies/UserPolicy.php b/api/app/Policies/UserPolicy.php similarity index 100% rename from app/Policies/UserPolicy.php rename to api/app/Policies/UserPolicy.php diff --git a/app/Providers/AppServiceProvider.php b/api/app/Providers/AppServiceProvider.php similarity index 100% rename from app/Providers/AppServiceProvider.php rename to api/app/Providers/AppServiceProvider.php diff --git a/app/Providers/AuthServiceProvider.php b/api/app/Providers/AuthServiceProvider.php similarity index 100% rename from app/Providers/AuthServiceProvider.php rename to api/app/Providers/AuthServiceProvider.php diff --git a/app/Providers/BroadcastServiceProvider.php b/api/app/Providers/BroadcastServiceProvider.php similarity index 100% rename from app/Providers/BroadcastServiceProvider.php rename to api/app/Providers/BroadcastServiceProvider.php diff --git a/app/Providers/EventServiceProvider.php b/api/app/Providers/EventServiceProvider.php similarity index 100% rename from app/Providers/EventServiceProvider.php rename to api/app/Providers/EventServiceProvider.php diff --git a/app/Providers/RepositoriesServiceProvider.php b/api/app/Providers/RepositoriesServiceProvider.php similarity index 100% rename from app/Providers/RepositoriesServiceProvider.php rename to api/app/Providers/RepositoriesServiceProvider.php diff --git a/app/Providers/RouteServiceProvider.php b/api/app/Providers/RouteServiceProvider.php similarity index 100% rename from app/Providers/RouteServiceProvider.php rename to api/app/Providers/RouteServiceProvider.php diff --git a/app/Repositories/UsersRepository.php b/api/app/Repositories/UsersRepository.php similarity index 100% rename from app/Repositories/UsersRepository.php rename to api/app/Repositories/UsersRepository.php diff --git a/app/Repositories/UsersRepositoryInterface.php b/api/app/Repositories/UsersRepositoryInterface.php similarity index 100% rename from app/Repositories/UsersRepositoryInterface.php rename to api/app/Repositories/UsersRepositoryInterface.php diff --git a/app/Traits/HasCompositeKey.php b/api/app/Traits/HasCompositeKey.php similarity index 100% rename from app/Traits/HasCompositeKey.php rename to api/app/Traits/HasCompositeKey.php diff --git a/artisan b/api/artisan similarity index 100% rename from artisan rename to api/artisan diff --git a/bootstrap/app.php b/api/bootstrap/app.php similarity index 100% rename from bootstrap/app.php rename to api/bootstrap/app.php diff --git a/bootstrap/cache/.gitignore b/api/bootstrap/cache/.gitignore similarity index 100% rename from bootstrap/cache/.gitignore rename to api/bootstrap/cache/.gitignore diff --git a/composer.json b/api/composer.json similarity index 97% rename from composer.json rename to api/composer.json index a521aed..2fa8ff7 100644 --- a/composer.json +++ b/api/composer.json @@ -9,6 +9,7 @@ "license": "MIT", "require": { "php": "^7.4", + "barryvdh/laravel-cors": "^0.11.4", "bensampo/laravel-enum": "^1.26", "fideloper/proxy": "^4.0", "hesto/multi-auth": "^2.0", diff --git a/composer.lock b/api/composer.lock similarity index 97% rename from composer.lock rename to api/composer.lock index 44fb0b8..f446f70 100644 --- a/composer.lock +++ b/api/composer.lock @@ -4,8 +4,122 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5ad08d213a9dfe327a11a5e2cbf510eb", + "content-hash": "192f30936bc72acc83e9681d8b6005e0", "packages": [ + { + "name": "asm89/stack-cors", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/asm89/stack-cors.git", + "reference": "c163e2b614550aedcf71165db2473d936abbced6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/asm89/stack-cors/zipball/c163e2b614550aedcf71165db2473d936abbced6", + "reference": "c163e2b614550aedcf71165db2473d936abbced6", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/http-foundation": "~2.7|~3.0|~4.0", + "symfony/http-kernel": "~2.7|~3.0|~4.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.0 || ^4.8.10", + "squizlabs/php_codesniffer": "^2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2-dev" + } + }, + "autoload": { + "psr-4": { + "Asm89\\Stack\\": "src/Asm89/Stack/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alexander", + "email": "iam.asm89@gmail.com" + } + ], + "description": "Cross-origin resource sharing library and stack middleware", + "homepage": "https://github.com/asm89/stack-cors", + "keywords": [ + "cors", + "stack" + ], + "time": "2017-12-20T14:37:45+00:00" + }, + { + "name": "barryvdh/laravel-cors", + "version": "v0.11.4", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-cors.git", + "reference": "03492f1a3bc74a05de23f93b94ac7cc5c173eec9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-cors/zipball/03492f1a3bc74a05de23f93b94ac7cc5c173eec9", + "reference": "03492f1a3bc74a05de23f93b94ac7cc5c173eec9", + "shasum": "" + }, + "require": { + "asm89/stack-cors": "^1.2", + "illuminate/support": "^5.5|^6", + "php": ">=7", + "symfony/http-foundation": "^3.1|^4", + "symfony/http-kernel": "^3.1|^4" + }, + "require-dev": { + "laravel/framework": "^5.5", + "orchestra/testbench": "3.3.x|3.4.x|3.5.x|3.6.x|3.7.x", + "phpunit/phpunit": "^4.8|^5.2|^7.0", + "squizlabs/php_codesniffer": "^2.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.11-dev" + }, + "laravel": { + "providers": [ + "Barryvdh\\Cors\\ServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Barryvdh\\Cors\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Adds CORS (Cross-Origin Resource Sharing) headers support in your Laravel application", + "keywords": [ + "api", + "cors", + "crossdomain", + "laravel" + ], + "time": "2019-08-28T11:27:11+00:00" + }, { "name": "bensampo/laravel-enum", "version": "v1.28.1", diff --git a/config/app.php b/api/config/app.php similarity index 100% rename from config/app.php rename to api/config/app.php diff --git a/config/auth.php b/api/config/auth.php similarity index 100% rename from config/auth.php rename to api/config/auth.php diff --git a/config/broadcasting.php b/api/config/broadcasting.php similarity index 100% rename from config/broadcasting.php rename to api/config/broadcasting.php diff --git a/config/cache.php b/api/config/cache.php similarity index 100% rename from config/cache.php rename to api/config/cache.php diff --git a/config/database.php b/api/config/database.php similarity index 100% rename from config/database.php rename to api/config/database.php diff --git a/config/filesystems.php b/api/config/filesystems.php similarity index 100% rename from config/filesystems.php rename to api/config/filesystems.php diff --git a/config/hashing.php b/api/config/hashing.php similarity index 100% rename from config/hashing.php rename to api/config/hashing.php diff --git a/config/jwt.php b/api/config/jwt.php similarity index 100% rename from config/jwt.php rename to api/config/jwt.php diff --git a/config/logging.php b/api/config/logging.php similarity index 100% rename from config/logging.php rename to api/config/logging.php diff --git a/config/mail.php b/api/config/mail.php similarity index 100% rename from config/mail.php rename to api/config/mail.php diff --git a/config/queue.php b/api/config/queue.php similarity index 100% rename from config/queue.php rename to api/config/queue.php diff --git a/config/services.php b/api/config/services.php similarity index 100% rename from config/services.php rename to api/config/services.php diff --git a/config/session.php b/api/config/session.php similarity index 100% rename from config/session.php rename to api/config/session.php diff --git a/config/view.php b/api/config/view.php similarity index 100% rename from config/view.php rename to api/config/view.php diff --git a/database/.gitignore b/api/database/.gitignore similarity index 100% rename from database/.gitignore rename to api/database/.gitignore diff --git a/database/factories/UsersFactory.php b/api/database/factories/UsersFactory.php similarity index 100% rename from database/factories/UsersFactory.php rename to api/database/factories/UsersFactory.php diff --git a/database/migrations/2019_11_30_153826_create_users_table.php b/api/database/migrations/2019_11_30_153826_create_users_table.php similarity index 100% rename from database/migrations/2019_11_30_153826_create_users_table.php rename to api/database/migrations/2019_11_30_153826_create_users_table.php diff --git a/database/seeds/DatabaseSeeder.php b/api/database/seeds/DatabaseSeeder.php similarity index 100% rename from database/seeds/DatabaseSeeder.php rename to api/database/seeds/DatabaseSeeder.php diff --git a/database/seeds/UsersTableSeeder.php b/api/database/seeds/UsersTableSeeder.php similarity index 55% rename from database/seeds/UsersTableSeeder.php rename to api/database/seeds/UsersTableSeeder.php index b478843..050d492 100644 --- a/database/seeds/UsersTableSeeder.php +++ b/api/database/seeds/UsersTableSeeder.php @@ -12,11 +12,9 @@ class UsersTableSeeder extends Seeder */ public function run() { - DB::table('admin')->insert([ - 'name' => 'adminTargi', - 'email' => 'adminTargi@poleng.pl', - 'password' => bcrypt('password'), - 'type' => 256 + DB::table('users')->insert([ + 'email' => 'artur.nowakowski@gmail.com', + 'password' => bcrypt('Tester#123'), ]); } } diff --git a/phpunit.xml b/api/phpunit.xml similarity index 100% rename from phpunit.xml rename to api/phpunit.xml diff --git a/public/.htaccess b/api/public/.htaccess similarity index 100% rename from public/.htaccess rename to api/public/.htaccess diff --git a/public/favicon.ico b/api/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to api/public/favicon.ico diff --git a/public/index.php b/api/public/index.php similarity index 100% rename from public/index.php rename to api/public/index.php diff --git a/public/robots.txt b/api/public/robots.txt similarity index 100% rename from public/robots.txt rename to api/public/robots.txt diff --git a/public/web.config b/api/public/web.config similarity index 100% rename from public/web.config rename to api/public/web.config diff --git a/resources/js/app.js b/api/resources/js/app.js similarity index 100% rename from resources/js/app.js rename to api/resources/js/app.js diff --git a/resources/js/bootstrap.js b/api/resources/js/bootstrap.js similarity index 100% rename from resources/js/bootstrap.js rename to api/resources/js/bootstrap.js diff --git a/resources/lang/en/auth.php b/api/resources/lang/en/auth.php similarity index 100% rename from resources/lang/en/auth.php rename to api/resources/lang/en/auth.php diff --git a/resources/lang/en/pagination.php b/api/resources/lang/en/pagination.php similarity index 100% rename from resources/lang/en/pagination.php rename to api/resources/lang/en/pagination.php diff --git a/resources/lang/en/passwords.php b/api/resources/lang/en/passwords.php similarity index 100% rename from resources/lang/en/passwords.php rename to api/resources/lang/en/passwords.php diff --git a/resources/lang/en/validation.php b/api/resources/lang/en/validation.php similarity index 100% rename from resources/lang/en/validation.php rename to api/resources/lang/en/validation.php diff --git a/resources/sass/app.scss b/api/resources/sass/app.scss similarity index 100% rename from resources/sass/app.scss rename to api/resources/sass/app.scss diff --git a/routes/api.php b/api/routes/api.php similarity index 100% rename from routes/api.php rename to api/routes/api.php diff --git a/routes/channels.php b/api/routes/channels.php similarity index 100% rename from routes/channels.php rename to api/routes/channels.php diff --git a/routes/console.php b/api/routes/console.php similarity index 100% rename from routes/console.php rename to api/routes/console.php diff --git a/routes/web.php b/api/routes/web.php similarity index 100% rename from routes/web.php rename to api/routes/web.php diff --git a/server.php b/api/server.php similarity index 100% rename from server.php rename to api/server.php diff --git a/storage/app/.gitignore b/api/storage/app/.gitignore similarity index 100% rename from storage/app/.gitignore rename to api/storage/app/.gitignore diff --git a/storage/app/public/.gitignore b/api/storage/app/public/.gitignore similarity index 100% rename from storage/app/public/.gitignore rename to api/storage/app/public/.gitignore diff --git a/storage/framework/.gitignore b/api/storage/framework/.gitignore similarity index 100% rename from storage/framework/.gitignore rename to api/storage/framework/.gitignore diff --git a/storage/framework/cache/.gitignore b/api/storage/framework/cache/.gitignore similarity index 100% rename from storage/framework/cache/.gitignore rename to api/storage/framework/cache/.gitignore diff --git a/storage/framework/cache/data/.gitignore b/api/storage/framework/cache/data/.gitignore similarity index 100% rename from storage/framework/cache/data/.gitignore rename to api/storage/framework/cache/data/.gitignore diff --git a/storage/framework/sessions/.gitignore b/api/storage/framework/sessions/.gitignore similarity index 100% rename from storage/framework/sessions/.gitignore rename to api/storage/framework/sessions/.gitignore diff --git a/storage/framework/testing/.gitignore b/api/storage/framework/testing/.gitignore similarity index 100% rename from storage/framework/testing/.gitignore rename to api/storage/framework/testing/.gitignore diff --git a/storage/framework/views/.gitignore b/api/storage/framework/views/.gitignore similarity index 100% rename from storage/framework/views/.gitignore rename to api/storage/framework/views/.gitignore diff --git a/storage/logs/.gitignore b/api/storage/logs/.gitignore similarity index 100% rename from storage/logs/.gitignore rename to api/storage/logs/.gitignore diff --git a/tests/CreatesApplication.php b/api/tests/CreatesApplication.php similarity index 100% rename from tests/CreatesApplication.php rename to api/tests/CreatesApplication.php diff --git a/tests/Feature/UsersTest.php b/api/tests/Feature/UsersTest.php similarity index 100% rename from tests/Feature/UsersTest.php rename to api/tests/Feature/UsersTest.php diff --git a/tests/TestCase.php b/api/tests/TestCase.php similarity index 100% rename from tests/TestCase.php rename to api/tests/TestCase.php diff --git a/tests/Unit/UserTest.php b/api/tests/Unit/UserTest.php similarity index 100% rename from tests/Unit/UserTest.php rename to api/tests/Unit/UserTest.php