Skip to content

Commit c684460

Browse files
committed
chore: add welcome link in login
1 parent 36b8725 commit c684460

8 files changed

Lines changed: 53 additions & 25202 deletions

File tree

client/package-lock.json

Lines changed: 32 additions & 25190 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
42.1 KB
Loading

client/src/Components/Startpage/Welcome/Attendance.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1+
import attendImg from '../Assets/attendance.png';
2+
13
const sectionStyle = "bg-white flex flex-row rounded-sm w-11/12 md:h-4/6 h-80 items-center m-auto invisible sm:visible my-32";
2-
const outerStyle = "bg-black flex rounded-sm h-full w-1/2 lg:w-5/12 flex-col justify-center items-center p-2";
4+
const outerStyle = "bg-white flex rounded-sm h-full w-1/2 lg:w-5/12 flex-col justify-center items-center p-2";
35
const paragraph = "w-1/2 lg:w-7/12 px-10 tracking-wider text-lg md:text-xl xl:px-32 xl:text-2xl leading-loose";
4-
const imageStyle = "bg-white w-5/6 h-5/6";
6+
const imageStyle = "bg-white w-5/6 p-1/4";
57

68
const Attendance: React.FC = () => {
79

810
return (
911
<div className="h-screen w-full">
1012
<section className={sectionStyle}>
1113
<div className={outerStyle}>
12-
<article className={imageStyle}></article>
14+
<article className={imageStyle}>
15+
<img src={attendImg} alt="attendance example" className="w-full h-full" />
16+
</article>
1317
</div>
1418
<div className={paragraph}>
1519
Once you begin a session, you'll recieve a list that

client/src/Components/Startpage/Welcome/Login.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const loginBtn =
2626
const linkStyle = 'flex text-white justify-center hover:underline';
2727
const lottieStyle = 'md:w-1/2 w-0 invisible md:visible';
2828
const errorStyle = 'w-1/2 xl:w-4/12 flex bg-white h-14 m-auto my-8 text-red';
29+
const logoStyle = 'm-auto h-1/6 w-1/4 lg:h-1/6 lg:w-1/5 xl:h-1/6 xl:w-1/6 mt-8';
2930

3031
const Login: React.FC = () => {
3132
const [userInfo, setUserInfo] = useState(initUser);
@@ -70,9 +71,9 @@ const Login: React.FC = () => {
7071

7172
return (
7273
<div className='h-screen'>
73-
<div className='h-20 w-32 m-auto md:my-4 md:h-28 md:w-40 lg:h-32 lg:w-44'>
74-
<QRLogo />
75-
</div>
74+
<Link to={'/'}>
75+
<div className={logoStyle}><QRLogo /></div>
76+
</Link>
7677
<div className={outerBox}>
7778
<div className={lottieStyle}>
7879
<Lottie options={defaultOptions} height={400} width={'100%'} />

client/src/Components/Startpage/Welcome/Prompt.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const Prompt: React.FC = () => {
2626
<div className='flex w-full h-full 2xl:px-32 2xl:w-3/4'>
2727
<Outlet />
2828
<section className={promptStyle}>
29-
<h1 className='text-green font-bold text-5xl md:text-6xl xl:text-7xl text-center'>
29+
<h1 className='text-green font-bold text-3xl sm:text-4xl md:text-5xl xl:text-6xl text-center'>
3030
Welcome to QRCheckd!
3131
</h1>
3232
<article className={welcomeStyle}>

client/src/Components/Startpage/Welcome/Welcome.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ const Welcome: React.FC = () => {
4242
<Attendance />
4343
</section>
4444
</div>
45-
<footer className='border-t-2 border-grey-light'>
46-
<div className='mx-8 text-grey-light'>@ 2021 QRcheckd. Do whateva.</div>
45+
<footer className='border-t-2 border-grey-light invisible sm:visible h-0 sm:h-2'>
46+
<div className='mx-8 text-grey-light invisible sm:visible h-0 sm:h-2'>@ 2021 QRcheckd. Do whateva.</div>
4747
</footer>
4848
</div>
4949
);

client/tailwind.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ module.exports = {
5858
'5/7': '71.4285714%',
5959
'6/7': '85.7142857%',
6060
},
61+
padding: {
62+
'1/2': '50%',
63+
full: '100%'
64+
}
6165
},
6266
screens: {
6367
tablet: '272px',

server/src/graphql/userModule.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const userModule: Module & { typeDefs: DocumentNode[] } = createModule({
5959
Query: {
6060
me: async (
6161
_: any,
62-
{},
62+
{ },
6363
{
6464
orm,
6565
req,
@@ -130,14 +130,14 @@ export const userModule: Module & { typeDefs: DocumentNode[] } = createModule({
130130

131131
logoutUser: async (
132132
_: any,
133-
{},
133+
{ },
134134
{
135135
req,
136136
}: {
137137
req: Request;
138138
}
139139
) => {
140-
if (req?.session) req.session.destroy(() => {});
140+
if (req?.session) req.session.destroy(() => { });
141141
return { data: true };
142142
},
143143
},

0 commit comments

Comments
 (0)