add api

plugins/ahmadfatoni/apigenerator/controllers/api/StrukturaSentraController.php

@@ -0,0 +1,99 @@
+<?php namespace AhmadFatoni\ApiGenerator\Controllers\API;
+
+use Cms\Classes\Controller;
+use BackendMenu;
+
+use Illuminate\Http\Request;
+use AhmadFatoni\ApiGenerator\Helpers\Helpers;
+use Illuminate\Support\Facades\Validator;
+use Atash\Slider\Models\StrukturaSentra;
+class StrukturaSentraController extends Controller
+{
+	protected $StrukturaSentra;
+
+    protected $helpers;
+
+    public function __construct(StrukturaSentra $StrukturaSentra, Helpers $helpers)
+    {
+        parent::__construct();
+        $this->StrukturaSentra    = $StrukturaSentra;
+        $this->helpers          = $helpers;
+    }
+
+    public function index(){
+
+        $data = $this->StrukturaSentra->all()->toArray();
+
+        return $this->helpers->apiArrayResponseBuilder(200, 'success', $data);
+    }
+
+    public function show($id){
+
+        $data = $this->StrukturaSentra::find($id);
+
+        if ($data){
+            return $this->helpers->apiArrayResponseBuilder(200, 'success', [$data]);
+        } else {
+            $this->helpers->apiArrayResponseBuilder(404, 'not found', ['error' => 'Resource id=' . $id . ' could not be found']);
+        }
+
+    }
+
+    public function store(Request $request){
+
+    	$arr = $request->all();
+
+        while ( $data = current($arr)) {
+            $this->StrukturaSentra->{key($arr)} = $data;
+            next($arr);
+        }
+
+        $validation = Validator::make($request->all(), $this->StrukturaSentra->rules);
+        
+        if( $validation->passes() ){
+            $this->StrukturaSentra->save();
+            return $this->helpers->apiArrayResponseBuilder(201, 'created', ['id' => $this->StrukturaSentra->id]);
+        }else{
+            return $this->helpers->apiArrayResponseBuilder(400, 'fail', $validation->errors() );
+        }
+
+    }
+
+    public function update($id, Request $request){
+
+        $status = $this->StrukturaSentra->where('id',$id)->update($data);
+    
+        if( $status ){
+            
+            return $this->helpers->apiArrayResponseBuilder(200, 'success', 'Data has been updated successfully.');
+
+        }else{
+
+            return $this->helpers->apiArrayResponseBuilder(400, 'bad request', 'Error, data failed to update.');
+
+        }
+    }
+
+    public function delete($id){
+
+        $this->StrukturaSentra->where('id',$id)->delete();
+
+        return $this->helpers->apiArrayResponseBuilder(200, 'success', 'Data has been deleted successfully.');
+    }
+
+    public function destroy($id){
+
+        $this->StrukturaSentra->where('id',$id)->delete();
+
+        return $this->helpers->apiArrayResponseBuilder(200, 'success', 'Data has been deleted successfully.');
+    }
+
+
+    public static function getAfterFilters() {return [];}
+    public static function getBeforeFilters() {return [];}
+    public static function getMiddleware() {return [];}
+    public function callAction($method, $parameters=false) {
+        return call_user_func_array(array($this, $method), $parameters);
+    }
+    
+}

plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php

@@ -24,7 +24,7 @@ class postsController extends Controller
 
         // $data = $this->Post->all()->toArray(); 
 
-        $data = $this->Post::with(['translations:locale,model_id,attribute_data','categories','featured_images'])->get();
+        $data = $this->Post::with(['translations:locale,model_id,attribute_data','categories','featured_images'])->paginate(6);
 
         return $this->helpers->apiArrayResponseBuilder(200, 'success', $data);
     }

plugins/ahmadfatoni/apigenerator/routes.php

