Skip to content

Commit

Permalink
fix all
Browse files Browse the repository at this point in the history
  • Loading branch information
@3x1io
3x1io committed Jul 28, 2021
1 parent 24b39ba commit 66c1292
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 82 deletions.
8 changes: 5 additions & 3 deletions .idea/workspace.xml
View file

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

59 changes: 4 additions & 55 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,57 +98,6 @@ npm i
```bash
npm run dev
```
8. Go to app/Providers/AppServiceProvider in boot function add this code

```PHP
Config::set('mail.mailers.smtp', [
'transport' => 'smtp',
'host' => setting('email.host'),
'port' => setting('email.port'),
'encryption' => setting('email.encryption'),
'username' => setting('email.username'),
'password' => setting('email.password'),
'timeout' => null,
'auth_mode' => null,
]);

Config::set('mail.from', [
'address' => setting('email.from'),
'name' => setting('email.from.name'),
]);

Config::set('broadcasting.connections.pusher', [
'driver' => 'pusher',
'key' => setting('pusher.key'),
'secret' => setting('pusher.secret'),
'app_id' => setting('pusher.app_id'),
'options' => [
'cluster' => setting('pusher.cluster'),
'useTLS' => true,
],
]);

Config::set('services.messagebird', [
'access_key' => setting('messagebird.access_key'),
'originator' => setting('messagebird.originator'),
'recipients' => setting('messagebird.recipients'),
]);

JavaScript::put([
'pusherKey' => setting('pusher.key'),
]);

if(auth('admin')->user()){
JavaScript::put([
'authId' => auth('admin')->user()->id
]);
}
else {
JavaScript::put([
'authId' => null
]);
}
```

### Generator
you can easy generate CURD operations with controllers and views and routes and every thing with just one command
Expand Down Expand Up @@ -191,9 +140,9 @@ our framework support front theme by easy way you can add a new theme by this wa
```json
{
"name": "3x1 Theme",
"ar": "3x1 ثيم",
"ar": "ثري اكس ون ثيم",
"description": "3x1 Theme Is Default Theme Of 3x1 Framework",
"description_ar": "الثيم الافتراضي",
"description_ar": "الثيم الافتراضي لنطاق عمل 3x1",
"keywords": [],
"aliases": "3x1",
"files": [],
Expand Down Expand Up @@ -229,12 +178,12 @@ you can import and export translation as excel sheet and a new languages by chan

you can access a lot of location features by helper function like
```php
dollar()
dollar($money)
```
it will echo the selected currency IOS with tag `<small>EGP</small>`

### Notifications
you build notification system with **[Pusher](https://pusher.com/)**
you build notification system with **[Laravel Websocket](https://github.com/beyondcode/laravel-websockets)**

to use Notification System
1. create a pusher account
Expand Down
4 changes: 3 additions & 1 deletion database/3x1.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,7 @@ INSERT INTO `languages` (`id`, `iso`, `name`, `arabic`, `created_at`, `updated_a

