Skip to content

Commit

Permalink
making a good amount of updates to settings and languageg
Browse files Browse the repository at this point in the history
  • Loading branch information
tnylea committed Oct 18, 2024
1 parent 0f0c60c commit 62911cd
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 432 deletions.
2 changes: 1 addition & 1 deletion app/Filament/Resources/SettingResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static function table(Table $table): Table
->columns([
Tables\Columns\TextColumn::make('key')
->searchable(),
Tables\Columns\TextColumn::make('display_name')
Tables\Columns\TextColumn::make('value')
->searchable(),
Tables\Columns\TextColumn::make('type')
->searchable(),
Expand Down
1 change: 1 addition & 0 deletions config/devdojo/auth/language.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
'show_subheadline' => false,
'email_address' => 'Email Address',
'password' => 'Password',
'remember_me' => 'Remember me',
'edit' => 'Edit',
'button' => 'Continue',
'forget_password' => 'Forget your password?',
Expand Down
152 changes: 2 additions & 150 deletions database/seeders/SettingsTableSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function run()
'id' => 2,
'key' => 'site.description',
'display_name' => 'Site Description',
'value' => 'The Software as a Service Starter Kit built on Laravel & Voyager',
'value' => 'The Software as a Service Starter Kit built with Laravel',
'details' => '',
'type' => 'text',
'order' => 2,
Expand All @@ -51,155 +51,7 @@ public function run()
'type' => 'text',
'order' => 4,
'group' => 'Site',
),
3 =>
array (
'id' => 6,
'key' => 'admin.title',
'display_name' => 'Admin Title',
'value' => 'Wave',
'details' => '',
'type' => 'text',
'order' => 1,
'group' => 'Admin',
),
4 =>
array (
'id' => 7,
'key' => 'admin.description',
'display_name' => 'Admin Description',
'value' => 'Create some waves and build your next great idea',
'details' => '',
'type' => 'text',
'order' => 2,
'group' => 'Admin',
),
5 =>
array (
'id' => 8,
'key' => 'admin.loader',
'display_name' => 'Admin Loader',
'value' => '',
'details' => '',
'type' => 'image',
'order' => 3,
'group' => 'Admin',
),
6 =>
array (
'id' => 9,
'key' => 'admin.icon_image',
'display_name' => 'Admin Icon Image',
'value' => '',
'details' => '',
'type' => 'image',
'order' => 4,
'group' => 'Admin',
),
7 =>
array (
'id' => 10,
'key' => 'admin.google_analytics_client_id',
'display_name' => 'Google Analytics Client ID (used for admin dashboard)',
'value' => '',
'details' => '',
'type' => 'text',
'order' => 1,
'group' => 'Admin',
),
8 =>
array (
'id' => 11,
'key' => 'site.favicon',
'display_name' => 'Favicon',
'value' => '',
'details' => NULL,
'type' => 'image',
'order' => 6,
'group' => 'Site',
),
9 =>
array (
'id' => 12,
'key' => 'auth.dashboard_redirect',
'display_name' => 'Homepage Redirect to Dashboard if Logged in',
'value' => '0',
'details' => NULL,
'type' => 'checkbox',
'order' => 7,
'group' => 'Auth',
),
10 =>
array (
'id' => 13,
'key' => 'auth.email_or_username',
'display_name' => 'Users Login with Email or Username',
'value' => 'email',
'details' => '{
"default" : "email",
"options" : {
"email": "Email Address",
"username": "Username"
}
}',
'type' => 'select_dropdown',
'order' => 8,
'group' => 'Auth',
),
11 =>
array (
'id' => 14,
'key' => 'auth.username_in_registration',
'display_name' => 'Username when Registering',
'value' => 'yes',
'details' => '{
"default" : "yes",
"options" : {
"yes": "Yes, Include the Username Field when Registering",
"no": "No, Have it automatically generated"
}
}',
'type' => 'select_dropdown',
'order' => 9,
'group' => 'Auth',
),
12 =>
array (
'id' => 15,
'key' => 'auth.verify_email',
'display_name' => 'Verify Email during Sign Up',
'value' => '0',
'details' => NULL,
'type' => 'checkbox',
'order' => 10,
'group' => 'Auth',
),
13 =>
array (
'id' => 16,
'key' => 'billing.card_upfront',
'display_name' => 'Require Credit Card Up Front',
'value' => '1',
'details' => '{
"on" : "Yes",
"off" : "No",
"checked" : false
}',
'type' => 'checkbox',
'order' => 11,
'group' => 'Billing',
),
14 =>
array (
'id' => 17,
'key' => 'billing.trial_days',
'display_name' => 'Trial Days when No Credit Card Up Front',
'value' => '-1',
'details' => NULL,
'type' => 'text',
'order' => 12,
'group' => 'Billing',
),
)
));


Expand Down
4 changes: 1 addition & 3 deletions resources/themes/anchor/pages/dashboard/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,12 @@
@subscriber
<p>You are a subscribed user with the <strong>{{ auth()->user()->roles()->first()->name }}</strong> role. Learn <a href="https://devdojo.com/wave/docs/features/roles-permissions" target="_blank" class="underline">more about roles</a> here.</p>
<x-app.message-for-subscriber />
@elsenotsubscriber
@else
<p>This current logged in user has a <strong>{{ auth()->user()->roles()->first()->name }}</strong> role. To upgrade, <a href="{{ route('settings.subscription') }}" class="underline">subscribe to a plan</a>. Learn <a href="https://devdojo.com/wave/docs/features/roles-permissions" target="_blank" class="underline">more about roles</a> here.</p>
@endsubscriber

