From 1a76a89b500ba282ee34a7c8cf34404eff98f93c Mon Sep 17 00:00:00 2001
From: Tomas Havlicek <xhavlic@fi.muni.cz>
Date: Sat, 11 Jun 2022 22:44:23 +0200
Subject: [PATCH] feat: added logo
---
frontend/src/LogoMovieBase.png | Bin 0 -> 2506 bytes
frontend/src/components/MainPage.tsx | 37 ++++++++++++--------------
frontend/src/styles/MainPage.css | 3 +++
frontend/src/styles/navigationbar.css | 30 ---------------------
4 files changed, 20 insertions(+), 50 deletions(-)
create mode 100644 frontend/src/LogoMovieBase.png
create mode 100644 frontend/src/styles/MainPage.css
delete mode 100644 frontend/src/styles/navigationbar.css
diff --git a/frontend/src/LogoMovieBase.png b/frontend/src/LogoMovieBase.png
new file mode 100644
index 0000000000000000000000000000000000000000..86db2f134d76dc8c0663aa505470e19208afbb91
GIT binary patch
literal 2506
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
Uf{rLU$p8QV07*qoM6N<$f+mN(L;wH)
literal 0
HcmV?d00001
diff --git a/frontend/src/components/MainPage.tsx b/frontend/src/components/MainPage.tsx
index daf11f8..09e68fc 100644
--- a/frontend/src/components/MainPage.tsx
+++ b/frontend/src/components/MainPage.tsx
@@ -1,40 +1,37 @@
-import { Breadcrumb, Layout, Menu } from 'antd';
+import { Breadcrumb, Button, Layout, Menu, Image } from 'antd';
import React from 'react';
const { Header, Content, Footer } = Layout;
import 'antd/dist/antd.css'
+import MenuItem from 'antd/lib/menu/MenuItem';
+import logo from '../LogoMovieBase.png';
+import '../styles/MainPage.css';
const MainPage = () => (
<Layout className="layout">
<Header>
- <div className="logo" />
+
+
+
<Menu
theme="dark"
mode="horizontal"
defaultSelectedKeys={['2']}
- items={new Array(5).fill(null).map((_, index) => {
- const key = index + 1;
- return {
- key,
- label: `nav ${key}`,
- };
- })}
- />
+ >
+ <Image src={logo} width={50} ></Image>
+
+
+ <Menu.Item>Home</Menu.Item>
+ <Menu.Item>Browse</Menu.Item>
+ <Menu.Item>Search</Menu.Item>
+ <Menu.Item>About</Menu.Item>
+ </Menu>
</Header>
<Content
style={{
padding: '0 50px',
}}
>
- <Breadcrumb
- style={{
- margin: '16px 0',
- }}
- >
- <Breadcrumb.Item>Home</Breadcrumb.Item>
- <Breadcrumb.Item>List</Breadcrumb.Item>
- <Breadcrumb.Item>App</Breadcrumb.Item>
- </Breadcrumb>
- <div className="site-layout-content">Content</div>
+ This is the content page and this is some Content
</Content>
<Footer
style={{
diff --git a/frontend/src/styles/MainPage.css b/frontend/src/styles/MainPage.css
new file mode 100644
index 0000000..be456de
--- /dev/null
+++ b/frontend/src/styles/MainPage.css
@@ -0,0 +1,3 @@
+.logo{
+ object-fit: contain;
+}
\ No newline at end of file
diff --git a/frontend/src/styles/navigationbar.css b/frontend/src/styles/navigationbar.css
deleted file mode 100644
index 060cfe1..0000000
--- a/frontend/src/styles/navigationbar.css
+++ /dev/null
@@ -1,30 +0,0 @@
-nav {
- margin: 50px auto;
- max-width: 700px;
- width: 95%;
- font-family: 'Roboto Condensed', sans-serif;
- }
- #checkbox1,
- .toggle {
- display: none;
- }
- .menu {
- padding: 0;
- margin: 0;
- max-width: 700px;
- height: 50px;
- border-radius: 5px;
- display: flex;
- flex-direction: row;
- justify-content: space-around;
- align-items: center;
- list-style-type: none;
- }
- .menu li a {
- text-decoration: none;
- align-self: center;
- border-radius: 5px;
- font-size: 14px;
- padding: 10px 15px;
- transition: background .2s linear;
- }
\ No newline at end of file
--
GitLab