Skip to content

Commit

Permalink
支持用户登录
Browse files Browse the repository at this point in the history
  • Loading branch information
@geekr-dev
geekr-dev committed Mar 25, 2023
1 parent c8ac9b6 commit c9bb5ba
Show file tree
Hide file tree
Showing 23 changed files with 512 additions and 246 deletions.
63 changes: 63 additions & 0 deletions app/Http/Controllers/ProfileController.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?php

namespace App\Http\Controllers;

use App\Http\Requests\ProfileUpdateRequest;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Redirect;
use Inertia\Inertia;
use Inertia\Response;

class ProfileController extends Controller
{
/**
* Display the user's profile form.
*/
public function edit(Request $request): Response
{
return Inertia::render('Profile/Edit', [
'mustVerifyEmail' => $request->user() instanceof MustVerifyEmail,
'status' => session('status'),
]);
}

/**
* Update the user's profile information.
*/
public function update(ProfileUpdateRequest $request): RedirectResponse
{
$request->user()->fill($request->validated());

if ($request->user()->isDirty('email')) {
$request->user()->email_verified_at = null;
}

$request->user()->save();

return Redirect::route('profile.edit');
}

/**
* Delete the user's account.
*/
public function destroy(Request $request): RedirectResponse
{
$request->validate([
'password' => ['required', 'current-password'],
]);

$user = $request->user();

Auth::logout();

$user->delete();

$request->session()->invalidate();
$request->session()->regenerateToken();

return Redirect::to('/');
}
}
5 changes: 5 additions & 0 deletions app/Models/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,9 @@ class User extends Authenticatable
protected $casts = [
'email_verified_at' => 'datetime',
];

public function getSubscribedAttribute(): bool
{
return $this->subscription_type > 0 && $this->subscription_ends_at > now();
}
}
4 changes: 2 additions & 2 deletions app/Providers/RouteServiceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ protected function configureRateLimiting(): void
RateLimiter::for('chat', function (Request $request) {
return $request->input('api_key')
? Limit::none()
: Limit::perMinute(30)->by($request->user()?->id ?: $request->ip());
: Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
});
RateLimiter::for('audio', function (Request $request) {
return $request->input('api_key')
? Limit::none()
: Limit::perMinute(15)->by($request->user()?->id ?: $request->ip());
: Limit::perMinute(30)->by($request->user()?->id ?: $request->ip());
});
RateLimiter::for('image', function (Request $request) {
return $request->input('api_key')
Expand Down
2 changes: 1 addition & 1 deletion config/openai.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/

'api_key' => env('OPENAI_API_KEY'),
'base_uri' => env('OPENAI_BASE_URI', 'api.openai.com'),
'base_uri' => env('OPENAI_BASE_URI', 'https://api.openai.com'),
'organization' => env('OPENAI_ORGANIZATION'),
'http_proxy' => env('HTTP_PROXY'),
];
32 changes: 32 additions & 0 deletions database/migrations/2023_03_24_080248_users_add_subscription_columns.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('users', function (Blueprint $table) {
// 用户类型
$table->tinyInteger('subscription_type')->default(0)->after('email_verified_at');
// 订阅结束时间
$table->timestamp('subscription_ends_at')->nullable()->after('subscription_type');
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('users', function (Blueprint $table) {
$table->dropColumn('subscription_type');
$table->dropColumn('subscription_ends_at');
});
}
};
6 changes: 1 addition & 5 deletions resources/js/Components/ApplicationLogo.vue
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
<template>
<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg">
<path
d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"
/>
</svg>
<img src="https://image.gstatics.cn/icon/geekchat.png" alt="GeekChat" class="rounded-lg w-12 h-12">
</template>
6 changes: 2 additions & 4 deletions resources/js/Components/PrimaryButton.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@ defineProps({
</script>

<template>
<button
:type="type"
class="inline-flex items-center px-4 py-2 bg-gray-800 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-gray-700 focus:bg-gray-700 active:bg-gray-900 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 transition ease-in-out duration-150"
>
<button :type="type"
class="inline-flex items-center px-4 py-2 bg-blue-500 border border-transparent rounded-md font-semibold text-xs text-white uppercase tracking-widest hover:bg-blue-600 focus:bg-blue-600 active:bg-blue-800 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2 transition ease-in-out duration-150">
<slot />
</button>
</template>
79 changes: 27 additions & 52 deletions resources/js/Layouts/AuthenticatedLayout.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,15 @@ const showingNavigationDropdown = ref(false);
<div class="flex">
<!-- Logo -->
<div class="shrink-0 flex items-center">
<Link :href="route('dashboard')">
<ApplicationLogo
class="block h-9 w-auto fill-current text-gray-800"
/>
<Link :href="route('home')">
<ApplicationLogo class="block h-9 w-auto fill-current text-gray-800" />
</Link>
</div>

<!-- Navigation Links -->
<div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
<NavLink :href="route('dashboard')" :active="route().current('dashboard')">
Dashboard
GeekChat
</NavLink>
</div>
</div>
Expand All @@ -41,32 +39,24 @@ const showingNavigationDropdown = ref(false);
<Dropdown align="right" width="48">
<template #trigger>
<span class="inline-flex rounded-md">
<button
type="button"
class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none transition ease-in-out duration-150"
>
<button type="button"
class="inline-flex items-center px-3 py-2 border border-transparent text-sm leading-4 font-medium rounded-md text-gray-500 bg-white hover:text-gray-700 focus:outline-none transition ease-in-out duration-150">
{{ $page.props.auth.user.name }}

<svg
class="ml-2 -mr-0.5 h-4 w-4"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20"
fill="currentColor"
>
<path
fill-rule="evenodd"
<svg class="ml-2 -mr-0.5 h-4 w-4" xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 20 20" fill="currentColor">
<path fill-rule="evenodd"
d="M5.293 7.293a1 1 0 011.414 0L10 10.586l3.293-3.293a1 1 0 111.414 1.414l-4 4a1 1 0 01-1.414 0l-4-4a1 1 0 010-1.414z"
clip-rule="evenodd"
/>
clip-rule="evenodd" />
</svg>
</button>
</span>
</template>

<template #content>
<DropdownLink :href="route('profile.edit')"> Profile </DropdownLink>
<DropdownLink :href="route('profile.edit')"> 编辑 </DropdownLink>
<DropdownLink :href="route('logout')" method="post" as="button">
Log Out
退出
</DropdownLink>
</template>
</Dropdown>
Expand All @@ -75,45 +65,30 @@ const showingNavigationDropdown = ref(false);

<!-- Hamburger -->
<div class="-mr-2 flex items-center sm:hidden">
<button
@click="showingNavigationDropdown = !showingNavigationDropdown"
class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out"
>
<button @click="showingNavigationDropdown = !showingNavigationDropdown"
class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 hover:text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-100 focus:text-gray-500 transition duration-150 ease-in-out">
<svg class="h-6 w-6" stroke="currentColor" fill="none" viewBox="0 0 24 24">
<path
:class="{
hidden: showingNavigationDropdown,
'inline-flex': !showingNavigationDropdown,
}"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M4 6h16M4 12h16M4 18h16"
/>
<path
:class="{
hidden: !showingNavigationDropdown,
'inline-flex': showingNavigationDropdown,
}"
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M6 18L18 6M6 6l12 12"
/>
<path :class="{
hidden: showingNavigationDropdown,
'inline-flex': !showingNavigationDropdown,
}" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
d="M4 6h16M4 12h16M4 18h16" />
<path :class="{
hidden: !showingNavigationDropdown,
'inline-flex': showingNavigationDropdown,
}" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
d="M6 18L18 6M6 6l12 12" />
</svg>
</button>
</div>
</div>
</div>

