(from getambassador.io) Merge pull request #531 from datawire/docs/mi…

…sc_fixes Docs misc fixes
telepresenceio · Mar 10, 2021 · 93f6337 · 93f6337
2 parents a8b3182 + 5f07e29
commit 93f6337
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 40 deletions.
diff --git a/install/index.md b/install/index.md
@@ -0,0 +1,12 @@
+import Alert from '@material-ui/lab/Alert';
+import QSTabs from '../quick-start/qs-tabs'
+
+# Install Telepresence
+
+Install Telepresence by running the commands below for your OS.
+
+<QSTabs/>
+
+## <img class="os-logo" src="../../images/logo.png"/> What's Next?
+
+Follow one of our [quick start guides](../quick-start/) to start using Telepresence, either with our sample app or in your own environment.
diff --git a/install/old-version-tabs.js b/install/old-version-tabs.js
@@ -0,0 +1,85 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { makeStyles } from '@material-ui/core/styles';
+import AppBar from '@material-ui/core/AppBar';
+import Tabs from '@material-ui/core/Tabs';
+import Tab from '@material-ui/core/Tab';
+import Box from '@material-ui/core/Box';
+import Button from '@material-ui/core/Button';
+import CodeBlock from '../../../../../src/components/CodeBlock';
+import LinuxIcon from '../../../../../src/assets/icons/linux.inline.svg';
+import AppleIcon from '../../../../../src/assets/icons/apple.inline.svg';
+
+function TabPanel(props) {
+  const { children, value, index, ...other } = props;
+
+  return (
+    <div
+      role="tabpanel"
+      hidden={value !== index}
+      id={`simple-tabpanel-${index}`}
+      aria-labelledby={`simple-tab-${index}`}
+      {...other}
+    >
+      {value === index && (
+        <Box p={3}>
+          {children}
+        </Box>
+      )}
+    </div>
+  );
+}
+
+TabPanel.propTypes = {
+  children: PropTypes.node,
+  index: PropTypes.any.isRequired,
+  value: PropTypes.any.isRequired,
+};
+
+function a11yProps(index) {
+  return {
+    id: `simple-tab-${index}`,
+    'aria-controls': `simple-tabpanel-${index}`,
+  };
+}
+
+const useStyles = makeStyles((theme) => ({
+  root: {
+    flexGrow: 1,
+    backgroundColor: 'transparent',
+  },
+}));
+
+export default function SimpleTabs() {
+  const classes = useStyles();
+  const [value, setValue] = React.useState(0);
+
+  const handleChange = (event, newValue) => {
+    setValue(newValue);
+  };
+
+  return (
+    <div className={classes.root}>
+      <AppBar elevation={0} style={{ background: 'transparent', color: 'black', borderBottom: '1px solid #e8e8e8', }} position="static">
+        <Tabs value={value} onChange={handleChange} aria-label="operating system tabs">
+          <Tab icon={<AppleIcon />} label="macOS" {...a11yProps(0)} style={{ minWidth: "10%", textTransform: 'none' }} />
+          <Tab icon={<LinuxIcon />} label="Linux" {...a11yProps(1)} style={{ minWidth: "10%", textTransform: 'none' }} />
+        </Tabs>
+      </AppBar>
+      <TabPanel value={value} index={0}>
+        <CodeBlock>
+        {
+          'https://app.getambassador.io/download/tel2/darwin/amd64/x.x.x/telepresence'
+        }
+        </CodeBlock>
+      </TabPanel>
+      <TabPanel value={value} index={1}>
+        <CodeBlock>
+        {
+          'https://app.getambassador.io/download/tel2/linux/amd64/x.x.x/telepresence'
+        }
+        </CodeBlock>
+      </TabPanel>
+    </div >
+  );
+}
diff --git a/howtos/upgrading.md → install/upgrade.md b/howtos/upgrading.md → install/upgrade.md
@@ -3,8 +3,9 @@ description: "How to upgrade your installation of Telepresence and install previ
 ---
 
 import QSTabs from '../quick-start/qs-tabs'
+import OldVersionTabs from './old-version-tabs'
 
-# Upgrading Telepresence
+# Upgrade Telepresence
 
 <div class="docs-article-toc">
 <h3>Contents</h3>
@@ -20,50 +21,13 @@ The Telepresence CLI will periodically check for new versions and notify you whe
 
 <QSTabs/>
 
-<!--
-### <img class="os-logo" src="../../../images/apple.png"/> macOS
-
-```
-sudo curl -fL https://app.getambassador.io/download/tel2/darwin/amd64/latest/telepresence \
--o /usr/local/bin/telepresence && \
-sudo chmod a+x /usr/local/bin/telepresence && \
-telepresence version
-```
-
-### <img class="os-logo" src="../../../images/linux.png"/> Linux
-
-```
-sudo curl -fL https://app.getambassador.io/download/tel2/linux/amd64/latest/telepresence \
--o /usr/local/bin/telepresence && \
-sudo chmod a+x /usr/local/bin/telepresence && \
-telepresence version
-```
--->
-
 After upgrading your CLI, the Traffic Manager **must be uninstalled** from your cluster. This can be done using `telepresence uninstall --everything` or by `kubectl delete svc,deploy traffic-manager`. The next time you run a `telepresence` command it will deploy an upgraded Traffic Manager.
 
 ## Installing Older Versions of Telepresence
 
-Use the following URLs to install an older version, replacing `x.x.x` with the version you want.
-
-```
-# macOS
-https://app.getambassador.io/download/tel2/darwin/amd64/x.x.x/telepresence
-  
-# Linux
-https://app.getambassador.io/download/tel2/linux/amd64/x.x.x/telepresence
-```
-
-
-Curl the following URLs to find the current latest version number.
+Use these URLs to download an older version for your OS, replacing `x.x.x` with the version you want.
 
-```
-# macOS
-https://app.getambassador.io/download/tel2/darwin/amd64/stable.txt
-  
-# Linux
-https://app.getambassador.io/download/tel2/linux/amd64/stable.txt
-```
+<OldVersionTabs/>
 
 ## Migrating from Telepresence 1 to Telepresence 2