fix: replace 'tutorbook.app' with 'tutorbook.org'

nicholaschiang · nicholaschiang · commit 4d084703c51c · 2021-03-03T13:52:38.000-08:00
diff --git a/README.md b/README.md
@@ -116,7 +116,7 @@ that object (e.g. Viewed, Installed, Created).
 
 ### Zoom Integration
 
-TB ([Tutorbook](https://tutorbook.app)) creates new recurring Zoom meetings for
+TB ([Tutorbook](https://tutorbook.org)) creates new recurring Zoom meetings for
 every [match](#match). To do so, TB stores Zoom OAuth refresh tokens and account
 IDs within [user](#user) and [org](#org) profiles.
 
diff --git a/components/window/browser.tsx b/components/window/browser.tsx
@@ -19,7 +19,7 @@ export default function Browser({ url, refresh }: BrowserProps): JSX.Element {
           <i className={styles.lock}>
             <LockIcon />
           </i>
-          <a href={url}>{`tutorbook.app${url}`}</a>
+          <a href={url}>{`tutorbook.org${url}`}</a>
           <button className={styles.refresh} type='button' onClick={refresh}>
             <RefreshIcon />
           </button>
diff --git a/cypress/fixtures/events/message.json b/cypress/fixtures/events/message.json
@@ -5,7 +5,7 @@
   "timestamp": "2020-10-15T19:04:15",
   "person": {
     "roles": ["tutee"],
-    "photo": "https://assets.tutorbook.app/jpgs/student.jpg",
+    "photo": "https://assets.tutorbook.org/jpgs/student.jpg",
     "handle": "5481564b-e29d-4241-a1dd-01456834f65d",
     "name": "Erik Lucatero",
     "id": "student"
diff --git a/cypress/fixtures/match.json b/cypress/fixtures/match.json
@@ -5,7 +5,7 @@
   "status": "new",
   "creator": {
     "roles": [],
-    "photo": "https://assets.tutorbook.app/jpgs/admin.jpg",
+    "photo": "https://assets.tutorbook.org/jpgs/admin.jpg",
     "handle": "e3eea549-b5a2-4395-889b-a63928874c3d",
     "name": "Nicholas Chiang",
     "id": "admin"
@@ -16,14 +16,14 @@
   "people": [
     {
       "roles": ["tutor"],
-      "photo": "https://assets.tutorbook.app/jpgs/volunteer.jpg",
+      "photo": "https://assets.tutorbook.org/jpgs/volunteer.jpg",
       "handle": "6316934d-63b9-4aec-82f8-1bf2645c048d",
       "name": "John Doe",
       "id": "volunteer"
     },
     {
       "roles": ["tutee"],
-      "photo": "https://assets.tutorbook.app/jpgs/student.jpg",
+      "photo": "https://assets.tutorbook.org/jpgs/student.jpg",
       "handle": "5481564b-e29d-4241-a1dd-01456834f65d",
       "name": "Erik Lucatero",
       "id": "student"
diff --git a/cypress/fixtures/meeting.json b/cypress/fixtures/meeting.json
@@ -18,7 +18,7 @@
   },
   "creator": {
     "roles": [],
-    "photo": "https://assets.tutorbook.app/jpgs/admin.jpg",
+    "photo": "https://assets.tutorbook.org/jpgs/admin.jpg",
     "handle": "e3eea549-b5a2-4395-889b-a63928874c3d",
     "name": "Nicholas Chiang",
     "id": "admin"
@@ -30,7 +30,7 @@
     "updated": "2020-10-15T19:04:10",
     "creator": {
       "roles": [],
-      "photo": "https://assets.tutorbook.app/jpgs/admin.jpg",
+      "photo": "https://assets.tutorbook.org/jpgs/admin.jpg",
       "handle": "e3eea549-b5a2-4395-889b-a63928874c3d",
       "name": "Nicholas Chiang",
       "id": "admin"
@@ -41,14 +41,14 @@
     "people": [
       {
         "roles": ["tutor"],
-        "photo": "https://assets.tutorbook.app/jpgs/volunteer.jpg",
+        "photo": "https://assets.tutorbook.org/jpgs/volunteer.jpg",
         "handle": "6316934d-63b9-4aec-82f8-1bf2645c048d",
         "name": "John Doe",
         "id": "volunteer"
       },
       {
         "roles": ["tutee"],
-        "photo": "https://assets.tutorbook.app/jpgs/student.jpg",
+        "photo": "https://assets.tutorbook.org/jpgs/student.jpg",
         "handle": "5481564b-e29d-4241-a1dd-01456834f65d",
         "name": "Erik Lucatero",
         "id": "student"
diff --git a/cypress/fixtures/orgs/default.json b/cypress/fixtures/orgs/default.json
@@ -3,8 +3,8 @@
   "created": "2020-10-15T19:04:10",
   "updated": "2020-10-15T19:04:10",
   "name": "Tutorbook",
-  "photo": "https://assets.tutorbook.app/jpgs/default.jpg",
-  "background": "https://assets.tutorbook.app/jpgs/rocky-beach.jpg",
+  "photo": "https://assets.tutorbook.org/jpgs/default.jpg",
+  "background": "https://assets.tutorbook.org/jpgs/rocky-beach.jpg",
   "email": "team@tutorbook.org",
   "phone": "+16508612723",
   "bio": "Tutorbook is the default (and public) organization for Tutorbook's web app; it can be used by anyone and everyone who needs (or wants to become) a volunteer tutor or mentor. We're connecting K-12 students with volunteer tutors (amidst COVID-19) and 9-12 students with expert mentors to work on cool projects together (also during COVID-19 and beyond).",
diff --git a/cypress/fixtures/orgs/school.json b/cypress/fixtures/orgs/school.json
@@ -3,7 +3,7 @@
   "created": "2020-10-15T19:04:10",
   "updated": "2020-10-15T19:04:10",
   "name": "Gunn High School",
-  "photo": "https://assets.tutorbook.app/jpgs/gunn.jpg",
+  "photo": "https://assets.tutorbook.org/jpgs/gunn.jpg",
   "background": "https://firebasestorage.googleapis.com/v0/b/covid-tutoring.appspot.com/o/default%2Forgs%2Fgunn-banner.jpg?alt=media&token=bf5f10b8-c13b-4e99-9267-f2cdbe82feb4",
   "email": "psteward@pausd.org",
   "phone": "+16503548271",
diff --git a/cypress/fixtures/users/admin.json b/cypress/fixtures/users/admin.json
@@ -6,7 +6,7 @@
   "email": "nicholas@example.com",
   "phone": "+16505550138",
   "background": "",
-  "photo": "https://assets.tutorbook.app/jpgs/admin.jpg",
+  "photo": "https://assets.tutorbook.org/jpgs/admin.jpg",
   "bio": "I'm currently a junior at Gunn High School interested in artificial intelligence, progressive web development, karate, cello, photography, filmmaking, music, and running.",
   "socials": [
     {
diff --git a/cypress/fixtures/users/student.json b/cypress/fixtures/users/student.json
@@ -5,7 +5,7 @@
   "name": "Erik Lucatero",
   "email": "erik@example.com",
   "phone": "+16505550175",
-  "photo": "https://assets.tutorbook.app/jpgs/student.jpg",
+  "photo": "https://assets.tutorbook.org/jpgs/student.jpg",
   "background": "",
   "bio": "I'm a student at Gunn High School passionate about Computer Science and running. I've been learning Python and TensorFlow with dreams of becoming a data scientist. Currently, I'm looking for somebody to help me with my learning!",
   "socials": [
diff --git a/cypress/fixtures/users/volunteer.json b/cypress/fixtures/users/volunteer.json
@@ -5,8 +5,8 @@
   "name": "John Doe",
   "email": "john@example.com",
   "phone": "+16505550137",
-  "photo": "https://assets.tutorbook.app/jpgs/volunteer.jpg",
-  "background": "https://assets.tutorbook.app/jpgs/volunteer-banner.jpg",
+  "photo": "https://assets.tutorbook.org/jpgs/volunteer.jpg",
+  "background": "https://assets.tutorbook.org/jpgs/volunteer-banner.jpg",
   "bio": "I'm currently an electrical engineering Ph.D. student at Stanford University who has been volunteering with AmeriCorps (tutoring local high schoolers) for over five years now. I'm passionate about teaching and would love to help you in any way that I can!",
   "socials": [
     {
diff --git a/firebase/functions/dist/index.js b/firebase/functions/dist/index.js
@@ -48,5 +48,5 @@ var axios_1 = __importDefault(require('axios'));
 exports.updateMeetings = functions.pubsub
   .schedule('every 15 minutes')
   .onRun(function () {
-    return axios_1.default.get('https://tutorbook.app/api/update-meetings');
+    return axios_1.default.get('https://tutorbook.org/api/update-meetings');
   });
diff --git a/firebase/functions/src/index.ts b/firebase/functions/src/index.ts
@@ -3,4 +3,4 @@ import axios from 'axios';
 
 export const updateMeetings = functions.pubsub
   .schedule('every 15 minutes')
-  .onRun(() => axios.get('https://tutorbook.app/api/update-meetings'));
+  .onRun(() => axios.get('https://tutorbook.org/api/update-meetings'));
diff --git a/lib/api/update/photo.ts b/lib/api/update/photo.ts
@@ -63,9 +63,9 @@ export default async function updatePhoto<T extends Account>(
   account: T,
   Model: Constructor<T>
 ): Promise<T> {
-  // Skip 'assets.tutorbook.app' photos that are used during integration tests.
+  // Skip 'assets.tutorbook.org' photos that are used during integration tests.
   if (/test-tutorbook\.appspot\.com/.exec(account.photo)) return account;
-  if (/assets\.tutorbook\.app/.exec(account.photo)) return account;
+  if (/assets\.tutorbook\.org/.exec(account.photo)) return account;
   if (!account.photo) return account;
 
   // Download the image, crop and/or resize it to 500x500 pixels, and upload the
diff --git a/lib/mail/campaigns/gunn/template.tsx b/lib/mail/campaigns/gunn/template.tsx
@@ -25,12 +25,12 @@ export default function GunnTemplate({ name }: GunnTemplateProps): JSX.Element {
         </P>
         <P>To login and update your profile, click the button below:</P>
         <br />
-        <Button href='https://tutorbook.app/profile'>UPDATE PROFILE</Button>
+        <Button href='https://tutorbook.org/profile'>UPDATE PROFILE</Button>
         <br />
         <P>Or copy and paste this URL into a new tab of your browser:</P>
         <P style={{ marginBottom: '0px !important' }}>
-          <Link href='https://tutorbook.app/profile'>
-            {'https://tutorbook.app/profile'}
+          <Link href='https://tutorbook.org/profile'>
+            {'https://tutorbook.org/profile'}
           </Link>
         </P>
         <br />
diff --git a/lib/mail/campaigns/quarantunes/index.tsx b/lib/mail/campaigns/quarantunes/index.tsx
@@ -16,7 +16,7 @@ export default async function quarantunes(req: Req, res: Res): Promise<void> {
       .get()
   ).docs.map((d) => User.fromFirestoreDoc(d));
   const analytics = new Analytics(process.env.SEGMENT_KEY as string);
-  const baseURL = 'https://tutorbook.app';
+  const baseURL = 'https://tutorbook.org';
   await Promise.all(
     users.map(async (user: User) => {
       analytics.identify({ userId: user.id, traits: user.toSegment() });
diff --git a/lib/mail/campaigns/quarantunes/template.tsx b/lib/mail/campaigns/quarantunes/template.tsx
@@ -61,7 +61,7 @@ export default function QuaranTunesTemplate({
           Julia Segal
           <br />
           Founder of{' '}
-          <Link href='https://tutorbook.app/quarantunes'>QuaranTunes</Link>
+          <Link href='https://tutorbook.org/quarantunes'>QuaranTunes</Link>
         </P>
         <img alt='' src={pixel} />
       </Item>
diff --git a/lib/mail/components.tsx b/lib/mail/components.tsx
@@ -374,7 +374,7 @@ export function Person({
                 textDecoration: 'none',
                 display: 'block !important',
               }}
-              href={`https://tutorbook.app/${org || 'default'}/users/${id}`}
+              href={`https://tutorbook.org/${org || 'default'}/users/${id}`}
             >
               <img
                 style={{
@@ -444,13 +444,13 @@ export function Header(): JSX.Element {
           height: '64px',
           display: 'block !important',
         }}
-        href='https://tutorbook.app'
+        href='https://tutorbook.org'
         aria-label='Tutorbook'
       >
         <img
           style={{ backgroundColor: colors.accents2, borderRadius: '4px' }}
           alt=''
-          src='https://tutorbook.app/favicon/favicon-96x96.png'
+          src='https://tutorbook.org/favicon/favicon-96x96.png'
           width='64px'
           height='64px'
         />
@@ -465,7 +465,7 @@ export function Footer({ children }: Partial<Props>): JSX.Element {
       <Item top='48px' bottom='48px' left='48px' right='48px'>
         <hr style={dividerStyle} />
         <P>
-          Tutorbook - <Link href='https://tutorbook.app'>tutorbook.app</Link>
+          Tutorbook - <Link href='https://tutorbook.org'>tutorbook.org</Link>
         </P>
         {children}
       </Item>
diff --git a/lib/mail/meetings/create/direct-template.tsx b/lib/mail/meetings/create/direct-template.tsx
@@ -21,7 +21,7 @@ export default function DirectMeetingEmail({
   recipient,
   creator,
 }: DirectMeetingEmailProps): JSX.Element {
-  const calendarURL = 'https://tutorbook.app/calendar';
+  const calendarURL = 'https://tutorbook.org/calendar';
   const isTutoring = recipient.roles.includes('tutor');
 
   return (
@@ -68,7 +68,7 @@ export default function DirectMeetingEmail({
         <P>
           This email was sent to you because you have a profile on Tutorbook.
           You can edit or remove your profile{' '}
-          <Link href='https://tutorbook.app/profile'>here</Link>.
+          <Link href='https://tutorbook.org/profile'>here</Link>.
         </P>
         <P style={{ marginBottom: '0px !important' }}>
           If this message contains spam or unwanted messages let us know at{' '}
diff --git a/lib/mail/meetings/create/org-direct-template.tsx b/lib/mail/meetings/create/org-direct-template.tsx
@@ -23,7 +23,7 @@ export default function OrgDirectMeetingEmail({
   recipient,
   creator,
 }: OrgDirectMeetingEmailProps): JSX.Element {
-  const calendarURL = `https://tutorbook.app/${org.id}/calendar`;
+  const calendarURL = `https://tutorbook.org/${org.id}/calendar`;
   const isTutoring = recipient.roles.includes('tutor');
 
   return (
diff --git a/lib/mail/meetings/create/org-template.tsx b/lib/mail/meetings/create/org-template.tsx
@@ -24,7 +24,7 @@ export default function OrgMeetingEmail({
   people,
   creator,
 }: OrgMeetingEmailProps): JSX.Element {
-  const calendarURL = `https://tutorbook.app/${org.id}/calendar`;
+  const calendarURL = `https://tutorbook.org/${org.id}/calendar`;
   const isTutoring = people.some((p) => p.roles.includes('tutor'));
 
   return (
diff --git a/lib/mail/meetings/create/template.tsx b/lib/mail/meetings/create/template.tsx
@@ -24,7 +24,7 @@ export default function MeetingEmail({
   people,
   creator,
 }: MeetingEmailProps): JSX.Element {
-  const calendarURL = 'https://tutorbook.app/calendar';
+  const calendarURL = 'https://tutorbook.org/calendar';
   const isTutoring = people.some((p) => p.roles.includes('tutor'));
 
   return (
@@ -75,7 +75,7 @@ export default function MeetingEmail({
         <P>
           This email was sent to you because you have a profile on Tutorbook.
           You can edit or remove your profile{' '}
-          <Link href='https://tutorbook.app/profile'>here</Link>.
+          <Link href='https://tutorbook.org/profile'>here</Link>.
         </P>
         <P style={{ marginBottom: '0px !important' }}>
           If this message contains spam or unwanted messages let us know at{' '}
diff --git a/lib/mail/meetings/update/direct-template.tsx b/lib/mail/meetings/update/direct-template.tsx
@@ -21,7 +21,7 @@ export default function DirectMeetingEmail({
   recipient,
   updater,
 }: DirectMeetingEmailProps): JSX.Element {
-  const calendarURL = 'https://tutorbook.app/calendar';
+  const calendarURL = 'https://tutorbook.org/calendar';
   const isTutoring = recipient.roles.includes('tutor');
 
   return (
@@ -64,7 +64,7 @@ export default function DirectMeetingEmail({
         <P>
           This email was sent to you because you have a profile on Tutorbook.
           You can edit or remove your profile{' '}
-          <Link href='https://tutorbook.app/profile'>here</Link>.
+          <Link href='https://tutorbook.org/profile'>here</Link>.
         </P>
         <P style={{ marginBottom: '0px !important' }}>
           If this message contains spam or unwanted messages let us know at{' '}
diff --git a/lib/mail/meetings/update/template.tsx b/lib/mail/meetings/update/template.tsx
@@ -24,7 +24,7 @@ export default function MeetingEmail({
   people,
   updater,
 }: MeetingEmailProps): JSX.Element {
-  const calendarURL = 'https://tutorbook.app/calendar';
+  const calendarURL = 'https://tutorbook.org/calendar';
   const isTutoring = people.some((p) => p.roles.includes('tutor'));
 
   return (
@@ -70,7 +70,7 @@ export default function MeetingEmail({
         <P>
           This email was sent to you because you have a profile on Tutorbook.
           You can edit or remove your profile{' '}
-          <Link href='https://tutorbook.app/profile'>here</Link>.
+          <Link href='https://tutorbook.org/profile'>here</Link>.
         </P>
         <P style={{ marginBottom: '0px !important' }}>
           If this message contains spam or unwanted messages let us know at{' '}
diff --git a/lib/mail/users/create/org-template.tsx b/lib/mail/users/create/org-template.tsx
@@ -23,7 +23,7 @@ export default function OrgUserTemplate({
   langs,
   org,
 }: OrgUserTemplateProps): JSX.Element {
-  const userDialogURL = `https://tutorbook.app/${org.id}/users/${user.id}`;
+  const userDialogURL = `https://tutorbook.org/${org.id}/users/${user.id}`;
 
   return (
     <Email>
@@ -35,7 +35,7 @@ export default function OrgUserTemplate({
         <br />
         <P>
           To view {user.name}&apos;s new profile and add it to{' '}
-          <Link href={`https://tutorbook.app/${org.id}/search`}>
+          <Link href={`https://tutorbook.org/${org.id}/search`}>
             {org.name}&apos;s search page
           </Link>
           , simply click the button below:
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
@@ -34,12 +34,12 @@ export function getPhotoFilename(url: string): string {
 
 /**
  * Essentially the same as the above function except much more lenient (i.e.
- * allows `assets.tutorbook.app` images when testing and developing).
+ * allows `assets.tutorbook.org` images when testing and developing).
  * @param url - The URL to check (typically a profile photo URL).
  * @return Whether or not that image is stored with us in a managed location.
  */
 export function validPhoto(url: string): boolean {
-  const asset = /https:\/\/assets\.tutorbook\.app\/(.*)/;
+  const asset = /https:\/\/assets\.tutorbook\.org\/(.*)/;
   return !!asset.exec(url) || !!getPhotoFilename(url);
 }
 
diff --git a/next.config.js b/next.config.js
@@ -11,7 +11,7 @@ module.exports = withImages({
     ],
   },
   images: {
-    domains: ['assets.tutorbook.app', 'firebasestorage.googleapis.com'],
+    domains: ['assets.tutorbook.org', 'firebasestorage.googleapis.com'],
     imageSizes: [260, 200, 160, 120, 85, 40, 24],
   },
   async redirects() {
diff --git a/pages/[org]/search.tsx b/pages/[org]/search.tsx
@@ -163,7 +163,7 @@ function SearchPage({ org, ...props }: SearchPageProps): JSX.Element {
   // @see {@link https://segment.com/docs/connections/spec/ecommerce/v2/#product-list-filtered}
   // @see {@link https://segment.com/academy/collecting-data/naming-conventions-for-clean-data}
   const url = useMemo(() => {
-    if (typeof window === 'undefined') return 'https://tutorbook.app';
+    if (typeof window === 'undefined') return 'https://tutorbook.org';
     return `${window.location.protocol}//${window.location.host}`;
   }, []);
   useAnalytics(
diff --git a/pages/api/login.tsx b/pages/api/login.tsx
@@ -18,7 +18,7 @@ async function sendLoginLink(req: Req, res: Res<void>): Promise<void> {
     throw new APIError('Request body must contain a redirect', 400);
   const actionCodeSettings = {
     url: `http://${
-      req.headers.host || 'tutorbook.app'
+      req.headers.host || 'tutorbook.org'
     }/confirm?href=${encodeURIComponent(req.body.redirect)}`,
   };
   const [err, link] = await to<string, FirebaseError>(
diff --git a/utils/firebase/anonymize.js b/utils/firebase/anonymize.js
@@ -5,7 +5,7 @@
  * @description
  * This script anonymizes the data backed up from the `default` database
  * partition for use in the `test` database partition (during development). As
- * specified in our [Privacy Policy]{@link https://tutorbook.app/legal#privacy},
+ * specified in our [Privacy Policy]{@link https://tutorbook.org/legal#privacy},
  * we **always** anonymize data for development purposes.
  *
  * @usage
diff --git a/utils/firebase/import-quarantunes.js b/utils/firebase/import-quarantunes.js
diff --git a/utils/firebase/old-to-new.js b/utils/firebase/old-to-new.js
diff --git a/utils/firebase/picktime.js b/utils/firebase/picktime.js
diff --git a/utils/firebase/utils.js b/utils/firebase/utils.js

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"email": "[email protected]",`
`7`	`7`	`"phone": "+16505550138",`
`8`	`8`	`"background": "",`
`9`		`- "photo": "https://assets.tutorbook.app/jpgs/admin.jpg",`
	`9`	`+ "photo": "https://assets.tutorbook.org/jpgs/admin.jpg",`
`10`	`10`	`"bio": "I'm currently a junior at Gunn High School interested in artificial intelligence, progressive web development, karate, cello, photography, filmmaking, music, and running.",`
`11`	`11`	`"socials": [`
`12`	`12`	`{`