@@ -14,3 +14,5 @@ Route::get('api/v1/posts/{id}/delete', ['as' => 'api/v1/posts.delete', 'uses' =>
 Route::resource('api/v1/categories', 'AhmadFatoni\ApiGenerator\Controllers\API\categoriesController', ['except' => ['destroy', 'create', 'edit','show']]);
 Route::get('api/v1/categories/{id}', ['as' => 'api/v1/categories.show', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\API\categoriesController@show']);
 Route::get('api/v1/categories/{id}/delete', ['as' => 'api/v1/categories.delete', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\API\categoriesController@destroy']);
+Route::resource('api/v1/struktura_sentra', 'AhmadFatoni\ApiGenerator\Controllers\API\StrukturaSentraController', ['except' => ['destroy', 'create', 'edit']]);
+Route::get('api/v1/struktura_sentra/{id}/delete', ['as' => 'api/v1/struktura_sentra.delete', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\API\StrukturaSentraController@destroy']);

plugins/atash/slider/controllers/StrukturaSentraController.php

@@ -0,0 +1,19 @@
+<?php namespace Atash\Slider\Controllers;
+
+use Backend\Classes\Controller;
+use BackendMenu;
+
+class StrukturaSentraController extends Controller
+{
+    public $implement = [        'Backend\Behaviors\ListController',        'Backend\Behaviors\FormController',        'Backend\Behaviors\ReorderController'    ];
+    
+    public $listConfig = 'config_list.yaml';
+    public $formConfig = 'config_form.yaml';
+    public $reorderConfig = 'config_reorder.yaml';
+
+    public function __construct()
+    {
+        parent::__construct();
+        BackendMenu::setContext('Atash.Slider', 'main-menu-item', 'side-menu-item');
+    }
+}

plugins/atash/slider/controllers/strukturasentracontroller/_list_toolbar.htm

@@ -0,0 +1,19 @@
+<div data-control="toolbar">
+        <a href="<?= Backend::url('atash/slider/strukturasentracontroller/create') ?>" class="btn btn-primary oc-icon-plus"><?= e(trans('backend::lang.form.create')) ?></a>
+            <a href="<?= Backend::url('atash/slider/strukturasentracontroller/reorder') ?>" class="btn btn-default oc-icon-list"><?= e(trans('backend::lang.reorder.default_title')) ?></a>
+        <button
+        class="btn btn-default oc-icon-trash-o"
+        disabled="disabled"
+        onclick="$(this).data('request-data', {
+            checked: $('.control-list').listWidget('getChecked')
+        })"
+        data-request="onDelete"
+        data-request-confirm="<?= e(trans('backend::lang.list.delete_selected_confirm')) ?>"
+        data-trigger-action="enable"
+        data-trigger=".control-list input[type=checkbox]"
+        data-trigger-condition="checked"
+        data-request-success="$(this).prop('disabled', true)"
+        data-stripe-load-indicator>
+        <?= e(trans('backend::lang.list.delete_selected')) ?>
+    </button>
+</div>

plugins/atash/slider/controllers/strukturasentracontroller/_reorder_toolbar.htm

@@ -0,0 +1,3 @@
+<div data-control="toolbar">
+    <a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>" class="btn btn-primary oc-icon-caret-left"><?= e(trans('backend::lang.form.return_to_list')) ?></a>
+</div>

plugins/atash/slider/controllers/strukturasentracontroller/config_form.yaml

@@ -0,0 +1,10 @@
+name: StrukturaSentraController
+form: $/atash/slider/models/strukturasentra/fields.yaml
+modelClass: Atash\Slider\Models\StrukturaSentra
+defaultRedirect: atash/slider/strukturasentracontroller
+create:
+    redirect: 'atash/slider/strukturasentracontroller/update/:id'
+    redirectClose: atash/slider/strukturasentracontroller
+update:
+    redirect: atash/slider/strukturasentracontroller
+    redirectClose: atash/slider/strukturasentracontroller

plugins/atash/slider/controllers/strukturasentracontroller/config_list.yaml

@@ -0,0 +1,12 @@
+list: $/atash/slider/models/strukturasentra/columns.yaml
+modelClass: Atash\Slider\Models\StrukturaSentra
+title: StrukturaSentraController
+noRecordsMessage: 'backend::lang.list.no_records'
+showSetup: true
+showCheckboxes: true
+recordsPerPage: 20
+toolbar:
+    buttons: list_toolbar
+    search:
+        prompt: 'backend::lang.list.search_prompt'
+recordUrl: 'atash/slider/strukturasentracontroller/update/:id'

plugins/atash/slider/controllers/strukturasentracontroller/config_reorder.yaml

@@ -0,0 +1,4 @@
+title: StrukturaSentraController
+modelClass: Atash\Slider\Models\StrukturaSentra
+toolbar:
+    buttons: reorder_toolbar

plugins/atash/slider/controllers/strukturasentracontroller/create.htm

@@ -0,0 +1,46 @@
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>">StrukturaSentraController</a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?= Form::open(['class' => 'layout']) ?>
+
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+
+        <div class="form-buttons">
+            <div class="loading-indicator-container">
+                <button
+                    type="submit"
+                    data-request="onSave"
+                    data-hotkey="ctrl+s, cmd+s"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    class="btn btn-primary">
+                    <?= e(trans('backend::lang.form.create')) ?>
+                </button>
+                <button 
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="close:1"
+                    data-hotkey="ctrl+enter, cmd+enter"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    class="btn btn-default">
+                    <?= e(trans('backend::lang.form.create_and_close')) ?>
+                </button>
+                <span class="btn-text">
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
+                </span>
+            </div>
+        </div>
+
+    <?= Form::close() ?>
+
+<?php else: ?>
+    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+    <p><a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
+<?php endif ?>

plugins/atash/slider/controllers/strukturasentracontroller/index.htm

@@ -0,0 +1 @@
+<?= $this->listRender() ?>

plugins/atash/slider/controllers/strukturasentracontroller/preview.htm

@@ -0,0 +1,22 @@
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>">StrukturaSentraController</a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <div class="form-preview">
+        <?= $this->formRenderPreview() ?>
+    </div>
+
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+<?php endif ?>
+
+<p>
+    <a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>" class="btn btn-default oc-icon-chevron-left">
+        <?= e(trans('backend::lang.form.return_to_list')) ?>
+    </a>
+</p>

plugins/atash/slider/controllers/strukturasentracontroller/reorder.htm

@@ -0,0 +1,8 @@
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>">StrukturaSentraController</a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?= $this->reorderRender() ?>

plugins/atash/slider/controllers/strukturasentracontroller/update.htm

@@ -0,0 +1,54 @@
+<?php Block::put('breadcrumb') ?>
+    <ul>
+        <li><a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>">StrukturaSentraController</a></li>
+        <li><?= e($this->pageTitle) ?></li>
+    </ul>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+
+    <?= Form::open(['class' => 'layout']) ?>
+
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+
+        <div class="form-buttons">
+            <div class="loading-indicator-container">
+                <button
+                    type="submit"
+                    data-request="onSave"
+                    data-request-data="redirect:0"
+                    data-hotkey="ctrl+s, cmd+s"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    class="btn btn-primary">
+                    <?= e(trans('backend::lang.form.save')) ?>
+                </button>
+                <button
+                    type="button"
+                    data-request="onSave"
+                    data-request-data="close:1"
+                    data-hotkey="ctrl+enter, cmd+enter"
+                    data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                    class="btn btn-default">
+                    <?= e(trans('backend::lang.form.save_and_close')) ?>
+                </button>
+                <button
+                    type="button"
+                    class="oc-icon-trash-o btn-icon danger pull-right"
+                    data-request="onDelete"
+                    data-load-indicator="<?= e(trans('backend::lang.form.deleting')) ?>"
+                    data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')) ?>">
+                </button>
+
+                <span class="btn-text">
+                    <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>"><?= e(trans('backend::lang.form.cancel')) ?></a>
+                </span>
+            </div>
+        </div>
+    <?= Form::close() ?>
+
+<?php else: ?>
+    <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+    <p><a href="<?= Backend::url('atash/slider/strukturasentracontroller') ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')) ?></a></p>
+<?php endif ?>

plugins/atash/slider/models/StrukturaSentra.php

@@ -0,0 +1,29 @@
+<?php namespace Atash\Slider\Models;
+
+use Model;
+
+/**
+ * Model
+ */
+class StrukturaSentra extends Model
+{
+    use \October\Rain\Database\Traits\Validation;
+    
+    /*
+     * Disable timestamps by default.
+     * Remove this line if timestamps are defined in the database table.
+     */
+    public $timestamps = false;
+
+
+    /**
+     * @var string The database table used by the model.
+     */
+    public $table = 'atash_slider_struktura_sentra';
+
+    /**
+     * @var array Validation rules
+     */
+    public $rules = [
+    ];
+}

plugins/atash/slider/models/strukturasentra/columns.yaml

@@ -0,0 +1,13 @@
+columns:
+    id:
+        label: id
+        type: number
+    name:
+        label: name
+        type: text
+    position_held:
+        label: position_held
+        type: text
+    phone:
+        label: phone
+        type: text

plugins/atash/slider/models/strukturasentra/fields.yaml

@@ -0,0 +1,13 @@
+fields:
+    name:
+        label: 'Фамилия, имя, отчество'
+        span: left
+        type: text
+    position_held:
+        label: 'Занимаемая должность'
+        span: left
+        type: text
+    phone:
+        label: 'Рабочий телефон'
+        span: left
+        type: text

plugins/atash/slider/plugin.yaml

@@ -9,3 +9,8 @@ navigation:
         label: Slider
         url: atash/slider/imagecontroller
         icon: icon-image
+        sideMenu:
+            side-menu-item:
+                label: 'Структура центра'
+                url: atash/slider/strukturasentracontroller
+                icon: icon-align-center

plugins/atash/slider/updates/builder_table_create_atash_slider_struktura_sentra.php

@@ -0,0 +1,24 @@
+<?php namespace Atash\Slider\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableCreateAtashSliderStrukturaSentra extends Migration
+{
+    public function up()
+    {
+        Schema::create('atash_slider_struktura_sentra', function($table)
+        {
+            $table->engine = 'InnoDB';
+            $table->increments('id')->unsigned();
+            $table->string('name');
+            $table->string('position_held');
+            $table->string('phone');
+        });
+    }
+    
+    public function down()
+    {
+        Schema::dropIfExists('atash_slider_struktura_sentra');
+    }
+}

plugins/atash/slider/updates/version.yaml

@@ -3,3 +3,6 @@
 1.0.2:
     - 'Created table atash_slider_slider'
     - builder_table_create_atash_slider_slider.php
+1.0.3:
+    - 'Created table atash_slider_struktura_sentra'
+    - builder_table_create_atash_slider_struktura_sentra.php

themes/tps-react/src/components/Global/Nav.js

@@ -38,7 +38,7 @@ function  Nav  ({ t })  {
           <div className="nav-right">
             <ul className="nav-link">
               <li className="nav-link">
-                <Link to="/news">Новости</Link>
+                <Link to="/news">Новос</Link>
               </li>
               <li className="nav-link">
                 <Link to="/etalons">Эталоны</Link>

themes/tps-react/src/pages/Etalon.js

@@ -2,7 +2,7 @@
 import React, { useEffect } from "react";
 import axios from "axios";
 import i18n from '../i18n';
-import '../i18n';
+// import '../i18n';
 import { withTranslation } from 'react-i18next';
 
 // IMPORT COMPONENTS

themes/tps-react/src/pages/Etalons.js

@@ -2,7 +2,7 @@
 import React, { useEffect } from "react";
 import axios from "axios";
 import i18n from '../i18n';
-import '../i18n';
+// import '../i18n';
 import { withTranslation } from 'react-i18next';
 
 // IMPORT COMPONENTS

themes/tps-react/src/pages/Legislation.js

@@ -2,7 +2,7 @@
 import React, { useEffect } from "react";
 import axios from "axios";
 import i18n from '../i18n';
-import '../i18n';
+// import '../i18n';
 import { withTranslation } from 'react-i18next';
 
 // IMPORT COMPONENTS

themes/tps-react/src/pages/Main.js

@@ -1,7 +1,7 @@
 // IMPORT MODULES
 import React from "react";
 import axios from "axios";
-import '../i18n';
+// import '../i18n';
 import { withTranslation } from 'react-i18next';
 
 // IMPORT COMPONENTS
@@ -44,7 +44,7 @@ class Main extends React.Component {
     }
 
     async getTodos() {
-      axios.get('http://217.174.238.204:8888/api/v1/slider')
+      await  axios.get('http://217.174.238.204:8888/api/v1/slider')
         .then(res => {
           const items = res.data;
           this.setState({

themes/tps-react/src/pages/News.js

@@ -3,7 +3,7 @@ import React, { useState, useEffect } from "react";
 import { Link } from "react-router-dom";
 import axios from "axios";
 import i18n from '../i18n';
-import '../i18n';
+// import '../i18n';
 import { withTranslation } from 'react-i18next';
 // IMPORT COMPONENTS
 import Breadcrumb from "../components/Global/Breadcrumb"; 

themes/tps-react/src/pages/Novelty.js

@@ -2,7 +2,7 @@
 import React, { useEffect } from "react";
 import axios from "axios";
 import i18n from '../i18n';
-import '../i18n';
+// import '../i18n';
 import { withTranslation } from 'react-i18next';
 
 // IMPORT COMPONENTS