Skip to content

Commit

Permalink
Renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
DSpeichert committed Feb 17, 2014
1 parent a79333f commit 14ff059
Show file tree
Hide file tree
Showing 19 changed files with 27 additions and 387 deletions.
6 changes: 3 additions & 3 deletions app/app.php → DevAAC/DevAAC.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
*/
// Autoload our dependencies with Composer
$loader = require '../vendor/autoload.php';
$loader->setPsr4('App\\', APP_ROOT);
$loader->setPsr4('DevAAC\\', APP_ROOT);

use App\models\Player;
use App\models\Account;
use DevAAC\Models\Player;
use DevAAC\Models\Account;

// Create Slim app
$app = new \Slim\Slim(array(
Expand Down
4 changes: 2 additions & 2 deletions app/models/Account.php → DevAAC/models/Account.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Date: 2/14/14
* Time: 1:33 AM
*/
namespace App\models;
namespace DevAAC\Models;

// https://github.com/illuminate/database/blob/master/Eloquent/Model.php
// https://github.com/otland/forgottenserver/blob/master/schema.sql
Expand All @@ -18,7 +18,7 @@ class Account extends \Illuminate\Database\Eloquent\Model {

public function players()
{
return $this->hasMany('App\models\Player');
return $this->hasMany('DevAAC\Models\Player');
}

public function setPasswordAttribute($pass)
Expand Down
4 changes: 2 additions & 2 deletions app/models/Player.php → DevAAC/models/Player.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Date: 2/14/14
* Time: 1:33 AM
*/
namespace App\models;
namespace DevAAC\Models;

/**
* @SWG\Model()
Expand All @@ -21,7 +21,7 @@ class Player extends \Illuminate\Database\Eloquent\Model {

public function account()
{
return $this->belongsTo('App\models\Account');
return $this->belongsTo('DevAAC\Models\Account');
}

public function setLevelAttribute($level)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Daniel Speichert
Copyright (c) 2014 Daniel Speichert & Wojciech Guziak

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
DUAAC
DevAAC
=====

DU AAC for TFS 1.0
DevAAC for TFS 1.0 by developers.pl

This software is designed to:
* be easy to understand and modify
* provide an example of good programming practices in PHP
* require zero configuration for simple and secure use
* emphasize simplicity and security
* follow [good practices of REST API](http://www.vinaysahni.com/best-practices-for-a-pragmatic-restful-api)
* follow [PSR-2 coding guidelines](http://www.php-fig.org/psr/psr-2/)

Requirements
=====
Expand All @@ -25,3 +25,10 @@ Installation
* Clone this repo
* composer.phar install

Authors
=====
* Don Daniello
* mrwogu
* Znote

Check [LICENSE](LICENSE).
8 changes: 4 additions & 4 deletions plugins/simple.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* Date: 2/15/14
* Time: 9:14 PM
*/
use App\models\Account;
use App\models\Player;
use DevAAC\Models\Account;
use DevAAC\Models\Player;

$app->map('/', function() use($app) {
$view = $app->view();
Expand Down Expand Up @@ -92,13 +92,13 @@
goto render;

// IF ACCOUNT DOES NOT EXIST, CREATE IT NOW
$account = App\models\Account::create( array('name' => $req->post('account-name'),
$account = DevAAC\Models\Account::create( array('name' => $req->post('account-name'),
'password' => $req->post('password'),
'email' => $req->post('email'),
'creation' => time()) );

createcharacter:
$player = new App\models\Player();
$player = new DevAAC\Models\Player();
$player->account()->associate($account);
$player->name = $name;
$player->vocation = $req->post('vocation');
Expand Down
3 changes: 1 addition & 2 deletions public_html/.htaccess
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^/duaac duaac.php [QSA,L]
RewriteRule ^ index.html [L]
RewriteRule ^/duaac index.php [QSA,L]
File renamed without changes.
113 changes: 0 additions & 113 deletions public_html/ember/app.js

This file was deleted.

Loading

0 comments on commit 14ff059

Please sign in to comment.