diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cca0e55..2351f9b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,8 +21,10 @@
-
-
+
+
+
+
@@ -320,7 +322,7 @@
-
+
diff --git a/README.md b/README.md
index e3ba761..129758c 100644
--- a/README.md
+++ b/README.md
@@ -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
@@ -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": [],
@@ -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 `EGP`
### 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
diff --git a/database/3x1.sql b/database/3x1.sql
index d10e0bb..3d3ad03 100644
--- a/database/3x1.sql
+++ b/database/3x1.sql
@@ -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'),
@@ -3299,3 +3299,5 @@ INSERT INTO `blocks` (`id`, `key`, `html`, `created_at`, `updated_at`) VALUES
(21, 'list.email', ' {{\'{{\'}} item.{{$data[\'name\']}} }}', '2021-07-28 12:25:28', '2021-07-28 12:25:28'),
(22, 'list.phone', ' {{\'{{\'}} item.{{$data[\'name\']}} }}', '2021-07-28 12:26:49', '2021-07-28 12:26:49'),
(23, 'list.link', ' {{\'{{\'}} item.{{$data[\'name\']}} }} ', '2021-07-28 12:27:25', '2021-07-28 12:27:33');
+(24, 'list.date', '\n {{\'{{\'}} item.{{$data[\'name\']}} | datetime }}\n', '2021-07-28 13:41:16', '2021-07-28 13:42:21'),
+(25, 'list.money', '{{\'{{\'}} item.{{$data[\'name\']}}.toLocaleString() }}{{setting(\'$\')}}', '2021-07-28 13:50:34', '2021-07-28 13:54:56');
diff --git a/resources/views/admin/layout/sidebar.blade.php b/resources/views/admin/layout/sidebar.blade.php
index 8103c80..d60b4cd 100644
--- a/resources/views/admin/layout/sidebar.blade.php
+++ b/resources/views/admin/layout/sidebar.blade.php
@@ -2,61 +2,60 @@