Skip to content

Commit 2c920e9

Browse files
zodmanzodman
committed
update inertia
1 parent 0e142f1 commit 2c920e9

File tree

19 files changed

+345
-315
lines changed

19 files changed

+345
-315
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,4 +133,4 @@ node_modules
133133
coverage
134134
htmlcov
135135
tags
136-
./demo/static/dist
136+
./demo/static/dist/*

‎demo/middleware.py‎

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,39 @@
1-
from django.contrib import messages
2-
from inertia.share import share
3-
4-
5-
class DemoMiddleware:
6-
def __init__(self, get_response):
7-
self.get_response = get_response
8-
# One-time configuration and initialization.
9-
10-
def __call__(self, request):
11-
12-
if request.user.is_authenticated:
13-
share(request, 'auth', {
14-
'user':{
15-
'account':{
16-
'id':request.user.id,
17-
'name':request.user.username,
18-
},
19-
'id': request.user.id,
20-
'firt_name': request.user.first_name,
21-
'last_name': request.user.last_name,
22-
'email': request.user.email,
23-
}
24-
})
25-
else:
26-
share(request, 'auth', {
27-
'user':{
28-
'account':{
29-
'id':"request.user.id",
30-
'name':"request.user.username",
31-
},
32-
'id': "request.user.id",
33-
'firt_name': "request.user.first_name",
34-
'last_name': "request.user.last_name",
35-
'email': "request.user.email",
36-
}
37-
})
38-
share(request, "flash", {'success':request.session.get("success",False),
39-
'error':request.session.get("error", False)})
40-
share(request, 'errors', request.session.get("errors",[]) )
41-
response = self.get_response(request)
42-
return response
1+
from django.contrib import messages
2+
from inertia.share import share
3+
4+
5+
class DemoMiddleware:
6+
def __init__(self, get_response):
7+
self.get_response = get_response
8+
# One-time configuration and initialization.
9+
10+
def __call__(self, request):
11+
12+
if request.user.is_authenticated:
13+
share(request, 'auth', {
14+
'user':{
15+
'account':{
16+
'id':request.user.id,
17+
'name':request.user.username,
18+
},
19+
'id': request.user.id,
20+
'firt_name': request.user.first_name,
21+
'last_name': request.user.last_name,
22+
'email': request.user.email,
23+
}
24+
})
25+
else:
26+
share(request, 'auth', {
27+
'user':{
28+
'account':{
29+
'id':"request.user.id",
30+
'name':"request.user.username",
31+
},
32+
'id': "request.user.id",
33+
'firt_name': "request.user.first_name",
34+
'last_name': "request.user.last_name",
35+
'email': "request.user.email",
36+
}
37+
})
38+
response = self.get_response(request)
39+
return response

‎demo/static/src/Pages/Auth/Login.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="px-10 py-12">
77
<h1 class="text-center font-bold text-3xl">Welcome Back!</h1>
88
<div class="mx-auto mt-6 w-24 border-b-2" />
9-
<text-input v-model="form.email" :errors="$page.errors.email" class="mt-10" label="Email" type="email" autofocus autocapitalize="off" />
9+
<text-input v-model="form.email" :error="errors.email" class="mt-10" label="Email" type="email" autofocus autocapitalize="off" />
1010
<text-input v-model="form.password" class="mt-6" label="Password" type="password" />
1111
<label class="mt-6 select-none flex items-center" for="remember">
1212
<input id="remember" v-model="form.remember" class="mr-1" type="checkbox">

‎demo/static/src/Pages/Contacts/Create.vue‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
<div class="bg-white rounded shadow overflow-hidden max-w-3xl">
88
<form @submit.prevent="submit">
99
<div class="p-8 -mr-6 -mb-8 flex flex-wrap">
10-
<text-input v-model="form.first_name" :errors="$page.errors.first_name" class="pr-6 pb-8 w-full lg:w-1/2" label="First name" />
11-
<text-input v-model="form.last_name" :errors="$page.errors.last_name" class="pr-6 pb-8 w-full lg:w-1/2" label="Last name" />
12-
<select-input v-model="form.organization_id" :errors="$page.errors.organization_id" class="pr-6 pb-8 w-full lg:w-1/2" label="Organization">
10+
<text-input v-model="form.first_name" :error="errors.first_name" class="pr-6 pb-8 w-full lg:w-1/2" label="First name" />
11+
<text-input v-model="form.last_name" :error="errors.last_name" class="pr-6 pb-8 w-full lg:w-1/2" label="Last name" />
12+
<select-input v-model="form.organization_id" :error="errors.organization_id" class="pr-6 pb-8 w-full lg:w-1/2" label="Organization">
1313
<option :value="null" />
1414
<option v-for="organization in organizations" :key="organization.id" :value="organization.id">{{ organization.name }}</option>
1515
</select-input>
16-
<text-input v-model="form.email" :errors="$page.errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
17-
<text-input v-model="form.phone" :errors="$page.errors.phone" class="pr-6 pb-8 w-full lg:w-1/2" label="Phone" />
18-
<text-input v-model="form.address" :errors="$page.errors.address" class="pr-6 pb-8 w-full lg:w-1/2" label="Address" />
19-
<text-input v-model="form.city" :errors="$page.errors.city" class="pr-6 pb-8 w-full lg:w-1/2" label="City" />
20-
<text-input v-model="form.region" :errors="$page.errors.region" class="pr-6 pb-8 w-full lg:w-1/2" label="Province/State" />
21-
<select-input v-model="form.country" :errors="$page.errors.country" class="pr-6 pb-8 w-full lg:w-1/2" label="Country">
16+
<text-input v-model="form.email" :error="errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
17+
<text-input v-model="form.phone" :error="errors.phone" class="pr-6 pb-8 w-full lg:w-1/2" label="Phone" />
18+
<text-input v-model="form.address" :error="errors.address" class="pr-6 pb-8 w-full lg:w-1/2" label="Address" />
19+
<text-input v-model="form.city" :error="errors.city" class="pr-6 pb-8 w-full lg:w-1/2" label="City" />
20+
<text-input v-model="form.region" :error="errors.region" class="pr-6 pb-8 w-full lg:w-1/2" label="Province/State" />
21+
<select-input v-model="form.country" :error="errors.country" class="pr-6 pb-8 w-full lg:w-1/2" label="Country">
2222
<option :value="null" />
2323
<option value="CA">Canada</option>
2424
<option value="US">United States</option>
2525
</select-input>
26-
<text-input v-model="form.postal_code" :errors="$page.errors.postal_code" class="pr-6 pb-8 w-full lg:w-1/2" label="Postal code" />
26+
<text-input v-model="form.postal_code" :error="errors.postal_code" class="pr-6 pb-8 w-full lg:w-1/2" label="Postal code" />
2727
</div>
2828
<div class="px-8 py-4 bg-gray-100 border-t border-gray-200 flex justify-end items-center">
2929
<loading-button :loading="sending" class="btn-indigo" type="submit">Create Contact</loading-button>
@@ -48,6 +48,7 @@ export default {
4848
TextInput,
4949
},
5050
props: {
51+
errors: Object,
5152
organizations: Array,
5253
},
5354
remember: 'form',

‎demo/static/src/Pages/Contacts/Edit.vue‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@
1111
<div class="bg-white rounded shadow overflow-hidden max-w-3xl">
1212
<form @submit.prevent="submit">
1313
<div class="p-8 -mr-6 -mb-8 flex flex-wrap">
14-
<text-input v-model="form.first_name" :errors="$page.errors.first_name" class="pr-6 pb-8 w-full lg:w-1/2" label="First name" />
15-
<text-input v-model="form.last_name" :errors="$page.errors.last_name" class="pr-6 pb-8 w-full lg:w-1/2" label="Last name" />
16-
<select-input v-model="form.organization_id" :errors="$page.errors.organization_id" class="pr-6 pb-8 w-full lg:w-1/2" label="Organization">
14+
<text-input v-model="form.first_name" :error="errors.first_name" class="pr-6 pb-8 w-full lg:w-1/2" label="First name" />
15+
<text-input v-model="form.last_name" :error="errors.last_name" class="pr-6 pb-8 w-full lg:w-1/2" label="Last name" />
16+
<select-input v-model="form.organization_id" :error="errors.organization_id" class="pr-6 pb-8 w-full lg:w-1/2" label="Organization">
1717
<option :value="null" />
1818
<option v-for="organization in organizations" :key="organization.id" :value="organization.id">{{ organization.name }}</option>
1919
</select-input>
20-
<text-input v-model="form.email" :errors="$page.errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
21-
<text-input v-model="form.phone" :errors="$page.errors.phone" class="pr-6 pb-8 w-full lg:w-1/2" label="Phone" />
22-
<text-input v-model="form.address" :errors="$page.errors.address" class="pr-6 pb-8 w-full lg:w-1/2" label="Address" />
23-
<text-input v-model="form.city" :errors="$page.errors.city" class="pr-6 pb-8 w-full lg:w-1/2" label="City" />
24-
<text-input v-model="form.region" :errors="$page.errors.region" class="pr-6 pb-8 w-full lg:w-1/2" label="Province/State" />
25-
<select-input v-model="form.country" :errors="$page.errors.country" class="pr-6 pb-8 w-full lg:w-1/2" label="Country">
20+
<text-input v-model="form.email" :error="errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
21+
<text-input v-model="form.phone" :error="errors.phone" class="pr-6 pb-8 w-full lg:w-1/2" label="Phone" />
22+
<text-input v-model="form.address" :error="errors.address" class="pr-6 pb-8 w-full lg:w-1/2" label="Address" />
23+
<text-input v-model="form.city" :error="errors.city" class="pr-6 pb-8 w-full lg:w-1/2" label="City" />
24+
<text-input v-model="form.region" :error="errors.region" class="pr-6 pb-8 w-full lg:w-1/2" label="Province/State" />
25+
<select-input v-model="form.country" :error="errors.country" class="pr-6 pb-8 w-full lg:w-1/2" label="Country">
2626
<option :value="null" />
2727
<option value="CA">Canada</option>
2828
<option value="US">United States</option>
2929
</select-input>
30-
<text-input v-model="form.postal_code" :errors="$page.errors.postal_code" class="pr-6 pb-8 w-full lg:w-1/2" label="Postal code" />
30+
<text-input v-model="form.postal_code" :error="errors.postal_code" class="pr-6 pb-8 w-full lg:w-1/2" label="Postal code" />
3131
</div>
3232
<div class="px-8 py-4 bg-gray-100 border-t border-gray-200 flex items-center">
3333
<button v-if="!contact.deleted_at" class="text-red-600 hover:underline" tabindex="-1" type="button" @click="destroy">Delete Contact</button>
@@ -59,6 +59,7 @@ export default {
5959
TrashedMessage,
6060
},
6161
props: {
62+
errors: Object,
6263
contact: Object,
6364
organizations: Array,
6465
},

‎demo/static/src/Pages/Organizations/Create.vue‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
<div class="bg-white rounded shadow overflow-hidden max-w-3xl">
88
<form @submit.prevent="submit">
99
<div class="p-8 -mr-6 -mb-8 flex flex-wrap">
10-
<text-input v-model="form.name" :errors="$page.errors.name" class="pr-6 pb-8 w-full lg:w-1/2" label="Name" />
11-
<text-input v-model="form.email" :errors="$page.errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
12-
<text-input v-model="form.phone" :errors="$page.errors.phone" class="pr-6 pb-8 w-full lg:w-1/2" label="Phone" />
13-
<text-input v-model="form.address" :errors="$page.errors.address" class="pr-6 pb-8 w-full lg:w-1/2" label="Address" />
14-
<text-input v-model="form.city" :errors="$page.errors.city" class="pr-6 pb-8 w-full lg:w-1/2" label="City" />
15-
<text-input v-model="form.region" :errors="$page.errors.region" class="pr-6 pb-8 w-full lg:w-1/2" label="Province/State" />
16-
<select-input v-model="form.country" :errors="$page.errors.country" class="pr-6 pb-8 w-full lg:w-1/2" label="Country">
10+
<text-input v-model="form.name" :error="errors.name" class="pr-6 pb-8 w-full lg:w-1/2" label="Name" />
11+
<text-input v-model="form.email" :error="errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
12+
<text-input v-model="form.phone" :error="errors.phone" class="pr-6 pb-8 w-full lg:w-1/2" label="Phone" />
13+
<text-input v-model="form.address" :error="errors.address" class="pr-6 pb-8 w-full lg:w-1/2" label="Address" />
14+
<text-input v-model="form.city" :error="errors.city" class="pr-6 pb-8 w-full lg:w-1/2" label="City" />
15+
<text-input v-model="form.region" :error="errors.region" class="pr-6 pb-8 w-full lg:w-1/2" label="Province/State" />
16+
<select-input v-model="form.country" :error="errors.country" class="pr-6 pb-8 w-full lg:w-1/2" label="Country">
1717
<option :value="null" />
1818
<option value="CA">Canada</option>
1919
<option value="US">United States</option>
2020
</select-input>
21-
<text-input v-model="form.postal_code" :errors="$page.errors.postal_code" class="pr-6 pb-8 w-full lg:w-1/2" label="Postal code" />
21+
<text-input v-model="form.postal_code" :error="errors.postal_code" class="pr-6 pb-8 w-full lg:w-1/2" label="Postal code" />
2222
</div>
2323
<div class="px-8 py-4 bg-gray-100 border-t border-gray-200 flex justify-end items-center">
2424
<loading-button :loading="sending" class="btn-indigo" type="submit">Create Organization</loading-button>
@@ -42,6 +42,9 @@ export default {
4242
SelectInput,
4343
TextInput,
4444
},
45+
props: {
46+
errors: Object,
47+
},
4548
remember: 'form',
4649
data() {
4750
return {

‎demo/static/src/Pages/Organizations/Edit.vue‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
<div class="bg-white rounded shadow overflow-hidden max-w-3xl">
1212
<form @submit.prevent="submit">
1313
<div class="p-8 -mr-6 -mb-8 flex flex-wrap">
14-
<text-input v-model="form.name" :errors="$page.errors.name" class="pr-6 pb-8 w-full lg:w-1/2" label="Name" />
15-
<text-input v-model="form.email" :errors="$page.errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
16-
<text-input v-model="form.phone" :errors="$page.errors.phone" class="pr-6 pb-8 w-full lg:w-1/2" label="Phone" />
17-
<text-input v-model="form.address" :errors="$page.errors.address" class="pr-6 pb-8 w-full lg:w-1/2" label="Address" />
18-
<text-input v-model="form.city" :errors="$page.errors.city" class="pr-6 pb-8 w-full lg:w-1/2" label="City" />
19-
<text-input v-model="form.region" :errors="$page.errors.region" class="pr-6 pb-8 w-full lg:w-1/2" label="Province/State" />
20-
<select-input v-model="form.country" :errors="$page.errors.country" class="pr-6 pb-8 w-full lg:w-1/2" label="Country">
14+
<text-input v-model="form.name" :error="errors.name" class="pr-6 pb-8 w-full lg:w-1/2" label="Name" />
15+
<text-input v-model="form.email" :error="errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
16+
<text-input v-model="form.phone" :error="errors.phone" class="pr-6 pb-8 w-full lg:w-1/2" label="Phone" />
17+
<text-input v-model="form.address" :error="errors.address" class="pr-6 pb-8 w-full lg:w-1/2" label="Address" />
18+
<text-input v-model="form.city" :error="errors.city" class="pr-6 pb-8 w-full lg:w-1/2" label="City" />
19+
<text-input v-model="form.region" :error="errors.region" class="pr-6 pb-8 w-full lg:w-1/2" label="Province/State" />
20+
<select-input v-model="form.country" :error="errors.country" class="pr-6 pb-8 w-full lg:w-1/2" label="Country">
2121
<option :value="null" />
2222
<option value="CA">Canada</option>
2323
<option value="US">United States</option>
2424
</select-input>
25-
<text-input v-model="form.postal_code" :errors="$page.errors.postal_code" class="pr-6 pb-8 w-full lg:w-1/2" label="Postal code" />
25+
<text-input v-model="form.postal_code" :error="errors.postal_code" class="pr-6 pb-8 w-full lg:w-1/2" label="Postal code" />
2626
</div>
2727
<div class="px-8 py-4 bg-gray-100 border-t border-gray-200 flex items-center">
2828
<button v-if="!organization.deleted_at" class="text-red-600 hover:underline" tabindex="-1" type="button" @click="destroy">Delete Organization</button>
@@ -90,6 +90,7 @@ export default {
9090
TrashedMessage,
9191
},
9292
props: {
93+
errors: Object,
9394
organization: Object,
9495
},
9596
remember: 'form',

‎demo/static/src/Pages/Users/Create.vue‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
<div class="bg-white rounded shadow overflow-hidden max-w-3xl">
88
<form @submit.prevent="submit">
99
<div class="p-8 -mr-6 -mb-8 flex flex-wrap">
10-
<text-input v-model="form.first_name" :errors="$page.errors.first_name" class="pr-6 pb-8 w-full lg:w-1/2" label="First name" />
11-
<text-input v-model="form.last_name" :errors="$page.errors.last_name" class="pr-6 pb-8 w-full lg:w-1/2" label="Last name" />
12-
<text-input v-model="form.email" :errors="$page.errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
13-
<text-input v-model="form.password" :errors="$page.errors.password" class="pr-6 pb-8 w-full lg:w-1/2" type="password" autocomplete="new-password" label="Password" />
14-
<select-input v-model="form.owner" :errors="$page.errors.owner" class="pr-6 pb-8 w-full lg:w-1/2" label="Owner">
10+
<text-input v-model="form.first_name" :error="errors.first_name" class="pr-6 pb-8 w-full lg:w-1/2" label="First name" />
11+
<text-input v-model="form.last_name" :error="errors.last_name" class="pr-6 pb-8 w-full lg:w-1/2" label="Last name" />
12+
<text-input v-model="form.email" :error="errors.email" class="pr-6 pb-8 w-full lg:w-1/2" label="Email" />
13+
<text-input v-model="form.password" :error="errors.password" class="pr-6 pb-8 w-full lg:w-1/2" type="password" autocomplete="new-password" label="Password" />
14+
<select-input v-model="form.owner" :error="errors.owner" class="pr-6 pb-8 w-full lg:w-1/2" label="Owner">
1515
<option :value="true">Yes</option>
1616
<option :value="false">No</option>
1717
</select-input>
18-
<file-input v-model="form.photo" :errors="$page.errors.photo" class="pr-6 pb-8 w-full lg:w-1/2" type="file" accept="image/*" label="Photo" />
18+
<file-input v-model="form.photo" :error="errors.photo" class="pr-6 pb-8 w-full lg:w-1/2" type="file" accept="image/*" label="Photo" />
1919
</div>
2020
<div class="px-8 py-4 bg-gray-100 border-t border-gray-200 flex justify-end items-center">
2121
<loading-button :loading="sending" class="btn-indigo" type="submit">Create User</loading-button>
@@ -41,6 +41,9 @@ export default {
4141
TextInput,
4242
FileInput,
4343
},
44+
props: {
45+
errors: Object,
46+
},
4447
remember: 'form',
4548
data() {
4649
return {

0 commit comments

Comments
 (0)