<!-- Responsive Navigation Menu -->
<div
:class="{ block: showingNavigationDropdown, hidden: !showingNavigationDropdown }"
class="sm:hidden"
>
<div :class="{ block: showingNavigationDropdown, hidden: !showingNavigationDropdown }" class="sm:hidden">
<div class="pt-2 pb-3 space-y-1">
<ResponsiveNavLink :href="route('dashboard')" :active="route().current('dashboard')">
Dashboard
用户后台
</ResponsiveNavLink>
</div>

Expand All @@ -127,9 +102,9 @@ const showingNavigationDropdown = ref(false);
</div>

<div class="mt-3 space-y-1">
<ResponsiveNavLink :href="route('profile.edit')"> Profile </ResponsiveNavLink>
<ResponsiveNavLink :href="route('profile.edit')"> 用户信息 </ResponsiveNavLink>
<ResponsiveNavLink :href="route('logout')" method="post" as="button">
Log Out
退出
</ResponsiveNavLink>
</div>
</div>
Expand Down
20 changes: 7 additions & 13 deletions resources/js/Pages/Auth/ConfirmPassword.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,24 @@ const submit = () => {

<template>
<GuestLayout>
<Head title="Confirm Password" />

<Head title="确认密码" />

<div class="mb-4 text-sm text-gray-600">
This is a secure area of the application. Please confirm your password before continuing.
这是应用程序的安全区域。请在继续操作之前确认您的密码。
</div>

<form @submit.prevent="submit">
<div>
<InputLabel for="password" value="Password" />
<TextInput
id="password"
type="password"
class="mt-1 block w-full"
v-model="form.password"
required
autocomplete="current-password"
autofocus
/>
<InputLabel for="password" value="密码" />
<TextInput id="password" type="password" class="mt-1 block w-full" v-model="form.password" required
autocomplete="current-password" autofocus />
<InputError class="mt-2" :message="form.errors.password" />
</div>

<div class="flex justify-end mt-4">
<PrimaryButton class="ml-4" :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Confirm
确认
</PrimaryButton>
</div>
</form>
Expand Down
23 changes: 8 additions & 15 deletions resources/js/Pages/Auth/ForgotPassword.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ const submit = () => {

<template>
<GuestLayout>
<Head title="Forgot Password" />

<Head title="忘记密码" />

<div class="mb-4 text-sm text-gray-600">
Forgot your password? No problem. Just let us know your email address and we will email you a password reset
link that will allow you to choose a new one.
忘记密码了？没问题。只需告诉我们您的注册邮箱地址，我们将向您发送一个密码重置链接，让您选择一个新密码。
</div>

<div v-if="status" class="mb-4 font-medium text-sm text-green-600">
Expand All @@ -34,24 +34,17 @@ const submit = () => {

<form @submit.prevent="submit">
<div>
<InputLabel for="email" value="Email" />

<TextInput
id="email"
type="email"
class="mt-1 block w-full"
v-model="form.email"
required
autofocus
autocomplete="username"
/>
<InputLabel for="email" value="邮箱" />

<TextInput id="email" type="email" class="mt-1 block w-full" v-model="form.email" required autofocus
autocomplete="username" />

<InputError class="mt-2" :message="form.errors.email" />
</div>

<div class="flex items-center justify-end mt-4">
<PrimaryButton :class="{ 'opacity-25': form.processing }" :disabled="form.processing">
Email Password Reset Link
密码重置链接
</PrimaryButton>
</div>
</form>
Expand Down
Loading

0 comments on commit c9bb5ba

Please sign in to comment.