Skip to content

Commit 46dd9d1

Browse files
SaevenSaeven
authored
Merge pull request #10 from Saeven/feature/forgot-password
Feature/forgot password
2 parents 3808867 + 48a5c04 commit 46dd9d1

File tree

82 files changed

+16410
-316
lines changed

Some content is hidden

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

82 files changed

+16410
-316
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ data/cache/*
77
phpunit.xml
88
.phpunit.result.cache
99
node_modules
10-
.idea
10+
.idea
11+
config/autoload/mailgun.local.php

‎composer.json

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,14 @@
2121
"ext-json": "*",
2222
"ext-intl": "*",
2323
"laminas/laminas-mvc": "^3.1.1",
24+
"laminas/laminas-eventmanager": "^3.6.0",
25+
"laminas/laminas-filter": "^2.23.0",
26+
"laminas/laminas-validator": "^2.26.0",
2427
"laminas/laminas-form": "^3.1.1",
2528
"laminas/laminas-view": "^2.24.0",
2629
"laminas/laminas-servicemanager": "^3.10.0",
30+
"laminas/laminas-router": "^3.10.0",
31+
"laminas/laminas-hydrator": "^4.7.0",
2732
"doctrine/annotations": "1.13.2",
2833
"doctrine/common": "3.2.x-dev",
2934
"doctrine/collections": "1.6.8",
@@ -35,6 +40,11 @@
3540
"doctrine/doctrine-module": "5.2.0",
3641
"doctrine/data-fixtures": "1.5.0",
3742
"beberlei/doctrineextensions": "v1.3.0",
43+
"mailgun/mailgun-php": "3.5.0",
44+
"php-http/client-common": "2.6.0",
45+
"php-http/guzzle7-adapter": "^1.0.0",
46+
"nyholm/psr7": "^1.5.1",
47+
"psr/container": "^1.1.0",
3848
"ramsey/uuid": "4.5.1",
3949
"ramsey/uuid-doctrine": "1.8.1",
4050
"saeven/zf3-purifier": "dev-master",
@@ -48,7 +58,8 @@
4858
"twig/string-extra": "@stable",
4959
"twig/intl-extra": "@stable",
5060
"saeven/laminas-assetic": "*",
51-
"bjeavons/zxcvbn-php": "1.3.1"
61+
"bjeavons/zxcvbn-php": "1.3.1",
62+
"hisorange/browser-detect": "4.5.3"
5263
},
5364
"replace": {
5465
"laminas/laminas-cache-storage-adapter-apc": "*",
@@ -86,7 +97,7 @@
8697
}
8798
},
8899
"scripts": {
89-
"cs-check": "vendor/bin/phpcs",
100+
"cs-check": "mkdir -p tmp && vendor/bin/phpcs",
90101
"cs-fix": "vendor/bin/phpcbf",
91102
"development-disable": "laminas-development-mode disable",
92103
"development-enable": "laminas-development-mode enable",
@@ -97,7 +108,10 @@
97108
"php -r 'if (file_exists(\"bin/remove-package-artifacts.php\")) include \"bin/remove-package-artifacts.php\";'",
98109
"php -r 'if (file_exists(\"CHANGELOG.md\")) unlink(\"CHANGELOG.md\");'"
99110
],
100-
"serve": "php -S 0.0.0.0:8080 -t public",
111+
"serve": [
112+
"Composer\\Config::disableProcessTimeout",
113+
"php -S 0.0.0.0:8080 -t public"
114+
],
101115
"myserve": "php -c /usr/local/etc/php/8.1/php.ini -S 0.0.0.0:8080 -t public",
102116
"test": "vendor/bin/phpunit",
103117
"static-analysis": "vendor/bin/psalm --shepherd --stats"

‎config/autoload/circlical.user.local.php

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
<?php
22

3+
declare(strict_types=1);
4+
5+
use Application\Entity\User;
6+
use Application\Model\System;
7+
use CirclicalUser\Service\PasswordChecker\Zxcvbn;
8+
39
return [
410
'circlical' => [
511
'user' => [
6-
712
/**
813
* Configuration settings for the access service
914
*/
1015
'access' => [
11-
1216
'superadmin' => [
1317

1418
/**
@@ -30,11 +34,10 @@
3034
* the default entities and relationships (recommended) -- this is the only config you need!
3135
*/
3236
'doctrine' => [
33-
'entity' => \Application\Entity\User::class,
37+
'entity' => User::class,
3438
],
35-
3639
'password_strength_checker' => [
37-
'implementation' => \CirclicalUser\Service\PasswordChecker\Zxcvbn::class,
40+
'implementation' => Zxcvbn::class,
3841
'config' => [
3942
'required_strength' => 3,
4043
],
@@ -45,9 +48,8 @@
4548
* how to behave.
4649
*/
4750
'auth' => [
48-
4951
'secure_cookies' => static function () {
50-
return \Application\Model\System::isSSL();
52+
return System::isSSL();
5153
},
5254

5355
// Lax is required, instead of Strict, or SSO breaks
@@ -84,16 +86,13 @@
8486
* Make sure that the request IP matches the verification IP
8587
*/
8688
'validate_ip' => false,
87-
8889
],
8990
],
9091

91-
9292
/*
9393
* When a user tries to access a page gated by auth, or rights - what do we do with them?
9494
* This user module provides a simple 'Redirect' strategy, but you can also roll your own
9595
*/
96-
9796
'deny_strategy' => [
9897

9998
/*
@@ -110,7 +109,6 @@
110109
// 'action' => 'login',
111110
// ],
112111
],
113-
114112
],
115113
],
116-
];
114+
];

‎config/autoload/global.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
declare(strict_types=1);
4+
35
/**
46
* Global Configuration Override
57
*
@@ -12,4 +14,9 @@
1214
* file.
1315
*/
1416

15-
return [];
17+
return [
18+
'identity' => [
19+
'name' => 'Sample Application',
20+
'email' => 'your@email.com',
21+
],
22+
];

‎maizzle/emails/.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
end_of_line = lf
7+
charset = utf-8
8+
trim_trailing_whitespace = true
9+
insert_final_newline = true

‎maizzle/emails/.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: weekly
7+
open-pull-requests-limit: 10

‎maizzle/emails/.github/logo-dark.svg

Lines changed: 1 addition & 0 deletions
Loading

‎maizzle/emails/.github/logo-light.svg

Lines changed: 1 addition & 0 deletions
Loading

‎maizzle/emails/.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
node_modules
2+
build_local
3+
.vscode
4+
.idea
5+
Thumbs.db
6+
.DS_Store
7+
npm-debug.log
8+
yarn-error.log

‎maizzle/emails/LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) Cosmin Popovici
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎maizzle/emails/README.md

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<div align="center">
2+
<p>
3+
<a href="https://maizzle.com/#gh-light-mode-only" target="_blank">
4+
<img src="./.github/logo-light.svg" alt="Maizzle" width="300">
5+
</a>
6+
<a href="https://maizzle.com/#gh-dark-mode-only" target="_blank">
7+
<img src="./.github/logo-dark.svg" alt="Maizzle" width="300">
8+
</a>
9+
</p>
10+
<p>Quickly build HTML emails with utility-first CSS</p>
11+
<div>
12+
13+
[![Version][npm-version-shield]][npm]
14+
[![Build][github-ci-shield]][github-ci]
15+
[![Downloads][npm-stats-shield]][npm-stats]
16+
[![License][license-shield]][license]
17+
18+
</div>
19+
</div>
20+
21+
## Getting Started
22+
23+
Clone this starter:
24+
25+
```bash
26+
npx degit maizzle/maizzle my-project
27+
```
28+
29+
Install dependencies:
30+
31+
```
32+
cd my-project
33+
34+
npm install
35+
```
36+
37+
Start local development:
38+
39+
```
40+
npm run dev
41+
```
42+
43+
Build emails for production:
44+
45+
```
46+
npm run build
47+
```
48+
49+
## Documentation
50+
51+
Maizzle documentation is available at https://maizzle.com
52+
53+
## Issues
54+
55+
Please open all issues in the [framework repository](https://github.com/maizzle/framework).
56+
57+
## License
58+
59+
The Maizzle framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).
60+
61+
[npm]: https://www.npmjs.com/package/@maizzle/framework
62+
[npm-stats]: https://npm-stat.com/charts.html?package=%40maizzle%2Fframework&from=2019-03-27
63+
[npm-version-shield]: https://img.shields.io/npm/v/@maizzle/framework.svg?style=flat-square
64+
[npm-stats-shield]: https://img.shields.io/npm/dt/@maizzle/framework.svg?style=flat-square&color=6875f5
65+
[github-ci]: https://github.com/maizzle/framework/actions
66+
[github-ci-shield]: https://img.shields.io/github/workflow/status/maizzle/cli/Node.js%20CI?style=flat-square
67+
[license]: ./LICENSE
68+
[license-shield]: https://img.shields.io/npm/l/@maizzle/framework.svg?style=flat-square&color=0e9f6e

‎maizzle/emails/config.js

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
|-------------------------------------------------------------------------------
3+
| Development config https://maizzle.com/docs/environments
4+
|-------------------------------------------------------------------------------
5+
|
6+
| The exported object contains the default Maizzle settings for development.
7+
| This is used when you run `maizzle build` or `maizzle serve` and it has
8+
| the fastest build time, since most transformations are disabled.
9+
|
10+
*/
11+
12+
module.exports = {
13+
build: {
14+
templates: {
15+
source: 'src/templates',
16+
destination: {
17+
path: 'build_local',
18+
},
19+
},
20+
},
21+
}

0 commit comments

Comments
 (0)