Skip to content

Commit

Permalink
Revert "[dashboard] Downtime in-app announcements (#18761)"
Browse files Browse the repository at this point in the history
This reverts commit cebee56.
  • Loading branch information
geropl committed Sep 25, 2023
1 parent 2389937 commit 1a5845a
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 221 deletions.
Binary file removed components/dashboard/public/maintenance/favicon.ico
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion components/dashboard/public/maintenance/gitpod.svg

This file was deleted.

7 changes: 0 additions & 7 deletions components/dashboard/public/maintenance/index.css

This file was deleted.

45 changes: 0 additions & 45 deletions components/dashboard/public/maintenance/index.html

This file was deleted.

28 changes: 0 additions & 28 deletions components/dashboard/public/maintenance/source.css

This file was deleted.

116 changes: 0 additions & 116 deletions components/dashboard/src/AppNotifications.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions components/dashboard/src/app/AppRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import PersonalAccessTokenCreateView from "../user-settings/PersonalAccessTokens
import { CreateWorkspacePage } from "../workspaces/CreateWorkspacePage";
import { WebsocketClients } from "./WebsocketClients";
import { BlockedEmailDomains } from "../admin/BlockedEmailDomains";
import { AppNotifications } from "../AppNotifications";

const Workspaces = React.lazy(() => import(/* webpackPrefetch: true */ "../workspaces/Workspaces"));
const Account = React.lazy(() => import(/* webpackPrefetch: true */ "../user-settings/Account"));
Expand Down Expand Up @@ -122,7 +121,6 @@ export const AppRoutes = () => {
<Route>
<div className="container">
<Menu />
<AppNotifications />
<Switch>
<Route path="/new" exact component={CreateWorkspacePage} />
<Route path={projectsPathNew} exact component={NewProject} />
Expand Down
9 changes: 4 additions & 5 deletions components/dashboard/src/components/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { ReactComponent as InfoSvg } from "../images/info.svg";
import { ReactComponent as XSvg } from "../images/x.svg";
import { ReactComponent as Check } from "../images/check-circle.svg";
import classNames from "classnames";
import { Button } from "./Button";

export type AlertType =
// Green
Expand Down Expand Up @@ -123,14 +122,14 @@ export default function Alert(props: AlertProps) {
{props.closable && (
<span className={`mt-1 ml-4`}>
{/* Use an IconButton component once we make it */}
<Button
type="secondary"
className="bg-transparent hover:bg-transparent"
<button
type="button"
className="bg-transparent p-1"
onClick={handleClose}
autoFocus={autoFocusClose}
>
<XSvg className="w-3 h-4 cursor-pointer" />
</Button>
</button>
</span>
)}
</div>
Expand Down
1 change: 0 additions & 1 deletion components/dashboard/src/data/featureflag-query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const featureFlags = {
publicApiExperimentalWorkspaceService: false,
personalAccessTokensEnabled: false,
oidcServiceEnabled: false,
scheduled_downtime_notification: false,
// Default to true to enable on gitpod dedicated until ff support is added for dedicated
orgGitAuthProviders: true,
userGitAuthProviders: false,
Expand Down
16 changes: 0 additions & 16 deletions components/proxy/conf/Caddyfile
Original file line number Diff line number Diff line change
Expand Up @@ -195,22 +195,6 @@ https://{$GITPOD_DOMAIN} {
import ssl_configuration
import security_headers

# maintenance redirect (+ redirect away afterwards)
@maintenance_redirect {
expression `'{$MAINTENANCE_REDIRECT}' == 'true'`
not path /maintenance/*
}
handle @maintenance_redirect {
redir https://{$GITPOD_DOMAIN}/maintenance/index.html 307
}
@maintenance_done_redirect {
expression `'{$MAINTENANCE_REDIRECT}' != 'true'`
path /maintenance/*
}
handle @maintenance_done_redirect {
redir https://{$GITPOD_DOMAIN}/workspaces permanent
}

@proxy_server_public_api path /public-api/gitpod.experimental.v1.HelloService*
handle @proxy_server_public_api {
uri strip_prefix /public-api
Expand Down

0 comments on commit 1a5845a

Please sign in to comment.