conflict resolved
This commit is contained in:
Olivier PARPAILLON
2
.env
2
.env
@@ -15,7 +15,7 @@
|
||||
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
|
||||
|
||||
###> symfony/framework-bundle ###
|
||||
APP_ENV=dev
|
||||
APP_ENV=prod
|
||||
APP_SECRET=ba1ab1eaa1c6662c10564a7a82901198
|
||||
###< symfony/framework-bundle ###
|
||||
|
||||
|
||||
1
.idea/sortir.iml
generated
1
.idea/sortir.iml
generated
@@ -3,6 +3,7 @@
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="App\" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="App\Tests\" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/cache" />
|
||||
|
||||
10
assets/not-found.js
Normal file
10
assets/not-found.js
Normal file
@@ -0,0 +1,10 @@
|
||||
// import './bootstrap.js';
|
||||
/*
|
||||
* Welcome to your app's main JavaScript file!
|
||||
*
|
||||
* This file will be included onto the page via the importmap() Twig function,
|
||||
* which should already be in your base.html.twig.
|
||||
*/
|
||||
import './styles/not-found.css';
|
||||
|
||||
console.log('This log comes from assets/notfound.js - welcome to AssetMapper! 🎉');
|
||||
88
assets/styles/not-found.css
Normal file
88
assets/styles/not-found.css
Normal file
@@ -0,0 +1,88 @@
|
||||
@import url('https://fonts.googleapis.com/css?family=VT323');
|
||||
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
:root {
|
||||
--light-grey: #e0e2f4;
|
||||
--grey: #aaaaaa;
|
||||
--blue: #0414a7;
|
||||
--base-font-size: 20px;
|
||||
--font-stack: 'VT323', monospace;
|
||||
}
|
||||
|
||||
body,
|
||||
h1,
|
||||
h2,
|
||||
h3,
|
||||
h4,
|
||||
p,
|
||||
a {
|
||||
color: var(--light-grey);
|
||||
}
|
||||
|
||||
body,
|
||||
p {
|
||||
font: normal var(--base-font-size)/1.25rem var(--font-stack);
|
||||
}
|
||||
|
||||
h1 {
|
||||
font: normal 2.75rem/1.05em var(--font-stack);
|
||||
}
|
||||
|
||||
h2 {
|
||||
font: normal 2.25rem/1.25em var(--font-stack);
|
||||
}
|
||||
|
||||
h3 {
|
||||
font: lighter 1.5rem/1.25em var(--font-stack);
|
||||
}
|
||||
|
||||
h4 {
|
||||
font: lighter 1.125rem/1.2222222em var(--font-stack);
|
||||
}
|
||||
|
||||
body {
|
||||
background: var(--blue);
|
||||
}
|
||||
|
||||
.container {
|
||||
width: 90%;
|
||||
margin: auto;
|
||||
max-width: 640px;
|
||||
}
|
||||
|
||||
.bsod {
|
||||
padding-top: 10%;
|
||||
}
|
||||
|
||||
.bsod .neg {
|
||||
text-align: center;
|
||||
color: var(--blue);
|
||||
}
|
||||
|
||||
.bsod .neg .bg {
|
||||
background: var(--grey);
|
||||
padding: 0 15px 2px 13px;
|
||||
}
|
||||
|
||||
.bsod .title {
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
|
||||
.bsod .nav {
|
||||
margin-top: 35px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.bsod .nav .link {
|
||||
text-decoration: none;
|
||||
padding: 0 9px 2px 8px;
|
||||
}
|
||||
|
||||
.bsod .nav .link:hover,
|
||||
.bsod .nav .link:focus {
|
||||
background: var(--grey);
|
||||
color: var(--blue);
|
||||
}
|
||||
16
composer.lock
generated
16
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "1fd68014d63c789294bcc54a5c6d1c50",
|
||||
"content-hash": "e172d72b9dfb496cd9861e9141efa997",
|
||||
"packages": [
|
||||
{
|
||||
"name": "composer/semver",
|
||||
@@ -428,16 +428,16 @@
|
||||
},
|
||||
{
|
||||
"name": "doctrine/doctrine-bundle",
|
||||
"version": "2.13.0",
|
||||
"version": "2.13.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/DoctrineBundle.git",
|
||||
"reference": "ca59d84b8e63143ce1aed90cdb333ba329d71563"
|
||||
"reference": "2740ad8b8739b39ab37d409c972b092f632b025a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/ca59d84b8e63143ce1aed90cdb333ba329d71563",
|
||||
"reference": "ca59d84b8e63143ce1aed90cdb333ba329d71563",
|
||||
"url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/2740ad8b8739b39ab37d409c972b092f632b025a",
|
||||
"reference": "2740ad8b8739b39ab37d409c972b092f632b025a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -451,7 +451,7 @@
|
||||
"symfony/console": "^5.4 || ^6.0 || ^7.0",
|
||||
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
|
||||
"symfony/deprecation-contracts": "^2.1 || ^3",
|
||||
"symfony/doctrine-bridge": "^5.4.19 || ^6.0.7 || ^7.0",
|
||||
"symfony/doctrine-bridge": "^5.4.46 || ^6.4.3 || ^7.0.3",
|
||||
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
|
||||
"symfony/polyfill-php80": "^1.15",
|
||||
"symfony/service-contracts": "^1.1.1 || ^2.0 || ^3"
|
||||
@@ -528,7 +528,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/doctrine/DoctrineBundle/issues",
|
||||
"source": "https://github.com/doctrine/DoctrineBundle/tree/2.13.0"
|
||||
"source": "https://github.com/doctrine/DoctrineBundle/tree/2.13.1"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@@ -544,7 +544,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-09-01T09:46:40+00:00"
|
||||
"time": "2024-11-08T23:27:54+00:00"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/doctrine-migrations-bundle",
|
||||
|
||||
19
package-lock.json
generated
19
package-lock.json
generated
@@ -5,6 +5,10 @@
|
||||
"packages": {
|
||||
"": {
|
||||
"license": "UNLICENSED",
|
||||
"dependencies": {
|
||||
"gsap": "^3.0.0-beta.11",
|
||||
"split-text": "^1.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.17.0",
|
||||
"@babel/preset-env": "^7.16.0",
|
||||
@@ -3837,6 +3841,12 @@
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/gsap": {
|
||||
"version": "3.0.0-beta.11",
|
||||
"resolved": "https://registry.npmjs.org/gsap/-/gsap-3.0.0-beta.11.tgz",
|
||||
"integrity": "sha512-MC5VetUp+PbupAHOGFtgXzsD8zHBAyq3gGOvIiaYU9NhIyhBm0F7unVb9XYYUg5iNo7lkhGqHki6WdjAskEHtQ==",
|
||||
"license": "Standard 'no charge' license: https://greensock.com/standard-license. Club GreenSock members get more: https://greensock.com/licensing/. Why GreenSock doesn't employ an MIT license: https://greensock.com/why-license/"
|
||||
},
|
||||
"node_modules/has-flag": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
|
||||
@@ -6093,6 +6103,15 @@
|
||||
"source-map": "^0.6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/split-text": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/split-text/-/split-text-1.0.0.tgz",
|
||||
"integrity": "sha512-uUKOFGpdt4/rrrBSmLugVbGmHaD7Ex4FcqIEXQRwlnxnDN+pL21Rx2lTgA3CSM8JE6EZPL4ZeEJp1ntzBsnc6Q==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/stackframe": {
|
||||
"version": "1.3.4",
|
||||
"resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz",
|
||||
|
||||
@@ -20,5 +20,9 @@
|
||||
"dev": "encore dev",
|
||||
"watch": "encore dev --watch",
|
||||
"build": "encore production --progress"
|
||||
},
|
||||
"dependencies": {
|
||||
"gsap": "^3.0.0-beta.11",
|
||||
"split-text": "^1.0.0"
|
||||
}
|
||||
}
|
||||
|
||||
23
templates/bundles/TwigBundle/Exception/error.html.twig
Normal file
23
templates/bundles/TwigBundle/Exception/error.html.twig
Normal file
@@ -0,0 +1,23 @@
|
||||
{% block head %}
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
{% block stylesheets %}
|
||||
{{ encore_entry_link_tags('not-found') }}
|
||||
{% endblock %}
|
||||
</head>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="bsod container mx-auto pt-24 max-w-xl">
|
||||
<h1 class="neg text-center text-6xl text-blue-800 mb-12">
|
||||
<span class="bg-gray-400 py-1 px-4">Error - {{ status_code }}</span>
|
||||
</h1>
|
||||
<p class="text-lg text-gray-200 mb-4">An error has occured, to continue:</p>
|
||||
<p class="text-lg text-gray-200 mb-8">
|
||||
* Return to our homepage.
|
||||
</p>
|
||||
<nav class="nav text-center mt-9">
|
||||
<a href="{{ path('home') }}" class="link text-gray-200 hover:bg-gray-400 hover:text-blue-800 py-1 px-2">index</a>
|
||||
</nav>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -21,6 +21,7 @@ Encore
|
||||
* and one CSS file (e.g. app.css) if your JavaScript imports CSS.
|
||||
*/
|
||||
.addEntry('app', './assets/app.js')
|
||||
.addEntry('not-found', './assets/not-found.js')
|
||||
.addEntry('add-lieu', './assets/js/add-lieu.js')
|
||||
.addEntry('show-lieu', './assets/js/show-lieu.js')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user