Renamed type to topic

nimzco · Nima Izadi · commit 79b9af33ef0d · 2018-03-04T19:28:23.000-05:00
diff --git a/src/components/App/App.js b/src/components/App/App.js
@@ -11,12 +11,12 @@ export default function App() {
       <Head />
       <div>
         <Switch>
-          <Route path="/cfp/:type/:country" render={renderCFP} />
-          <Route path="/cfp/:type/" render={renderCFP} />
+          <Route path="/cfp/:topic/:country" render={renderCFP} />
+          <Route path="/cfp/:topic/" render={renderCFP} />
           <Route path="/cfp" render={renderCFP} />
-          <Route path="/:year/:type/:country" render={redirect} />
-          <Route path="/:type/:country" render={redirectOrRender} />
-          <Route path="/:type" component={ConferencePage} />
+          <Route path="/:year/:topic/:country" render={redirect} />
+          <Route path="/:topic/:country" render={redirectOrRender} />
+          <Route path="/:topic" component={ConferencePage} />
           <Route exact path="/" component={ConferencePage} />
           <Route component={ConferencePage} />
         </Switch>
@@ -29,30 +29,30 @@ function renderCFP({match}) {
 }
 
 function redirect(props) {
-  const {type, country} = props.match.params;
+  const {topic, country} = props.match.params;
 
-  return <Redirect to={`/${type}/${country}`} state={{status: 301}} />;
+  return <Redirect to={`/${topic}/${country}`} state={{status: 301}} />;
 }
 
 /*
-  Old routes were /:year/:type and now is /:type/:country
-  If we detect that :type is a year, the user actually wanted to reach
-  the new route /:type
+  Old routes were /:year/:topic and now is /:topic/:country
+  If we detect that :topic is a year, the user actually wanted to reach
+  the new route /:topic
 */
 function redirectOrRender(props) {
-  const {type, country} = props.match.params;
+  const {topic, country} = props.match.params;
 
-  if (isYear(type)) {
+  if (isYear(topic)) {
     return <Redirect to={`/${country}`} state={{status: 301}} />;
   } else {
-    return <ConferencePage {...props} fallback={redirectToType} />;
+    return <ConferencePage {...props} fallback={redirectToTopic} />;
   }
 }
 
 function isYear(year) {
   return (year.length === 4 && !isNaN(parseInt(year, 10)));
 }
 
-function redirectToType(type) {
-  return <Redirect to={`/${type}`} state={{status: 301}} />;
+function redirectToTopic(topic) {
+  return <Redirect to={`/${topic}`} state={{status: 301}} />;
 }
diff --git a/src/components/ConferencePage/ConferencePage.js b/src/components/ConferencePage/ConferencePage.js
@@ -73,18 +73,18 @@ class ConferencePage extends Component {
 
   render() {
     const {showPast, sortBy} = this.state;
-    const {showCFP, match: {params: {type, country}}} = this.props;
-    const addConferenceUrl = getAddConferenceUrl(type);
+    const {showCFP, match: {params: {topic, country}}} = this.props;
+    const addConferenceUrl = getAddConferenceUrl(topic);
 
     return (
       <div>
         <Helmet>
           <title>Tech conferences | Confs.tech</title>
         </Helmet>
-        <Favicon url={`/${type}.png`} />
+        <Favicon url={`/${topic}.png`} />
         <header className={styles.Header}>
           <h1 className="visuallyHidden">
-            List of all {type ? TOPICS[type] : 'tech'} conferences of {CURRENT_YEAR}
+            List of all {topic ? TOPICS[topic] : 'tech'} conferences of {CURRENT_YEAR}
             {country ? ` in ${country}` : null}
           </h1>
           <Heading element="p">Find your next tech conference</Heading>
@@ -103,7 +103,7 @@ class ConferencePage extends Component {
           />
           <RefinementList
             attributeName="topics"
-            defaultRefinement={type ? [type] : []}
+            defaultRefinement={topic ? [topic] : []}
             transformItems={transformTopicRefinements}
           />
           <RefinementList
diff --git a/src/components/config/index.js b/src/components/config/index.js
@@ -22,6 +22,6 @@ const REPO_URLS = {
   general: 'https://github.com/tech-conferences/confs.tech',
 };
 
-export function getAddConferenceUrl(type = 'JavaScript') {
-  return `${REPO_URLS[type.toLocaleLowerCase()]}/issues/new`;
+export function getAddConferenceUrl(topic = 'JavaScript') {
+  return `${REPO_URLS[topic.toLocaleLowerCase()]}/issues/new`;
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ const REPO_URLS = {`
`22`	`22`	`general: 'https://github.com/tech-conferences/confs.tech',`
`23`	`23`	`};`
`24`	`24`
`25`		`-export function getAddConferenceUrl(type = 'JavaScript') {`
`26`		- return `${REPO_URLS[type.toLocaleLowerCase()]}/issues/new`;
	`25`	`+export function getAddConferenceUrl(topic = 'JavaScript') {`
	`26`	+ return `${REPO_URLS[topic.toLocaleLowerCase()]}/issues/new`;
`27`	`27`	`}`