...

21 files changed, 241 insertions, 168 deletions

diff --git a/FrontEnd/src/views/admin/AdminNav.tsx b/FrontEnd/src/views/admin/AdminNav.tsx
index 47e2138f..8b4c5fda 100644
--- a/FrontEnd/src/views/admin/AdminNav.tsx
+++ b/FrontEnd/src/views/admin/AdminNav.tsx
@@ -1,43 +1,29 @@
 import React from "react";
-import { Nav } from "react-bootstrap";
-import { useTranslation } from "react-i18next";
-import { useHistory, useRouteMatch } from "react-router";
+import { useRouteMatch } from "react-router";
+
+import Tabs from "../common/tab/Tabs";
 
 const AdminNav: React.FC = () => {
   const match = useRouteMatch<{ name: string }>();
-  const history = useHistory();
-
-  const { t } = useTranslation();
 
   const name = match.params.name;
 
-  function toggle(newTab: string): void {
-    history.push(`/admin/${newTab}`);
-  }
-
   return (
-    <Nav variant="tabs" className="my-2">
-      <Nav.Item>
-        <Nav.Link
-          active={name === "users"}
-          onClick={() => {
-            toggle("users");
-          }}
-        >
-          {t("admin:nav.users")}
-        </Nav.Link>
-      </Nav.Item>
-      <Nav.Item>
-        <Nav.Link
-          active={name === "more"}
-          onClick={() => {
-            toggle("more");
-          }}
-        >
-          {t("admin:nav.more")}
-        </Nav.Link>
-      </Nav.Item>
-    </Nav>
+    <Tabs
+      activeTabName={name}
+      tabs={[
+        {
+          name: "users",
+          text: "admin:nav.users",
+          link: "/admin/users",
+        },
+        {
+          name: "more",
+          text: "admin:nav.more",
+          link: "/admin/more",
+        },
+      ]}
+    />
   );
 };
 
diff --git a/FrontEnd/src/views/center/TimelineBoard.tsx b/FrontEnd/src/views/center/TimelineBoard.tsx
index d6f6228d..d7aa39ab 100644
--- a/FrontEnd/src/views/center/TimelineBoard.tsx
+++ b/FrontEnd/src/views/center/TimelineBoard.tsx
@@ -1,7 +1,6 @@
 import React from "react";
 import classnames from "classnames";
 import { Link } from "react-router-dom";
-import { Spinner } from "react-bootstrap";
 
 import { HttpTimelineInfo } from "@/http/timeline";
 
@@ -10,6 +9,7 @@ import UserTimelineLogo from "../common/UserTimelineLogo";
 import LoadFailReload from "../common/LoadFailReload";
 import FlatButton from "../common/button/FlatButton";
 import Card from "../common/Card";
