Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

featue/FE-16 #309

Merged
merged 1 commit into from
Dec 2, 2022
Merged

featue/FE-16 #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions App/frontend/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.env
4 changes: 2 additions & 2 deletions App/frontend/src/components/IntroImage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ function IntroImage() {
<img className="background-image" src={background} alt="Aurora" />
<div className="input-on-background-image">
<div className="text-on-background-image">
<p className="main-header"> PRESENT, MANAGE AND SELL YOUR ART </p>
<p className="main-header"> Present, Manage And Sell Your Art </p>
<p>
Revolutionize the way you promote your art online – with APPNAME
Revolutionize the way you promote your art online – with Artopia
tools.
</p>
</div>
Expand Down
Binary file added App/frontend/src/images/artopia_logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion App/frontend/src/layout/Mainbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Searchbar from "../components/Searchbar";
import MenuButton from "../components/MenuButton";

import "./styles/Mainbar.css";
import artopia_logo from "../images/artopia_logo.png";

function Mainbar(props) {
function scrollToTop() {
Expand All @@ -31,7 +32,7 @@ function Mainbar(props) {
<Container fluid>
<Link to="/" onClick={scrollToTop} style={{ textDecoration: "none" }}>
<Navbar.Brand className="ms-4 me-5" style={{ color: "white" }}>
App Name
<img className="logo-image" src={artopia_logo} />
</Navbar.Brand>
</Link>
<Navbar.Collapse>
Expand Down
3 changes: 2 additions & 1 deletion App/frontend/src/layout/MainbarLogged.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import Navbar from "react-bootstrap/Navbar";
import Searchbar from "../components/Searchbar";
import MenuButton from "../components/MenuButton";
import { SlEnvolope } from "react-icons/sl";
import artopia_logo from "../images/artopia_logo.png";

import "./styles/Mainbar.css";

Expand All @@ -32,7 +33,7 @@ function MainbarLogged(props) {
<Container fluid>
<Link to="/" style={{ textDecoration: "none" }} onClick={scrollToTop}>
<Navbar.Brand className="ms-4 me-5" style={{ color: "white" }}>
App Name
<img className="logo-image" src={artopia_logo} />
</Navbar.Brand>
</Link>
<Navbar.Collapse>
Expand Down
6 changes: 6 additions & 0 deletions App/frontend/src/layout/styles/Mainbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,9 @@
.btn-logged-sidebar:active {
color: #18121c !important;
}

.logo-image{
margin-top: 2rem;
height: 5.5rem;
weight: auto;
}