mathieu/CAU-Web-Fall-2018-Project-1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Work in part

Browse Source
This commit is contained in:
Mathieu Sanchez
2018-12-15 14:50:08 +09:00
parent 46be9eb7f4
commit 2a1c7da008
10 changed files with 1091 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/API/APIMuscles.php Normal file
View File

@ -0,0 +1,54 @@
<?php
namespace WebProjectFitness\API;
use WebProjectFitness\Model\BDD;
use WebProjectFitness\Model\BDTables;
class APIMuscles extends API {
private $declaredFunctions = [
'get-list' => [
'method' => 'POST',
'params' => [
'muscle' => [
'require' => true,
'type' => 'string'
]
]
],
'get-exercise' => [
'method' => 'POST',
'params' => [
'id' => [
'required' => true,
'type' => 'int'
]
]
]
];
public function __construct() {
parent::__construct( $this->declaredFunctions );
}
public function getList( $data ) {
$query = "SELECT " . BDTables::EXERCISE . ".id, title FROM " . BDTables::EXERCISE .
" LEFT JOIN " . BDTables::MUSCLES . " ON " . BDTables::MUSCLES . ".id = " . BDTables::EXERCISE . ".muscle
WHERE " . BDTables::MUSCLES . ".muscle = :muscle";
$query = BDD::instance()->prepare( $query );
$query->execute( $data );
$this->returnJson( json_encode( $query->fetchAll() ) );
}
public function getExercise( $data ) {
$query = "SELECT `title`, `video`, `description` FROM " . BDTables::EXERCISE .
" WHERE `id` = :id";
$query = BDD::instance()->prepare( $query );
$query->execute( $data );
$this->returnJson( json_encode( $query->fetch() ) );
}
}

66
src/API/APIUser.php
View File

@ -5,14 +5,12 @@ namespace WebProjectFitness\API;
use WebProjectFitness\Model\BDTables;
use WebProjectFitness\Model\Model;
class APIUser extends API
{
class APIUser extends API {
private $declaredFunctions = [
'create' => [
'method' => 'POST',
'params' => [
]
'params' => []
],
'modify' => [
'method' => 'POST',
@ -105,68 +103,58 @@ class APIUser extends API
]
]
]
];
public function __construct()
{
parent::__construct($this->declaredFunctions);
public function __construct() {
parent::__construct( $this->declaredFunctions );
}
//functions for user table.
public function create($data)
{
public function create() {
$id = uniqid();
$id = substr($id, 0, 6);
Model::insert(BDTables::USER, [
$id = substr( $id, 0, 6 );
Model::insert( BDTables::USER, [
"name" => "",
"user_id" => $id
]);
$this->returnJson(['id' => $id]);
] );
$this->returnJson( [ 'id' => $id ] );
}
public function modify($data)
{
Model::update(BDTables::USER, ['name' => $data['name']], "user_id", $data['user_id']);
$this->returnJson(['name' => $data['name'], 'id' => $data['user_id']]);
public function modify( $data ) {
Model::update( BDTables::USER, [ 'name' => $data[ 'name' ] ], "user_id", $data[ 'user_id' ] );
$this->returnJson( [ 'name' => $data[ 'name' ], 'id' => $data[ 'user_id' ] ] );
}
//Functions for favorite table.
public function favoriteAdd($data)
{
Model::insert(BDTables::FAVORITE, ['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise']]);
$this->returnJson(['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise']]);
public function favoriteAdd( $data ) {
Model::insert( BDTables::FAVORITE, [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ] ] );
$this->returnJson( [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ] ] );
}
public function favoriteDelete($data)
{
Model::delete(BDTables::FAVORITE, ['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise']]);
$this->returnJson(['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise']]);
public function favoriteDelete( $data ) {
Model::delete( BDTables::FAVORITE, [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ] ] );
$this->returnJson( [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ] ] );
}
//functions for training table
public function trainingAdd($data)
{
Model::insert(BDTables::TRAINING, ['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise'], 'id_order' => $data['id_order']]);
$this->returnJson(['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise'], 'id_order' => $data['id_order']]);
public function trainingAdd( $data ) {
Model::insert( BDTables::TRAINING, [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ], 'id_order' => $data[ 'id_order' ] ] );
$this->returnJson( [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ], 'id_order' => $data[ 'id_order' ] ] );
}
public function trainingDelete($data)
{
Model::delete(BDTables::TRAINING, ['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise'], 'id_order' => $data['id_order']]);
public function trainingDelete( $data ) {
Model::delete( BDTables::TRAINING, [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ], 'id_order' => $data[ 'id_order' ] ] );
$this->returnJson(['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise'], 'id_order' => $data['id_order']]);
$this->returnJson( [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ], 'id_order' => $data[ 'id_order' ] ] );
}
public function trainingChangeOrder($data)
{
Model::update_order(BDTables::TRAINING, ['id_user' => $data['id_user'], 'id_order' => $data['id_order'], 'id_exercise' => $data['id_exercise'] ], $data['new_order']);
public function trainingChangeOrder( $data ) {
Model::update_order( BDTables::TRAINING, [ 'id_user' => $data[ 'id_user' ], 'id_order' => $data[ 'id_order' ], 'id_exercise' => $data[ 'id_exercise' ] ], $data[ 'new_order' ] );
$this->returnJson(['id_user' => $data['id_user'], 'id_exercise' => $data['id_exercise'], 'id_order' => $data['id_order'], 'new_order' => $data['new_order']]);
$this->returnJson( [ 'id_user' => $data[ 'id_user' ], 'id_exercise' => $data[ 'id_exercise' ], 'id_order' => $data[ 'id_order' ], 'new_order' => $data[ 'new_order' ] ] );
}
}