INSERT INTO `settings` (`id`, `key`, `group`, `value`, `created_at`, `updated_at`) VALUES
(22, 'geo.key', 'geo', 'geo', '2021-04-14 10:55:35', '2021-04-14 10:58:57'),
(23, '$', 'local', '46', '2021-04-14 11:57:13', '2021-04-14 12:26:31'),
(23, '$', 'local', 'EGP', '2021-04-14 11:57:13', '2021-04-14 12:26:31'),
(24, 'local.lang', 'local', '141', '2021-04-14 11:57:28', '2021-04-14 12:26:31'),
(25, 'local.country', 'local', '65', '2021-04-14 11:57:58', '2021-04-14 12:24:55'),
(26, 'local.phone', 'local', '+2', '2021-04-14 11:58:22', '2021-04-14 11:58:22'),
Expand Down Expand Up @@ -3299,3 +3299,5 @@ INSERT INTO `blocks` (`id`, `key`, `html`, `created_at`, `updated_at`) VALUES
(21, 'list.email', '<a :href=\"\'mailto:\'+item.{{$data[\'name\']}}\" class=\"badge badge-primary p-2\"><i class=\"fa fa-envelope\"></i> {{\'{{\'}} item.{{$data[\'name\']}} }}</a>', '2021-07-28 12:25:28', '2021-07-28 12:25:28'),
(22, 'list.phone', '<a :href=\"\'tel:\'+item.{{$data[\'name\']}}\" class=\"badge badge-primary p-2\"><i class=\"fa fa-phone\"></i> {{\'{{\'}} item.{{$data[\'name\']}} }}</a>', '2021-07-28 12:26:49', '2021-07-28 12:26:49'),
(23, 'list.link', '<a href=\"{{$data[\'url\']}}\" @if(sizeof($data[\'options\']) && isset($data[\'options\'][\'target\'])) target=\"{{$data[\'options\'][\'target\']}}\" @endif> {{\'{{\'}} item.{{$data[\'name\']}} }} </a>', '2021-07-28 12:27:25', '2021-07-28 12:27:33');
(24, 'list.date', '<span class=\"badge badge-primary p-2\">\n <i class=\"fa fa-clock-o\"></i> {{\'{{\'}} item.{{$data[\'name\']}} | datetime }}\n</span>', '2021-07-28 13:41:16', '2021-07-28 13:42:21'),
(25, 'list.money', '<h5 class=\"text-{{$data[\'options\'][\'bg\']}}\"><b>{{\'{{\'}} item.{{$data[\'name\']}}.toLocaleString() }}</b><small>{{setting(\'$\')}}</small></h3>', '2021-07-28 13:50:34', '2021-07-28 13:54:56');
43 changes: 21 additions & 22 deletions resources/views/admin/layout/sidebar.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,60 @@
<nav class="sidebar-nav">
<ul class="nav">

