Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit fe931e4

Browse files
Merge pull request #383 from connorabbas/feature/typescript
Feature - TypeScript
2 parents ca0b9e4 + 6a7fa04 commit fe931e4

Some content is hidden

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

62 files changed

+3546
-1781
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"laravel.vscode-laravel",
1818
"Vue.volar",
1919
"hollowtree.vue-snippets",
20+
"dbaeumer.vscode-eslint",
21+
"EditorConfig.EditorConfig",
2022
"bradlc.vscode-tailwindcss",
2123
"eamodio.gitlens",
2224
"esbenp.prettier-vscode",

‎.env.example‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ WWWGROUP=1000
6767
WWWUSER=1000
6868

6969
APP_PORT=8000
70-
VITE_PORT=5173
70+
VITE_APP_PORT=5173
7171
FORWARD_DB_PORT=

‎.gitignore‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
11
/.phpunit.cache
2-
/node_modules
32
/bootstrap/ssr
3+
/node_modules
44
/public/build
55
/public/hot
66
/public/storage
7-
/public/themes
87
/storage/*.key
8+
/storage/pail
9+
/resources/js/actions
10+
/resources/js/routes
11+
/resources/js/wayfinder
912
/vendor
13+
.DS_Store
1014
.env
1115
.env.backup
1216
.env.production
1317
.phpactor.json
1418
.phpunit.result.cache
1519
Homestead.json
1620
Homestead.yaml
17-
auth.json
1821
npm-debug.log
1922
yarn-error.log
20-
components.d.ts
23+
/auth.json
2124
/.fleet
2225
/.idea
23-
/.vscode
26+
/.nova
27+
/.vscode
28+
/.zed
29+
30+
components.d.ts
31+
*.tsbuildinfo

‎.prettierrc.cjs‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎app/Http/Controllers/Settings/PasswordController.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Http\Controllers\Settings;
44

55
use App\Http\Controllers\Controller;
6-
use Illuminate\Contracts\Auth\MustVerifyEmail;
76
use Illuminate\Http\RedirectResponse;
87
use Illuminate\Http\Request;
98
use Illuminate\Support\Facades\Hash;
@@ -18,10 +17,7 @@ class PasswordController extends Controller
1817
*/
1918
public function edit(Request $request): Response
2019
{
21-
return Inertia::render('settings/Password', [
22-
'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
23-
'status' => $request->session()->get('status'),
24-
]);
20+
return Inertia::render('settings/Password');
2521
}
2622

2723
/**

‎docker-compose.local.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- 'host.docker.internal:host-gateway'
1111
#ports:
1212
#- '${APP_PORT:-80}:80' not required using Traefik
13-
#- '${VITE_PORT:-5173}:${VITE_PORT:-5173}' Not required if using dev containers (auto forwards port to localhost)
13+
#- '${VITE_APP_PORT:-5173}:${VITE_APP_PORT:-5173}' Not required if using dev containers (auto forwards port to localhost)
1414
environment:
1515
WWWUSER: '${WWWUSER}'
1616
LARAVEL_SAIL: 1
Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
import vue from 'eslint-plugin-vue';
2-
import {
3-
defineConfigWithVueTs,
4-
vueTsConfigs,
5-
} from '@vue/eslint-config-typescript';
6-
import eslint from '@eslint/js';
7-
import globals from 'globals';
1+
import vue from 'eslint-plugin-vue'
2+
import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript'
83

94
export default [
105
// Global ignores
@@ -17,23 +12,6 @@ export default [
1712
'bootstrap/ssr',
1813
],
1914
},
20-
// JavaScript files
21-
{
22-
files: ['**/*.js'],
23-
...eslint.configs.recommended,
24-
languageOptions: {
25-
ecmaVersion: 'latest',
26-
sourceType: 'module',
27-
globals: {
28-
...globals.browser,
29-
...globals.node,
30-
process: 'readonly',
31-
module: 'readonly',
32-
require: 'readonly',
33-
window: 'readonly',
34-
},
35-
},
36-
},
3715
// Vue and TypeScript files
3816
...defineConfigWithVueTs(
3917
vue.configs['flat/recommended'],
@@ -44,14 +22,13 @@ export default [
4422
'vue/attribute-hyphenation': 'off',
4523
'vue/v-on-event-hyphenation': 'off',
4624
'vue/multi-word-component-names': 'off',
47-
'vue/block-lang': 'off',
4825
'vue/no-v-html': 'off',
4926
'vue/html-indent': ['error', 4],
5027
'@typescript-eslint/no-explicit-any': 'off',
5128
indent: ['error', 4],
52-
semi: ['error', 'always'],
29+
semi: ['error', 'never'],
5330
'linebreak-style': ['error', 'unix'],
5431
},
55-
}
32+
},
5633
),
57-
];
34+
]

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /