Skip to content

Commit

Permalink
address pr feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
miaawong committed Oct 10, 2024
1 parent d3c94ce commit 76c537f
Show file tree
Hide file tree
Showing 23 changed files with 57 additions and 38 deletions.
31 changes: 25 additions & 6 deletions kurl_proxy/assets/insecure.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
>
<img src="/assets/images/check.svg" alt="check" />
<span class="font-normal ml-2">
Validate the environment & install {{.AppTitle}}
Validate the environment & deploy {{.AppTitle}}
</span>
</div>
</div>
Expand All @@ -112,10 +112,10 @@
<div class="mt-8 p-8 bg-[#F9FBFC]">
<div>
<p class="tls-header-sub">
We use a self-signed SSL/TLS Certificate to secure the
communication between your local machine and the Admin Console
during setup. You'll see a warning about this in your browser,
but you can be confident that this is secure.
We use a self-signed TLS Certificate to secure the communication
between your local machine and the Admin Console during setup.
You'll see a warning about this in your browser, but you can be
confident that this is secure.
</p>
</div>
<div class="flex1 flex">
Expand Down Expand Up @@ -177,6 +177,7 @@
<pre>
<code id="verify-snippet">
</code>
<span id="copy-command">Copy command</span>
</pre>
</div>
</div>
Expand Down Expand Up @@ -208,7 +209,7 @@
</body>
<script>
document.getElementById("verify-snippet").innerHTML =
"$ echo | openssl s_client -servername local -connect " +
"echo | openssl s_client -servername local -connect " +
opensslLink +
" 2>/dev/null | openssl x509 -noout -fingerprint";
</script>
Expand All @@ -230,5 +231,23 @@
document.getElementById("up-arrow").style.display = "none";
}
});

