From eab2c8d91fed8bbd19c5638f9e0b2ed2c98f78fb Mon Sep 17 00:00:00 2001 From: srgooglo Date: Sat, 3 Sep 2022 03:47:41 +0200 Subject: [PATCH] move `explore` page to `home` --- packages/app/config/index.js | 5 +- packages/app/constants/defaultSettings.json | 3 +- packages/app/constants/routes.json | 9 +--- packages/app/src/components/Login/index.jsx | 2 +- .../app/src/pages/{explore => home}/index.jsx | 0 .../src/pages/{explore => home}/index.less | 0 packages/app/src/pages/main/index.jsx | 42 --------------- packages/app/src/pages/main/index.less | 51 ------------------- 8 files changed, 8 insertions(+), 104 deletions(-) rename packages/app/src/pages/{explore => home}/index.jsx (100%) rename packages/app/src/pages/{explore => home}/index.less (100%) delete mode 100644 packages/app/src/pages/main/index.jsx delete mode 100644 packages/app/src/pages/main/index.less diff --git a/packages/app/config/index.js b/packages/app/config/index.js index 07247df8..cf7bf383 100644 --- a/packages/app/config/index.js +++ b/packages/app/config/index.js @@ -7,16 +7,19 @@ const envOrigins = { "development": { mainApi: `http://${window.location.hostname}:3000`, authApi: `http://${window.location.hostname}:4000`, + contentApi: `http://${window.location.hostname}:3050`, streamingApi: `http://${window.location.hostname}:3002`, }, "indev": { mainApi: "https://indev_api.comty.pw", authApi: `http://indev_auth.comty.pw`, + contentApi: `http://indev_content.comty.pw`, streamingApi: "https://indev_live.comty.pw", }, "nightly": { mainApi: "https://nightly_api.comty.pw", authApi: `https://nightly_auth.comty.pw`, + contentApi: `https://nightly_content.comty.pw`, streamingApi: "https://nightly_live.comty.pw" } } @@ -40,7 +43,7 @@ export default { app: { title: packagejson.name, siteName: "Comty", - mainPath: "/main", + mainPath: "/home", storage: { basics: "user", token: "token", diff --git a/packages/app/constants/defaultSettings.json b/packages/app/constants/defaultSettings.json index 539fb046..6ebb850f 100644 --- a/packages/app/constants/defaultSettings.json +++ b/packages/app/constants/defaultSettings.json @@ -17,8 +17,7 @@ "style.compactMode": false, "language": "en", "sidebarKeys": [ - "main", - "explore", + "home", "saved", "marketplace", "streams" diff --git a/packages/app/constants/routes.json b/packages/app/constants/routes.json index 00f8233e..e2795691 100644 --- a/packages/app/constants/routes.json +++ b/packages/app/constants/routes.json @@ -1,14 +1,9 @@ [ { - "id": "main", - "title": "Dashboard", + "id": "home", + "title": "Home", "icon": "Home" }, - { - "id": "explore", - "title": "Explore", - "icon": "Compass" - }, { "id": "saved", "title": "Saved", diff --git a/packages/app/src/components/Login/index.jsx b/packages/app/src/components/Login/index.jsx index ead2d74c..b73841c9 100644 --- a/packages/app/src/components/Login/index.jsx +++ b/packages/app/src/components/Login/index.jsx @@ -116,7 +116,7 @@ export default class Login extends React.Component {
@{this.props.session.username}
- window.app.setLocation(config.app?.mainPath ?? "/main")} >Go to main + window.app.setLocation(config.app?.mainPath ?? "/home")} >Go to main } -
-
- -
-
-
- -
-
- { - (t) =>

{t("main_welcome")} {user.fullName ?? user.username ?? "Guest"}

- }
-
-
-
- - {!window.isMobile &&
- -
} - - ) - } -} \ No newline at end of file diff --git a/packages/app/src/pages/main/index.less b/packages/app/src/pages/main/index.less deleted file mode 100644 index 3e23b7de..00000000 --- a/packages/app/src/pages/main/index.less +++ /dev/null @@ -1,51 +0,0 @@ -.dashboard { - padding: 20px; - width: 100%; - height: 100%; - - h1 { - font-size: 28px; - margin: 0; - } - - > div { - margin-bottom: 20px; - } - - .header { - display: flex; - - > div { - margin-right: 20px; - } - } - - .content { - > div { - margin-left: 20px; - } - } - - .quick_actions { - display: flex; - flex-wrap: wrap; - - > div { - margin: 6px 10px; - } - } - - .widgets { - display: flex; - flex-direction: column; - - .widget { - //background-color: var(--background-color-accent); - //padding: 10px; - } - - > div { - margin-bottom: 20px; - } - } -}