feat: bits and pieces

vycdev · Jul 26, 2020 · 0e83e3b · 0e83e3b
1 parent d105f29
commit 0e83e3b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/packages/web/src/components/common/typingBox/style.tsx b/packages/web/src/components/common/typingBox/style.tsx
@@ -169,3 +169,14 @@ export const WaitingPlayers = styled.div`
 
     font-family: "Verdana";
 `;
+
+export const ImageWrapper = styled.div`
+    position: relative;
+    margin: auto;
+    width: 700px;
+    padding-top: 100px;
+`;
+export const KeyboardImage = styled.img`
+    margin: auto;
+    width: 700px;
+`;
diff --git a/packages/web/src/components/common/typingBox/typingBox.tsx b/packages/web/src/components/common/typingBox/typingBox.tsx
@@ -23,7 +23,9 @@ import {
     ActuallyTyped,
     BlockOfFinishedText,
     TextInfo,
-    WaitingPlayers
+    WaitingPlayers,
+    ImageWrapper,
+    KeyboardImage
 } from "./style";
 import { sendWebsocket } from "../../../utils/websocket";
 
@@ -858,6 +860,16 @@ export const TypingBox = (props: TypingBoxProps) => {
                     }}
                 ></InputBox>
             </Container>
+            {time > 0 && props.tutorial ? (
+                <ImageWrapper>
+                    <KeyboardImage
+                        src="http://transcribeme.com/wp-content/uploads/2018/02/[email protected]"
+                        alt="OOOPS Looks like the image failed to load."
+                    ></KeyboardImage>
+                </ImageWrapper>
+            ) : (
+                ""
+            )}
         </Wrapper>
     );
 };
diff --git a/packages/web/src/components/dashboard/dashboard.tsx b/packages/web/src/components/dashboard/dashboard.tsx
@@ -434,13 +434,12 @@ const AchievementItemSettings = (props: {
                             setIsHidden(true);
                         }}
                     >
-                        Delete Text
+                        Delete Achievement
                     </button>
                     <button
                         onClick={() => {
                             if (verifyForm()) {
                                 UpdateAchievementData(data);
-                                location.reload();
                             }
                         }}
                     >
@@ -688,7 +687,6 @@ const TextItemSettings = (props: { hidden: boolean; data: Text }) => {
                         onClick={() => {
                             if (verifyForm()) {
                                 UpdateTextData(data);
-                                location.reload();
                             }
                         }}
                     >
@@ -874,7 +872,6 @@ const AddNewAchievement = (props: { hidden: boolean }) => {
                         onClick={() => {
                             if (verifyForm()) {
                                 PostNewAchievement(data);
-                                location.reload();
                             }
                         }}
                     >
@@ -1092,7 +1089,6 @@ const AddNewText = (props: { hidden: boolean }) => {
                         onClick={() => {
                             if (verifyForm()) {
                                 PostNewText(data);
-                                location.reload();
                             }
                         }}
                     >
@@ -1124,7 +1120,7 @@ const UserItemSettings = (props: { hidden: boolean; data: AllUser }) => {
                 data.role != "member" &&
                 data.role != "unverified") ||
             data.description.length > 250 ||
-            data.name.length <= 3 ||
+            data.name.length < 2 ||
             data.email.length <= 10
         ) {
             statusDiv.current.innerHTML =
@@ -1247,7 +1243,6 @@ const UserItemSettings = (props: { hidden: boolean; data: AllUser }) => {
                         onClick={() => {
                             if (verifyForm()) {
                                 UpdateUserData(data);
-                                location.reload();
                             }
                         }}
                     >

diff --git a/packages/web/src/components/startTypingPage/startTypingPage.tsx b/packages/web/src/components/startTypingPage/startTypingPage.tsx
@@ -14,7 +14,6 @@ import { Tutorials } from "./components/tutorials/tutorials";
 const theme = getTheme();
 
 import { CreateNewWS } from "./helpers/websocket";
-import { sendWebsocket } from "../../utils/websocket";
 import { setWsHeartbeat } from "ws-heartbeat/client";
 
 export const StartTypingPage = () => {