Merge pull request #27 from WildCodeSchool-2023-09/last_fixes

[FIXES]
WildCodeSchool-2023-09 · Feb 7, 2024 · f5bb641 · f5bb641
2 parents 689eb37 + df5e24c
commit f5bb641
Show file tree

Hide file tree

Showing 18 changed files with 91 additions and 274 deletions.
diff --git a/assets/app.js b/assets/app.js
@@ -38,6 +38,7 @@ import './styles/main/desktop.scss';
 import './styles/main/reset.scss';
 
 import './styles/prize/prize-index.scss';
+import './styles/prize/prize-form.scss';
 
 import './styles/gameplayed.scss';
 import './styles/leaderboard.scss';

diff --git a/assets/styles/event/event-form.scss b/assets/styles/event/event-form.scss
@@ -6,6 +6,7 @@
         flex-direction: column;
         justify-content: center;
         align-items: center;
+		gap: .5rem;
 
 		form {
 
@@ -23,7 +24,6 @@
 			}
 
 			.big-btn {
-				// margin-top: 2.5rem;
 				width: 50%;
 			}
 		}
@@ -38,10 +38,6 @@
 		.container {
 			form {
 				width: 70%;
-
-				& > div {
-
-				}
 			}
 		}
 	}

diff --git a/assets/styles/forms/global.scss b/assets/styles/forms/global.scss
@@ -30,9 +30,14 @@ form textarea:hover {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
+			gap: 1rem;
 
 			& > div {
-				// width: 50%;
+				.vich-file {
+					div, a {
+						display: none;
+					}
+				}
 
 				label, input {
 					cursor: pointer;
@@ -41,7 +46,7 @@ form textarea:hover {
 				label {
 					display: none;
 
-					margin-top: 1rem;
+					margin-bottom: .5rem;
 
 					text-align: center;
 					font-size: 1.2rem;
@@ -67,7 +72,7 @@ form textarea:hover {
 					box-shadow: $shadow;
 
 					padding: .25rem 1.25rem;
-					margin-top: .5rem;
+					// margin-top: .5rem;
 
 					&:hover {
 						border: 1px solid #06CCF8;

diff --git a/assets/styles/game/game-form.scss b/assets/styles/game/game-form.scss
@@ -2,6 +2,12 @@
 
 #game-form .content .container {
     form {
+        .vich-file {
+            div, a {
+                display: none;
+            }
+        }
+
         input:hover,
         textarea:hover {
             border: 1px solid #0982cd;
@@ -36,12 +42,6 @@
             height: 46px;
         }
 
-        .vich-file {
-            div, a {
-                display: none;
-            }
-        }
-
         select {
             option {
                 color: #5755ce;
@@ -72,19 +72,8 @@
             align-items: center;
         }
 
-        button#add-edit-game {
-            border-radius: $borderRadiusMedium;
-            border: 0.5px $colorGradient1;
-            background: $colorGradient5;
-            color : #020051;
-            width: 288px;
-            height: 50px;
-            text-align: center;
-            font-size: 18px;
-            margin-left: calc(50% - 144px);
-            margin-top: 24px;
-
-            cursor: pointer;
+        .big-btn {
+            width: 30%;
         }
     }
 }

diff --git a/assets/styles/main/app.scss b/assets/styles/main/app.scss
@@ -261,8 +261,6 @@ button {
     &:hover {
         transform: scale(102%);
     }
-
-    transition: background-color ease-in-out 100ms;
 }
 
 h2:hover {

diff --git a/assets/styles/prize/prize-form.scss b/assets/styles/prize/prize-form.scss
@@ -0,0 +1,43 @@
+@import "../main/_variables";
+
+#prize-form {
+	.container {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+
+		form {
+
+			& > div {
+				width: 100%;
+
+                label {
+                    display: block;
+                }
+
+                & > div {
+                    display: flex;
+                    gap: 1rem;
+                }
+			}
+
+			.big-btn {
+				width: 50%;
+			}
+		}
+	}
+}
+
+//
+
+@media screen and (min-width: $desktopWidth) {
+
+	#prize-form {
+		.container {
+			form {
+				width: 70%;
+			}
+		}
+	}
+}
diff --git a/migrations/Version20240207152234.php → migrations/Version20240207155635.php b/migrations/Version20240207152234.php → migrations/Version20240207155635.php
@@ -10,7 +10,7 @@
 /**
  * Auto-generated Migration: Please modify to your needs!
  */
-final class Version20240207152234 extends AbstractMigration
+final class Version20240207155635 extends AbstractMigration
 {
     public function getDescription(): string
     {

diff --git a/src/Form/PrizeFormType.php b/src/Form/PrizeFormType.php
@@ -31,6 +31,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ],
         ])
         ->add('description', TextareaType::class, [
+            'attr' => [
+                'rows' => 3
+            ],
             'constraints' => [
                 new NotBlank([
                     'message' => 'Please enter the description',

diff --git a/templates/event/_delete_form.html 2.twig b/templates/event/_delete_form.html 2.twig
diff --git a/templates/event/_form.html 2.twig b/templates/event/_form.html 2.twig
diff --git a/templates/event/edit.html 2.twig b/templates/event/edit.html 2.twig
diff --git a/templates/event/index.html 2.twig b/templates/event/index.html 2.twig
diff --git a/templates/event/new.html 2.twig b/templates/event/new.html 2.twig