Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d121ef5

Browse files
pushpak1300pushpak1300
committed
Merge branch 'main' into add_error_state_in_hook
# Conflicts: # resources/js/composables/useTwoFactorAuth.ts
2 parents f485b1c + ccdb9dd commit d121ef5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1112
-253
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88

99
CHANGELOG.md export-ignore
1010
README.md export-ignore
11+
.github/workflows/browser-tests.yml export-ignore

‎.github/workflows/browser-tests.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: browser-tests
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- main
8+
pull_request:
9+
branches:
10+
- develop
11+
- main
12+
13+
jobs:
14+
ci:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Setup PHP
22+
uses: shivammathur/setup-php@v2
23+
with:
24+
php-version: 8.4
25+
tools: composer:v2
26+
coverage: xdebug
27+
28+
- name: Setup Node
29+
uses: actions/setup-node@v4
30+
with:
31+
node-version: '22'
32+
cache: 'npm'
33+
34+
- name: Install Node Dependencies
35+
run: npm ci
36+
37+
- name: Install Playwright Dependencies
38+
run: npm install playwright@latest
39+
40+
- name: Install Playwright Browsers
41+
run: npx playwright install --with-deps
42+
43+
- name: Add `laravel-labs/starter-kit-browser-tests` Repository
44+
run: |
45+
composer config repositories.browser-tests '{"type": "vcs", "url": "https://github.com/laravel-labs/starter-kit-browser-tests"}' --file composer.json
46+
composer remove "phpunit/phpunit" --dev --no-update
47+
composer require "laravel-labs/starter-kit-browser-tests:dev-main@dev" --dev --no-update
48+
49+
- name: Install Dependencies
50+
run: composer install --no-interaction --prefer-dist --optimize-autoloader
51+
52+
- name: Copy Environment File
53+
run: cp .env.example .env
54+
55+
- name: Generate Application Key
56+
run: php artisan key:generate
57+
58+
- name: Setup Test Environment
59+
run: |
60+
cp vendor/laravel-labs/starter-kit-browser-tests/phpunit.xml.dist .
61+
rm phpunit.xml
62+
rm -Rf tests/
63+
cp -rf vendor/laravel-labs/starter-kit-browser-tests/tests/ tests/
64+
65+
- name: Build Assets
66+
run: npm run build
67+
68+
- name: Tests
69+
run: php vendor/bin/pest

‎.prettierrc‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,16 @@
33
"singleQuote": true,
44
"singleAttributePerLine": false,
55
"htmlWhitespaceSensitivity": "css",
6-
"printWidth": 150,
7-
"plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"],
8-
"tailwindFunctions": ["clsx", "cn", "cva"],
6+
"printWidth": 80,
7+
"plugins": [
8+
"prettier-plugin-organize-imports",
9+
"prettier-plugin-tailwindcss"
10+
],
11+
"tailwindFunctions": [
12+
"clsx",
13+
"cn",
14+
"cva"
15+
],
916
"tailwindStylesheet": "resources/css/app.css",
1017
"tabWidth": 4,
1118
"overrides": [

‎app/Http/Requests/Auth/LoginRequest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function validateCredentials(): User
4141
{
4242
$this->ensureIsNotRateLimited();
4343

44-
/** @var User $user */
44+
/** @var User|null $user */
4545
$user = Auth::getProvider()->retrieveByCredentials($this->only('email', 'password'));
4646

4747
if (! $user || ! Auth::getProvider()->validateCredentials($user, $this->only('password'))) {

‎eslint.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import prettier from 'eslint-config-prettier';
1+
import prettier from 'eslint-config-prettier/flat';
22
import vue from 'eslint-plugin-vue';
33

44
import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript';

‎package-lock.json‎

Lines changed: 18 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/css/app.css‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
@custom-variant dark (&:is(.dark *));
99

1010
@theme inline {
11-
--font-sans: Instrument Sans, ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
11+
--font-sans:
12+
Instrument Sans, ui-sans-serif, system-ui, sans-serif,
13+
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
14+
'Noto Color Emoji';
1215

1316
--radius-lg: var(--radius);
1417
--radius-md: calc(var(--radius) - 2px);
@@ -80,7 +83,9 @@
8083
body,
8184
html {
8285
--font-sans:
83-
'Instrument Sans', ui-sans-serif, system-ui, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
86+
'Instrument Sans', ui-sans-serif, system-ui, sans-serif,
87+
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
88+
'Noto Color Emoji';
8489
}
8590
}
8691

‎resources/js/app.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ const appName = import.meta.env.VITE_APP_NAME || 'Laravel';
1010

1111
createInertiaApp({
1212
title: (title) => (title ? `${title} - ${appName}` : appName),
13-
resolve: (name) => resolvePageComponent(`./pages/${name}.vue`, import.meta.glob<DefineComponent>('./pages/**/*.vue')),
13+
resolve: (name) =>
14+
resolvePageComponent(
15+
`./pages/${name}.vue`,
16+
import.meta.glob<DefineComponent>('./pages/**/*.vue'),
17+
),
1418
setup({ el, App, props, plugin }) {
1519
createApp({ render: () => h(App, props) })
1620
.use(plugin)

‎resources/js/components/AppContent.vue‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ const className = computed(() => props.class);
1515
<SidebarInset v-if="props.variant === 'sidebar'" :class="className">
1616
<slot />
1717
</SidebarInset>
18-
<main v-else class="mx-auto flex h-full w-full max-w-7xl flex-1 flex-col gap-4 rounded-xl" :class="className">
18+
<main
19+
v-else
20+
class="mx-auto flex h-full w-full max-w-7xl flex-1 flex-col gap-4 rounded-xl"
21+
:class="className"
22+
>
1923
<slot />
2024
</main>
2125
</template>

0 commit comments

Comments
 (0)