Skip to content

Commit 8ac57c5

Browse files
authored
Merge pull request #49 from connorabbas/develop
Fixes
2 parents bfe36cc + 059e7bc commit 8ac57c5

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

.devcontainer/devcontainer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
],
77
"service": "laravel",
88
"workspaceFolder": "/var/www/html",
9+
"mounts": [
10+
"type=bind,source=/home/${localEnv:USER}/.ssh,target=/home/sail/.ssh,readonly"
11+
],
912
"customizations": {
1013
"vscode": {
1114
"extensions": [

docker/local/database/init.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
GRANT ALL PRIVILEGES ON *.* TO 'docker_mariadb'@'%';
1+
GRANT ALL PRIVILEGES ON *.* TO '$MYSQL_USER'@'%';
22
FLUSH PRIVILEGES;

resources/js/Layouts/AuthenticatedLayout.vue

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@ watchEffect(() => {
115115
text
116116
severity="secondary"
117117
rounded
118-
:pt="{
119-
icon: {
120-
class: 'text-muted-color',
121-
},
122-
}"
123118
/>
124119
</div>
125120
<!-- User Dropdown Menu -->
@@ -128,15 +123,11 @@ watchEffect(() => {
128123
id="user-menu-btn"
129124
text
130125
severity="secondary"
126+
:label="$page.props.auth.user.name"
127+
icon="pi pi-angle-down"
128+
iconPos="right"
131129
@click="toggleUserMenu($event)"
132-
>
133-
<span class="text-muted-color">
134-
{{ $page.props.auth.user.name }}
135-
</span>
136-
<i
137-
class="pi pi-angle-down text-muted-color"
138-
></i>
139-
</Button>
130+
/>
140131
<div
141132
id="user-menu-append"
142133
class="relative"

resources/js/theme-preset.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Preset from '@primevue/themes/lara';
1+
import Preset from '@primevue/themes/aura';
22
import { definePreset } from '@primevue/themes';
33

44
const customThemePreset = definePreset(Preset, {

0 commit comments

Comments
 (0)