+import Spinner from "../common/Spinner";
 
 interface TimelineBoardItemProps {
   timeline: HttpTimelineInfo;
@@ -249,7 +249,7 @@ const TimelineBoardUI: React.FC<TimelineBoardUIProps> = (props) => {
         if (timelines === "loading") {
           return (
             <div className="d-flex flex-grow-1 justify-content-center align-items-center">
-              <Spinner variant="primary" animation="border" />
+              <Spinner />
             </div>
           );
         } else if (timelines === "offline") {
diff --git a/FrontEnd/src/views/center/index.tsx b/FrontEnd/src/views/center/index.tsx
index dfad082a..77bb6ec8 100644
--- a/FrontEnd/src/views/center/index.tsx
+++ b/FrontEnd/src/views/center/index.tsx
@@ -21,7 +21,7 @@ const HomePage: React.FC = () => {
 
   return (
     <>
-      <div>
+      <div className="container">
         <div className="row my-3 justify-content-center">
           <div className="col col-12 col-sm-8 col-lg-6">
             <SearchInput
diff --git a/FrontEnd/src/views/common/AppBar.css b/FrontEnd/src/views/common/AppBar.css
new file mode 100644
index 00000000..c6f4e184
--- /dev/null
+++ b/FrontEnd/src/views/common/AppBar.css
@@ -0,0 +1,90 @@
+.app-bar {

+  display: flex;

+  align-items: center;

+  height: 56px;

+  position: fixed;

+  z-index: 1030;

+  top: 0;

+  left: 0;

+  right: 0;

+  background-color: var(--tl-primary-color);

+  transition: background-color 1s;

+}

+.app-bar a {

+  color: var(--tl-text-on-primary-r1-color);

+  text-decoration: none;

+  margin: 0 1em;

+  transition: color 1s;

+}

+.app-bar a:hover {

+  color: var(--tl-text-on-primary-color);

+}

+.app-bar a.active {

+  color: var(--tl-text-on-primary-color);

+}

+

+.app-bar-brand {

+  display: flex;

+  align-items: center;

+}

+

+.app-bar-brand-icon {

+  height: 2em;

+}

+

+.app-bar-main-area {

+  display: flex;

+  flex-grow: 1;

+}

+

+.app-bar-link-area {

+  display: flex;

+  align-items: center;

+  flex-shrink: 0;

+}

+

+.app-bar-user-area {

+  display: flex;

+  align-items: center;

+  flex-shrink: 0;

+  margin-left: auto;

+}

+

+.small-screen .app-bar-main-area {

+  position: absolute;

+  top: 56px;

+  left: 0;

+  right: 0;

+  transform-origin: top;

+  transition: transform 0.6s, background-color 1s;

+  background-color: var(--tl-primary-color);

+  flex-direction: column;

+}

+.small-screen .app-bar-main-area.app-bar-collapse {

+  transform: scale(1, 0);

+}

+.small-screen .app-bar-main-area a {

+  text-align: left;

+  padding: 0.5em 0.5em;

+}

+.small-screen .app-bar-link-area {

+  flex-direction: column;

+  align-items: stretch;

+}

+.small-screen .app-bar-user-area {

+  flex-direction: column;

+  align-items: stretch;

+  margin-left: unset;

+}

+.small-screen .app-bar-avatar {

+  align-self: flex-end;

+}

+

+.app-bar-toggler {

+  margin-left: auto;

+  font-size: 2em;

+  margin-right: 1em;

+  color: var(--tl-text-on-primary-color);

+  cursor: pointer;

+  user-select: none;

+}

diff --git a/FrontEnd/src/views/common/AppBar.tsx b/FrontEnd/src/views/common/AppBar.tsx
index ebc8bf0c..7ec0a5eb 100644
--- a/FrontEnd/src/views/common/AppBar.tsx
+++ b/FrontEnd/src/views/common/AppBar.tsx
@@ -9,7 +9,7 @@ import { useUser } from "@/services/user";
 import TimelineLogo from "./TimelineLogo";
 import UserAvatar from "./user/UserAvatar";
 
-import "./index.css";
+import "./AppBar.css";
 
 const AppBar: React.FC = (_) => {
   const { t } = useTranslation();
diff --git a/FrontEnd/src/views/common/LoadingPage.tsx b/FrontEnd/src/views/common/LoadingPage.tsx
index 590fafa0..8c1e681a 100644
--- a/FrontEnd/src/views/common/LoadingPage.tsx
+++ b/FrontEnd/src/views/common/LoadingPage.tsx
@@ -1,10 +1,11 @@
 import React from "react";
-import { Spinner } from "react-bootstrap";
+
+import Spinner from "./Spinner";
 
 const LoadingPage: React.FC = () => {
   return (
     <div className="position-fixed w-100 h-100 d-flex justify-content-center align-items-center">
-      <Spinner variant="primary" animation="border" />
+      <Spinner />
     </div>
   );
 };
diff --git a/FrontEnd/src/views/common/SearchInput.css b/FrontEnd/src/views/common/SearchInput.css
new file mode 100644
index 00000000..2943b3a2
--- /dev/null
+++ b/FrontEnd/src/views/common/SearchInput.css
@@ -0,0 +1,4 @@
+.cru-search-input {

+  display: flex;

+  flex-wrap: wrap;

+}

diff --git a/FrontEnd/src/views/common/SearchInput.tsx b/FrontEnd/src/views/common/SearchInput.tsx
index fff11b95..da3f1c19 100644
--- a/FrontEnd/src/views/common/SearchInput.tsx
+++ b/FrontEnd/src/views/common/SearchInput.tsx
@@ -4,6 +4,8 @@ import { useTranslation } from "react-i18next";
 
 import LoadingButton from "./button/LoadingButton";
 
+import "./SearchInput.css";
+
 export interface SearchInputProps {
   value: string;
   onChange: (value: string) => void;
diff --git a/FrontEnd/src/views/common/alert/alert.css b/FrontEnd/src/views/common/alert/alert.css
new file mode 100644
index 00000000..12ce294e
--- /dev/null
+++ b/FrontEnd/src/views/common/alert/alert.css
@@ -0,0 +1,4 @@
+.alert-container {

+  position: fixed;

+  z-index: 1040;

+}

diff --git a/FrontEnd/src/views/common/alert/alert.sass b/FrontEnd/src/views/common/alert/alert.sass
deleted file mode 100644
index c3560b87..00000000
--- a/FrontEnd/src/views/common/alert/alert.sass
+++ /dev/null
@@ -1,15 +0,0 @@
-.alert-container

-  position: fixed

-  z-index: $zindex-popover

-

-@include media-breakpoint-up(sm)

-  .alert-container

-    bottom: 0

-    right: 0

-

-@include media-breakpoint-down(sm)

-  .alert-container

-    bottom: 0

-    right: 0

-    left: 0

-    text-align: center

diff --git a/FrontEnd/src/views/common/button/Button.css b/FrontEnd/src/views/common/button/Button.css
index e69de29b..b6df222f 100644
--- a/FrontEnd/src/views/common/button/Button.css
+++ b/FrontEnd/src/views/common/button/Button.css
@@ -0,0 +1,72 @@
+.cru-button {

+  color: white;

+  cursor: pointer;

+  padding: 0.2em 0.5em;

+  border-radius: 0.2em;

+  border: none;

+  transition: all 0.6s;

+}

+

+.cru-button.primary {

+  background-color: var(--tl-primary-color);

+}

+

+.cru-button.primary:hover {

+  background-color: var(--tl-primary-f1-color);

+}

+

+.cru-button.primary:active {

+  background-color: var(--tl-primary-f2-color);

+}

+

+.cru-button.primary.disabled {

+  background-color: var(--tl-primary-f3-color);

+}

+

+.cru-button.secondary {

+  background-color: var(--tl-secondary-color);

+}

+

+.cru-button.secondary:hover {

+  background-color: var(--tl-secondary-f1-color);

+}

+

+.cru-button.secondary:active {

+  background-color: var(--tl-secondary-f2-color);

+}

+

+.cru-button.secondary.disabled {

+  background-color: var(--tl-secondary-f3-color);

+}

+

+.cru-button.success {

+  background-color: var(--tl-success-color);

+}

+

+.cru-button.success:hover {

+  background-color: var(--tl-success-f1-color);

+}

+

+.cru-button.success:active {

+  background-color: var(--tl-success-f2-color);

+}

+

+.cru-button.success.disabled {

+  background-color: var(--tl-success-f3-color);

+}

+

+.cru-button.danger {

+  background-color: var(--tl-danger-color);

+}

+

+.cru-button.danger:hover {

+  background-color: var(--tl-danger-f1-color);

+}

+

+.cru-button.danger:active {

+  background-color: var(--tl-danger-f2-color);

+}

+

+.cru-button.danger.disabled {

+  background-color: var(--tl-danger-f3-color);

+}

diff --git a/FrontEnd/src/views/common/button/Button.tsx b/FrontEnd/src/views/common/button/Button.tsx
index 11710647..a39ef8a7 100644
--- a/FrontEnd/src/views/common/button/Button.tsx
+++ b/FrontEnd/src/views/common/button/Button.tsx
@@ -6,16 +6,19 @@ import { calculateProps, CommonButtonProps } from "./common";
 import "./Button.css";
 
 function _Button(
-  props: CommonButtonProps & { customButtonClassName?: string },
+  props: CommonButtonProps & {
+    outline?: boolean;
+    customButtonClassName?: string;
+  },
   ref: React.ForwardedRef<HTMLButtonElement>
 ): React.ReactElement | null {
   const { t } = useTranslation();
 
-  const { customButtonClassName, ...otherProps } = props;
+  const { customButtonClassName, outline, ...otherProps } = props;
 
   const { newProps, children } = calculateProps(
     otherProps,
-    customButtonClassName ?? "cru-button",
+    customButtonClassName ?? "cru-button" + (outline ? " outline" : ""),
     t
   );
 
diff --git a/FrontEnd/src/views/common/button/FlatButton.css b/FrontEnd/src/views/common/button/FlatButton.css
index 522563b9..c3c0dbb3 100644
--- a/FrontEnd/src/views/common/button/FlatButton.css
+++ b/FrontEnd/src/views/common/button/FlatButton.css
@@ -20,7 +20,7 @@
 }

 

 .cru-flat-button.primary.disabled {

-  color: var(--tl-primary-lighter-color);

+  color: var(--tl-primary-l1-color);

 }

 

 .cru-flat-button.secondary {

@@ -28,7 +28,7 @@
 }

 

 .cru-flat-button.secondary.disabled {

-  color: var(--tl-secondary-lighter-color);

+  color: var(--tl-secondary-l1-color);

 }

 

 .cru-flat-button.success {

@@ -36,7 +36,7 @@
 }

 

 .cru-flat-button.success.disabled {

-  color: var(--tl-success-lighter-color);

+  color: var(--tl-success-l1-color);

 }

 

 .cru-flat-button.danger {

@@ -44,5 +44,5 @@
 }

 

 .cru-flat-button.danger.disabled {

-  color: var(--tl-danger-ligher-color);

+  color: var(--tl-danger-l1-color);

 }

diff --git a/FrontEnd/src/views/common/button/TextButton.css b/FrontEnd/src/views/common/button/TextButton.css
index dc5abaaa..d267fb38 100644
--- a/FrontEnd/src/views/common/button/TextButton.css
+++ b/FrontEnd/src/views/common/button/TextButton.css
@@ -8,7 +8,7 @@
 }

 

 .cru-text-button.primary:hover {

-  color: var(--tl-primary-lighter-color);

+  color: var(--tl-primary-l1-color);

 }

 

 .cru-text-button.secondary {

@@ -16,7 +16,7 @@
 }

 

 .cru-text-button.secondary:hover {

-  color: var(--tl-secondary-lighter-color);

+  color: var(--tl-secondary-l1-color);

 }

 

 .cru-text-button.success {

@@ -24,7 +24,7 @@
 }

 

 .cru-text-button.success:hover {

-  color: var(--tl-success-lighter-color);

+  color: var(--tl-success-l1-color);

 }

 

 .cru-text-button.danger {

@@ -32,5 +32,5 @@
 }

 

 .cru-text-button.danger:hover {

-  color: var(--tl-danger-lighter-color);

+  color: var(--tl-danger-l1-color);

 }

diff --git a/FrontEnd/src/views/common/FullPage.tsx b/FrontEnd/src/views/common/dailog/FullPageDialog.tsx
index 1b59045a..88c90bbc 100644
--- a/FrontEnd/src/views/common/FullPage.tsx
+++ b/FrontEnd/src/views/common/dailog/FullPageDialog.tsx
@@ -1,13 +1,13 @@
 import React from "react";
 import classnames from "classnames";
 
-export interface FullPageProps {
+export interface FullPageDialogProps {
   show: boolean;
   onBack: () => void;
   contentContainerClassName?: string;
 }
 
-const FullPage: React.FC<FullPageProps> = ({
+const FullPageDialog: React.FC<FullPageDialogProps> = ({
   show,
   onBack,
   children,
@@ -36,4 +36,4 @@ const FullPage: React.FC<FullPageProps> = ({
   );
 };
 
-export default FullPage;
+export default FullPageDialog;
diff --git a/FrontEnd/src/views/common/index.css b/FrontEnd/src/views/common/index.css
index bfd82b58..f580c781 100644
--- a/FrontEnd/src/views/common/index.css
+++ b/FrontEnd/src/views/common/index.css
@@ -37,96 +37,6 @@
   touch-action: none;

 }

 

-.app-bar {

-  display: flex;

-  align-items: center;

-  height: 56px;

-  position: fixed;

-  z-index: 1030;

-  top: 0;

-  left: 0;

-  right: 0;

-  background-color: var(--tl-primary-color);

-  transition: background-color 1s;

-}

-.app-bar a {

-  color: var(--tl-text-on-primary-inactive-color);

-  text-decoration: none;

-  margin: 0 1em;

-}

-.app-bar a:hover {

-  color: var(--tl-text-on-primary-color);

-}

-.app-bar a.active {

-  color: var(--tl-text-on-primary-color);

-}

-

-.app-bar-brand {

-  display: flex;

-  align-items: center;

-}

-

-.app-bar-brand-icon {

-  height: 2em;

-}

-

-.app-bar-main-area {

-  display: flex;

-  flex-grow: 1;

-}

-

-.app-bar-link-area {

-  display: flex;

-  align-items: center;

-  flex-shrink: 0;

-}

-

-.app-bar-user-area {

-  display: flex;

-  align-items: center;

-  flex-shrink: 0;

-  margin-left: auto;

-}

-

-.small-screen .app-bar-main-area {

-  position: absolute;

-  top: 56px;

-  left: 0;

-  right: 0;

-  transform-origin: top;

-  transition: transform 0.6s, background-color 1s;

-  background-color: var(--tl-primary-color);

-  flex-direction: column;

-}

-.small-screen .app-bar-main-area.app-bar-collapse {

-  transform: scale(1, 0);

-}

-.small-screen .app-bar-main-area a {

-  text-align: left;

-  padding: 0.5em 0.5em;

-}

-.small-screen .app-bar-link-area {

-  flex-direction: column;

-  align-items: stretch;

-}

-.small-screen .app-bar-user-area {

-  flex-direction: column;

-  align-items: stretch;

-  margin-left: unset;

-}

-.small-screen .app-bar-avatar {

-  align-self: flex-end;

-}

-

-.app-bar-toggler {

-  margin-left: auto;

-  font-size: 2em;

-  margin-right: 1em;

-  color: var(--tl-text-on-primary-color);

-  cursor: pointer;

-  user-select: none;

-}

-

 .cru-skeleton {

   padding: 0 1em;

 }

@@ -247,10 +157,7 @@
   align-items: center;

 }

 

-.cru-search-input {

-  display: flex;

-  flex-wrap: wrap;

-}

+

 

 .alert-container {

   position: fixed;

diff --git a/FrontEnd/src/views/common/TabPages.tsx b/FrontEnd/src/views/common/tab/TabPages.tsx
index b7a9fb36..b7a9fb36 100644
--- a/FrontEnd/src/views/common/TabPages.tsx
+++ b/FrontEnd/src/views/common/tab/TabPages.tsx
diff --git a/FrontEnd/src/views/common/tab/Tabs.tsx b/FrontEnd/src/views/common/tab/Tabs.tsx
new file mode 100644
index 00000000..29ebcbd8
--- /dev/null
+++ b/FrontEnd/src/views/common/tab/Tabs.tsx
@@ -0,0 +1,19 @@
+import React from "react";
+
+import { I18nText } from "@/common";
+
+export interface Tab {
+  name: string;
+  text: I18nText;
+  link?: string;
+  onClick?: () => void;
+}
+
+export interface TabsProps {
+  activeTabName?: string;
+  tabs: Tab[];
+}
+
+export default function Tabs(props: TabsProps): React.ReactElement | null {
+  return <div></div>;
+}
diff --git a/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx b/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
index 9f0753b9..b16bf43d 100644
--- a/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
+++ b/FrontEnd/src/views/timeline-common/MarkdownPostEdit.tsx
@@ -9,7 +9,7 @@ import { getHttpTimelineClient, HttpTimelinePostInfo } from "@/http/timeline";
 import TimelinePostBuilder from "@/services/TimelinePostBuilder";
 
 import FlatButton from "../common/button/FlatButton";
-import TabPages from "../common/TabPages";
+import TabPages from "../common/tab/TabPages";
 import ConfirmDialog from "../common/dailog/ConfirmDialog";
 import Spinner from "../common/Spinner";
 
diff --git a/FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx b/FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx
index 851dfa55..78057be2 100644
--- a/FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx
+++ b/FrontEnd/src/views/timeline-common/TimelinePageCardTemplate.tsx
@@ -18,7 +18,7 @@ import { TimelineMemberDialog } from "./TimelineMember";
 import TimelinePropertyChangeDialog from "./TimelinePropertyChangeDialog";
 import ConnectionStatusBadge from "./ConnectionStatusBadge";
 import { MenuItems, PopupMenu } from "../common/Menu";
-import FullPage from "../common/FullPage";
+import FullPageDialog from "../common/dailog/FullPageDialog";
 import Card from "../common/Card";
 
 export interface TimelineCardTemplateProps extends TimelinePageCardProps {
@@ -120,13 +120,13 @@ const TimelinePageCardTemplate: React.FC<TimelineCardTemplateProps> = ({
           <CollapseButton collapse={collapse} onClick={toggleCollapse} />
         </div>
         {isSmallScreen ? (
-          <FullPage
+          <FullPageDialog
             onBack={toggleCollapse}
             show={!collapse}
             contentContainerClassName="p-2"
           >
             {content}
-          </FullPage>
+          </FullPageDialog>
         ) : (
           <div style={{ display: collapse ? "none" : "block" }}>{content}</div>
         )}
diff --git a/FrontEnd/src/views/timeline-common/index.css b/FrontEnd/src/views/timeline-common/index.css
index e38d0ba7..b78564a3 100644
--- a/FrontEnd/src/views/timeline-common/index.css
+++ b/FrontEnd/src/views/timeline-common/index.css
@@ -13,19 +13,19 @@
 
 @keyframes timeline-line-node-noncurrent {
   to {
-    box-shadow: 0 0 20px 3px var(--tl-primary-lighter-color);
+    box-shadow: 0 0 20px 3px var(--tl-primary-l1-color);
   }
 }
 
 @keyframes timeline-line-node-current {
   to {
-    box-shadow: 0 0 20px 3px var(--tl-primary-enhance-lighter-color);
+    box-shadow: 0 0 20px 3px var(--tl-primary-enhance-l1-color);
   }
 }
 
 @keyframes timeline-line-node-loading {
   to {
-    box-shadow: 0 0 20px 3px var(--tl-primary-lighter-color);
+    box-shadow: 0 0 20px 3px var(--tl-primary-l1-color);
   }
 }