Skip to content

Commit d756ee5

Browse files
yaroslav8765yaroslav8765
committed
chore: update dev demo
1 parent 444bcdb commit d756ee5

File tree

2 files changed

+48
-58
lines changed

2 files changed

+48
-58
lines changed

‎dev-demo/resources/adminuser.ts‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ export default {
4343
required: true,
4444
isUnique: true,
4545
type: AdminForthDataTypes.STRING,
46-
validation: [
47-
// you can also use AdminForth.Utils.EMAIL_VALIDATOR which is alias to this object
48-
{
49-
regExp: '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$',
50-
message: 'Email is not valid, must be in format example@test.com'
51-
},
52-
]
5346
},
5447
{
5548
name: 'created_at',
@@ -82,10 +75,6 @@ export default {
8275
masked: true, // to show stars in input field
8376

8477
minLength: 8,
85-
validation: [
86-
// request to have at least 1 digit, 1 upper case, 1 lower case
87-
AdminForth.Utils.PASSWORD_VALIDATORS.UP_LOW_NUM,
88-
],
8978
},
9079
{
9180
name: 'password_hash',
@@ -116,6 +105,7 @@ export default {
116105
{
117106
twoFaSecretFieldName: 'secret2fa',
118107
timeStepWindow: 1,
108+
stepUpMfaGracePeriodSeconds: 300,
119109
usersFilterToAllowSkipSetup: (adminUser: AdminUser) => {
120110
// allow skip setup 2FA for users which email is 'adminforth' or 'adminguest'
121111
return (true);
@@ -146,23 +136,23 @@ export default {
146136
new ForeignInlineListPlugin({
147137
foreignResourceId: 'cars_sl'
148138
}),
149-
// new ForeignInlineListPlugin({
150-
// foreignResourceId: 'adminuser',
151-
// }),
139+
new ForeignInlineListPlugin({
140+
foreignResourceId: 'adminuser',
141+
}),
152142
new UploadPlugin({
153143
pathColumnName: "avatar",
154-
// storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
155-
// fileSystemFolder: "./images",
156-
// adminServeBaseUrl: "static/source",
157-
// mode: "public",
158-
// signingSecret: "TOP_SECRET",
159-
// }),
160-
storageAdapter: new AdminForthAdapterS3Storage({
161-
bucket: process.env.AWS_BUCKET_NAME as string,
162-
region: process.env.AWS_REGION as string,
163-
accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
164-
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
144+
storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
145+
fileSystemFolder: "./images",
146+
adminServeBaseUrl: "static/source",
147+
mode: "public",
148+
signingSecret: "TOP_SECRET",
165149
}),
150+
// storageAdapter: new AdminForthAdapterS3Storage({
151+
// bucket: process.env.AWS_BUCKET_NAME as string,
152+
// region: process.env.AWS_REGION as string,
153+
// accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
154+
// secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
155+
// }),
166156
allowedFileExtensions: [
167157
"jpg",
168158
"jpeg",

‎dev-demo/resources/carsResourseTemplate.ts‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -156,18 +156,18 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
156156
157157
*********************************************************************************/
158158
new UploadPlugin({
159-
// storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
160-
// fileSystemFolder: "./images",
161-
// adminServeBaseUrl: "static/source",
162-
// mode: "public",
163-
// signingSecret: "TOP_SECRET",
164-
// }),
165-
storageAdapter: new AdminForthAdapterS3Storage({
166-
bucket: process.env.AWS_BUCKET_NAME as string,
167-
region: process.env.AWS_REGION as string,
168-
accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
169-
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
159+
storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
160+
fileSystemFolder: "./images",
161+
adminServeBaseUrl: "static/source",
162+
mode: "public",
163+
signingSecret: "TOP_SECRET",
170164
}),
165+
// storageAdapter: new AdminForthAdapterS3Storage({
166+
// bucket: process.env.AWS_BUCKET_NAME as string,
167+
// region: process.env.AWS_REGION as string,
168+
// accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
169+
// secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
170+
// }),
171171
pathColumnName: 'photos',
172172
allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
173173
maxFileSize: 1024 * 1024 * 20, // 20 MB
@@ -179,18 +179,18 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
179179
},
180180
}),
181181
new UploadPlugin({
182-
// storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
183-
// fileSystemFolder: "./images",
184-
// adminServeBaseUrl: "static/source",
185-
// mode: "public",
186-
// signingSecret: "TOP_SECRET",
187-
// }),
188-
storageAdapter: new AdminForthAdapterS3Storage({
189-
bucket: process.env.AWS_BUCKET_NAME as string,
190-
region: process.env.AWS_REGION as string,
191-
accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
192-
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
182+
storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
183+
fileSystemFolder: "./images",
184+
adminServeBaseUrl: "static/source",
185+
mode: "public",
186+
signingSecret: "TOP_SECRET",
193187
}),
188+
// storageAdapter: new AdminForthAdapterS3Storage({
189+
// bucket: process.env.AWS_BUCKET_NAME as string,
190+
// region: process.env.AWS_REGION as string,
191+
// accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
192+
// secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
193+
// }),
194194
pathColumnName: 'promo_picture',
195195
allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
196196
maxFileSize: 1024 * 1024 * 20, // 20 MB
@@ -238,18 +238,18 @@ export default function carsResourseTemplate(resourceId: string, dataSource: str
238238
...(process.env.OPENAI_API_KEY ?
239239
[
240240
new UploadPlugin({
241-
// storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
242-
// fileSystemFolder: "./images",
243-
// adminServeBaseUrl: "static/source",
244-
// mode: "public",
245-
// signingSecret: "TOP_SECRET",
246-
// }),
247-
storageAdapter: new AdminForthAdapterS3Storage({
248-
bucket: process.env.AWS_BUCKET_NAME as string,
249-
region: process.env.AWS_REGION as string,
250-
accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
251-
secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
241+
storageAdapter: new AdminForthStorageAdapterLocalFilesystem({
242+
fileSystemFolder: "./images",
243+
adminServeBaseUrl: "static/source",
244+
mode: "public",
245+
signingSecret: "TOP_SECRET",
252246
}),
247+
// storageAdapter: new AdminForthAdapterS3Storage({
248+
// bucket: process.env.AWS_BUCKET_NAME as string,
249+
// region: process.env.AWS_REGION as string,
250+
// accessKeyId: process.env.AWS_ACCESS_KEY_ID as string,
251+
// secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY as string,
252+
// }),
253253
pathColumnName: 'generated_promo_picture',
254254
allowedFileExtensions: ['jpg', 'jpeg', 'png', 'gif', 'webm', 'webp'],
255255
maxFileSize: 1024 * 1024 * 20, // 20 MB

0 commit comments

Comments
 (0)