1
src/Model/BDTables.php
View File

@ -12,6 +12,7 @@ abstract class BDTables {
const FAVORITE = "favorite";
const EXERCISE = "exercise";
const TRAINING = "training";
const MUSCLES = "muscles";
}
?>

4
src/Model/Model.php
View File

@ -46,7 +46,7 @@ class Model {
$req->execute( $data );
}
public static function delete (string $tableName, array $data){
public static function delete( string $tableName, array $data ) {
$reqStr = 'DELETE FROM ' . $tableName . ' WHERE ';
$lastKey = endKey( $data );
foreach ( $data as $key => $value ) {
@ -63,7 +63,7 @@ class Model {
}
public static function update_order( string $tableName, array $data, string $newOrder) {
public static function update_order( string $tableName, array $data, string $newOrder ) {
$reqStr = 'UPDATE ' . $tableName . ' SET id_order = :newOrder WHERE ';
$lastKey = endKey( $data );
foreach ( $data as $key => $value ) {

17
src/View/Site/Index.php
View File

@ -2,7 +2,7 @@
<div class="col l3 m4 s6 green lighten-1 white-text" style="height: 750px;">
<div class="row">
<div class="col s12 center-align">
<h5>Selected part of the body</h5>
<h5 id="exercise-title">Selected part of the body</h5>
</div>
<div class="col s12" id="point-container">
<img src="/img/muscles.jpg" style="width: 100%;">
@ -10,22 +10,15 @@
<div class="col s12" id="list-exercices-select-part">
<div class="container">
<h5>Exercise List</h5>
<div>Please select a muscle</div>
<div id="exercises-container">
<div>Please select a muscle</div>
</div>
</div>
</div>
</div>
</div>
<div class="col l9 m8 s6">
<div class="container">
<h2>Title</h2>
<div class="center-align">
<!-- <iframe width="560" height="315" src="https://www.youtube.com/embed/1gLmEOSwQMs" frameborder="0"-->
<!-- allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture"-->
<!-- allowfullscreen></iframe>-->
<div class="exercise-info-container blue-grey lighten-4 left-align">
Test
</div>
</div>
<div class="container" id="main-container">
</div>
</div>
</div>

18
src/View/Site/tpl/footer.php
View File

@ -1,5 +1,23 @@
</main>
<div id="modal" class="md-modal">
<div class="md-content">
<h3 class="md-header md-title"></h3>
<div class="md-container row">
</div>
<div class="md-footer">
<a class="waves-effect waves-green btn-flat" id="md-validate">Validate</a>
<a class="waves-effect waves-red btn-flat" id="md-cancel">Cancel</a>
</div>
</div>
</div>
<div class="md-overlay"></div>
<footer class="page-footer green darken-3">
<div class="footer-copyright">
<div class="container">

5
src/View/Site/tpl/head.php
View File

@ -25,6 +25,7 @@
<link href='https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700%7CRoboto+Condensed:400,700%7CMaterial+Icons'
rel='stylesheet' type='text/css'>
<link href="/css/materialize.min.css" rel="stylesheet">
<link href="/css/modal.css" rel="stylesheet">
<link href="/css/style.css?v=<?= WebProjectFitness\Config::SITE_CSS_VERSION ?>" rel="stylesheet">
@ -43,7 +44,7 @@
<body class="grey lighten-4">
<ul id="user" class="dropdown-content">
<li><a>Your Account</a></li>
<li><a id="change-name">Change Your Name</a></li>
<li class="divider"></li>
<li><a>Your Saved Exercises</a></li>
<li class="divider"></li>
@ -59,7 +60,7 @@
<ul class="right hide-on-med-and-down">
<li>
<a class="dropdown-trigger" data-target="user">Name Of The Account<i class="material-icons right">arrow_drop_down</i></a>
<a class="dropdown-trigger" data-target="user">Your Account<i class="material-icons right">arrow_drop_down</i></a>
</li>
</ul>
</div>