Skip to content

Commit

Permalink
Merge pull request #8 from Informatik-Projekt-Kurs/IPK-14-Landing-Pag…
Browse files Browse the repository at this point in the history
…e-Design

Ipk 14 landing page design
  • Loading branch information
bencodes07 authored Dec 15, 2023
2 parents 174aea0 + b9a94b4 commit 07e03a1
Show file tree
Hide file tree
Showing 13 changed files with 664 additions and 411 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ yarn-error.log*
# typescript
*.tsbuildinfo
next-env.d.ts

bun.lockb
Binary file modified bun.lockb
Binary file not shown.
8 changes: 6 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {
images: {
domains: ["assets-global.website-files.com"]
}
};

module.exports = nextConfig
module.exports = nextConfig;
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"dependencies": {
"@reduxjs/toolkit": "^1.9.7",
"framer-motion": "^10.16.15",
"jsonwebtoken": "^9.0.2",
"next": "14.0.3",
"react": "^18",
Expand Down
Binary file added public/landingLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/landingLogoNoBg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes.
7 changes: 3 additions & 4 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ import React from "react";
const inter = Inter({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "Create Next App",
description: "Generated by create next app"
title: "MeetMate | Welcome"
};

export default function RootLayout({ children }: { children: React.ReactNode }) {
return (
<html lang="en">
<body className={inter.className}>
<html lang="en" className="overflow-x-hidden">
<body className={inter.className + "overflow-x-hidden"}>
<ReduxProvider>{children}</ReduxProvider>
</body>
</html>
Expand Down
5 changes: 4 additions & 1 deletion src/app/login/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ const LoginForm = () => {
mode: "onBlur"
});

const onSubmitLogin: SubmitHandler<loginInputs> = (data) => console.log(data);
const onSubmitLogin: SubmitHandler<loginInputs> = (data) => {
console.log(data);
handleLogin();
};

const onSubmitRegister: SubmitHandler<registerInputs> = (data) => console.log(data);

Expand Down
338 changes: 235 additions & 103 deletions src/app/page.tsx

Large diffs are not rendered by default.

Loading

0 comments on commit 07e03a1

Please sign in to comment.