Skip to content

Commit

Permalink
Merge pull request #10 from Saeven/feature/forgot-password
Browse files Browse the repository at this point in the history
Feature/forgot password
  • Loading branch information
Saeven authored Oct 17, 2022
2 parents 3808867 + 48a5c04 commit 46dd9d1
Show file tree
Hide file tree
Showing 82 changed files with 16,410 additions and 316 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ data/cache/*
phpunit.xml
.phpunit.result.cache
node_modules
.idea
.idea
config/autoload/mailgun.local.php
20 changes: 17 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,14 @@
"ext-json": "*",
"ext-intl": "*",
"laminas/laminas-mvc": "^3.1.1",
"laminas/laminas-eventmanager": "^3.6.0",
"laminas/laminas-filter": "^2.23.0",
"laminas/laminas-validator": "^2.26.0",
"laminas/laminas-form": "^3.1.1",
"laminas/laminas-view": "^2.24.0",
"laminas/laminas-servicemanager": "^3.10.0",
"laminas/laminas-router": "^3.10.0",
"laminas/laminas-hydrator": "^4.7.0",
"doctrine/annotations": "1.13.2",
"doctrine/common": "3.2.x-dev",
"doctrine/collections": "1.6.8",
Expand All @@ -35,6 +40,11 @@
"doctrine/doctrine-module": "5.2.0",
"doctrine/data-fixtures": "1.5.0",
"beberlei/doctrineextensions": "v1.3.0",
"mailgun/mailgun-php": "3.5.0",
"php-http/client-common": "2.6.0",
"php-http/guzzle7-adapter": "^1.0.0",
"nyholm/psr7": "^1.5.1",
"psr/container": "^1.1.0",
"ramsey/uuid": "4.5.1",
"ramsey/uuid-doctrine": "1.8.1",
"saeven/zf3-purifier": "dev-master",
Expand All @@ -48,7 +58,8 @@
"twig/string-extra": "@stable",
"twig/intl-extra": "@stable",
"saeven/laminas-assetic": "*",
"bjeavons/zxcvbn-php": "1.3.1"
"bjeavons/zxcvbn-php": "1.3.1",
"hisorange/browser-detect": "4.5.3"
},
"replace": {
"laminas/laminas-cache-storage-adapter-apc": "*",
Expand Down Expand Up @@ -86,7 +97,7 @@
}
},
"scripts": {
"cs-check": "vendor/bin/phpcs",
"cs-check": "mkdir -p tmp && vendor/bin/phpcs",
"cs-fix": "vendor/bin/phpcbf",
"development-disable": "laminas-development-mode disable",
"development-enable": "laminas-development-mode enable",
Expand All @@ -97,7 +108,10 @@
"php -r 'if (file_exists(\"bin/remove-package-artifacts.php\")) include \"bin/remove-package-artifacts.php\";'",
"php -r 'if (file_exists(\"CHANGELOG.md\")) unlink(\"CHANGELOG.md\");'"
],
"serve": "php -S 0.0.0.0:8080 -t public",
"serve": [
"Composer\\Config::disableProcessTimeout",
"php -S 0.0.0.0:8080 -t public"
],
"myserve": "php -c /usr/local/etc/php/8.1/php.ini -S 0.0.0.0:8080 -t public",
"test": "vendor/bin/phpunit",
"static-analysis": "vendor/bin/psalm --shepherd --stats"
Expand Down
22 changes: 10 additions & 12 deletions config/autoload/circlical.user.local.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<?php

declare(strict_types=1);

use Application\Entity\User;
use Application\Model\System;
use CirclicalUser\Service\PasswordChecker\Zxcvbn;

return [
'circlical' => [
'user' => [

/**
* Configuration settings for the access service
*/
'access' => [

'superadmin' => [

/**
Expand All @@ -30,11 +34,10 @@
* the default entities and relationships (recommended) -- this is the only config you need!
*/
'doctrine' => [
'entity' => \Application\Entity\User::class,
'entity' => User::class,
],

'password_strength_checker' => [
'implementation' => \CirclicalUser\Service\PasswordChecker\Zxcvbn::class,
'implementation' => Zxcvbn::class,
'config' => [
'required_strength' => 3,
],
Expand All @@ -45,9 +48,8 @@
* how to behave.
*/
'auth' => [

'secure_cookies' => static function () {
return \Application\Model\System::isSSL();
return System::isSSL();
},

// Lax is required, instead of Strict, or SSO breaks
Expand Down Expand Up @@ -84,16 +86,13 @@
* Make sure that the request IP matches the verification IP
*/
'validate_ip' => false,

],
],


/*
* When a user tries to access a page gated by auth, or rights - what do we do with them?
* This user module provides a simple 'Redirect' strategy, but you can also roll your own
*/

'deny_strategy' => [

/*
Expand All @@ -110,7 +109,6 @@
// 'action' => 'login',
// ],
],

],
],
];
];
9 changes: 8 additions & 1 deletion config/autoload/global.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

declare(strict_types=1);

/**
* Global Configuration Override
*
Expand All @@ -12,4 +14,9 @@
* file.
*/

return [];
return [
'identity' => [
'name' => 'Sample Application',
'email' => 'your@email.com',
],
];
9 changes: 9 additions & 0 deletions maizzle/emails/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
7 changes: 7 additions & 0 deletions maizzle/emails/.github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: weekly
open-pull-requests-limit: 10
1 change: 1 addition & 0 deletions maizzle/emails/.github/logo-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions maizzle/emails/.github/logo-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions maizzle/emails/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
node_modules
build_local
.vscode
.idea
Thumbs.db
.DS_Store
npm-debug.log
yarn-error.log
21 changes: 21 additions & 0 deletions maizzle/emails/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) Cosmin Popovici

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
68 changes: 68 additions & 0 deletions maizzle/emails/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<div align="center">
<p>
<a href="https://maizzle.com/#gh-light-mode-only" target="_blank">
<img src="./.github/logo-light.svg" alt="Maizzle" width="300">
</a>
<a href="https://maizzle.com/#gh-dark-mode-only" target="_blank">
<img src="./.github/logo-dark.svg" alt="Maizzle" width="300">
</a>
</p>
<p>Quickly build HTML emails with utility-first CSS</p>
<div>

[![Version][npm-version-shield]][npm]
[![Build][github-ci-shield]][github-ci]
[![Downloads][npm-stats-shield]][npm-stats]
[![License][license-shield]][license]

</div>
</div>

## Getting Started

Clone this starter:

```bash
npx degit maizzle/maizzle my-project
```

Install dependencies:

```
cd my-project
npm install
```

Start local development:

```
npm run dev
```

Build emails for production:

```
npm run build
```

## Documentation

Maizzle documentation is available at https://maizzle.com

## Issues

Please open all issues in the [framework repository](https://github.com/maizzle/framework).

## License

The Maizzle framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

[npm]: https://www.npmjs.com/package/@maizzle/framework
[npm-stats]: https://npm-stat.com/charts.html?package=%40maizzle%2Fframework&from=2019-03-27
[npm-version-shield]: https://img.shields.io/npm/v/@maizzle/framework.svg?style=flat-square
[npm-stats-shield]: https://img.shields.io/npm/dt/@maizzle/framework.svg?style=flat-square&color=6875f5
[github-ci]: https://github.com/maizzle/framework/actions
[github-ci-shield]: https://img.shields.io/github/workflow/status/maizzle/cli/Node.js%20CI?style=flat-square
[license]: ./LICENSE
[license-shield]: https://img.shields.io/npm/l/@maizzle/framework.svg?style=flat-square&color=0e9f6e
21 changes: 21 additions & 0 deletions maizzle/emails/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
/*
|-------------------------------------------------------------------------------
| Development config https://maizzle.com/docs/environments
|-------------------------------------------------------------------------------
|
| The exported object contains the default Maizzle settings for development.
| This is used when you run `maizzle build` or `maizzle serve` and it has
| the fastest build time, since most transformations are disabled.
|
*/

module.exports = {
build: {
templates: {
source: 'src/templates',
destination: {
path: 'build_local',
},
},
},
}
Loading

0 comments on commit 46dd9d1

Please sign in to comment.