Skip to content

Commit

Permalink
Fixed some styling issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@bilalmohib
bilalmohib committed Apr 6, 2023
1 parent 79c179f commit 6b35472
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 55 deletions.
29 changes: 4 additions & 25 deletions components/CustomLoader/index.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import React from "react";
import Image from "next/image";
import AnimatedText from 'react-animated-text-content';

import {
CircularProgress,
Box,
Typography,
CircularProgress
} from "@mui/material";

const CustomLoader = () => {
return (
<div style={{ display: 'flex', flexDirection: "column", justifyContent: "center", alignItems: "center",height:"100vh" }}>
<div style={{ display: 'flex', flexDirection: "column", justifyContent: "center", alignItems: "center", height: "100vh" }}>
<div style={{ display: "flex", alignItems: "center", marginTop: "0px" }}>
<Image style={{ display: "block" }} width={100} height={100} src={"/logocopy.png"} alt="logo" title="Logo" />
</div>
Expand All @@ -19,31 +16,13 @@ const CustomLoader = () => {
color: "text.dark",
fontStyle: "normal",
fontWeight: "400",
fontSize: "48px",
fontSize: "45px",
lineHeight: "36px",
marginTop: "30px",
letterSpacing: "0.15px",
}}
>
{/* <AnimatedText
type="chars" // animate words or chars
animation={{
x: '200px',
y: '-20px',
scale: 1.1,
ease: 'ease-in-out',
}}
animationType="wave"
interval={0.15}
duration={0.5}
tag="p"
className="animated-paragraph"
includeWhiteSpaces
threshold={0.1}
rootMargin="20%"
> */}
Project Management Software
{/* </AnimatedText> */}
TaskEncher - Rev Up Tasks and Efficiency
</h1>
<div
style={{
Expand Down
55 changes: 29 additions & 26 deletions components/Main/Home/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,30 +73,30 @@ const Home = () => {
</audio>,
name: "People",
},
{
id: 4,
src: <audio id='hoverSoundClip'>
<source src="audio/4.mp3" />
Your browser is not invited for super fun audio time.
</audio>,
name: "Tasks I've Assigned",
},
{
id: 5,
src: <audio id='hoverSoundClip'>
<source src="audio/5.mp3" />
Your browser is not invited for super fun audio time.
</audio>,
name: "My goals",
},
{
id: 6,
src: <audio id='hoverSoundClip'>
<source src="audio/6.mp3" />
Your browser is not invited for super fun audio time.
</audio>,
name: "Manager Tasks",
}
// {
// id: 4,
// src: <audio id='hoverSoundClip'>
// <source src="audio/4.mp3" />
// Your browser is not invited for super fun audio time.
// </audio>,
// name: "Tasks I've Assigned",
// },
// {
// id: 5,
// src: <audio id='hoverSoundClip'>
// <source src="audio/5.mp3" />
// Your browser is not invited for super fun audio time.
// </audio>,
// name: "My goals",
// },
// {
// id: 6,
// src: <audio id='hoverSoundClip'>
// <source src="audio/6.mp3" />
// Your browser is not invited for super fun audio time.
// </audio>,
// name: "Manager Tasks",
// }
]);

// ________________________ For Login ________________________ //
Expand Down Expand Up @@ -293,12 +293,15 @@ const Home = () => {
{item.id === 3 && <Widget3 email={signedInUserData.email} item={item.id} currentFullLengthItem={currentFullLengthItem} setCurrentFullLengthItem={setCurrentFullLengthItem} />}
{item.id === 4 && <Widget4 email={signedInUserData.email} item={item.id} currentFullLengthItem={currentFullLengthItem} setCurrentFullLengthItem={setCurrentFullLengthItem} />}
{item.id === 5 && <Widget5 email={signedInUserData.email} item={item.id} currentFullLengthItem={currentFullLengthItem} setCurrentFullLengthItem={setCurrentFullLengthItem} />}
{/* {item.id === 6 && <Widget6 email={signedInUserData.email} item={item.id} currentFullLengthItem={currentFullLengthItem} setCurrentFullLengthItem={setCurrentFullLengthItem} />} */}
{item.id === 6 && <Widget6 email={signedInUserData.email} item={item.id} currentFullLengthItem={currentFullLengthItem} setCurrentFullLengthItem={setCurrentFullLengthItem} />}
</div>
))}
</section>
{/* ++++++++++++++++++++++++++++++++++++ Widgets Container ++++++++++++++++++++++++++++++++++++ */}

<br />
<br />
<br />
<br />
</section>
)}

Expand Down
2 changes: 1 addition & 1 deletion components/Sidebar/style.module.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/* border: 1px solid red; */
top: 4.4rem;
width: 250px;
height: 95.3vh;
height: 92.8vh;
transition: 0.2s linear;
}

Expand Down
3 changes: 3 additions & 0 deletions loader.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ display: block;
color: #000000;
font-weight: 300 !important;
font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif !important;
paddingleft: 10px;
paddingRight: 10px;
fontSize: 24px;
}
.sk-cube-grid {
Expand Down
2 changes: 1 addition & 1 deletion pages/_document.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const Document = () => {
<body>
<div id={'globalLoader'}>
<div className="loader">
<h1 className="headingLoader">TaskVibe - Streamlined Project Management</h1>
<h1 className="headingLoader">TaskEncher - Rev Up Tasks and Efficiency</h1>
<div className="sk-cube-grid">
<div className="sk-cube sk-cube1"></div>
<div className="sk-cube sk-cube2"></div>
Expand Down
4 changes: 2 additions & 2 deletions pages/login.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ const Login: NextPage = () => {
return (
<Box className={styles.container}>
<Head>
<title>Login TaskVibe - Streamlined Project Management</title>
<title>Login TaskEncher - Rev Up Tasks and Efficiency</title>
<meta name="description" content="Generated by create next app" />
<link rel="icon" href="/favicon.ico" />
</Head>
Expand All @@ -287,7 +287,7 @@ const Login: NextPage = () => {
<Box>
<Box className={styles.main}>
<Box className={styles.login_box}>
<span style={{ fontSize: 25, fontWeight: "400" }}>Project Management Software</span>
<span style={{ fontSize: 25, fontWeight: "400" }}>TaskEncher</span>
<h2 className={styles.login_title}>Log in</h2>
{/* Icons Section */}
<Box>
Expand Down

1 comment on commit 6b35472

@vercel
Copy link

@vercel vercel bot commented on 6b35472 Apr 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

fyp-project-management-software – ./

fyp-project-management-software-topideas.vercel.app
fyp-project-management-software-git-main-topideas.vercel.app
fyp-project-management-software.vercel.app

Please sign in to comment.