diff --git a/external/lang b/external/lang
index 84d711fc..026f884b 160000
--- a/external/lang
+++ b/external/lang
@@ -1 +1 @@
-Subproject commit 84d711fc721b125df3bedd8d2194494cc0666286
+Subproject commit 026f884b54f515d3e47f2dbd410c2386b5fa68a9
diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx
index 79c2ef2b..4465d42a 100644
--- a/src/components/common/messaging/attachments/MessageReply.tsx
+++ b/src/components/common/messaging/attachments/MessageReply.tsx
@@ -98,6 +98,12 @@ export const ReplyBase = styled.div<{
transition: transform ease-in-out 0.1s;
filter: brightness(1);
+ > span > p {
+ display: flex;
+ align-items: center;
+ gap: 4px;
+ }
+
&:hover {
filter: brightness(2);
}
diff --git a/src/pages/home/Home.module.scss b/src/pages/home/Home.module.scss
index f4ad219d..479c3440 100644
--- a/src/pages/home/Home.module.scss
+++ b/src/pages/home/Home.module.scss
@@ -1,29 +1,53 @@
.home {
height: 100%;
user-select: none;
+ position: relative;
- h3 {
- margin: 1em 0;
- font-size: 48px;
- text-align: center;
-
- img {
- height: 36px;
- }
- }
-
- .actions {
- gap: 8px;
- width: 236px;
-
- margin: auto;
+ .homeScreen {
display: flex;
- width: fit-content;
- align-items: stretch;
flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ height: 95%;
+ padding: 12px;
+
+ h3 {
+ margin: 20px 0;
+ font-size: 48px;
+ text-align: center;
+
+ img {
+ height: 36px;
+ }
+ }
a {
- width: 100%;
+ font-size: 13px;
+ }
+
+ .actions {
+ //grid-template-columns: repeat(2, 300px);
+ grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+ grid-column: span 2;
+ gap: 16px;
+ //margin: auto;
+ display: grid;
+ width: fit-content;
+ align-items: stretch;
+ flex-direction: column;
+ margin-bottom: 20px;
+
+ a {
+ width: 100%;
+
+ &:nth-child(4) {
+ margin-bottom: 20px;
+ }
+
+ div {
+ margin: 0;
+ }
+ }
}
}
}
diff --git a/src/pages/home/Home.tsx b/src/pages/home/Home.tsx
index f0c483c8..2da66ce6 100644
--- a/src/pages/home/Home.tsx
+++ b/src/pages/home/Home.tsx
@@ -1,4 +1,13 @@
-import { Home as HomeIcon } from "@styled-icons/boxicons-solid";
+import { Money } from "@styled-icons/boxicons-regular";
+import {
+ Home as HomeIcon,
+ PlusCircle,
+ Compass,
+ Megaphone,
+ Group,
+ Cog,
+ RightArrowCircle,
+} from "@styled-icons/boxicons-solid";
import { Link } from "react-router-dom";
import styled, { css } from "styled-components";
@@ -103,72 +112,110 @@ export default function Home() {
))}
-
+
-
-
-
-
-
-
-
-
}>
- {client.servers.get(
- "01F7ZSBSFHQ8TA81725KQCSDDP",
- ) ? (
-
- ) : (
-
- )}
-
-
-
- }>
-
-
-
-
-
}>
-
-
-
-
- }>
-
-
-
-
}>
+
+
+
+
+
+
+
}>
-
+ icon={
}
+ description={
+ "Invite all of your friends, some cool bots, and throw a big party."
+ }>
+ Create a group
-
+
+ }
+ description={
+ "Find a community based on your hobbies or interests."
+ }>
+ Join a community
+
+
+
+ {client.servers.get(
+ "01F7ZSBSFHQ8TA81725KQCSDDP",
+ ) ? (
+
+
}
+ description={
+ "You can report issues and discuss improvements with us directly here."
+ }>
+
+
+
+ ) : (
+
+
}
+ description={
+ "You can report issues and discuss improvements with us directly here."
+ }>
+
+
+
+ )}
+
+
+
}
+ description={
+ "Let us know how we can improve our app by giving us feedback."
+ }>
+
+
+
+
+ }>
+
+
+
+
+
+ }>
+
+
}>
+
+
+
+
+
+
+
Turn off homescreen effects
+
-
+ {" "}
);
}
diff --git a/src/pages/home/snow.scss b/src/pages/home/snow.scss
index 6ce1e3c1..4df53e93 100644
--- a/src/pages/home/snow.scss
+++ b/src/pages/home/snow.scss
@@ -1,5 +1,7 @@
// Pure CSS Snowfall
// Released by Artimon under MIT license
+//
+// Source: https://github.com/Artimon/pure-css-snowfall
$count: 36;
$screenOffset: 0px;
diff --git a/src/pages/settings/panes/Panes.module.scss b/src/pages/settings/panes/Panes.module.scss
index 29ecba1b..9c8b70fa 100644
--- a/src/pages/settings/panes/Panes.module.scss
+++ b/src/pages/settings/panes/Panes.module.scss
@@ -149,11 +149,21 @@
.badgePicker {
display: flex;
- gap: 10px;
margin-bottom: 20px;
+ //padding-bottom: 8px;
+ position: relative;
+
+ .container {
+ display: flex;
+ overflow-x: auto;
+ gap: 10px;
+ }
+
.check {
cursor: pointer;
+
+ flex-shrink: 0;
height: 50px;
width: 50px;
background: var(--secondary-background);
@@ -173,9 +183,41 @@
}
}
+ // TOFIX: need to merge overlay 1 and 2 later
+
+ .overlay {
+ position: absolute;
+ flex-shrink: 0;
+ width: 8px;
+ background: red;
+ height: 100%;
+
+ background: linear-gradient(
+ to right,
+ var(--primary-background),
+ transparent
+ );
+ }
+
+ .overlay2 {
+ position: absolute;
+ right: 0;
+ flex-shrink: 0;
+ width: 8px;
+ background: red;
+ height: 100%;
+
+ background: linear-gradient(
+ to left,
+ var(--primary-background),
+ transparent
+ );
+ }
+
.row {
gap: 20px;
display: flex;
+ margin-bottom: 30px;
.pfp {
display: flex;
diff --git a/src/pages/settings/panes/Profile.tsx b/src/pages/settings/panes/Profile.tsx
index fcbc5d97..b13c97af 100644
--- a/src/pages/settings/panes/Profile.tsx
+++ b/src/pages/settings/panes/Profile.tsx
@@ -74,10 +74,15 @@ export const Profile = observer(() => {
{/*Badges
*/}
+
diff --git a/src/pages/settings/panes/Sessions.tsx b/src/pages/settings/panes/Sessions.tsx
index fd15313a..e65c841c 100644
--- a/src/pages/settings/panes/Sessions.tsx
+++ b/src/pages/settings/panes/Sessions.tsx
@@ -1,5 +1,5 @@
import { Chrome, Android, Apple, Windows } from "@styled-icons/boxicons-logos";
-import { HelpCircle, Desktop } from "@styled-icons/boxicons-regular";
+import { HelpCircle, Desktop, LogOut } from "@styled-icons/boxicons-regular";
import {
Safari,
Firefoxbrowser,
@@ -24,6 +24,7 @@ import { AppContext } from "../../../context/revoltjs/RevoltClient";
import Button from "../../../components/ui/Button";
import Preloader from "../../../components/ui/Preloader";
import Tip from "../../../components/ui/Tip";
+import CategoryButton from "../../../components/ui/fluent/CategoryButton";
dayjs.extend(relativeTime);
@@ -207,7 +208,7 @@ export function Sessions() {
);
})}
-
{
// ! FIXME: add to rAuth
@@ -230,7 +231,37 @@ export function Sessions() {
setSessions(sessions.filter((x) => x._id === deviceId));
}}>
-
+ */}
+
+
{
+ // ! FIXME: add to rAuth
+ const del: string[] = [];
+ render.forEach((session) => {
+ if (deviceId !== session._id) {
+ del.push(session._id);
+ }
+ });
+
+ setDelete(del);
+
+ for (const id of del) {
+ await client.req(
+ "DELETE",
+ `/auth/session/${id}` as "/auth/session/id",
+ );
+ }
+
+ setSessions(sessions.filter((x) => x._id === deviceId));
+ }}
+ icon={ }
+ action={"chevron"}
+ description={
+ "Logs you out of all sessions except this device."
+ }>
+
+
+
diff --git a/src/pages/settings/panes/ThemeShop.tsx b/src/pages/settings/panes/ThemeShop.tsx
index fe22c79e..33a337b2 100644
--- a/src/pages/settings/panes/ThemeShop.tsx
+++ b/src/pages/settings/panes/ThemeShop.tsx
@@ -296,6 +296,7 @@ export function ThemeShop() {
The Theme Shop is currently under construction.
+
{/* FIXME INTEGRATE WITH MOBX */}
{/*