diff --git a/.drone.yml b/.drone.yml index 03c0eae..64ced87 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,8 +11,8 @@ steps: - name: formulaire image: plugins/docker settings: - dockerfile: ./Dockerfile - context: . + dockerfile: ./Source/Dockerfile + context: ./Source registry: hub.codefirst.iut.uca.fr repo: hub.codefirst.iut.uca.fr/dorian.hodin/sae4.01_formulaire username: diff --git a/.idea/SAE4.01_FORMULAIRE.iml b/.idea/SAE4.01_FORMULAIRE.iml index aa81e2c..b2ec46c 100644 --- a/.idea/SAE4.01_FORMULAIRE.iml +++ b/.idea/SAE4.01_FORMULAIRE.iml @@ -8,5 +8,10 @@ + + + + + \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..c41cb55 --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Source/.htaccess b/Source/.htaccess index 56d0b29..f41aadd 100644 --- a/Source/.htaccess +++ b/Source/.htaccess @@ -27,5 +27,6 @@ RewriteRule ^deleteResponse$ %{ENV:APP_ROOT}index.php?page=deleteResponse [L] RewriteRule ^deleteKeyword$ %{ENV:APP_ROOT}index.php?page=deleteKeyword [L] RewriteRule ^deleteResponsesCandidate$ %{ENV:APP_ROOT}index.php?page=deleteResponsesCandidate [L] - -AddType text/css *.css \ No newline at end of file +AddType text/css .css +AddType text/javascript .js +AddType application/javascript .js diff --git a/Source/Config/composer.lock b/Source/Config/composer.lock index c370d1b..092ddd6 100644 --- a/Source/Config/composer.lock +++ b/Source/Config/composer.lock @@ -730,25 +730,25 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", + "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.3-dev" }, "thanks": { "name": "symfony/contracts", @@ -777,7 +777,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1" }, "funding": [ { @@ -793,7 +793,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-03-01T10:25:55+00:00" } ], "packages-dev": [ @@ -1343,16 +1343,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.0.17", + "version": "10.0.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b75eddcabca052312ae38c8a2bc69ff1a7b89b77" + "reference": "20c23e85c86e5c06d63538ba464e8054f4744e62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b75eddcabca052312ae38c8a2bc69ff1a7b89b77", - "reference": "b75eddcabca052312ae38c8a2bc69ff1a7b89b77", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20c23e85c86e5c06d63538ba464e8054f4744e62", + "reference": "20c23e85c86e5c06d63538ba464e8054f4744e62", "shasum": "" }, "require": { @@ -1424,7 +1424,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.0.19" }, "funding": [ { @@ -1440,7 +1440,7 @@ "type": "tidelift" } ], - "time": "2023-03-20T14:42:33+00:00" + "time": "2023-03-27T11:46:33+00:00" }, { "name": "sebastian/cli-parser", @@ -1744,16 +1744,16 @@ }, { "name": "sebastian/diff", - "version": "5.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "70dd1b20bc198da394ad542e988381b44e64e39f" + "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/70dd1b20bc198da394ad542e988381b44e64e39f", - "reference": "70dd1b20bc198da394ad542e988381b44e64e39f", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/aae9a0a43bff37bd5d8d0311426c87bf36153f02", + "reference": "aae9a0a43bff37bd5d8d0311426c87bf36153f02", "shasum": "" }, "require": { @@ -1798,7 +1798,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/5.0.1" }, "funding": [ { @@ -1806,7 +1807,7 @@ "type": "github" } ], - "time": "2023-02-03T07:00:31+00:00" + "time": "2023-03-23T05:12:41+00:00" }, { "name": "sebastian/environment", diff --git a/Dockerfile b/Source/Dockerfile similarity index 70% rename from Dockerfile rename to Source/Dockerfile index 2020225..f8e3985 100644 --- a/Dockerfile +++ b/Source/Dockerfile @@ -1,12 +1,10 @@ FROM php:8.1-apache RUN apt-get update && apt-get install -y git zip -COPY . /var/www/html -WORKDIR /var/www/html/Source/Config +COPY ../Source /var/www/html +WORKDIR /var/www/html/Config RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer RUN composer update && composer install RUN a2enmod rewrite RUN a2enmod actions RUN service apache2 restart -WORKDIR /var/www/html -RUN ln -sf ./Source/index.php index.php diff --git a/Source/Views/CSS/styles.css b/Source/Views/CSS/styles.css index 3a5c1f6..fe9b13c 100644 --- a/Source/Views/CSS/styles.css +++ b/Source/Views/CSS/styles.css @@ -1,3 +1,10 @@ +@charset "UTF-8"; +@import url("styles.css") screen; +/* Déclaration de la directive Content-Type */ + +/* Le reste de votre code CSS ici */ + + body { background: #eee } diff --git a/Source/Views/CSS/stylesForm.css b/Source/Views/CSS/stylesForm.css index 2ade287..c2cbc09 100644 --- a/Source/Views/CSS/stylesForm.css +++ b/Source/Views/CSS/stylesForm.css @@ -1,4 +1,6 @@ @charset "UTF-8"; +@import url("styles.css") screen; + /*! * Start Bootstrap - Shop Homepage v5.0.5 (https://startbootstrap.com/template/shop-homepage) * Copyright 2013-2022 Start Bootstrap diff --git a/Source/Views/HTML/form.php b/Source/Views/HTML/form.php index 670af97..8ddda42 100644 --- a/Source/Views/HTML/form.php +++ b/Source/Views/HTML/form.php @@ -37,8 +37,8 @@ - - + +