From a221655027fccfe6e9eb6e13bfad774461c82dd4 Mon Sep 17 00:00:00 2001 From: Red J Adaya Date: Sat, 21 Sep 2024 05:06:51 +0800 Subject: [PATCH] new wave modal (#781) --- src/app/appconst.ts | 1 + src/app/assets/new-wave-screenshot.svg | 322 +++++++++++++++++++++++++ src/app/common/modals/index.tsx | 1 + src/app/common/modals/newwave.less | 95 ++++++++ src/app/common/modals/newwave.tsx | 78 ++++++ src/app/common/modals/provider.tsx | 22 +- src/app/common/modals/registry.tsx | 2 + wavesrv/pkg/pcloud/pcloud.go | 9 +- wavesrv/pkg/pcloud/pclouddata.go | 1 + 9 files changed, 529 insertions(+), 2 deletions(-) create mode 100644 src/app/assets/new-wave-screenshot.svg create mode 100644 src/app/common/modals/newwave.less create mode 100644 src/app/common/modals/newwave.tsx diff --git a/src/app/appconst.ts b/src/app/appconst.ts index 4f1efc62f..f5f012ec2 100644 --- a/src/app/appconst.ts +++ b/src/app/appconst.ts @@ -9,6 +9,7 @@ export const LINE_SETTINGS = "lineSettings"; export const CLIENT_SETTINGS = "clientSettings"; export const TAB_SWITCHER = "tabSwitcher"; export const USER_INPUT = "userInput"; +export const NEW_WAVE = "newWave"; export const LineContainer_Main = "main"; export const LineContainer_History = "history"; diff --git a/src/app/assets/new-wave-screenshot.svg b/src/app/assets/new-wave-screenshot.svg new file mode 100644 index 000000000..240fc821e --- /dev/null +++ b/src/app/assets/new-wave-screenshot.svg @@ -0,0 +1,322 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/common/modals/index.tsx b/src/app/common/modals/index.tsx index 434340444..a2fb8e28f 100644 --- a/src/app/common/modals/index.tsx +++ b/src/app/common/modals/index.tsx @@ -10,3 +10,4 @@ export { SessionSettingsModal } from "./sessionsettings"; export { ScreenSettingsModal } from "./screensettings"; export { LineSettingsModal } from "./linesettings"; export { UserInputModal } from "./userinput"; +export { NewWaveModal } from "./newwave"; diff --git a/src/app/common/modals/newwave.less b/src/app/common/modals/newwave.less new file mode 100644 index 000000000..f4be79511 --- /dev/null +++ b/src/app/common/modals/newwave.less @@ -0,0 +1,95 @@ +.newwave-modal { + width: 640px; + border-radius: 8px; + border: 0.5px solid rgba(255, 255, 255, 0.12); + background: #232323; + box-shadow: 0px 8px 32px 0px rgba(0, 0, 0, 0.25); + + .wave-modal-content .wave-modal-body { + padding: 0; + gap: 8px; + + .wave-modal-body-inner { + gap: 24px; + display: flex; + flex-direction: column; + + header.newwave-header { + padding: 24px 32px 0; + position: relative; + flex-direction: column; + gap: 12px; + border-bottom: none; + + .modal-title { + text-align: left; + font-size: 20px; + font-weight: normal; + } + + .close { + position: absolute; + right: 32px; + top: 24px; + } + } + + .content.newwave-content { + display: flex; + flex-direction: column; + align-items: flex-start; + width: 100%; + margin-bottom: 0; + gap: 10px; + + .item { + width: 100%; + line-height: 19px; + font-weight: 400; + padding-left: 32px; + padding-right: 32px; + + &.image-item { + padding: 0 0; + height: 360px; + } + + img { + width: 100%; + margin-bottom: -45px; + } + + span { + font-weight: 600; + } + } + } + + footer { + padding: 0 32px 24px; + display: flex; + justify-content: flex-end; + + .button-wrapper { + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + + button { + font-size: 15px; + margin-top: 16px; + + &:last-child { + margin-left: 10px; + } + } + + button.disabled-button { + cursor: default; + } + } + } + } + } +} diff --git a/src/app/common/modals/newwave.tsx b/src/app/common/modals/newwave.tsx new file mode 100644 index 000000000..d03041dab --- /dev/null +++ b/src/app/common/modals/newwave.tsx @@ -0,0 +1,78 @@ +// Copyright 2023, Command Line Inc. +// SPDX-License-Identifier: Apache-2.0 + +import * as React from "react"; +import * as mobxReact from "mobx-react"; +import { boundMethod } from "autobind-decorator"; +import { Modal, Button } from "@/elements"; +import { getApi } from "@/models"; + +import newwave from "@/assets/new-wave-screenshot.svg"; + +import "./newwave.less"; + +@mobxReact.observer +class NewWaveModal extends React.Component<{ onClose: () => void }, {}> { + @boundMethod + handleDownloadOldWave(): void { + getApi().openExternalLink("https://www.waveterm.dev/download-legacy"); + } + + @boundMethod + handleDownloadNewWave(): void { + getApi().openExternalLink("https://www.waveterm.dev/download"); + } + + @boundMethod + handleClose(): void { + this.props.onClose(); + } + + render() { + return ( + +
+
+
+
A New Wave is Coming!
+ +
+
+
+ We are excited to share that after 3-months of work, and almost 1000 new commits, Wave + v0.8 is now available. It features a new layout engine for screen splitting, improved + remote file browsing and previewing, improved performance, and a new design. We've also + removed some of the more controversial features that took over the shell experience and + overrode things like completions, history, and prompts. +
+
+ The new build is a fresh start, and a clean break from the current version. As such, + your history, settings, and configuration will not be carried over. If you'd like + to continue to run the legacy version, you will need to download it separately. +
+
+ +
+
+ You can download Wave v0.8 now or wait for an auto-update next week. The legacy version + will be available via separate download page. +
+
+
+
+ +
+
+ +
+
+
+
+ + ); + } +} + +export { NewWaveModal }; diff --git a/src/app/common/modals/provider.tsx b/src/app/common/modals/provider.tsx index 27acbd308..8fd04bbe1 100644 --- a/src/app/common/modals/provider.tsx +++ b/src/app/common/modals/provider.tsx @@ -5,14 +5,34 @@ import * as React from "react"; import * as mobxReact from "mobx-react"; import { GlobalModel } from "@/models"; import { TosModal } from "./tos"; +import { NewWaveModal } from "./newwave"; + +const SessionStorageKey = "newWaveRendered"; @mobxReact.observer -class ModalsProvider extends React.Component { +class ModalsProvider extends React.Component<{}, {}> { + constructor(props) { + super(props); + this.handleNewWaveOnClose = this.handleNewWaveOnClose.bind(this); + } + + handleNewWaveOnClose() { + sessionStorage.setItem(SessionStorageKey, "1"); + this.forceUpdate(); + } + render() { let store = GlobalModel.modalsModel.store.slice(); + if (GlobalModel.needsTos()) { return ; } + + const newWaveRendered = sessionStorage.getItem(SessionStorageKey); + if (!newWaveRendered) { + return ; + } + let rtn: JSX.Element[] = []; for (let i = 0; i < store.length; i++) { let entry = store[i]; diff --git a/src/app/common/modals/registry.tsx b/src/app/common/modals/registry.tsx index 7853742c4..ca255846c 100644 --- a/src/app/common/modals/registry.tsx +++ b/src/app/common/modals/registry.tsx @@ -13,6 +13,7 @@ import { ScreenSettingsModal, LineSettingsModal, UserInputModal, + NewWaveModal, } from "@/modals"; import * as constants from "@/app/appconst"; @@ -27,6 +28,7 @@ const modalsRegistry: { [key: string]: React.ComponentType } = { [constants.LINE_SETTINGS]: LineSettingsModal, [constants.TAB_SWITCHER]: TabSwitcherModal, [constants.USER_INPUT]: UserInputModal, + [constants.NEW_WAVE]: NewWaveModal, }; export { modalsRegistry }; diff --git a/wavesrv/pkg/pcloud/pcloud.go b/wavesrv/pkg/pcloud/pcloud.go index f599ed108..b6e842d3d 100644 --- a/wavesrv/pkg/pcloud/pcloud.go +++ b/wavesrv/pkg/pcloud/pcloud.go @@ -167,7 +167,14 @@ func SendTelemetry(ctx context.Context, force bool) error { log.Printf("[pcloud] sending telemetry data\n") dayStr := telemetry.GetCurDayStr() defaultShellType := shellapi.DetectLocalShellType() - input := TelemetryInputType{UserId: clientData.UserId, ClientId: clientData.ClientId, CurDay: dayStr, DefaultShell: defaultShellType, Activity: activity} + input := TelemetryInputType{ + UserId: clientData.UserId, + ClientId: clientData.ClientId, + AppType: "wave", + CurDay: dayStr, + DefaultShell: defaultShellType, + Activity: activity, + } req, err := makeAnonPostReq(ctx, TelemetryUrl, input) if err != nil { return err diff --git a/wavesrv/pkg/pcloud/pclouddata.go b/wavesrv/pkg/pcloud/pclouddata.go index 548b589cf..172be08ed 100644 --- a/wavesrv/pkg/pcloud/pclouddata.go +++ b/wavesrv/pkg/pcloud/pclouddata.go @@ -22,6 +22,7 @@ type NoTelemetryInputType struct { type TelemetryInputType struct { UserId string `json:"userid"` ClientId string `json:"clientid"` + AppType string `json:"apptype"` CurDay string `json:"curday"` DefaultShell string `json:"defaultshell"` Activity []*telemetry.ActivityType `json:"activity"`