waveterm/backup
0
0
Fork 0
mirror of https://github.com/wavetermdev/backup.git synced 2026-08-05 13:57:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pe 199 pre rel 0.4.0 (#34)

Browse Source 
* Tab bg matches selections

* WIP: need to fix all modals one by one

* ready to pull latest

* history fixed
This commit is contained in:
anandamarsh
2023-10-11 23:43:47 -07:00
committed by GitHub
parent acc4eea74f
commit 474552d732
48 changed files with 570 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app.less
+3 -58
View File
@@ -1,4 +1,4 @@
@import "../index.less";
@import "./common/themes/themes.less";
@font-face {
font-family: "Martian Mono";
@@ -94,7 +94,7 @@ svg.icon {
border: none;
border-radius: 5px;
cursor: pointer;
background-color: @button-background;
background-color: @button-background !important;
color: @prompt-green;
.hoverEffect;
&:hover {
@@ -169,9 +169,8 @@ a.a-block {
flex-grow: 1;
display: flex;
flex-direction: column;
min-width: 300px;
margin-right: 0.5em;
position: relative;
&.is-hidden {
display: none;
}
@@ -395,57 +394,3 @@ a.a-block {
opacity: 0;
}
}
.alt-view {
background-color: #111;
overflow-y: auto;
flex-grow: 1;
.alt-title {
margin: 20px 10px 0px 5px;
padding-left: 10px;
padding-bottom: 12px;
color: @term-bright-white;
border-bottom: 1px solid white;
}
.alt-list {
color: @term-white;
margin: 4px 10px 5px 5px;
border-bottom: 1px solid white;
}
.no-content {
color: @term-white;
padding: 30px 10px 35px 10px;
border-bottom: 1px solid white;
}
.close-button {
position: absolute;
padding: 4px;
color: #aaa;
right: 15px;
top: 18px;
cursor: pointer;
&:hover {
color: #fff;
}
}
.alt-help {
color: @term-white;
margin-top: 20px;
display: flex;
flex-direction: row;
align-items: center;
margin-bottom: 10px;
.help-entry {
margin-left: 20px;
}
}
}
src/app/assets/icons/favourites/copy.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M352 0l96 96V384H160V0H352zM64 128h64v64H64V448H256V416h64v32 64H256 64 0V448 192 128H64z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 337 B

src/app/assets/icons/favourites/pen.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M0 512L32 352 292.7 91.3l128 128L160 480 0 512zM443.3 196.7l-128-128L384 0 512 128l-68.7 68.7z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 342 B

src/app/assets/icons/favourites/trash.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M144 0L128 32H0V96H448V32H320L304 0H144zM416 128H32L56 512H392l24-384z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 318 B

src/app/assets/icons/history/angle-down.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M224 365.3l22.6-22.6 160-160L429.3 160 384 114.7l-22.6 22.6L224 274.7 86.6 137.4 64 114.7 18.7 160l22.6 22.6 160 160L224 365.3z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 375 B

src/app/assets/icons/history/chevron-left.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M2.7 256l22.6 22.6 192 192L240 493.3 285.3 448l-22.6-22.6L93.3 256 262.6 86.6 285.3 64 240 18.7 217.4 41.4l-192 192L2.7 256z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 372 B

src/app/assets/icons/history/chevron-right.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M317.3 256l-22.6 22.6-192 192L80 493.3 34.7 448l22.6-22.6L226.7 256 57.4 86.6 34.7 64 80 18.7l22.6 22.6 192 192L317.3 256z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 370 B

src/app/assets/icons/history/copy.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M352 0l96 96V384H160V0H352zM64 128h64v64H64V448H256V416h64v32 64H256 64 0V448 192 128H64z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 337 B

src/app/assets/icons/history/right.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M422.6 278.6L445.3 256l-22.6-22.6-144-144L256 66.7 210.8 112l22.6 22.6L322.8 224 32 224 0 224l0 64 32 0 290.7 0-89.4 89.4L210.8 400 256 445.3l22.6-22.6 144-144z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 408 B

src/app/assets/icons/history/search.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 594 B

src/app/assets/icons/history/square-check.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zM337 209L209 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L303 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 497 B

src/app/assets/icons/history/square-minus.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M64 32C28.7 32 0 60.7 0 96V416c0 35.3 28.7 64 64 64H384c35.3 0 64-28.7 64-64V96c0-35.3-28.7-64-64-64H64zm88 200H296c13.3 0 24 10.7 24 24s-10.7 24-24 24H152c-13.3 0-24-10.7-24-24s10.7-24 24-24z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 441 B

src/app/assets/icons/history/square.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Free 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 354 B

src/app/assets/icons/trash.svg
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--! Font Awesome Pro 6.4.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2023 Fonticons, Inc. --><path d="M144 0L128 32H0V96H448V32H320L304 0H144zM416 128H32L56 512H392l24-384z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 318 B

src/app/bookmarks/bookmarks.less
+24 -1
View File
@@ -1,6 +1,29 @@
@import "../../index.less";
@import "../../app/app.less";
.bookmarks-view {
background-color: @background-session;
.close-button {
position: absolute;
right: 1em;
top: 0.8em;
cursor: pointer;
width: 1.5em;
height: 1.5em;
border-radius: 50%;
svg {
width: 1.5em;
height: 1.5em;
fill: @base-color;
}
}
.icon {
width: 1em;
height: 1em;
fill: @base-color;
}
.bookmarks-list {
color: @term-white;
margin: 4px 10px 5px 5px;
src/app/bookmarks/bookmarks.tsx
+17 -12
View File
@@ -8,6 +8,12 @@ import type { BookmarkType } from "../../types/types";
import { GlobalModel } from "../../model/model";
import { CmdStrCode, Markdown } from "../common/common";
import { ReactComponent as XmarkIcon } from "../assets/icons/line/xmark.svg";
import { ReactComponent as CopyIcon } from "../assets/icons/favourites/copy.svg";
import { ReactComponent as PenIcon } from "../assets/icons/favourites/pen.svg";
import { ReactComponent as TrashIcon } from "../assets/icons/favourites/trash.svg";
import { ReactComponent as FavouritesIcon } from "../assets/icons/favourites.svg";
import "./bookmarks.less";
@mobxReact.observer
@@ -157,10 +163,10 @@ class Bookmark extends React.Component<{ bookmark: BookmarkType }, {}> {
</div>
<div className="bookmark-controls">
<div className="bookmark-control" onClick={this.handleEditClick}>
<i className="fa-sharp fa-solid fa-pen" />
<PenIcon className={"icon"} />
</div>
<div className="bookmark-control" onClick={this.handleDeleteClick}>
<i className="fa-sharp fa-solid fa-trash" />
<TrashIcon className={"icon"} />
</div>
</div>
</div>
@@ -184,13 +190,13 @@ class BookmarksView extends React.Component<{}, {}> {
let idx: number = 0;
let bookmark: BookmarkType = null;
return (
<div className={cn("bookmarks-view", "alt-view", { "is-hidden": isHidden })}>
<div className="close-button" onClick={this.closeView}>
<i className="fa-sharp fa-solid fa-xmark"></i>
<div className={cn("bookmarks-view", { "is-hidden": isHidden })}>
<div className="close-button hoverEffect" title="Close (Escape)" onClick={this.closeView}>
<XmarkIcon className={"icon"} />
</div>
<div className="alt-title">
<i className="fa-sharp fa-solid fa-bookmark" style={{ marginRight: 10 }} />
BOOKMARKS
<FavouritesIcon className={"icon"} style={{ marginRight: 10 }} />
Favourites
</div>
<div className="bookmarks-list">
<For index="idx" each="bookmark" of={bookmarks}>
@@ -200,8 +206,7 @@ class BookmarksView extends React.Component<{}, {}> {
<div className="no-content">
No Bookmarks.
<br />
Use the <i className="fa-sharp fa-solid fa-bookmark" /> icon on commands to add your first
bookmark.
Use the <FavouritesIcon className={"icon"} /> icon on commands to add your first bookmark.
</div>
</If>
</div>
@@ -210,13 +215,13 @@ class BookmarksView extends React.Component<{}, {}> {
<div className="help-entry">
[Enter] to Use Bookmark
<br />
[Backspace/Delete]x2 or <i className="fa-sharp fa-solid fa-trash" /> to Delete
[Backspace/Delete]x2 or <TrashIcon className={"icon"} /> to Delete
<br />
[Arrow Up]/[Arrow Down]/[PageUp]/[PageDown] to Move in List
<br />
[e] or <i className="fa-sharp fa-solid fa-pen" /> to Edit
[e] or <PenIcon className={"icon"} /> to Edit
<br />
[c] or <i className="fa-sharp fa-regular fa-copy" /> to Copy
[c] or <CopyIcon className={"icon"} /> to Copy
<br />
</div>
</div>
src/app/common/common.less
+2 -10
View File
@@ -1,4 +1,4 @@
@import "../../index.less";
@import "../../app/app.less";
.info-message {
position: relative;
@@ -67,7 +67,6 @@
flex-grow: 0;
padding: 3px;
border-radius: 3px 0 0 3px;
height: 22px;
width: 22px;
display: flex;
@@ -75,11 +74,6 @@
justify-content: center;
align-self: flex-start;
cursor: pointer;
background-color: @term-black;
&:hover {
background-color: #777;
}
}
.code-div {
@@ -115,9 +109,7 @@
padding-left: 4px;
cursor: pointer;
width: 20px;
background-color: @term-black;
border: 1px solid #333;
color: #777;
&:hover {
color: @term-white;
}
src/app/common/common.tsx
+8 -5
View File
@@ -8,6 +8,9 @@ import cn from "classnames";
import { If } from "tsx-control-statements/components";
import type { RemoteType } from "../../types/types";
import { ReactComponent as CheckIcon } from "../assets/icons/line/check.svg";
import { ReactComponent as CopyIcon } from "../assets/icons/history/copy.svg";
import "./common.less";
type OV<V> = mobx.IObservableValue<V>;
@@ -52,15 +55,15 @@ class CmdStrCode extends React.Component<
<div>copied</div>
</div>
</If>
<div key="use" className="use-button" title="Use Command" onClick={this.handleUse}>
<i className="fa-sharp fa-solid fa-check" />
<div key="use" className="use-button hoverEffect" title="Use Command" onClick={this.handleUse}>
<CheckIcon className="icon" />
</div>
<div key="code" className="code-div">
<code>{cmdstr}</code>
</div>
<div key="copy" className="copy-control">
<div className="inner-copy" onClick={this.handleCopy}>
<i title="copy" className="fa-sharp fa-regular fa-copy" />
<div key="copy" className="copy-control hoverEffect">
<div className="inner-copy" onClick={this.handleCopy} title="copy">
<CopyIcon className="icon" />
</div>
</div>
</div>
src/app/common/modals/modals.less
+11 -9
View File
@@ -1,4 +1,4 @@
@import "../../../index.less";
@import "../../../app/app.less";
// modal css (also includes settings-field)
@@ -128,14 +128,16 @@
.close-icon {
position: absolute;
right: 10px;
top: 6px;
right: 1em;
top: 0.8em;
cursor: pointer;
padding: 3px;
color: #aaa;
&:hover {
color: #fff;
width: 1.5em;
height: 1.5em;
border-radius: 50%;
svg {
width: 1.5em;
height: 1.5em;
fill: @base-color;
}
}
}
@@ -306,7 +308,7 @@
fill: @tab-white;
}
.tab-color-icon.color-black path {
fill: @tab-black
fill: @tab-black;
}
.tab-colors {
src/app/common/modals/modals.tsx
+6 -4
View File
@@ -9,6 +9,8 @@ import localizedFormat from "dayjs/plugin/localizedFormat";
import { GlobalModel } from "../../../model/model";
import { Markdown } from "../common";
import { ReactComponent as XmarkIcon } from "../../assets/icons/line/xmark.svg";
dayjs.extend(localizedFormat);
type OV<V> = mobx.IObservableValue<V>;
@@ -176,8 +178,8 @@ class AlertModal extends React.Component<{}, {}> {
<p className="modal-title">
<i className="fa-sharp fa-solid fa-triangle-exclamation" /> {title}
</p>
<div className="close-icon">
<i onClick={this.closeModal} className="fa-sharp fa-solid fa-times" />
<div className="close-icon hoverEffect" title="Close (Escape)" onClick={this.closeModal}>
<XmarkIcon />
</div>
</header>
<If condition={message.markdown}>
@@ -259,8 +261,8 @@ class WelcomeModal extends React.Component<{}, {}> {
<div className="modal-content">
<header>
<div className="modal-title">welcome to [prompt]</div>
<div className="close-icon">
<i onClick={this.closeModal} className="fa-sharp fa-solid fa-times" />
<div className="close-icon hoverEffect" title="Close (Escape)" onClick={this.closeModal}>
<XmarkIcon />
</div>
</header>
<div className={cn("inner-content content", { "is-hidden": pageNum != 1 })}>

Some files were not shown because too many files have changed in this diff Show More