From 98a6d497f6ccdf023539edd6bcf667293d9dd96e Mon Sep 17 00:00:00 2001
From: jdurrell <john.m.durrell@gmail.com>
Date: Fri, 31 Mar 2023 16:35:37 -0400
Subject: [PATCH 1/2] Changed schedule view to columns based on room instead of
 difficulty level.

---
 .../views/live-view/live-view.component.html  | 83 ++++++++-----------
 .../src/environments/environment.ts           |  8 +-
 2 files changed, 39 insertions(+), 52 deletions(-)

diff --git a/user-registration-app/src/app/views/live-view/live-view.component.html b/user-registration-app/src/app/views/live-view/live-view.component.html
index 75f91046..42dbc80c 100644
--- a/user-registration-app/src/app/views/live-view/live-view.component.html
+++ b/user-registration-app/src/app/views/live-view/live-view.component.html
@@ -472,19 +472,14 @@
 
     <div id="workshop-container" class="container-fluid nopadding">
       <div class="row no padding">
-        <div class="col-xl-1"></div>
+        <!-- <div class="col-xl-1"></div> -->
         
-        <!-- <div class="col-md-6 col-lg-6 col-xl-5 nopadding"> -->
-          <!-- <span class="workshop-track">Beginner</span> -->
-          <div class="container-fluid">
-            <div class="col-12">
+        <div class="col-sm-6 col-md-12 col-lg-4 col-xl-4 nopadding">
+          <span class="workshop-track">Room 124</span>
+          <div class="container-fluid py-4">
+            <div class="col-12 p-md-0 px-4">
               <div *ngFor="let workshop of workshops">
-                <!-- Bodgy hack since person putting in events is inconsistent -->
-                <div *ngIf="workshop.ws_skill_level == 'Beginner' 
-                || workshop.ws_skill_levell == 'beginner'
-                || workshop.ws_skill_level == '' 
-                || workshop.ws_skill_level == null" 
-                style="max-width: 800px; margin: auto">
+                <div *ngIf="workshop.location_name === '124 Business Building'">
                   <app-live-workshop
                     [title]="workshop.event_title"
                     [description]="workshop.event_description"
@@ -506,26 +501,22 @@
               </div>
             </div>
           </div>
-        <!-- </div> -->
+        </div>
         
-        <!-- <div class="col-md-6 col-lg-6 col-xl-5 nopadding">
-          <span class="workshop-track">INTERMEDIATE</span>
+        <div class="col-sm-6 col-md-12 col-lg-4 col-xl-4 nopadding">
+          <span class="workshop-track">Room 125</span>
           <div class="container-fluid py-4">
             <div class="col-12 p-md-0 px-4">
               <div *ngFor="let workshop of workshops">
-                <div *ngIf="workshop.ws_skill_level == 'Intermediate'">
+                <div *ngIf="workshop.location_name === '125 Business Building'">
                   <app-live-workshop
                     [title]="workshop.event_title"
                     [description]="workshop.event_description"
                     [date]="workshop.event_start_time"
                     [endTime]="workshop.event_end_time"
                     [location]="workshop.location_name"
-                    [skills]="
-                      workshop.ws_relevant_skills ? workshop.ws_relevant_skills.split(',') : []
-                    "
-                    [presenters]="
-                      workshop.ws_presenter_names ? workshop.ws_presenter_names.split(',') : []
-                    "
+                    [skills]="workshop.ws_relevant_skills ? workshop.ws_relevant_skills.split(',') : []"
+                    [presenters]="workshop.ws_presenter_names ? workshop.ws_presenter_names.split(',') : []"
                     [eventIcon]="workshop.event_icon ? workshop.event_icon.split(',') : []"
                     [downloads]="workshop.ws_urls"
                     collapseID="css/html"
@@ -536,38 +527,34 @@
             </div>
           </div>
         </div>
-        <div class="col-xl-1"></div> -->
+        <!-- <div class="col-xl-1"></div> -->
+
         <!-- ADVANCED -->
