Skip to content

Commit

Permalink
Merge branch 'main' into leah/boundary-remove-install
Browse files Browse the repository at this point in the history
  • Loading branch information
LeahMarieBush authored Jan 29, 2025
2 parents 97a5221 + 94d049f commit afcf17b
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 52 deletions.
9 changes: 5 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"dependencies": {
"@actions/core": "^1.9.1",
"@apidevtools/json-schema-ref-parser": "^9.0.9",
"@hashicorp/design-system-tokens": "^2.2.2",
"@hashicorp/design-system-tokens": "^2.3.0",
"@hashicorp/flight-icons": "^3.7.0",
"@hashicorp/localstorage-polyfill": "^1.0.14",
"@hashicorp/mktg-global-styles": "^4.5.0",
Expand Down
5 changes: 1 addition & 4 deletions src/content/tutorials-landing.json
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,7 @@
"text": "Explore other providers"
}
],
"featuredCollectionSlugs": [
"vagrant/getting-started",
"vagrant/networking-provisioning-operations"
]
"featuredCollectionSlugs": ["vagrant/networking-provisioning-operations"]
},
"waypoint": {
"featuredUseCases": [
Expand Down
5 changes: 0 additions & 5 deletions src/content/vagrant/install-vmware-landing.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"featuredTutorialsSlugs": [
"vagrant/getting-started-index",
"vagrant/getting-started-boxes",
"vagrant/getting-started-networking"
],
"doesNotHavePackageManagers": true,
"sidecarMarketingCard": {
"title": "About Vagrant",
Expand Down
37 changes: 1 addition & 36 deletions src/content/vagrant/product-landing.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"ctas": [
{
"text": "CLI Quick Start",
"url": "/vagrant/tutorials/getting-started"
"url": "/vagrant/tutorials/get-started"
}
]
},
Expand All @@ -40,40 +40,15 @@
"body": "The package format for Vagrant environments - create your own or use one from the public catalog.",
"url": "/vagrant/docs/boxes"
},
{
"heading": "Install and Specify a Box",
"body": "Use a base image to quickly clone a virtual machine.",
"url": "/vagrant/tutorials/getting-started/getting-started-boxes"
}
]
},
{
"type": "linked_cards",
"cards": [
{
"heading": "Vagrantfile",
"body": "Describe your virtual machine's configuration and how to provision it.",
"url": "/vagrant/docs/vagrantfile"
},
{
"heading": "Create a Vagrantfile",
"body": "Begin your Vagrant project by creating a Vagrantfile.",
"url": "/vagrant/tutorials/getting-started/getting-started-project-setup"
}
]
},
{
"type": "linked_cards",
"cards": [
{
"heading": "vagrant up",
"body": "Create and configure your virtual machine with the single most important Vagrant CLI command.",
"url": "/vagrant/docs/cli/up"
},
{
"heading": "Boot an Environment",
"body": "Start your virtual machine with vagrant up.",
"url": "/vagrant/tutorials/getting-started/getting-started-up"
}
]
},
Expand All @@ -91,16 +66,6 @@
"body": "Sync files from your host machine to the guest machine.",
"url": "/vagrant/docs/synced-folders"
},
{
"heading": "Synchronize Your Files",
"body": "Vagrant automatically syncs files to and from the guest machine allowing you to edits files locally and run them in your virtual machine.",
"url": "/vagrant/tutorials/getting-started/getting-started-synced-folders"
}
]
},
{
"type": "linked_cards",
"cards": [
{
"heading": "Networking",
"body": "Access your virtual machines through the high-level networking set up by Vagrant.",
Expand Down
1 change: 0 additions & 1 deletion src/pages/tutorials/library.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ const DEFAULT_SLUGS = [
'vault/why-use-vault',
'consul/get-started',
'nomad/get-started-install',
'vagrant/getting-started-index',
'packer/get-started-install-cli',
'boundary/getting-started-intro',
'waypoint/get-started-intro',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import Card from 'components/card'
import CardWithLink from 'views/product-downloads-view/components/card-with-link'
import MobileDownloadStandaloneLink from 'components/mobile-download-standalone-link'
import Heading from 'components/heading'
import InlineAlert from 'components/inline-alert'
import InlineLink from 'components/inline-link'
import { IconInfo16 } from '@hashicorp/flight-icons/svg-react/info-16'
import { IconDownload16 } from '@hashicorp/flight-icons/svg-react/download-16'
// Types
import { InstallProps, ReleaseBuild } from './types'
Expand All @@ -28,6 +31,7 @@ function InstallCallout({
customInstallProps,
headingData,
cardClassName,
children,
}: {
customInstallProps: InstallProps
/** We link to this heading from the side nav, so we've lifted up its data */
Expand All @@ -36,6 +40,7 @@ function InstallCallout({
text: string
}
cardClassName?: string
children?: React.ReactNode
}) {
const { latestVersion, builds } = customInstallProps
const { currentVersion } = useCurrentVersion()
Expand Down Expand Up @@ -77,6 +82,7 @@ function InstallCallout({
/>
))}
</div>
{children}
</Card>
)
}
Expand Down
10 changes: 10 additions & 0 deletions src/views/product-downloads-view/boundary/download.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,13 @@
.lastCard {
margin-top: 32px;
}

.alert {
margin-top: 24px;
}

.cardIcon {
margin-top: 3px;
max-height: 16px;
max-width: 16px;
}
23 changes: 22 additions & 1 deletion src/views/product-downloads-view/boundary/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import ProductDownloadsView from 'views/product-downloads-view'
// Components
import { InstallCallout } from './components'
import InlineAlert from 'components/inline-alert'
import InlineLink from 'components/inline-link'
import { IconInfo16 } from '@hashicorp/flight-icons/svg-react/info-16'
// Types
import { InstallProps } from './components/install-callout/types'
import { ProductDownloadsViewProps } from 'views/product-downloads-view/types'
Expand Down Expand Up @@ -60,7 +63,25 @@ function BoundaryDownloadsView({
<InstallCallout
headingData={SHARED_HEADINGS.desktopClient}
customInstallProps={desktopClientProps}
/>
>
<InlineAlert
className={s.alert}
color="neutral"
title="Note"
description={
<>
You can find previous versions of the Desktop Client on the{' '}
<InlineLink
href="https://releases.hashicorp.com/boundary-desktop"
textSize={200}
>
Desktop Client releases page.
</InlineLink>
</>
}
icon={<IconInfo16 className={s.cardIcon} />}
/>
</InstallCallout>
<InstallCallout
cardClassName={s.lastCard}
headingData={SHARED_HEADINGS.installer}
Expand Down

0 comments on commit afcf17b

Please sign in to comment.