From 40c75ecf87834c612700865dd11d49bb0f58bb10 Mon Sep 17 00:00:00 2001
From: Brian Caldera <hcaldera@deakin.edu.au>
Date: Tue, 5 Dec 2023 20:18:02 +1100
Subject: [PATCH 1/3] refactor(migration): replaced fxlayout with tailwind
 equivalent in welcome component

---
 src/app/welcome/welcome.component.html     | 14 ++++++--------
 src/styles/common/hero-sidebar-layout.scss | 11 +++++++++++
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/app/welcome/welcome.component.html b/src/app/welcome/welcome.component.html
index 26780c3d4..bfc2f246c 100644
--- a/src/app/welcome/welcome.component.html
+++ b/src/app/welcome/welcome.component.html
@@ -1,17 +1,15 @@
-<section class="welcome" fxFlex fxLayout="row">
-  <f-hero-sidebar fxHide.lt-md fxFlexAlign="start"></f-hero-sidebar>
-  <!-- <section class="content" fxFlex.gt-sm  > -->
-  <section class="content" fxFlex.gt-sm fxLayout.gt-sm="column" [ngClass.gt-sm]="'large'">
+<section class="welcome flex flex-row sm:h-screen">
+  <f-hero-sidebar class="media-screen-hide self-start flex-col h-full"></f-hero-sidebar>
+  <section class="content flex flex-col sm:h-screen">
     <div class="container">
       <div class="subcontainer">
-        <div class="wordmark" fxLayout="row" fxLayoutAlign="start center" fxHide.gt-sm fxFlexAlign="start">
+        <div class="wordmark flex flex-row place-content-start md:hidden">
           <img src="../../../assets/images/logo-bw.svg" width="40px" alt="Homepage Logo" />
           <p>{{ externalName.value }}</p>
         </div>
-        <h1 class="welcome-heading" fxFlexAlign="start">Welcome to {{ externalName.value }}</h1>
+        <h1 class="welcome-heading flex flex-row place-content-start">Welcome to {{ externalName.value }}</h1>
         <f-edit-profile-form mode="create"></f-edit-profile-form>
       </div>
     </div>
   </section>
-  <!-- </section> -->
-</section>
\ No newline at end of file
+</section>
diff --git a/src/styles/common/hero-sidebar-layout.scss b/src/styles/common/hero-sidebar-layout.scss
index ca4d84bd0..f22afc74c 100644
--- a/src/styles/common/hero-sidebar-layout.scss
+++ b/src/styles/common/hero-sidebar-layout.scss
@@ -58,3 +58,14 @@ f-welcome .container {
 .welcome {
   width: 100%;
 }
+
+.media-screen-hide {
+  display: flex; /* Initially visible */
+}
+
+/* Media query for small screens */
+@media screen and (max-width: 960px) {
+  .media-screen-hide {
+    display: none; /* Hide on small screens */
+  }
+}

From 555b948e1a1e81ecd62023b813c41daabbde1571 Mon Sep 17 00:00:00 2001
From: Brian Caldera <hcaldera@deakin.edu.au>
Date: Thu, 7 Dec 2023 18:57:53 +1100
Subject: [PATCH 2/3] refactor(migration): fixe minor errors after peer review

---
 src/app/welcome/welcome.component.html     |  8 +++++---
 src/styles/common/hero-sidebar-layout.scss | 21 ++++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/app/welcome/welcome.component.html b/src/app/welcome/welcome.component.html
index bfc2f246c..08bebd9a5 100644
--- a/src/app/welcome/welcome.component.html
+++ b/src/app/welcome/welcome.component.html
@@ -1,13 +1,15 @@
 <section class="welcome flex flex-row sm:h-screen">
-  <f-hero-sidebar class="media-screen-hide self-start flex-col h-full"></f-hero-sidebar>
+  <f-hero-sidebar class="sidebar self-start flex-col h-full"></f-hero-sidebar>
   <section class="content flex flex-col sm:h-screen">
     <div class="container">
       <div class="subcontainer">
-        <div class="wordmark flex flex-row place-content-start md:hidden">
+        <div class="wordmark flex-row place-content-start">
           <img src="../../../assets/images/logo-bw.svg" width="40px" alt="Homepage Logo" />
           <p>{{ externalName.value }}</p>
         </div>
-        <h1 class="welcome-heading flex flex-row place-content-start">Welcome to {{ externalName.value }}</h1>
+        <h1 class="welcome-heading flex flex-row place-content-start">
+          Welcome to {{ externalName.value }}
+        </h1>
         <f-edit-profile-form mode="create"></f-edit-profile-form>
       </div>
     </div>
diff --git a/src/styles/common/hero-sidebar-layout.scss b/src/styles/common/hero-sidebar-layout.scss
index f22afc74c..def50c253 100644
--- a/src/styles/common/hero-sidebar-layout.scss
+++ b/src/styles/common/hero-sidebar-layout.scss
@@ -59,13 +59,24 @@ f-welcome .container {
   width: 100%;
 }
 
-.media-screen-hide {
+/* Sidebar and Wordmark Media query for screens 960px and below */
+
+.sidebar {
   display: flex; /* Initially visible */
 }
 
-/* Media query for small screens */
-@media screen and (max-width: 960px) {
-  .media-screen-hide {
-    display: none; /* Hide on small screens */
+.wordmark {
+  display: none; /* Initially invisible */
+}
+
+@media (max-width: 959px) {
+  .sidebar {
+    display: none; /* Hide the element */
+  }
+}
+
+@media (max-width: 959px) {
+  .wordmark{
+    display: flex; /* Show the element */
   }
 }

From 93080f41e491844dc82e5674602c2def58705f18 Mon Sep 17 00:00:00 2001
From: Brian Caldera <hcaldera@deakin.edu.au>
Date: Thu, 7 Dec 2023 21:24:08 +1100
Subject: [PATCH 3/3] refactor(migration): fix minor errors after peer review

---
 src/styles/common/hero-sidebar-layout.scss | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/styles/common/hero-sidebar-layout.scss b/src/styles/common/hero-sidebar-layout.scss
index def50c253..f4444b4d2 100644
--- a/src/styles/common/hero-sidebar-layout.scss
+++ b/src/styles/common/hero-sidebar-layout.scss
@@ -59,8 +59,6 @@ f-welcome .container {
   width: 100%;
 }
 
-/* Sidebar and Wordmark Media query for screens 960px and below */
-
 .sidebar {
   display: flex; /* Initially visible */
 }
@@ -69,13 +67,12 @@ f-welcome .container {
   display: none; /* Initially invisible */
 }
 
+/* Sidebar and Wordmark Media query for screens 960px and below */
+
 @media (max-width: 959px) {
   .sidebar {
     display: none; /* Hide the element */
   }
-}
-
-@media (max-width: 959px) {
   .wordmark{
     display: flex; /* Show the element */
   }