-        <!-- <div class="col-md-6 col-lg-4 nopadding">
-          <span class="workshop-track">ADVANCED</span>
-          <div class="row">
-            <div class="container-fluid py-4">
-              <div class="col-12 p-md-0 px-4">
-                <div *ngFor="let workshop of workshops">
-                  <div *ngIf="workshop.ws_skill_level == 'Advanced'">
-                    <app-live-workshop
-                      [title]="workshop.event_title"
-                      [description]="workshop.event_description"
-                      [date]="workshop.event_start_time"
-                      [endTime]="workshop.event_end_time"
-                      [location]="workshop.location_name"
-                      [skills]="
-                        workshop.ws_relevant_skills ? workshop.ws_relevant_skills.split(',') : []
-                      "
-                      [presenters]="
-                        workshop.ws_presenter_names ? workshop.ws_presenter_names.split(',') : []
-                      "
-                      [eventIcon]="workshop.event_icon ? workshop.event_icon.split(',') : []"
-                      [downloads]="workshop.ws_urls"
-                      collapseID="css/html"
-                    >
-                    </app-live-workshop>
-                  </div>
+        <div class="col-sm-6 col-md-12 col-lg-4 col-xl-4 nopadding">
+          <span class="workshop-track">Room 126</span>
+          <div class="container-fluid py-4">
+            <div class="col-12 p-md-0 px-4">
+              <div *ngFor="let workshop of workshops">
+                <div *ngIf="workshop.location_name === '126 Business Building'">
+                  <app-live-workshop
+                    [title]="workshop.event_title"
+                    [description]="workshop.event_description"
+                    [date]="workshop.event_start_time"
+                    [endTime]="workshop.event_end_time"
+                    [location]="workshop.location_name"
+                    [skills]="workshop.ws_relevant_skills ? workshop.ws_relevant_skills.split(',') : []"
+                    [presenters]="workshop.ws_presenter_names ? workshop.ws_presenter_names.split(',') : []"
+                    [eventIcon]="workshop.event_icon ? workshop.event_icon.split(',') : []"
+                    [downloads]="workshop.ws_urls"
+                    collapseID="css/html"
+                  >
+                  </app-live-workshop>
                 </div>
               </div>
             </div>
           </div>
-        </div> -->
+        </div>
+
       </div>
     </div>
   </section>
diff --git a/user-registration-app/src/environments/environment.ts b/user-registration-app/src/environments/environment.ts
index 81e35a17..de9dcdef 100644
--- a/user-registration-app/src/environments/environment.ts
+++ b/user-registration-app/src/environments/environment.ts
@@ -4,12 +4,12 @@
 
 export const environment = {
   production: false,
-  api_url: 'https://staging-dot-hackpsu18.appspot.com/v1/',
-  api_v2_url: 'https://staging-v2-dot-hackpsu18.uc.r.appspot.com/v2/',
+  // api_url: 'https://staging-dot-hackpsu18.appspot.com/v1/',
+  // api_v2_url: 'https://staging-v2-dot-hackpsu18.uc.r.appspot.com/v2/',
   // api_url: 'http://localhost:5000/v1/',
   // api_v2_url: 'http://localhost:5000/v2/',
-  // api_url: 'https://api.hackpsu.org/v1/',
-  // api_v2_url: 'https://api.hackpsu.org/v2/',
+  api_url: 'https://api.hackpsu.org/v1/',
+  api_v2_url: 'https://api.hackpsu.org/v2/',
   // https://staging-v2-dot-hackpsu18.uc.r.appspot.com/
 
   firebase: {

From ba7fd7307f428dbf61970159898b8349cb19edff Mon Sep 17 00:00:00 2001
From: jdurrell <john.m.durrell@gmail.com>
Date: Fri, 31 Mar 2023 16:36:27 -0400
Subject: [PATCH 2/2] I'm never going to stop forgetting this, aren't I?

---
 user-registration-app/src/environments/environment.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/user-registration-app/src/environments/environment.ts b/user-registration-app/src/environments/environment.ts
index de9dcdef..81e35a17 100644
--- a/user-registration-app/src/environments/environment.ts
+++ b/user-registration-app/src/environments/environment.ts
@@ -4,12 +4,12 @@
 
 export const environment = {
   production: false,
-  // api_url: 'https://staging-dot-hackpsu18.appspot.com/v1/',
-  // api_v2_url: 'https://staging-v2-dot-hackpsu18.uc.r.appspot.com/v2/',
+  api_url: 'https://staging-dot-hackpsu18.appspot.com/v1/',
+  api_v2_url: 'https://staging-v2-dot-hackpsu18.uc.r.appspot.com/v2/',
   // api_url: 'http://localhost:5000/v1/',
   // api_v2_url: 'http://localhost:5000/v2/',
-  api_url: 'https://api.hackpsu.org/v1/',
-  api_v2_url: 'https://api.hackpsu.org/v2/',
+  // api_url: 'https://api.hackpsu.org/v1/',
+  // api_v2_url: 'https://api.hackpsu.org/v2/',
   // https://staging-v2-dot-hackpsu18.uc.r.appspot.com/
 
   firebase: {