Sample repo working again

chamhayden · Sep 7, 2024 · 7c70ebd · 7c70ebd
1 parent 5ce965a
commit 7c70ebd
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/backend/src/config.js b/backend/src/config.js
@@ -6,11 +6,11 @@ const config = {
   JWT_SECRET: 'TESTING2',
   PORT: 6080,
   COOKIE_EXPIRY: 60 * 60 * 24 * 7,
-  AIRTABLE_API_KEY: 'keyOJnoA6KHnByQUv',
   TERMS: {
     sample: {
       STUDENT_LIST_SH: 'echo "5555555\n3418003"',
-      AIRTABLE_BASE: 'appYoRmspUPWynt68',
+      AIRTABLE_BASE: 'app7CNZud3QDy1IP5',
+      AIRTABLE_API_KEY: 'patMWMSzpWIIw4ygQ.8905a12dae8ee6ecd484ea4dc3f1f2961f587b9c87a4682407063345298bd802',
       TUTOR_ID_LIST: [],
       AUDIT_ID_LIST: []
     },

diff --git a/backend/src/content.js b/backend/src/content.js
@@ -9,7 +9,8 @@ const tables = Object.keys(joinSchema);
 
 const generateContent = (term) => {
   const basename = config.TERMS[term].AIRTABLE_BASE;
-  const base = new Airtable({ apiKey: config.AIRTABLE_API_KEY }).base(basename);
+  const base = new Airtable({ apiKey: config.TERMS[term].AIRTABLE_API_KEY }).base(basename);
+  console.log(basename, base);
   return new Promise((resolve, reject) => {
     const obj = {};
     Promise.all(tables.map(table => {

diff --git a/frontend/src/page/Timetable/TimetableLectures.jsx b/frontend/src/page/Timetable/TimetableLectures.jsx
@@ -58,7 +58,7 @@ const TimetableLectures = () => {
               </TableCell>}
               {getters.loggedIn &&
                 <TableCell align="left">
-                  <h4>In-person in {rowKey < 2 ? 'Ainsworth G03' : 'Keith Burrows Theatre'}</h4><br />
+                  <h4>{row.location}</h4><br />
                   <Button variant="contained" onClick={() => {
                     window.location.href = `${row.call_url_h}`;
                   }}>Watch Live</Button>

diff --git a/frontend/src/page/Timetable/TimetableTutorials.jsx b/frontend/src/page/Timetable/TimetableTutorials.jsx
@@ -47,7 +47,7 @@ const TimetableTutorials = () => {
                 {row.call_url_h.includes('http') ? (
                   <Button variant="contained" onClick={() => {
                     window.location.href = row.call_url_h;
-                  }}>Watch</Button>
+                  }}>Join</Button>
                 ) : (
                   <b>{row.call_url_h}</b>
                 )}