document
.getElementById("copy-command")
.addEventListener("click", function () {
// Get the code inside the <code> element
const codeSnippet =
document.getElementById("verify-snippet").textContent;

// Copy the code to the clipboard
navigator.clipboard
.writeText(codeSnippet)
.then(() => {
alert("Command copied to clipboard!");
})
.catch((err) => {
console.error("Failed to copy text: ", err);
});
});
</script>
</html>
2 changes: 1 addition & 1 deletion kurl_proxy/assets/tls.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
style="width: 16px; height: 16px"
/>
<span class="ml-2">
Validate the environment & install {{.AppTitle}}
Validate the environment & deploy {{.AppTitle}}
</span>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion kurl_proxy/assets/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
>
<img src="/assets/images/check.svg" alt="check" />
<p class="text-sm font-medium">
Validate the environment & install {{ .AppTitle }}
Validate the environment & deploy {{ .AppTitle }}
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/src/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ const Root = () => {
getStepProps(3).textColor
}`}
>
Validate the environment & Install{" "}
Validate the environment & deploy{" "}
{state.selectedAppName || ""}
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/PreflightResultPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function PreflightResultPage(props: Props) {
{Utilities.isInitialAppInstall(selectedApp) && props.isEmbeddedCluster && (
<div className="tw-mt-8 tw-shadow-[0_1px_0_#c4c8ca]">
<p className="tls-header tw-pb-8 tw-font-bold u-textColor--primary">
Validate the environment and deploy {selectedApp?.name}
Validate the environment & deploy {selectedApp?.name}
</p>
</div>
)}
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/apps/EmbeddedClusterManagement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ const EmbeddedClusterManagement = ({
const AddNodeInstructions = () => {
return (
<div className="tw-mb-2 tw-text-base">
<p className="tw-mb-8">
<p className="tw-mb-8 tw-text-gray-800">
Optionally add nodes to the cluster. Click{" "}
<span className="tw-font-semibold">Continue </span>
to proceed with a single node.
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/identity/ConfigureIngress.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class ConfigureIngress extends Component {
</div>
<p className="u-fontSize--normal u-lineHeight--normal u-fontWeight--medium u-marginTop--5">
{" "}
This is the host at which you can reach the admin console.{" "}
This is the host at which you can reach the Admin Console.{" "}
</p>
<input
type="text"
Expand Down
8 changes: 4 additions & 4 deletions web/src/components/modals/BackupRestoreModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function BackupRestoreModal(props) {

<p className="u-fontSize--normal u-fontWeight--normal u-textColor--bodyCopy u-lineHeight--normal">
Select the type of backup you want to perform. A full restore of the
admin console, your application and its metadata, application config
Admin Console, your application and its metadata, application config
and your database or a partial restore of your application and its
metadata. All data not backed up will be lost and replaced with data
in this backup.
Expand Down Expand Up @@ -103,7 +103,7 @@ export default function BackupRestoreModal(props) {
Will this be a full or partial restore?{" "}
</p>
<p className="u-fontSize--normal u-fontWeight--normal u-textColor--bodyCopy u-lineHeight--normal">
You can do a full restore of the application, admin console, and
You can do a full restore of the application, Admin Console, and
databases or you can do a partial restore of just your application
and its metadata.
</p>
Expand Down Expand Up @@ -169,11 +169,11 @@ export default function BackupRestoreModal(props) {
<div className="flex flex-column u-marginLeft--10">
<p className="u-fontSize--normal u-fontWeight--medium u-textColor--primary u-lineHeight--normal">
{" "}
Restore admin console{" "}
Restore Admin Console{" "}
</p>
<p className="u-fontSize--small u-fontWeight--normal u-textColor--bodyCopy u-lineHeight--normal">
{" "}
Only restores the admin console
Only restores the Admin Console
</p>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/modals/RestoreSnapshotModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export default function RestoreSnapshotModal(props) {
Restoring to this version will remove data and replace it with
data from the restored version. During the restoration, your
application will not be available and you will not be able to use
the admin console. This action cannot be reversed.{" "}
the Admin Console. This action cannot be reversed.{" "}
</p>
</div>
<div className="flex flex-column u-marginTop--20">
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/snapshots/AppSnapshotRestore.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ class AppSnapshotRestore extends Component {
<p className="u-fontSize--normal u-fontWeight--medium u-textColor--bodyCopy u-lineHeight--normal">
{" "}
After all volumes have been restored you will need to log back in
to the admin console.{" "}
to the Admin Console.{" "}
</p>
<div className="flex flex-column u-marginTop--40">
{restoreLoading && (
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/snapshots/SnapshotRestore.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ class SnapshotRestore extends Component {
<p className="u-fontSize--normal u-fontWeight--medium u-textColor--bodyCopy u-lineHeight--normal">
{" "}
After all volumes have been restored you will need to log back in
to the admin console.{" "}
to the Admin Console.{" "}
</p>
<div className="flex flex-column u-marginTop--40">
{restoreLoading && (
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/snapshots/SnapshotSchedule.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ class SnapshotSchedule extends Component {
<p className="card-title">Scheduled {featureName}s</p>
<div className="u-marginBottom--10">
<p className="u-fontSize--normal u-fontWeight--normal u-lineHeight--normal u-textColor--bodyCopy u-marginTop--12 schedule">
Configure a schedule for {featureName}s of the admin console and
Configure a schedule for {featureName}s of the Admin Console and
all application data.
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/snapshots/Snapshots.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ class Snapshots extends Component {
</div>
</div>
<p className="u-marginTop--10 u-fontSize--normal u-lineHeight--more u-fontWeight--medium u-textColor--bodyCopy">
Back up the admin console and all application data for
Back up the Admin Console and all application data for
disaster recovery.{" "}
{!this.props.isEmbeddedCluster && (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ const GenerateSupportBundleModal = ({
<p className="u-paddingBottom--10 u-textColor--secondary u-fontSize--normal">
Run the following commands to generate a support bundle from
the CLI. You can then upload a support bundle so that it
appears in the admin console.
appears in the Admin Console.
</p>
<CodeSnippet
language="bash"
Expand Down Expand Up @@ -356,7 +356,7 @@ const GenerateSupportBundleModal = ({
click here
</a>{" "}
to get a command to manually generate a support bundle. This is
useful if the admin console is inaccessible.
useful if the Admin Console is inaccessible.
</span>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/AddNewApp/components/InstallWithHelm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function InstallWithHelm() {
className="u-fontSize--normal u-textColor--accent u-fontWeight--medium u-lineHeight--normal u-marginTop--20 u-marginRight--30 u-marginLeft--30"
style={{ maxWidth: "300px" }}
>
In order to use the admin console you need to install a Helm
In order to use the Admin Console you need to install a Helm
chart.
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ async function getAdminConsoleUpdateStatus({

if (!response.ok) {
throw new Error(
`Error while trying to get admin console update status: ${response.status}`
`Error while trying to get Admin Console update status: ${response.status}`
);
}

Expand All @@ -48,7 +48,7 @@ function useAdminConsoleUpdateStatus({ slug }: { slug: string }) {
console.log(err);
throw new Error(
err.message ||
"Error while trying to get admin console update status. Please try again."
"Error while trying to get Admin Console update status. Please try again."
);
},
});
Expand Down
8 changes: 4 additions & 4 deletions web/src/features/AdminConsole/api/postUpdateAdminConsole.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ async function postUpdateAdminConsole({

if (!response.ok) {
throw new Error(
`Error while trying to update admin console: ${response.status}`
`Error while trying to update Admin Console: ${response.status}`
);
}

Expand All @@ -32,11 +32,11 @@ async function postUpdateAdminConsole({
} catch (err) {
if (err instanceof Error) {
throw new Error(
`Error while trying to unmarshal update admin console response: ${err.message}`
`Error while trying to unmarshal update Admin Console response: ${err.message}`
);
}
throw new Error(
`Error while trying to unmarshal update admin console response`
`Error while trying to unmarshal update Admin Console response`
);
}
}
Expand All @@ -59,7 +59,7 @@ function useUpdateAdminConsole({
console.log(err);
throw new Error(
err.message ||
"Error while trying to update admin console. Please try again."
"Error while trying to update Admin Console. Please try again."
);
},
onSuccess: () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function useAdminConsoleUpdateStatus({
console.log(err);
throw new Error(
err.message ||
"Error while trying to get admin console update status. Please try again."
"Error while trying to get Admin Console update status. Please try again."
);
},
});
Expand Down
6 changes: 3 additions & 3 deletions web/src/features/Auth/components/SecureAdminConsole.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -359,13 +359,13 @@ class SecureAdminConsole extends Component<Props, State> {
>
Log in
{appName && appName !== ""
? ` to ${appName} admin console`
: " to admin console"}
? ` to ${appName} Admin Console`
: " to Admin Console"}
</p>
</div>
<div className="flex-auto flex-column justifyContent--center">
<p className="u-marginTop--10 u-marginTop--5 u-fontSize--large u-textAlign--center u-fontWeight--medium u-lineHeight--normal u-textColor--bodyCopy break-word">
Enter the password to access the {appName} admin console.
Enter the password to access the {appName} Admin Console.
</p>
<div className="u-marginTop--20 flex-column">
{loginErr && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function DashboardGitOpsCard(props) {
>
Config
</Link>{" "}
page in the admin console.
page in the Admin Console.
</p>
</div>
<div className="u-marginTop--10">
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/Gitops/components/AppGitops.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const AppGitops = () => {
<p className="step-sub">
Connect a git version control system so all application updates are
committed to a git repository. <br /> When GitOps is enabled, you
cannot deploy updates directly from the admin console.
cannot deploy updates directly from the Admin Console.
</p>
</div>
<div className="card-item u-padding--15">
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/Gitops/components/SetupProvider.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const SetupProvider = ({ appName }) => {
Connect a git version control system so all application updates are
committed to a git repository.
<br /> When GitOps is enabled, you cannot deploy updates directly from
the admin console.
the Admin Console.
</p>
<div className="flex-column u-textAlign--left card-item u-padding--15">
<div className="flex alignItems--center u-marginBottom--30">
Expand Down
2 changes: 1 addition & 1 deletion web/src/features/Gitops/components/modals/DisableModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const DisableModal = ({ isOpen, setOpen, disableGitOps, provider }) => {
<p className="u-fontSize--normal u-textColor--bodyCopy u-textAlign--center u-lineHeight--normal">
Commits will no longer be made to your repository, and you will have
to <br />
deploy from the admin console.
deploy from the Admin Console.
</p>
<div className="u-marginTop--30">
<button
Expand Down

0 comments on commit 76c537f

Please sign in to comment.