Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
DerGoogler committed Aug 13, 2023
1 parent ff434f4 commit af9efeb
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 26 deletions.
23 changes: 2 additions & 21 deletions Website/src/activitys/DescriptonActivity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ import { CommentsActivity } from "./CommentsActivity";
import { os } from "@Native/Os";
import { useStrings } from "@Hooks/useStrings";

import { getDatabase, set, ref, update, onValue, get, query } from "firebase/database";
import { getAuth } from "firebase/auth";
import { firebaseApp } from "@Util/firebase";

import ArrowBackIcon from "@mui/icons-material/ArrowBack";
import VerifiedIcon from "@mui/icons-material/Verified";
import CommentIcon from "@mui/icons-material/Comment";
Expand All @@ -37,6 +33,7 @@ type Extra = {
type: "module" | "request";
request?: { url: string } | undefined;
zip_url?: string;
authorData?: any;
};

interface State<T> {
Expand All @@ -46,14 +43,11 @@ interface State<T> {
type Cache<T> = { [url: string]: T };
type Action<T> = { type: "loading" } | { type: "fetched"; payload: T } | { type: "error"; payload: Error };

const auth = getAuth(firebaseApp);
const db = getDatabase(firebaseApp);

function DescriptonActivity() {
const { context, extra } = useActivity<Extra>();
const { strings } = useStrings();
const { theme } = useTheme();
const { desc, title, request, prop_url, zip_url, module_options } = extra;
const { desc, title, request, prop_url, zip_url, module_options, authorData } = extra;

const { isVerified, isHidden } = useModuleOptions(prop_url?.id);

Expand Down Expand Up @@ -137,19 +131,6 @@ function DescriptonActivity() {
}, [url]);
}

const [authorData, setAuthorData] = React.useState<any>({});

React.useEffect(() => {
if (prop_url?.mmrlAuthor) {
const dbRef = ref(db, "users/" + prop_url.mmrlAuthor);
onValue(query(dbRef), (snapshot) => {
setAuthorData(snapshot.val());
});
} else {
setAuthorData(undefined);
}
}, []);

const renderToolbar = () => {
return (
<Toolbar modifier="noshadow">
Expand Down
12 changes: 11 additions & 1 deletion Website/src/activitys/account/AccountActivity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ import IconButton from "@mui/material/IconButton";
import Grid from "@mui/material/Grid";
import Avatar from "@mui/material/Avatar";
import { os } from "@Native/Os";
import Alert from "@mui/material/Alert";
import AlertTitle from "@mui/material/AlertTitle";

const auth = getAuth(firebaseApp);
const db = getDatabase(firebaseApp);
Expand Down Expand Up @@ -88,7 +90,15 @@ const AccountActivty = () => {
<Avatar alt={username} src={picurl} />
</Stack>

<Stack direction="column" justifyContent="flex-start" alignItems="flex-start" spacing={2}>
{verified && (
<Alert severity="info">
<AlertTitle>Verified</AlertTitle>
You're a verified user/creator, this means that single module veification won't affect your modules. Single module verification
symbol won't show while you're verified.
</Alert>
)}

<Stack direction="column" style={{ marginTop: verified ? 18 : 0 }} justifyContent="flex-start" alignItems="flex-start" spacing={2}>
<FormControl fullWidth variant="outlined">
<InputLabel htmlFor="outlined-adornment-username">Username</InputLabel>
<OutlinedInput
Expand Down
33 changes: 29 additions & 4 deletions Website/src/components/ExploreModule.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useStrings } from "@Hooks/useStrings";
import DescriptonActivity from "@Activitys/DescriptonActivity";
import { VerifiedRounded } from "@mui/icons-material";
import ThumbUpIcon from "@mui/icons-material/ThumbUp";
import VerifiedIcon from "@mui/icons-material/Verified";
import { os } from "@Native/Os";
import { StyledCard } from "./StyledCard";
import { useLowQualityModule } from "@Hooks/useLowQualityModule";
Expand All @@ -14,10 +15,10 @@ import { useFormatDate } from "@Hooks/useFormatDate";
import { useModuleOptions } from "@Hooks/useModuleOptions";
import { GestureDetector } from "./onsenui/GestureDetector";

import { getDatabase, set, ref, update, onValue } from "firebase/database";
import { getAuth, createUserWithEmailAndPassword } from "firebase/auth";
import { getDatabase, ref, onValue, query } from "firebase/database";
import { firebaseApp } from "@Util/firebase";
const auth = getAuth(firebaseApp);
import React from "react";

const db = getDatabase(firebaseApp);

interface Props {
Expand All @@ -39,6 +40,19 @@ export const ExploreModule = (props: Props) => {
return null;
}

const [authorData, setAuthorData] = React.useState<any>({});

React.useEffect(() => {
if (prop_url?.mmrlAuthor) {
const dbRef = ref(db, "users/" + prop_url.mmrlAuthor);
onValue(query(dbRef), (snapshot) => {
setAuthorData(snapshot.val());
});
} else {
setAuthorData(undefined);
}
}, []);

const handleOpen = () => {
context.pushPage<any>({
component: DescriptonActivity,
Expand All @@ -53,6 +67,7 @@ export const ExploreModule = (props: Props) => {
title: prop_url.name,
prop_url: prop_url,
zip_url: zip_url,
authorData: authorData,
request: {
url: notes_url,
},
Expand Down Expand Up @@ -88,7 +103,17 @@ export const ExploreModule = (props: Props) => {
{prop_url.name}
</Typography>{" "}
<Typography variant="caption" sx={{ fontSize: ".70rem" }} color="text.secondary">
{prop_url.version} ({prop_url.versionCode}) / {prop_url.author}
<Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={0.5}>
<span>
{prop_url.version} ({prop_url.versionCode}) /
</span>
{prop_url.mmrlAuthor ? (
<span>{authorData.username ? authorData.username : prop_url.author}</span>
) : (
<span>{prop_url.author}</span>
)}
{authorData?.options?.verified && <VerifiedIcon sx={{ fontSize: ".70rem" }} />}
</Stack>
</Typography>
<Typography variant="body1" color="text.secondary">
{prop_url.description}
Expand Down

0 comments on commit af9efeb

Please sign in to comment.