Merge pull request #2076 from StoDevX/globals

Use Globals and Global Functions for Constant URLs

Author: rye

source/globals.js

@@ -0,0 +1,8 @@
+// @flow
+
+export const GH_PAGES_URL = (relativePath: string) => {
+  return `https://stodevx.github.io/AAO-React-Native/${relativePath}`
+}
+
+export const GH_NEW_ISSUE_URL =
+  'https://github.com/StoDevX/AAO-React-Native/issues/new'

source/views/building-hours/report/submit.js

@@ -4,6 +4,7 @@ import jsYaml from 'js-yaml'
 import type {BuildingType} from '../types'
 import {email} from 'react-native-communications'
 import querystring from 'querystring'
+import {GH_NEW_ISSUE_URL} from '../../../globals'
 
 export function submitReport(current: BuildingType, suggestion: BuildingType) {
   // calling trim() on these to remove the trailing newlines
@@ -64,7 +65,7 @@ function makeIssueLink(before: string, after: string, title: string): string {
     title: `Building hours update for ${title}`,
     body: makeMarkdownBody(before, after),
   })
-  return `https://github.com/StoDevX/AAO-React-Native/issues/new?${q}`
+  return `${GH_NEW_ISSUE_URL}?${q}`
 }
 
 function stringifyBuilding(building: BuildingType): string {

source/views/building-hours/stateful-list.js

@@ -13,10 +13,10 @@ import {reportNetworkProblem} from '../../lib/report-network-problem'
 import toPairs from 'lodash/toPairs'
 import groupBy from 'lodash/groupBy'
 import delay from 'delay'
-
 import {CENTRAL_TZ} from './lib'
-const githubBaseUrl =
-  'https://stodevx.github.io/AAO-React-Native/building-hours.json'
+import {GH_PAGES_URL} from '../../globals'
+
+const buildingHoursUrl = GH_PAGES_URL('building-hours.json')
 
 const groupBuildings = (buildings: BuildingType[], favorites: string[]) => {
   const favoritesGroup = {
@@ -109,7 +109,7 @@ export class BuildingHoursView extends React.PureComponent<Props, State> {
   }
 
   fetchData = async () => {
-    let {data: buildings} = await fetchJson(githubBaseUrl).catch(err => {
+    let {data: buildings} = await fetchJson(buildingHoursUrl).catch(err => {
       reportNetworkProblem(err)
       return defaultData
     })

source/views/contacts/contact-detail.js

@@ -10,8 +10,7 @@ import {tracker} from '../../analytics'
 import {Button} from '../components/button'
 import openUrl from '../components/open-url'
 import type {ContactType} from './types'
-
-const AAO_URL = 'https://github.com/StoDevX/AAO-React-Native/issues/new'
+import {GH_NEW_ISSUE_URL} from '../../globals'
 
 const Title = glamorous.text({
   fontSize: 36,
@@ -93,7 +92,7 @@ export class ContactsDetailView extends React.PureComponent<Props> {
           <Button onPress={this.onPress} title={contact.buttonText} />
 
           <ListFooter
-            href={AAO_URL}
+            href={GH_NEW_ISSUE_URL}
             title="Collected by the humans of All About Olaf"
           />
         </Container>

source/views/contacts/contact-list.js

@@ -13,9 +13,9 @@ import toPairs from 'lodash/toPairs'
 import * as c from '../components/colors'
 import type {ContactType} from './types'
 import type {TopLevelViewPropsType} from '../types'
+import {GH_PAGES_URL} from '../../globals'
 
-const GITHUB_URL =
-  'https://stodevx.github.io/AAO-React-Native/contact-info.json'
+const contactInfoUrl = GH_PAGES_URL('contact-info.json')
 
 const groupContacts = (contacts: ContactType[]) => {
   const grouped = groupBy(contacts, c => c.category)
@@ -70,7 +70,7 @@ export class ContactsListView extends React.PureComponent<Props, State> {
   }
 
   fetchData = async () => {
-    let {data: contacts} = await fetchJson(GITHUB_URL).catch(err => {
+    let {data: contacts} = await fetchJson(contactInfoUrl).catch(err => {
       reportNetworkProblem(err)
       return defaultData
     })

source/views/dictionary/detail.js

@@ -5,10 +5,11 @@ import {Markdown} from '../components/markdown'
 import {ListFooter} from '../components/list'
 import glamorous from 'glamorous-native'
 import type {WordType} from './types'
+import {GH_NEW_ISSUE_URL} from '../../globals'
 
 // TODO: This doesn't point at the SA dictionary because they don't have an
 // overview page.
-const STO_SA_DICT_URL = 'https://github.com/StoDevX/AAO-React-Native/issues/new'
+const STO_SA_DICT_URL = GH_NEW_ISSUE_URL
 
 const Term = glamorous.text({
   fontSize: 36,

source/views/dictionary/list.js

@@ -21,8 +21,10 @@ import uniq from 'lodash/uniq'
 import words from 'lodash/words'
 import deburr from 'lodash/deburr'
 import * as defaultData from '../../../docs/dictionary.json'
+import {GH_PAGES_URL} from '../../globals'
+
+const dictionaryUrl = GH_PAGES_URL('dictionary.json')
 
-const GITHUB_URL = 'https://stodevx.github.io/AAO-React-Native/dictionary.json'
 const ROW_HEIGHT = Platform.OS === 'ios' ? 76 : 89
 const SECTION_HEADER_HEIGHT = Platform.OS === 'ios' ? 33 : 41
 
@@ -83,7 +85,7 @@ export class DictionaryView extends React.PureComponent<Props, State> {
   }
 
   fetchData = async () => {
-    let {data: allTerms} = await fetchJson(GITHUB_URL).catch(err => {
+    let {data: allTerms} = await fetchJson(dictionaryUrl).catch(err => {
       reportNetworkProblem(err)
       return defaultData
     })

source/views/faqs/index.js

@@ -7,8 +7,9 @@ import {reportNetworkProblem} from '../../lib/report-network-problem'
 import LoadingView from '../components/loading'
 import * as defaultData from '../../../docs/faqs.json'
 import delay from 'delay'
+import {GH_PAGES_URL} from '../../globals'
 
-const faqsUrl = 'https://stodevx.github.io/AAO-React-Native/faqs.json'
+const faqsUrl = GH_PAGES_URL('faqs.json')
 
 type Props = {}
 

source/views/menus/menu-github.js

@@ -20,9 +20,9 @@ import {upgradeMenuItem, upgradeStation} from './lib/process-menu-shorthands'
 import {data as fallbackMenu} from '../../../docs/pause-menu.json'
 import {tracker} from '../../analytics'
 import bugsnag from '../../bugsnag'
-const CENTRAL_TZ = 'America/Winnipeg'
+import {GH_PAGES_URL} from '../../globals'
 
-const githubMenuBaseUrl = 'https://stodevx.github.io/AAO-React-Native'
+const CENTRAL_TZ = 'America/Winnipeg'
 
 type Props = TopLevelViewPropsType & {
   name: string,
@@ -59,7 +59,7 @@ export class GitHubHostedMenu extends React.PureComponent<Props, State> {
     let stationMenus: StationMenuType[] = []
     let corIcons: MasterCorIconMapType = {}
     try {
-      let container = await fetchJson(`${githubMenuBaseUrl}/pause-menu.json`)
+      let container = await fetchJson(GH_PAGES_URL('pause-menu.json'))
       let data = container.data
       foodItems = data.foodItems || []
       stationMenus = data.stationMenus || []

source/views/streaming/webcams/list.js

@@ -10,8 +10,9 @@ import {Column} from '../../components/layout'
 import {partitionByIndex} from '../../../lib/partition-by-index'
 import type {Webcam} from './types'
 import {StreamThumbnail} from './thumbnail'
+import {GH_PAGES_URL} from '../../../globals'
 
-const GITHUB_URL = 'https://stodevx.github.io/AAO-React-Native/webcams.json'
+const webcamsUrl = GH_PAGES_URL('webcams.json')
 
 type Props = {}
 
@@ -66,7 +67,7 @@ export class WebcamsView extends React.PureComponent<Props, State> {
   fetchData = async () => {
     this.setState(() => ({loading: true}))
 
-    let {data: webcams} = await fetchJson(GITHUB_URL).catch(err => {
+    let {data: webcams} = await fetchJson(webcamsUrl).catch(err => {
       reportNetworkProblem(err)
       return defaultData
     })