Skip to content

Commit

Permalink
Merge with updated octodependencythingmabob
Browse files Browse the repository at this point in the history
  • Loading branch information
Mellurboo committed May 15, 2024
1 parent 90891d2 commit 5fb693d
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 16 deletions.
10 changes: 3 additions & 7 deletions client/src/pages/developer/developer.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { observer } from "mobx-react";
import React, { FC, useEffect } from "react";
import "./developer.style.css";
import { Button, Chip, Image } from "@nextui-org/react";
import { FiCode } from "react-icons/fi";
import { FloatingSquares } from "@/components/images/floatingsquares.component";

interface IProps {}
Expand All @@ -15,7 +14,6 @@ interface IProps {}

import img from "../../assets/images/ICON_Develop.gif";
import { Link } from "react-router-dom";
import { BiCodeAlt, BiCodeCurly } from "react-icons/bi";
import { HiCode } from "react-icons/hi";

const DeveloperComp: FC<IProps> = (props) => {
Expand All @@ -32,15 +30,13 @@ const DeveloperComp: FC<IProps> = (props) => {
<div>
<p className="text-5xl font-heading text-left mt-5">
SHOW US WHAT{" "}
<span className="bg-gradient-to-r animate-bounce from-pink-400 to-blue-400 inline-block text-transparent bg-clip-text">
<span className="bg-gradient-to-r from-purple-500 to-blue-400 inline-block text-transparent bg-clip-text">
YOU
</span>{" "}
GOT.
</p>
<p className="text-lg text-left mt-2 font-semibold">
Develop. Publish. Earn. That's Select Launcher.
</p>
<div className="buttons flex items-center justify-start mt-32">

<div className="buttons flex items-center justify-start mt-10">
<Link to="/developer/index">
<Button
size="lg"
Expand Down
3 changes: 1 addition & 2 deletions client/src/pages/games/[game].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ import { GamesStore } from "@/stores/GamesStore";
import { UserStore } from "@/stores/UserStore";
import { FunctionComponent, useEffect, useState } from "react";
import { useParams } from "react-router";
import { InfoBar, ContentHeader, ContentFooter } from "./components";
import { ContentHeader, ContentFooter } from "./components";
import { observer } from "mobx-react";
import { InfoBarObservable } from "./components/info_bar";
import retrieveGameInfo from "@/handlers/api";
import { BiArrowBack } from "react-icons/bi";
import {
Button,
Input,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ const AccountSettingsComp: FC<IProps> = (props) => {
</div>
<Modal
closeButton
backdrop="blur"
backdrop="opaque"
aria-labelledby="modal-title"
isDismissable={loading ? false : true}
isOpen={editAccountVisible}
Expand Down
8 changes: 4 additions & 4 deletions client/src/pages/settings/app/app-settings.page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ const AppSettingsComp: FC<IProps> = (props) => {
<AppSettingsThemeCard theme="light" />
<AppSettingsThemeCard theme="spearmint" />
<AppSettingsThemeCard theme="aquatica" />
<AppSettingsThemeCard theme="experience" />
</div>
<Card className="mt-10 p-2 max-h-fit bg-content2">
<CardHeader className="font-heading flex items-center text-xl">
<span className="uppercase tracking-wide flex items-center">
Special Themes{" "}
From Games you own{" "}
<Tooltip
content="We do not endorse any of the titles below."
content="Accessing these themes requires you to own the game."
showArrow
>
<Chip className="ml-2 bg-content1 uppercase">
Expand All @@ -56,8 +57,7 @@ const AppSettingsComp: FC<IProps> = (props) => {
<CardBody>
<div>
<div className="grid grid-cols-3">
<AppSettingsThemeCard theme="minecraft" />
<AppSettingsThemeCard theme="discord" />
<AppSettingsThemeCard theme="acerace" />
</div>
</div>
</CardBody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ interface IProps {
| "minecraft"
| "spearmint"
| "aquatica"
| "discord";
| "experience"
| "discord"
| "acerace";
}

/**
Expand All @@ -30,6 +32,8 @@ export const AppSettingsThemeCard: FC<IProps> = ({ theme }) => {
spearmint: "Runnin' hot.",
aquatica: "The blue one.",
discord: "Womp womp.",
experience: "this shit look like my ex’s phone",
acerace: "By Select Studios"
};

return (
Expand Down
4 changes: 3 additions & 1 deletion client/src/stores/ThemeStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ type Theme =
| "minecraft"
| "spearmint"
| "aquatica"
| "discord";
| "discord"
| "experience"
| "acerace";

export class ThemeStore_Impl {
theme: Theme = "midnight";
Expand Down
28 changes: 28 additions & 0 deletions client/themes.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,20 @@
"content2": "#1a1a3c"
}
},
"experience": {
"colors": {
"background": "#F9E2E8",
"foreground": "#3b2e32",
"primary": {
"DEFAULT": "#FF7E9D",
"foreground": "#FFFFFF"
},
"default": "#D96B86",
"default-100": "#FFDDE5",
"content1": "#F8C1D1",
"content2": "#FFE1EE"
}
},
"minecraft": {
"colors": {
"background": "#2c1e0f",
Expand Down Expand Up @@ -96,5 +110,19 @@
"content1": "#36393e",
"content2": "#424549"
}
},
"acerace": {
"colors": {
"background": "#1E1E1E",
"foreground": "#E0E0E0",
"primary": {
"DEFAULT": "#BDBDBD",
"foreground": "#171717"
},
"default": "#757575",
"default-100": "#9E9E9E",
"content1": "#424242",
"content2": "#333333"
}
}
}

0 comments on commit 5fb693d

Please sign in to comment.