Skip to content

Commit

Permalink
change Kendo reference to Laravel
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Cappiello committed Aug 25, 2017
1 parent 60f5931 commit b6687a1
Show file tree
Hide file tree
Showing 61 changed files with 148 additions and 150 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Contributions are **welcome** and will be fully **credited**.

We accept contributions via pull requests via
[Github](https://github.com/xoco70/kendo-tournaments).
[Github](https://github.com/xoco70/laravel-tournaments).

1. Fork the project.
2. Create your bugfix/feature branch and write your (well-commented) code.
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@


<p align="center">
<a href="https://scrutinizer-ci.com/g/xoco70/kendo-tournaments/?branch=master"><img src="https://camo.githubusercontent.com/d3f5c9de8adbb7fc3c18e44640c205c9d105f0ec/68747470733a2f2f7363727574696e697a65722d63692e636f6d2f672f786f636f37302f6b656e646f2d746f75726e616d656e74732f6261646765732f7175616c6974792d73636f72652e706e673f623d6d6173746572" alt="Scrutinizer Code Quality" data-canonical-src="https://scrutinizer-ci.com/g/xoco70/kendo-tournaments/badges/quality-score.png?b=master" style="max-width:100%;"></a>
<a href="https://scrutinizer-ci.com/g/xoco70/laravel-tournaments/?branch=master"><img src="https://camo.githubusercontent.com/d3f5c9de8adbb7fc3c18e44640c205c9d105f0ec/68747470733a2f2f7363727574696e697a65722d63692e636f6d2f672f786f636f37302f6b656e646f2d746f75726e616d656e74732f6261646765732f7175616c6974792d73636f72652e706e673f623d6d6173746572" alt="Scrutinizer Code Quality" data-canonical-src="https://scrutinizer-ci.com/g/ xoco70/laravel-tournaments/badges/quality-score.png?b=master" style="max-width:100%;"></a>
<a href="https://opensource.org/licenses/MIT"><img src="https://camo.githubusercontent.com/28ddbec0801282129302d6a51a9dd09b4c09c438/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4c6963656e73652d4d49542d627269676874677265656e2e7376673f7374796c653d666c61742d737175617265" alt="License: MIT" data-canonical-src="https://img.shields.io/badge/License-MIT-brightgreen.svg?style=flat-square" style="max-width:100%;"></a>
<a href="https://scrutinizer-ci.com/g/xoco70/kendo-tournaments/badges/build.png?b=master"><img src="https://camo.githubusercontent.com/e1471ee47a70cb9663eb9f8b71707718451e83cc/68747470733a2f2f7363727574696e697a65722d63692e636f6d2f672f786f636f37302f6b656e646f2d746f75726e616d656e74732f6261646765732f6275696c642e706e673f623d6d6173746572" alt="Build Status" data-canonical-src="https://scrutinizer-ci.com/g/xoco70/kendo-tournaments/badges/build.png?b=master" style="max-width:100%;"></a>
<a href="https://scrutinizer-ci.com/g/xoco70/kendo-tournaments/?branch=master"><img src="https://camo.githubusercontent.com/49b2a16d45e04d814850ed43ea432aea6d623121/68747470733a2f2f7363727574696e697a65722d63692e636f6d2f672f786f636f37302f6b656e646f2d746f75726e616d656e74732f6261646765732f636f7665726167652e706e673f623d6d6173746572" alt="Code Coverage" data-canonical-src="https://scrutinizer-ci.com/g/xoco70/kendo-tournaments/badges/coverage.png?b=master" style="max-width:100%;"></a>
<a href="https://scrutinizer-ci.com/g/xoco70/laravel-tournaments/badges/build.png?b=master"><img src="https://camo.githubusercontent.com/e1471ee47a70cb9663eb9f8b71707718451e83cc/68747470733a2f2f7363727574696e697a65722d63692e636f6d2f672f786f636f37302f6b656e646f2d746f75726e616d656e74732f6261646765732f6275696c642e706e673f623d6d6173746572" alt="Build Status" data-canonical-src="https://scrutinizer-ci.com/g/xoco70/laravel-tournaments/badges/build.png?b=master" style="max-width:100%;"></a>
<a href="https://scrutinizer-ci.com/g/xoco70/laravel-tournaments/?branch=master"><img src="https://camo.githubusercontent.com/49b2a16d45e04d814850ed43ea432aea6d623121/68747470733a2f2f7363727574696e697a65722d63692e636f6d2f672f786f636f37302f6b656e646f2d746f75726e616d656e74732f6261646765732f636f7665726167652e706e673f623d6d6173746572" alt="Code Coverage" data-canonical-src="https://scrutinizer-ci.com/g/xoco70/laravel-tournaments/badges/coverage.png?b=master" style="max-width:100%;"></a>
</p>
<h1 align="center">
<br>
Expand Down Expand Up @@ -61,7 +61,7 @@ Then, update `config/app.php` by adding an entry for the service provider.
```php
'providers' => [
// ...
Xoco70\KendoTournaments\TournamentsServiceProvider::class,
Xoco70\LaravelTournaments\TournamentsServiceProvider::class,
];
```

Expand All @@ -86,7 +86,7 @@ php artisan db:seed --class=LaravelTournamentSeeder

```

You will be able to access the demo at `http:https://yourdomain.com/kendo-tournaments`
You will be able to access the demo at `http:https://yourdomain.com/laravel-tournaments`


## Run Functional Tests
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
],
"autoload": {
"psr-4": {
"Xoco70\\KendoTournaments\\": "src"
" Xoco70\\LaravelTournaments\\": "src"
},
"classmap": [
"src/"
]
},
"autoload-dev": {
"psr-4": {
"Xoco70\\KendoTournaments\\Tests\\": "tests"
" Xoco70\\LaravelTournaments\\Tests\\": "tests"
},
"classmap": [
"tests",
Expand All @@ -32,7 +32,7 @@
"extra": {
"laravel": {
"providers": [
"Xoco70\\KendoTournaments\\TournamentServiceProvider"
" Xoco70\\LaravelTournaments\\TournamentServiceProvider"
]
}
},
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion database/factories/CategoryFactory.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php


use Xoco70\KendoTournaments\Models\Category as Cat;
use Xoco70\LaravelTournaments\Models\Category as Cat;

$factory->define(Cat::class, function (Faker\Generator $faker) {
$name = ['categories.junior',
Expand Down
6 changes: 3 additions & 3 deletions database/factories/ChampionshipFactory.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php


use Xoco70\KendoTournaments\Models\Category as Cat;
use Xoco70\KendoTournaments\Models\Championship;
use Xoco70\KendoTournaments\Models\Tournament;
use Xoco70\LaravelTournaments\Models\Category as Cat;
use Xoco70\LaravelTournaments\Models\Championship;
use Xoco70\LaravelTournaments\Models\Tournament;

$factory->define(Championship::class, function (Faker\Generator $faker) {
$tournaments = Tournament::all()->pluck('id')->toArray();
Expand Down
4 changes: 2 additions & 2 deletions database/factories/ChampionshipSettingsFactory.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php


use Xoco70\KendoTournaments\Models\Championship;
use Xoco70\KendoTournaments\Models\ChampionshipSettings;
use Xoco70\LaravelTournaments\Models\Championship;
use Xoco70\LaravelTournaments\Models\ChampionshipSettings;

$factory->define(ChampionshipSettings::class, function (Faker\Generator $faker) use ($factory) {
$tcs = Championship::all()->pluck('id')->toArray();
Expand Down
4 changes: 2 additions & 2 deletions database/factories/CompetitorFactory.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

use Illuminate\Foundation\Auth\User;
use Xoco70\KendoTournaments\Models\Championship;
use Xoco70\KendoTournaments\Models\Competitor;
use Xoco70\LaravelTournaments\Models\Championship;
use Xoco70\LaravelTournaments\Models\Competitor;

$factory->define(Competitor::class, function(Faker\Generator $faker) {
$tcs = Championship::all()->pluck('id')->toArray();
Expand Down
2 changes: 1 addition & 1 deletion database/factories/TeamFactory.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use Xoco70\KendoTournaments\Models\Team;
use Xoco70\LaravelTournaments\Models\Team;
$factory->define(Team::class, function (Faker\Generator $faker) {

return [
Expand Down
4 changes: 2 additions & 2 deletions database/factories/TournamentFactory.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

use Illuminate\Foundation\Auth\User;
use Xoco70\KendoTournaments\Models\Tournament;
use Xoco70\KendoTournaments\Models\Venue;
use Xoco70\LaravelTournaments\Models\Tournament;
use Xoco70\LaravelTournaments\Models\Venue;

$factory->define(Tournament::class, function (Faker\Generator $faker) {
$users = User::all()->pluck('id')->toArray();
Expand Down
2 changes: 1 addition & 1 deletion database/factories/VenueFactory.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

use Xoco70\KendoTournaments\Models\Venue;
use Xoco70\LaravelTournaments\Models\Venue;

$factory->define(Venue::class, function (Faker\Generator $faker) {
return [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Illuminate\Database\Migrations\Migration;
use \Xoco70\KendoTournaments\DBHelpers;
use \Xoco70\LaravelTournaments\DBHelpers;
class AddUsersFieldsTable extends Migration
{
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\DB;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateTournamentTable extends Migration
{
Expand All @@ -24,7 +24,7 @@ public function up()
$table->date('dateIni');
$table->date('dateFin');
$table->date('registerDateLimit');
$table->integer('sport')->unsigned()->default(1); // Default is Kendo for now
$table->integer('sport')->unsigned()->default(1);
$table->string('promoter')->nullable();
$table->string('host_organization')->nullable();
$table->string('technical_assistance')->nullable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateCategoryTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateChampionshipSettingsTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Kalnoy\Nestedset\NestedSet;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateFightersGroupTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateFightTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateTeamTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateFightersGroupCompetitorTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateFightersGroupTeamTable extends Migration
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class CreateCompetitorTeamTable extends Migration
{
Expand Down
2 changes: 1 addition & 1 deletion database/seeds/CategorySeeder.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

use Illuminate\Database\Seeder;
use Xoco70\KendoTournaments\Models\Category;
use Xoco70\LaravelTournaments\Models\Category;

class CategorySeeder extends Seeder
{
Expand Down
4 changes: 2 additions & 2 deletions database/seeds/CompetitorSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

use Illuminate\Database\Seeder;
use Illuminate\Foundation\Auth\User;
use Xoco70\KendoTournaments\Models\Championship;
use Xoco70\KendoTournaments\Models\Competitor;
use Xoco70\LaravelTournaments\Models\Championship;
use Xoco70\LaravelTournaments\Models\Competitor;

class CompetitorSeeder extends Seeder
{
Expand Down
2 changes: 1 addition & 1 deletion database/seeds/LaravelTournamentSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
use Xoco70\KendoTournaments\DBHelpers;
use Xoco70\LaravelTournaments\DBHelpers;

class LaravelTournamentSeeder extends Seeder
{
Expand Down
6 changes: 3 additions & 3 deletions database/seeds/TournamentSeeder.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php

use Illuminate\Database\Seeder;
use Xoco70\KendoTournaments\Models\Championship;
use Xoco70\KendoTournaments\Models\Tournament;
use Xoco70\KendoTournaments\Models\Venue;
use Xoco70\LaravelTournaments\Models\Championship;
use Xoco70\LaravelTournaments\Models\Tournament;
use Xoco70\LaravelTournaments\Models\Venue;

class TournamentSeeder extends Seeder
{
Expand Down
2 changes: 1 addition & 1 deletion database/seeds/VenueSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
use Xoco70\KendoTournaments\Models\Venue;
use Xoco70\LaravelTournaments\Models\Venue;

class VenueSeeder extends Seeder
{
Expand Down
8 changes: 3 additions & 5 deletions resources/views/partials/settings.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class="form-settings">

<div class="col-lg-3">
<div class="form-group">
<label for="preliminaryGroupSize">{{trans('kendo-tournaments::categories.preliminaryGroupSize')}}</label>
<label for="preliminaryGroupSize">{{trans('laravel-tournaments::categories.preliminaryGroupSize')}}</label>
<select class="form-control" id="preliminaryGroupSize" name="preliminaryGroupSize">
<option value="3" @if ($setting->preliminaryGroupSize == 3) selected @endif>3</option>
<option value="4" @if ($setting->preliminaryGroupSize == 4) selected @endif>4</option>
Expand Down Expand Up @@ -53,16 +53,14 @@ class="form-settings">

<label for="treeType">Tree Type</label>
<select class="form-control" id="treeType" name="treeType">
{{--<option value="0"--}}
{{--@if ($setting->treeType == 0) selected @endif >{{ trans('kendo-tournaments::categories.roundRobin') }}</option>--}}
<option value="1"
@if ($setting->treeType == 1) selected @endif>{{ trans('kendo-tournaments::categories.direct_elimination') }}</option>
@if ($setting->treeType == 1) selected @endif>{{ trans('laravel-tournaments::categories.direct_elimination') }}</option>
</select>
</div>

<div class="col-lg-2">

<label for="fightingAreas">{{ trans_choice('kendo-tournaments::categories.fightingArea',2) }}</label>
<label for="fightingAreas">{{ trans_choice('laravel-tournaments::categories.fightingArea',2) }}</label>
<select class="form-control" id="fightingAreas" name="fightingAreas">
<option value="1" @if ($setting->fightingAreas == 1) selected @endif>1</option>
<option value="2" @if ($setting->fightingAreas == 2) selected @endif>2</option>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/partials/tree/directElimination.blade.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
use Xoco70\KendoTournaments\TreeGen\CreateDirectEliminationTree;
use Xoco70\LaravelTournaments\TreeGen\CreateDirectEliminationTree;
$directEliminationTree = $championship->fightersGroups->where('round', '>=', $hasPreliminary + 1)->groupBy('round');
if (sizeof($directEliminationTree) > 0) {
Expand Down Expand Up @@ -27,10 +27,10 @@
<div class="match-wrapper"
style="top: {{ $match['matchWrapperTop'] }}px; left: {{ $match['matchWrapperLeft'] }}px; width: {{ $treeGen->matchWrapperWidth }}px;">
<input type="text"
class="score"> @include('kendo-tournaments::partials.tree.brackets.playerList', ['selected' => $match['playerA'], 'numRound' => $round])
class="score"> @include('laravel-tournaments::partials.tree.brackets.playerList', ['selected' => $match['playerA'], 'numRound' => $round])
<div class="match-divider"></div>
<input type="text"
class="score"> @include('kendo-tournaments::partials.tree.brackets.playerList', ['selected' => $match['playerB'], 'numRound' => $round])
class="score"> @include('laravel-tournaments::partials.tree.brackets.playerList', ['selected' => $match['playerB'], 'numRound' => $round])
</div>

@if ($roundNumber != $treeGen->noRounds)
Expand Down
4 changes: 2 additions & 2 deletions resources/views/partials/tree/preliminary.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
<td class="p-10 text-center">{{$group->area}}</td>
@foreach ($fighters as $fighter)
<td class="p-10">{{ $letter++ }}</td>
<td class="p-10">@include('kendo-tournaments::partials.tree.brackets.playerList', ['selected' => $fighter,'numRound' => 1])</td>
<td class="p-10">@include('laravel-tournaments::partials.tree.brackets.playerList', ['selected' => $fighter,'numRound' => 1])</td>
@endforeach
</tr>
@endforeach
</table><br/>
@endforeach

@include('kendo-tournaments::partials.tree.directElimination', ['hasPreliminary' => 1])
@include('laravel-tournaments::partials.tree.directElimination', ['hasPreliminary' => 1])

Loading

0 comments on commit b6687a1

Please sign in to comment.