<li class="nav-item"><a class="nav-link" href="{{ url('admin') }}"><i class="nav-icon fa fa-home"></i> {{ __('Dashboard') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin') }}"><i class="nav-icon icon-home"></i> {{ __('Dashboard') }}</a></li>
<li class="nav-title">{{ trans('brackets/admin-ui::admin.sidebar.content') }}</li>


<li class="nav-item"><a class="nav-link" href="{{ url('admin/customers') }}"><i class="nav-icon icon-puzzle"></i> {{ trans('admin.customer.title') }}</a></li>
{{-- Do not delete me :) I'm used for auto-generation menu items --}}
<li class="nav-title">{{ trans('brackets/admin-ui::admin.sidebar.settings') }}</li>
<li class="nav-item nav-dropdown">
<a class="nav-link nav-dropdown-toggle " href="#">
<i class="nav-icon fa fa-lock"></i>
<i class="nav-icon icon-lock"></i>
{{ __('Access') }}
</a>
<ul class="nav-dropdown-items">
<li class="nav-item"><a class="nav-link" href="{{ url('admin/admin-users') }}"><i class="nav-icon fa fa-users "></i> {{ __('Manage access') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/roles') }}"><i class="nav-icon fa fa-user-secret"></i> {{ trans('admin.role.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/permissions') }}"><i class="nav-icon fa fa-lock"></i> {{ trans('admin.permission.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/admin-users') }}"><i class="nav-icon icon-user "></i> {{ __('Manage access') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/roles') }}"><i class="nav-icon fa icon-organization"></i> {{ trans('admin.role.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/permissions') }}"><i class="nav-icon fa icon-lock-open"></i> {{ trans('admin.permission.title') }}</a></li>
</ul>
</li>
<li class="nav-item nav-dropdown ">
<a class="nav-link nav-dropdown-toggle " href="#">
<i class="nav-icon fa fa-language"></i>
<i class="nav-icon icon-globe"></i>
{{ __('Localization') }}
</a>
<ul class="nav-dropdown-items">
<li class="nav-item"><a class="nav-link" href="{{ url('admin/localization') }}"><i class="nav-icon fa fa-map"></i> {{ __('Localization Setting') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/translations') }}"><i class="nav-icon fa fa-globe"></i> {{ __('Translations') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/languages') }}"><i class="nav-icon fa fa-language"></i> {{ trans('admin.language.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/countries') }}"><i class="nav-icon fa fa-flag"></i> {{ trans('admin.country.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/cities') }}"><i class="nav-icon fa fa-map-marker"></i> {{ trans('admin.city.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/areas') }}"><i class="nav-icon fa fa-map-pin"></i> {{ trans('admin.area.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/localization') }}"><i class="nav-icon icon-settings"></i> {{ __('Localization Setting') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/translations') }}"><i class="nav-icon icon-speech"></i> {{ __('Translations') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/languages') }}"><i class="nav-icon icon-globe-alt"></i> {{ trans('admin.language.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/countries') }}"><i class="nav-icon icon-flag"></i> {{ trans('admin.country.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/cities') }}"><i class="nav-icon icon-map"></i> {{ trans('admin.city.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/areas') }}"><i class="nav-icon icon-location-pin"></i> {{ trans('admin.area.title') }}</a></li>
</ul>
</li>
<li class="nav-item nav-dropdown ">
<a class="nav-link nav-dropdown-toggle " href="#">
<i class="nav-icon fa fa-bell"></i>
<i class="nav-icon icon-bell"></i>
{{ __('Notification') }}
</a>
<ul class="nav-dropdown-items">
<li class="nav-item"><a class="nav-link" href="{{ url('admin/user-notifications') }}"><i class="nav-icon fa fa-user-circle"></i> {{ trans('admin.user-notification.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/user-notifications') }}"><i class="nav-icon icon-user"></i> {{ trans('admin.user-notification.title') }}</a></li>
</ul>
</li>
<li class="nav-item nav-dropdown ">
<a class="nav-link nav-dropdown-toggle " href="#">
<i class="nav-icon fa fa-google"></i>
<i class="nav-icon icon-social-google"></i>
{{ __('Services') }}
</a>
<ul class="nav-dropdown-items">
<li class="nav-item"><a class="nav-link" href="{{ url('admin/themes') }}"><i class="nav-icon fa fa-paint-brush"></i> {{ __('Themes') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/blocks') }}"><i class="nav-icon fa fa-square"></i> {{ trans('admin.block.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/payment') }}"><i class="nav-icon fa fa-credit-card"></i> {{ __('Payments') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/email') }}"><i class="nav-icon fa fa-envelope"></i> {{ __('Email') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/services') }}"><i class="nav-icon fa fa-amazon"></i> {{ __('Services') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/themes') }}"><i class="nav-icon icon-diamond"></i> {{ __('Themes') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/blocks') }}"><i class="nav-icon icon-bulb"></i> {{ trans('admin.block.title') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/payment') }}"><i class="nav-icon icon-credit-card"></i> {{ __('Payments') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/email') }}"><i class="nav-icon icon-envelope-letter"></i> {{ __('Email') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/services') }}"><i class="nav-icon icon-share"></i> {{ __('Services') }}</a></li>
</ul>
</li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/settings') }}"><i class="nav-icon fa fa-gear"></i> {{ __('Settings') }}</a></li>
<li class="nav-item"><a class="nav-link" href="{{ url('admin/settings') }}"><i class="nav-icon icon-settings"></i> {{ __('Settings') }}</a></li>

{{-- Do not delete me :) I'm also used for auto-generation menu items --}}
</ul>
Expand Down
4 changes: 3 additions & 1 deletion resources/views/components/placeholder.blade.php
View file
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
<h5 class="text-{{$data['options']['bg']}}"><b>{{'{{'}} item.{{$data['name']}}.toLocaleString() }}</b><small>{{setting('$')}}</small></h3>
<span class="badge badge-primary p-2">
<i class="fa fa-clock-o"></i> {{'{{'}} item.{{$data['name']}} | datetime }}
</span>

0 comments on commit 66c1292

Please sign in to comment.