mirror of
https://github.com/aykhans/slash-e.git
synced 2025-04-18 21:19:44 +00:00
chore: update view store
This commit is contained in:
parent
9455824a2d
commit
05bc21b660
@ -1,9 +1,9 @@
|
|||||||
import useFilterStore from "../stores/v1/filter";
|
import useViewStore from "../stores/v1/filter";
|
||||||
import Icon from "./Icon";
|
import Icon from "./Icon";
|
||||||
|
|
||||||
const FilterView = () => {
|
const FilterView = () => {
|
||||||
const filterStore = useFilterStore();
|
const viewStore = useViewStore();
|
||||||
const filter = filterStore.filter;
|
const filter = viewStore.filter;
|
||||||
const shouldShowFilters = filter.tag !== undefined;
|
const shouldShowFilters = filter.tag !== undefined;
|
||||||
|
|
||||||
if (!shouldShowFilters) {
|
if (!shouldShowFilters) {
|
||||||
@ -16,7 +16,7 @@ const FilterView = () => {
|
|||||||
{filter.tag && (
|
{filter.tag && (
|
||||||
<button
|
<button
|
||||||
className="ml-2 px-2 py-1 flex flex-row justify-center items-center bg-gray-200 rounded-full text-gray-500 text-sm hover:line-through"
|
className="ml-2 px-2 py-1 flex flex-row justify-center items-center bg-gray-200 rounded-full text-gray-500 text-sm hover:line-through"
|
||||||
onClick={() => filterStore.setFilter({ tag: undefined })}
|
onClick={() => viewStore.setFilter({ tag: undefined })}
|
||||||
>
|
>
|
||||||
<Icon.Tag className="w-4 h-auto mr-1" />#{filter.tag}
|
<Icon.Tag className="w-4 h-auto mr-1" />#{filter.tag}
|
||||||
</button>
|
</button>
|
||||||
|
@ -5,7 +5,7 @@ import { useTranslation } from "react-i18next";
|
|||||||
import toast from "react-hot-toast";
|
import toast from "react-hot-toast";
|
||||||
import { shortcutService } from "../services";
|
import { shortcutService } from "../services";
|
||||||
import useFaviconStore from "../stores/v1/favicon";
|
import useFaviconStore from "../stores/v1/favicon";
|
||||||
import useFilterStore from "../stores/v1/filter";
|
import useViewStore from "../stores/v1/filter";
|
||||||
import useUserStore from "../stores/v1/user";
|
import useUserStore from "../stores/v1/user";
|
||||||
import { absolutifyLink } from "../helpers/utils";
|
import { absolutifyLink } from "../helpers/utils";
|
||||||
import { showCommonDialog } from "./Alert";
|
import { showCommonDialog } from "./Alert";
|
||||||
@ -23,7 +23,7 @@ const ShortcutView = (props: Props) => {
|
|||||||
const { shortcut, handleEdit } = props;
|
const { shortcut, handleEdit } = props;
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const currentUser = useUserStore().getCurrentUser();
|
const currentUser = useUserStore().getCurrentUser();
|
||||||
const filterStore = useFilterStore();
|
const viewStore = useViewStore();
|
||||||
const faviconStore = useFaviconStore();
|
const faviconStore = useFaviconStore();
|
||||||
const [favicon, setFavicon] = useState<string | undefined>(undefined);
|
const [favicon, setFavicon] = useState<string | undefined>(undefined);
|
||||||
const [showQRCodeDialog, setShowQRCodeDialog] = useState<boolean>(false);
|
const [showQRCodeDialog, setShowQRCodeDialog] = useState<boolean>(false);
|
||||||
@ -125,7 +125,7 @@ const ShortcutView = (props: Props) => {
|
|||||||
<span
|
<span
|
||||||
key={tag}
|
key={tag}
|
||||||
className="text-gray-400 text-sm font-mono leading-4 cursor-pointer hover:text-gray-600"
|
className="text-gray-400 text-sm font-mono leading-4 cursor-pointer hover:text-gray-600"
|
||||||
onClick={() => filterStore.setFilter({ tag: tag })}
|
onClick={() => viewStore.setFilter({ tag: tag })}
|
||||||
>
|
>
|
||||||
#{tag}
|
#{tag}
|
||||||
</span>
|
</span>
|
||||||
|
@ -3,15 +3,15 @@
|
|||||||
"visibility": {
|
"visibility": {
|
||||||
"private": {
|
"private": {
|
||||||
"self": "Private",
|
"self": "Private",
|
||||||
"description": "Only you can see this"
|
"description": "Only you can view this shortcut"
|
||||||
},
|
},
|
||||||
"workspace": {
|
"workspace": {
|
||||||
"self": "Workspace",
|
"self": "Workspace",
|
||||||
"description": "Only people in your workspace can see this"
|
"description": "Visible to Workspace Members"
|
||||||
},
|
},
|
||||||
"public": {
|
"public": {
|
||||||
"self": "Public",
|
"self": "Public",
|
||||||
"description": "Anyone can see this"
|
"description": "Visible to Everyone on the Internet"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ import { Button, Tab, TabList, Tabs } from "@mui/joy";
|
|||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { shortcutService } from "../services";
|
import { shortcutService } from "../services";
|
||||||
import { useAppSelector } from "../stores";
|
import { useAppSelector } from "../stores";
|
||||||
import useFilterStore, { Filter } from "../stores/v1/filter";
|
import useViewStore, { Filter } from "../stores/v1/filter";
|
||||||
import useUserStore from "../stores/v1/user";
|
import useUserStore from "../stores/v1/user";
|
||||||
import useLoading from "../hooks/useLoading";
|
import useLoading from "../hooks/useLoading";
|
||||||
import Icon from "../components/Icon";
|
import Icon from "../components/Icon";
|
||||||
@ -35,12 +35,13 @@ const getFilteredShortcutList = (shortcutList: Shortcut[], filter: Filter, curre
|
|||||||
const Home: React.FC = () => {
|
const Home: React.FC = () => {
|
||||||
const loadingState = useLoading();
|
const loadingState = useLoading();
|
||||||
const currentUser = useUserStore().getCurrentUser();
|
const currentUser = useUserStore().getCurrentUser();
|
||||||
const filterStore = useFilterStore();
|
const viewStore = useViewStore();
|
||||||
const { shortcutList } = useAppSelector((state) => state.shortcut);
|
const { shortcutList } = useAppSelector((state) => state.shortcut);
|
||||||
const [state, setState] = useState<State>({
|
const [state, setState] = useState<State>({
|
||||||
showCreateShortcutDialog: false,
|
showCreateShortcutDialog: false,
|
||||||
});
|
});
|
||||||
const filteredShortcutList = getFilteredShortcutList(shortcutList, filterStore.filter, currentUser);
|
const filter = viewStore.filter;
|
||||||
|
const filteredShortcutList = getFilteredShortcutList(shortcutList, filter, currentUser);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
Promise.all([shortcutService.getMyAllShortcuts()]).finally(() => {
|
Promise.all([shortcutService.getMyAllShortcuts()]).finally(() => {
|
||||||
@ -63,7 +64,11 @@ const Home: React.FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
<div className="w-full flex flex-row justify-between items-center mb-4">
|
<div className="w-full flex flex-row justify-between items-center mb-4">
|
||||||
<div className="flex flex-row justify-start items-center">
|
<div className="flex flex-row justify-start items-center">
|
||||||
<Tabs defaultValue={"ALL"} size="sm" onChange={(_, value) => filterStore.setFilter({ mineOnly: value !== "ALL" })}>
|
<Tabs
|
||||||
|
value={filter.mineOnly ? "PRIVATE" : "ALL"}
|
||||||
|
size="sm"
|
||||||
|
onChange={(_, value) => viewStore.setFilter({ mineOnly: value !== "ALL" })}
|
||||||
|
>
|
||||||
<TabList>
|
<TabList>
|
||||||
<Tab value={"ALL"}>All</Tab>
|
<Tab value={"ALL"}>All</Tab>
|
||||||
<Tab value={"PRIVATE"}>Mine</Tab>
|
<Tab value={"PRIVATE"}>Mine</Tab>
|
||||||
|
@ -1,20 +1,28 @@
|
|||||||
import { create } from "zustand";
|
import { create } from "zustand";
|
||||||
|
import { persist } from "zustand/middleware";
|
||||||
|
|
||||||
export interface Filter {
|
export interface Filter {
|
||||||
tag?: string;
|
tag?: string;
|
||||||
mineOnly?: boolean;
|
mineOnly?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
interface FilterState {
|
interface ViewState {
|
||||||
filter: Filter;
|
filter: Filter;
|
||||||
setFilter: (filter: Partial<Filter>) => void;
|
setFilter: (filter: Partial<Filter>) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const useFilterStore = create<FilterState>()((set, get) => ({
|
const useViewStore = create<ViewState>()(
|
||||||
filter: {},
|
persist(
|
||||||
setFilter: (filter: Partial<Filter>) => {
|
(set, get) => ({
|
||||||
set({ filter: { ...get().filter, ...filter } });
|
filter: {},
|
||||||
},
|
setFilter: (filter: Partial<Filter>) => {
|
||||||
}));
|
set({ filter: { ...get().filter, ...filter } });
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
name: "view",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
export default useFilterStore;
|
export default useViewStore;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user