Refresh contact subjects & links (#985)

Author: jankeromnes

src/blog/gitlab-support.md

@@ -61,6 +61,6 @@ All important features in Gitpod go through a beta phase, so you get the chance
 
 ## I run GitLab Self-Managed!
 
-If you want to use Gitpod with your self-managed instance of GitLab, you'll need to wait a bit longer for Gitpod Enterprise (or [apply for our private beta](https://www.typefox.io/contact/)).
+If you want to use Gitpod with your self-managed instance of GitLab, you'll need to wait a bit longer for Gitpod Enterprise (or [apply for our private beta](https://www.gitpod.io/contact/)).
 
 Gitpod Enterprise will be released soon and allows to run Gitpod either self-managed or managed by us. Gitpod Enterprise runs on Google Cloud or any vanilla Kubernetes installation and can be configured to connect with any GitLab or GitHub installation.

src/components/pricing/PricingFAQs.tsx

@@ -71,14 +71,14 @@ const SelfHostedFAQs = ({ title }: { title: string }) => (
                 If you'd like to access additional features like unlimited prebuilds, shared workspaces, snapshots and an admin dashboard,
                 you can upgrade to the Professional Plan at any time. Simply update your existing instance with a purchased license key.
                 Self-hosted Gitpod licenses can currently only be purchased by request. Please request a license key{' '}
-                <Link to="/enterprise-license">here</Link> or <Link to="/contact/">Contact sales</Link> if you have any questions.
+                <Link to="/enterprise-license/">here</Link> or <Link to="/contact/">Contact sales</Link> if you have any questions.
               </p>
             </div>
             <div>
               <h3>Do you offer discounts for educational institutions?</h3>
               <p>
                 Yes, qualified educational institutions may receive a special discount. Please visit{' '}
-                <Link to="/education">Gitpod Education</Link> for more information or <Link to="/contact/">Contact Sales</Link>.
+                <Link to="/education/">Gitpod Education</Link> for more information or <Link to="/contact/">Contact Sales</Link>.
               </p>
             </div>
             <div>
@@ -113,7 +113,7 @@ const SelfHostedFAQs = ({ title }: { title: string }) => (
               <h3>How can I pay?</h3>
               <p>
                 Currently, <strong>Gitpod Self-Hosted</strong> can only be purchased on request. Please request a license key{' '}
-                <Link to="/enterprise-license">here</Link> and we'll reach out to you. If you have any questions, please{' '}
+                <Link to="/enterprise-license/">here</Link> and we'll reach out to you. If you have any questions, please{' '}
                 <Link to="/contact/">Contact sales</Link>.
               </p>
               <p>All our plans can be paid via invoice.</p>
@@ -141,7 +141,7 @@ const SelfHostedFAQs = ({ title }: { title: string }) => (
               <h3>Do you offer discounts for students and educational institutions?</h3>
               <p>
                 Yes, qualified educational institutions may receive a special discount. Please visit{' '}
-                <Link to="/education">Gitpod Education</Link> for more information or <Link to="/contact/">Contact Sales</Link>. If you are a
+                <Link to="/education/">Gitpod Education</Link> for more information or <Link to="/contact/">Contact Sales</Link>. If you are a
                 student, you may use the Student Unlimited Plan for {isEurope() ? '€8' : '$9'} per month (usually{' '}
                 {isEurope() ? '€35' : '$39'}). See <a href="#plans">Gitpod for Students</a> for more information.
               </p>

src/contents/enterprise.tsx

@@ -19,7 +19,7 @@ export const textCardsData = [
     },
     {
         title: "Smooth Integration",
-        paragraphs: ['All Gitpod needs is a Kubernetes cluster.', 'It enables user authentication and integration with your GitHub Enterprise, GitLab, or Bitbucket.', <>Please <Link to="/contact/" state={{ subject: 'I have a question regarding Gitpod Enterprise' }}>contact us</Link> for further customizations.</>],
+        paragraphs: ['All Gitpod needs is a Kubernetes cluster.', 'It enables user authentication and integration with your GitHub Enterprise, GitLab, or Bitbucket.', <>Please <Link to="/contact/" state={{ subject: 'Question about Gitpod Enterprise' }}>contact us</Link> for further customizations.</>],
         logos: ['Bitbucket', 'Github', 'Gitlab', 'Git']
     },
     // {

src/docs/release-notes/2019-04-05/april-2019.md

@@ -3,7 +3,7 @@
 Today we are happy to announce that we are moving out of beta.
 We want to thank all the beta testers who have provided great feedback. Gitpod wouldn't be what it is without you! ❤️
 
-You can read more about the announcement in [the blog post](https://www.gitpod.io/blog/gitpod-launch).
+You can read more about the announcement in [the blog post](https://www.gitpod.io/blog/gitpod-launch/).
 
 Besides a complete relaunch of the website and app, we have added some very exciting new features:
 

src/pages/contact.tsx

@@ -76,11 +76,12 @@ const StyledContactPage = styled.div`
 `
 
 const subjects: string[] = [
-  'I have a question regarding Gitpod Self-Hosted',
-  'I have a question regarding Gitpod Education',
+  'Question about Gitpod\'s Plans / Pricing',
   'Student Unlimited: Get Verified as a Student',
   'Applying for Professional Open Source',
-  'Other'
+  'Applying for the Custom IDE Support Beta',
+  'Applying for a Job at Gitpod',
+  'Other',
 ]
 
 export default function ContactPage(props: any) {
@@ -225,6 +226,13 @@ export default function ContactPage(props: any) {
                       ))}
                   </select>
                 </div>
+                <div>
+                    <p>Looking for help with a common request?</p>
+                    <ul>
+                        <li><a href="https://community.gitpod.io/">Get help from the Gitpod Community</a></li>
+                    </ul>
+                </div>
+                <label style={{ marginTop: 15, marginBottom: 10 }}>How can we help?</label>
                 <label className="visually-hidden" htmlFor="message">
                   Please type your message
                 </label>

src/pages/education.tsx

@@ -155,7 +155,7 @@ const EducationPage: React.SFC<{}> = ({data}: any) => (
                 <tr className="buttons">
                     <th></th>
                     <td><Link to="/#get-started" className="btn btn--cta">Start for Free</Link></td>
-                    <td><Link to="/contact/" state={{ subject: "I have a question regarding Gitpod Education" }} className="btn btn--cta">Contact Sales</Link></td>
+                    <td><Link to="/contact/" state={{ subject: "Question about Gitpod Education" }} className="btn btn--cta">Contact Sales</Link></td>
                     <td><Link to="/self-hosted/" className="btn">Host Yourself</Link></td>
                 </tr>
             </tbody>
@@ -164,7 +164,7 @@ const EducationPage: React.SFC<{}> = ({data}: any) => (
         <ActionCard
             title='Didn’t find what you’re looking for?'
             text='Please get in touch. We’re happy to answer your questions.'
-            anchors={[{href: 'https://calendly.com/gitpod/sales',text: 'Schedule a Call'}, {href: '/contact/', subject: "I have a question regarding Gitpod Education", text: 'Contact'}]}
+            anchors={[{href: 'https://calendly.com/gitpod/sales',text: 'Schedule a Call'}, {href: '/contact/', subject: "Question about Gitpod Education", text: 'Contact'}]}
         />
 
     </IndexLayout>

src/pages/enterprise-license.tsx

@@ -296,7 +296,7 @@ const EnterpriseLicensePage = () => {
   }
 
   return (
-    <IndexLayout>
+    <IndexLayout canonical="/enterprise-license/">
       <StyledEnterpriseLicensePage>
         <div className="row">
           {state.messageSent ? (

src/pages/enterprise.tsx

@@ -143,7 +143,7 @@ const EnterprisePage: React.SFC<{}> = ({data}: any) => (
                 </tr>
                 <tr className="buttons">
                     <th></th>
-                    <td><Link to="/contact/" state={{ subject: "I have a question regarding Gitpod Enterprise" }} className="btn btn--cta">Contact Sales</Link></td>
+                    <td><Link to="/contact/" state={{ subject: "Question about Gitpod Enterprise" }} className="btn btn--cta">Contact Sales</Link></td>
                     <td><Link to="/self-hosted/" className="btn">Host Yourself</Link></td>
                 </tr>
             </tbody>
@@ -152,7 +152,7 @@ const EnterprisePage: React.SFC<{}> = ({data}: any) => (
         <ActionCard
             title='Didn’t find what you’re looking for?'
             text='Please get in touch. We’re happy to answer your questions.'
-            anchors={[{ href: 'https://calendly.com/gitpod/sales', text: 'Schedule a Call' }, { href: '/contact/', subject: "I have a question regarding Gitpod Enterprise", text: 'Contact' }]}
+            anchors={[{ href: 'https://calendly.com/gitpod/sales', text: 'Schedule a Call' }, { href: '/contact/', subject: "Question about Gitpod Enterprise", text: 'Contact' }]}
         />
 
     </IndexLayout>

src/pages/recruiting.tsx

@@ -157,7 +157,7 @@ const RecrutingPage: React.SFC<{}> = ({data}: any) => (
                 <tr className="buttons">
                     <th></th>
                     <td><Link to="/#get-started" className="btn btn--cta">Start for Free</Link></td>
-                    <td><Link to="/contact/" state={{ subject: "I have a question regarding Gitpod Recruiting" }} className="btn btn--cta">Contact Sales</Link></td>
+                    <td><Link to="/contact/" state={{ subject: "Question about Gitpod Recruiting" }} className="btn btn--cta">Contact Sales</Link></td>
                     <td><Link to="/self-hosted/" className="btn">Host Yourself</Link></td>
                 </tr>
             </tbody>
@@ -166,7 +166,7 @@ const RecrutingPage: React.SFC<{}> = ({data}: any) => (
         <ActionCard
             title='Didn’t find what you’re looking for?'
             text='Please get in touch. We’re happy to answer your questions.'
-            anchors={[{ href: 'https://calendly.com/gitpod/sales', text: 'Schedule a Call' }, { href: '/contact/', subject: "I have a question regarding Gitpod Recruiting", text: 'Contact' }]}
+            anchors={[{ href: 'https://calendly.com/gitpod/sales', text: 'Schedule a Call' }, { href: '/contact/', subject: "Qestion about Gitpod Recruiting", text: 'Contact' }]}
         />
 
     </IndexLayout>

src/pages/self-hosted.tsx

@@ -78,7 +78,7 @@ const SelfHostedPage: React.SFC<{}> = ({ data }: any) => {
             </p>
                         </React.Fragment>
                     }
-                    anchors={[{ href: '/contact/', subject: 'I have a question regarding Gitpod Self-Hosted', text: 'Contact' }]}
+                    anchors={[{ href: 'https://community.gitpod.io/', text: 'Community Support' }]}
                 />
 
                 <MoreInfo {...MoreInfoContents.selfHosted} />