Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/app/component/login/login.component.html

src/app/component/login/login.component.html

@@ -1,7 +1,21 @@
 <div class="h-screen w-screen flex items-center justify-center">
-  <div class="max-w-md py-12">
+  <div class="max-w-md">
 
     <div class="bg-white px-6 py-8 rounded-lg shadow-md w-[400px]">
+      <div style="padding-bottom: 30px">
+        <div class="alert alert-error shadow-lg">
+          <div>
+            <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none"
+                 viewBox="0 0 24 24">
+              <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
+                    d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"/>
+            </svg>
+            <span *ngIf="errorLogin">Username o password sbagliate</span>
+            <span *ngIf="errorCreateUser">Username già utilizzato</span>
+            <span>ciao</span>
+          </div>
+        </div>
+      </div>
 
       <h2 *ngIf="login" class="text-center text-2xl font-bold mb-8">{{ loginTranslation.login }}</h2>
       <h2 *ngIf="!login" class="text-center text-2xl font-bold mb-8">{{ loginTranslation.register }}</h2>