feat update

myclubapp · May 15, 2024 · f41abc9 · f41abc9
1 parent e3ae3e0
commit f41abc9
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 39 deletions.
diff --git a/src/app/pages/auth/login/login.page.scss b/src/app/pages/auth/login/login.page.scss
@@ -1,4 +1,9 @@
 ion-list{
     margin-left: 0px !important;
     margin-right: 0px !important;
-}
+}
+
+ion-card-title{
+    margin-top: 16px  !important;
+    margin-bottom: 16px  !important;
+}
diff --git a/src/app/pages/auth/logout/logout.page.scss b/src/app/pages/auth/logout/logout.page.scss
@@ -1,4 +1,8 @@
 ion-list{
     margin-left: 0px !important;
     margin-right: 0px !important;
-}
+}
+ion-card-title{
+    margin-top: 16px  !important;
+    margin-bottom: 16px  !important;
+}
diff --git a/src/app/pages/auth/reset-password/reset-password.page.scss b/src/app/pages/auth/reset-password/reset-password.page.scss
@@ -1,4 +1,8 @@
 ion-list{
     margin-left: 0px !important;
     margin-right: 0px !important;
-}
+}
+ion-card-title{
+    margin-top: 16px  !important;
+    margin-bottom: 16px  !important;
+}
diff --git a/src/app/pages/auth/signup/signup.page.scss b/src/app/pages/auth/signup/signup.page.scss
@@ -1,4 +1,8 @@
 ion-list{
     margin-left: 0px !important;
     margin-right: 0px !important;
-}
+}
+ion-card-title{
+    margin-top: 16px  !important;
+    margin-bottom: 16px  !important;
+}
diff --git a/src/app/pages/auth/signup/signup.page.ts b/src/app/pages/auth/signup/signup.page.ts
@@ -103,7 +103,7 @@ export class SignupPage implements OnInit {
           header: await lastValueFrom(
             this.translate.get("signup.account__created")
           ),
-          message: "signup.account__created_description",
+          message: await lastValueFrom(this.translate.get("signup.account__created_description")),
           buttons: [
             {
               text: await lastValueFrom(this.translate.get("common.ok")),

diff --git a/src/app/pages/onboarding/onboarding-club/onboarding-club.page.html b/src/app/pages/onboarding/onboarding-club/onboarding-club.page.html
@@ -8,19 +8,19 @@
   <ion-grid class="ion-no-padding" style="height: 100vh;">
     <ion-row style="height: 100%;">
       <!-- Login Form Column -->
-      <ion-col size-md="6" size-lg="5" style="display: flex; align-items: top; justify-content: center;">
+      <ion-col size-md="6" size-lg="5" style="display: flex; align-items: center; justify-content: center;">
         <ion-card class="ion-no-margin" style="max-width: 500px; width: 100%;">
           <ion-card-content>
             <ion-img src="assets/logo_trans.png" alt="Logo" style="max-height: 100px; max-width: 100px;"></ion-img>
-            <ion-card-title>Trete deinem Verein bei</ion-card-title>
+            <ion-card-title>Trete deinem Club bei</ion-card-title>           
             <ion-text>
-              <p>Damit wir dein Profil fertig einrichten könnnen musst du einem Club beitreten.</p>
+              <p>Damit wir dein Profil fertig einrichten könnnen, musst du zuerst einem Club beitreten.</p>
               <p>Suche deinen Club über das Suchfeld und stelle anschliessend eine Beitrittsanfrage an deinen Verein. Die Verantworlichen Personen werden anschliessend prüfen ob du berechtigt bist, diesem Verein beizutreten und fügen dich einem Team hinzu. Du wirst per E-Mail Benachrichtigt, wenn dein Antrag angenommen wurde.</p>
             </ion-text>
             <ion-searchbar  class="ion-no-padding" (ionInput)="handleChange($event)" animated="false"
               search-icon="search-circle"
               [placeholder]='"onboarding.search_by_club__pholder" |  translate'></ion-searchbar>
-            <ion-list [inset]="true">
+            <ion-list [inset]="true" class="ion-no-margin">
               <ion-list-header *ngIf="clubListSU.length > 0">
                 Unihockey
               </ion-list-header>

diff --git a/src/app/pages/onboarding/onboarding-club/onboarding-club.page.scss b/src/app/pages/onboarding/onboarding-club/onboarding-club.page.scss
@@ -0,0 +1,7 @@
+ion-list {
+    margin: 0px !important;
+}
+ion-card-title{
+    margin-top: 16px  !important;
+    margin-bottom: 16px  !important;
+}
diff --git a/src/app/pages/onboarding/onboarding-email/onboarding-email.page.html b/src/app/pages/onboarding/onboarding-email/onboarding-email.page.html
@@ -4,38 +4,65 @@
       <ion-icon name="log-out-outline" size="small"></ion-icon>
     </ion-fab-button>
   </ion-fab>
-  <ion-card>
-    <svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="570" height="350" viewBox="0 0 570 511.67482"
-      xmlns:xlink="http://www.w3.org/1999/xlink">
-      <path
-        d="M879.99927,389.83741a.99678.99678,0,0,1-.5708-.1792L602.86963,197.05469a5.01548,5.01548,0,0,0-5.72852.00977L322.57434,389.65626a1.00019,1.00019,0,0,1-1.14868-1.6377l274.567-192.5918a7.02216,7.02216,0,0,1,8.02-.01318l276.55883,192.603a1.00019,1.00019,0,0,1-.57226,1.8208Z"
-        transform="translate(-315 -194.16259)" fill="#3f3d56" />
-      <polygon points="23.264 202.502 285.276 8.319 549.276 216.319 298.776 364.819 162.776 333.819 23.264 202.502"
-        fill="#e6e6e6" />
-      <path
-        d="M489.25553,650.70367H359.81522a6.04737,6.04737,0,1,1,0-12.09473H489.25553a6.04737,6.04737,0,1,1,0,12.09473Z"
-        transform="translate(-315 -194.16259)" fill="#6c63ff" />
-      <path
-        d="M406.25553,624.70367H359.81522a6.04737,6.04737,0,1,1,0-12.09473h46.44031a6.04737,6.04737,0,1,1,0,12.09473Z"
-        transform="translate(-315 -194.16259)" fill="#6c63ff" />
-      <path
-        d="M603.96016,504.82207a7.56366,7.56366,0,0,1-2.86914-.562L439.5002,437.21123v-209.874a7.00817,7.00817,0,0,1,7-7h310a7.00818,7.00818,0,0,1,7,7v210.0205l-.30371.12989L606.91622,504.22734A7.61624,7.61624,0,0,1,603.96016,504.82207Z"
-        transform="translate(-315 -194.16259)" fill="#fff" />
-      <path
-        d="M603.96016,505.32158a8.07177,8.07177,0,0,1-3.05957-.59863L439.0002,437.54521v-210.208a7.50851,7.50851,0,0,1,7.5-7.5h310a7.50851,7.50851,0,0,1,7.5,7.5V437.68779l-156.8877,66.999A8.10957,8.10957,0,0,1,603.96016,505.32158Zm-162.96-69.1123,160.66309,66.66455a6.1182,6.1182,0,0,0,4.668-.02784l155.669-66.47851V227.33721a5.50653,5.50653,0,0,0-5.5-5.5h-310a5.50653,5.50653,0,0,0-5.5,5.5Z"
-        transform="translate(-315 -194.16259)" fill="#3f3d56" />
-      <path
-        d="M878,387.83741h-.2002L763,436.85743l-157.06982,67.07a5.06614,5.06614,0,0,1-3.88038.02L440,436.71741l-117.62012-48.8-.17968-.08H322a7.00778,7.00778,0,0,0-7,7v304a7.00779,7.00779,0,0,0,7,7H878a7.00779,7.00779,0,0,0,7-7v-304A7.00778,7.00778,0,0,0,878,387.83741Zm5,311a5.002,5.002,0,0,1-5,5H322a5.002,5.002,0,0,1-5-5v-304a5.01106,5.01106,0,0,1,4.81006-5L440,438.87739l161.28027,66.92a7.12081,7.12081,0,0,0,5.43994-.03L763,439.02741l115.2002-49.19a5.01621,5.01621,0,0,1,4.7998,5Z"
-        transform="translate(-315 -194.16259)" fill="#3f3d56" />
-      <path
-        d="M602.345,445.30958a27.49862,27.49862,0,0,1-16.5459-5.4961l-.2959-.22217-62.311-47.70752a27.68337,27.68337,0,1,1,33.67407-43.94921l40.36035,30.94775,95.37793-124.38672a27.68235,27.68235,0,0,1,38.81323-5.12353l-.593.80517.6084-.79346a27.71447,27.71447,0,0,1,5.12353,38.81348L624.36938,434.50586A27.69447,27.69447,0,0,1,602.345,445.30958Z"
-        transform="translate(-315 -194.16259)" fill="#6c63ff" />
-    </svg>
+
+  <ion-grid class="ion-no-padding" style="height: 100vh;">
+    <ion-row style="height: 100%;">
+      <!-- Login Form Column -->
+      <ion-col size-md="6" size-lg="5" style="display: flex; align-items: center; justify-content: center;">
+        <ion-card class="ion-no-margin" style="max-width: 500px; width: 100%;">
+          <ion-card-content>
+            <ion-img src="assets/logo_trans.png" alt="Logo" style="max-height: 100px; max-width: 100px;">
+            </ion-img>
+
+            <ion-card-title>E-Mail Adresse verifizieren</ion-card-title>
+            <ion-text>
+              <p>Damit wir dein Profil fertig einrichten können, musst du zuerst deine E-Mail Adresse verifizieren.</p>
+              <p>Prüfe bitte dein E-Mail Postfach (schau auch im SPAM Ordner nach) und klicke auf den Link "E-Mail verifizieren".</p>
+            </ion-text>
+            <ion-row>
+              <ion-col size="3"> </ion-col>
+              <ion-col size="6">
+                <ion-button color="light" expand="block" shape="round" (click)="resendEmailActivation()">E-Mail erneut senden</ion-button>
+              </ion-col>
+              <ion-col size="3"> </ion-col>
+            </ion-row>
+            <ion-row>
+              <ion-col size="3"> </ion-col>
+              <ion-col size="6">
+                <ion-button color="primary" expand="block" shape="round" (click)="verified()">Weiter</ion-button>
+              </ion-col>
+              <ion-col size="3"> </ion-col>
+            </ion-row>
+          </ion-card-content>
+        </ion-card>
+      </ion-col>
+      <!-- Image Column -->
+      <ion-col size-md="6" size-lg="7" style="padding: 0;" class="ion-hide-md-down">
+        <div
+          style="height: 100%; background-image: url('assets/bg/login.jpg'); background-size: cover; background-position: center;">
+        </div>
+      </ion-col>
+    </ion-row>
+  </ion-grid>
+
+
+</ion-content>
+
+<!--
+
+  <ion-content>
+    <ion-fab vertical="top" horizontal="end">
+      <ion-fab-button size="small" (click)="logout()">
+        <ion-icon name="log-out-outline" size="small"></ion-icon>
+      </ion-fab-button>
+    </ion-fab>
+    <ion-card>
+    
     <ion-card-header>
       <ion-card-title>E-Mail Adresse verifizieren</ion-card-title>
       <ion-card-subtitle>Onboarding</ion-card-subtitle>
     </ion-card-header>
-
+    
     <ion-card-content> Bitte zuerst E-Mail Adresse prüfen </ion-card-content>
     <ion-row>
       <ion-col size="3"> </ion-col>
@@ -52,5 +79,6 @@
       <ion-col size="3"> </ion-col>
     </ion-row>
   </ion-card>
-
-</ion-content>
+  
+</ion-content>
+-->
diff --git a/src/app/pages/onboarding/onboarding-email/onboarding-email.page.scss b/src/app/pages/onboarding/onboarding-email/onboarding-email.page.scss
@@ -0,0 +1,4 @@
+ion-card-title{
+    margin-top: 16px  !important;
+    margin-bottom: 16px  !important;
+}