Skip to content

Commit

Permalink
Merge pull request #71 from SCCapstone/rahul-home
Browse files Browse the repository at this point in the history
finished the home page
  • Loading branch information
rahulbulusu authored Nov 29, 2022
2 parents bf9fd36 + 07a83e8 commit 99eb1f8
Show file tree
Hide file tree
Showing 6 changed files with 16,870 additions and 938 deletions.
1 change: 1 addition & 0 deletions client/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
margin: 0;
padding: 0;
font-family: 'Montserrat', sans-serif;
/*background-color: aqua;*/
}
1 change: 1 addition & 0 deletions client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import CreateAccount from "./views/CreateAccount/FormSignUp";
import LeftSideNavBar from "./components/LeftSideNavBar/LeftSideNavBar";
import TermsServices from "./views/TermsServices";
import LoginForm from "./views/Login/loginform";
//import "./App.css";

var React = require("react");
var Component = React.Component;
Expand Down
2 changes: 1 addition & 1 deletion client/src/views/AboutUs.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// About Us Page
import React from "react";
import bookstorepic from '../assets/bookstorepic.jpg';
import bookstorepic from '../assets/bookstorepic.jpg';

function AboutUs() {
return (
Expand Down
12 changes: 11 additions & 1 deletion client/src/views/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,18 @@ function Home() {
return (
<div className="home">
<h1 style={{ color: 'green' }}>Welcome</h1>
<p>
<h2>
Welcome to the Book Store Website!
If You Love Books, You'll Love Our Book Store!
</h2>

<h2>November 27 - Weekly Newsletter</h2>
<p>
New Books will be coming in the next week. We will also be having a signing day for a very special author. STAY TUNED FOR MORE INFO!!
</p>
<h2>November 21 - The Biggest Sale Ever Now Through New Years Day </h2>
<p>
40%, 60%, and 80% off on best sellers. Come in store today and get an additional 20% on your total purchase.
</p>
</div>
);
Expand Down
Loading

0 comments on commit 99eb1f8

Please sign in to comment.