@admin
<x-app.message-for-admin />
@elsenotadmin

@endadmin
</div>
</x-app.container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public function mount(): void
<x-app.alert id="no_subscriptions" :dismissable="false" type="info">
You are logged in as an admin and have full access. Authenticate with a different user and visit this page to see the subscription checkout process.
</x-app.alert>
@notrole
@else
@subscriber

<div class="relative w-full h-auto">
Expand All @@ -48,8 +48,6 @@ public function mount(): void
@endif
<livewire:billing.update />
</div>


@endsubscriber

@notsubscriber
Expand Down
2 changes: 0 additions & 2 deletions resources/themes/anchor/partials/footer-scripts.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
@include('theme::partials.dev_bar')
@endif

@waveCheckout
{{-- @yield('javascript') --}}

@if(setting('site.google_analytics_tracking_id', ''))
Expand All @@ -17,5 +16,4 @@ function gtag(){dataLayer.push(arguments);}
gtag('config', '{{ setting("site.google_analytics_tracking_id") }}');
</script>

@endif
2 changes: 1 addition & 1 deletion resources/themes/anchor/partials/head.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@if(isset($seo->title))
<title>{{ $seo->title }}</title>
@else
<title>{{ setting('site.title', 'Laravel Wave') . ' - ' . setting('site.description', 'The Software as a Service Starter Kit built on Laravel & Voyager') }}</title>
<title>{{ setting('site.title', 'Laravel Wave') . ' - ' . setting('site.description', 'The Software as a Service Starter Kit built with Laravel') }}</title>
@endif

<meta charset="utf-8">
Expand Down
18 changes: 2 additions & 16 deletions storage/dump.sql
Original file line number Diff line number Diff line change
Expand Up @@ -946,22 +946,8 @@ LOCK TABLES `settings` WRITE;
INSERT INTO `settings` (`id`, `key`, `display_name`, `value`, `details`, `type`, `order`, `group`)
VALUES
(1,'site.title','Site Title','Wave','','text',1,'Site'),
(2,'site.description','Site Description','The Software as a Service Starter Kit built on Laravel & Voyager','','text',2,'Site'),
(4,'site.google_analytics_tracking_id','Google Analytics Tracking ID',NULL,'','text',4,'Site'),
(5,'admin.bg_image','Admin Background Image','','','image',5,'Admin'),
(6,'admin.title','Admin Title','Wave','','text',1,'Admin'),
(7,'admin.description','Admin Description','Create some waves and build your next great idea','','text',2,'Admin'),
(8,'admin.loader','Admin Loader','settings/November2017/UYzuapBFBCrR4gKzwR9E.png','','image',3,'Admin'),
(9,'admin.icon_image','Admin Icon Image','settings/March2018/a1benhFYD9IhEgrKEL4n.png','','image',4,'Admin'),
(10,'admin.google_analytics_client_id','Google Analytics Client ID (used for admin dashboard)','854769825891-6pu07rot7151p7qtrph91joqmg0lo7ml.apps.googleusercontent.com','','text',1,'Admin'),
(11,'site.favicon','Favicon','',NULL,'image',6,'Site'),
(12,'auth.dashboard_redirect','Homepage Redirect to Dashboard if Logged in','0',NULL,'checkbox',7,'Auth'),
(13,'auth.email_or_username','Users Login with Email or Username','email','{\r\n \"default\" : \"email\",\r\n \"options\" : {\r\n \"email\": \"Email Address\",\r\n \"username\": \"Username\"\r\n }\r\n}','select_dropdown',8,'Auth'),
(14,'auth.username_in_registration','Username when Registering','yes','{\r\n \"default\" : \"yes\",\r\n \"options\" : {\r\n \"yes\": \"Yes, Include the Username Field when Registering\",\r\n \"no\": \"No, Have it automatically generated\"\r\n }\r\n}','select_dropdown',9,'Auth'),
(15,'auth.verify_email','Verify Email during Sign Up','0',NULL,'checkbox',10,'Auth'),
(16,'billing.card_upfront','Require Credit Card Up Front','0','{\n \"on\" : \"Yes\",\n \"off\" : \"No\",\n \"checked\" : false\n}','checkbox',11,'Billing'),
(17,'billing.trial_days','Trial Days when No Credit Card Up Front','14',NULL,'text',12,'Billing'),
(18,'site.custom_javascript','Custom Javascript (inserted before the ending </body> tag)',NULL,NULL,'code_editor',13,'Site');
(2,'site.description','Site Description','The Software as a Service Starter Kit built with Laravel','','text',2,'Site'),
(3,'site.google_analytics_tracking_id','Google Analytics Tracking ID',NULL,'','text',4,'Site');

/*!40000 ALTER TABLE `settings` ENABLE KEYS */;
UNLOCK TABLES;
Expand Down
Loading

0 comments on commit 62911cd

Please sign in to comment.