diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e3d20fd0d2..e312f7093e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4035,15 +4035,12 @@ packages: engines: {node: ^22.13.0 || ^24.3.0 || ^26.0.0 || >=27.0.0} hasBin: true peerDependencies: - '@expo/dom-webview': '*' '@expo/metro-runtime': '*' react: '*' react-native: '*' react-native-web: '*' react-native-webview: '*' peerDependenciesMeta: - '@expo/dom-webview': - optional: true '@expo/metro-runtime': optional: true react-native-web: diff --git a/source/campuses/__tests__/sections.test.ts b/source/campuses/__tests__/sections.test.ts index 3a50ff95e4..b817980eed 100644 --- a/source/campuses/__tests__/sections.test.ts +++ b/source/campuses/__tests__/sections.test.ts @@ -62,7 +62,7 @@ describe('Carleton', () => { }) test('titles its contacts as its tile does, and leads from them to its own directory', () => { - expect(carleton.contacts?.title).toBe('Directory') + expect(carleton.contacts?.title).toBe('Contacts') expect(carleton.contacts?.directoryUrl).toBe('https://www.carleton.edu/directory/') }) }) diff --git a/source/campuses/edu-carleton.ts b/source/campuses/edu-carleton.ts index 5fc7918be6..d47fe479af 100644 --- a/source/campuses/edu-carleton.ts +++ b/source/campuses/edu-carleton.ts @@ -38,7 +38,7 @@ export const carleton = { phoneNumber: '5072225999', }, }, - contacts: {title: 'Directory', directoryUrl: 'https://www.carleton.edu/directory/'}, + contacts: {title: 'Contacts', directoryUrl: 'https://www.carleton.edu/directory/'}, api: { defaultUrl: 'https://carleton.frogpond.tech/v1/', storageKey: 'settings:server-address:edu.carleton', diff --git a/source/campuses/edu-carleton/home-tiles.ts b/source/campuses/edu-carleton/home-tiles.ts index 2dc29210eb..c165e696f7 100644 --- a/source/campuses/edu-carleton/home-tiles.ts +++ b/source/campuses/edu-carleton/home-tiles.ts @@ -24,14 +24,6 @@ export const carletonHomeTiles: ReadonlyArray = [ icon: 'briefcase.fill', gradient: c.goldGradient, }, - // The CARLS app's Balances tile; the OneCard site shows them, and the card's other uses. - { - type: 'url', - url: 'https://get.cbord.com/carletonstolaf/full/prelogin.php', - title: 'OneCard', - icon: 'creditcard.fill', - gradient: c.mintGradient, - }, { type: 'view', view: '/hours?campus=edu.carleton', @@ -50,7 +42,7 @@ export const carletonHomeTiles: ReadonlyArray = [ { type: 'view', view: '/contacts', - title: 'Directory', + title: 'Contacts', icon: 'phone.fill', gradient: c.orangeGradient, }, @@ -127,5 +119,12 @@ export const carletonHomeTiles: ReadonlyArray = [ icon: 'megaphone.fill', gradient: c.indigoGradient, }, + { + type: 'url', + url: 'https://www.carleton.edu/directory/', + title: 'Directory', + icon: 'person.fill', + gradient: c.redGradient, + }, developerTile, ] diff --git a/source/features/__tests__/views.test.ts b/source/features/__tests__/views.test.ts index effb53c627..141fb8f59d 100644 --- a/source/features/__tests__/views.test.ts +++ b/source/features/__tests__/views.test.ts @@ -157,10 +157,9 @@ describe("Carleton's Home tiles", () => { expect(carleton().map((view) => [view.title, viewTarget(view)])).toEqual([ ['Menus', '/menus'], ['Workday', 'https://www.carleton.edu/workday/'], - ['OneCard', 'https://get.cbord.com/carletonstolaf/full/prelogin.php'], ['Building Hours', '/hours?campus=edu.carleton'], ['Calendar', '/calendar'], - ['Directory', '/contacts'], + ['Contacts', '/contacts'], ['KRLX', 'radio:krlx'], ['SUMO', '/schedule/sumo'], ['The Carletonian', '/newspaper'], @@ -171,6 +170,7 @@ describe("Carleton's Home tiles", () => { ['Student Orgs', 'https://www.carleton.edu/student-organizations/'], ['Moodle', 'https://moodle.carleton.edu/'], ['Carleton News', '/news'], + ['Directory', 'https://www.carleton.edu/directory/'], ['Developer', '/developer'], ]) }) @@ -205,6 +205,18 @@ describe('opensInBrowser for a station', () => { let krlx = carletonView((v) => v.type === 'radio') expect(opensInBrowser(krlx)).toBe(false) }) + + test('is true for the Directory web link', () => { + let directoryLink = carletonView( + (v) => v.type === 'url' && v.url === 'https://www.carleton.edu/directory/', + ) + expect(directoryLink).toMatchObject({ + type: 'url', + url: 'https://www.carleton.edu/directory/', + icon: 'person.fill', + }) + expect(opensInBrowser(directoryLink)).toBe(true) + }) }) function carletonView(matches: (view: ViewType) => boolean): ViewType { diff --git a/source/features/quick-actions/__tests__/destinations.test.ts b/source/features/quick-actions/__tests__/destinations.test.ts index 5b1fac2d69..289e0f1876 100644 --- a/source/features/quick-actions/__tests__/destinations.test.ts +++ b/source/features/quick-actions/__tests__/destinations.test.ts @@ -87,7 +87,7 @@ describe('on Carleton', () => { 'Menus', 'Building Hours', 'Calendar', - 'Directory', + 'Contacts', 'SUMO', 'The Carletonian', 'Transportation', diff --git a/uitests/CampusSmokeTests.swift b/uitests/CampusSmokeTests.swift index f15cce7505..55bb0bd640 100644 --- a/uitests/CampusSmokeTests.swift +++ b/uitests/CampusSmokeTests.swift @@ -173,7 +173,7 @@ final class CarletonSmokeTests: CampusSmokeTests { building: "Burton", mapRoute: "/map?campus=edu.carleton", mapPlace: "Boliou Hall", - contactsTitle: "Directory", + contactsTitle: "Contacts", contact: "Security Services", word: "A & I", transitTitle: "Transportation",