Skip to content

Brandon branch final css 1.2 #9

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

Open
bran2miz wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Brandon branch final css 1.2 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dcc72d
finished all css, condensed nav bar, banners, ads, and containerized …
bran2miz May 18, 2022
aaebf84
commented out the out of stock feature in productitem.js
bran2miz May 19, 2022
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
6 changes: 4 additions & 2 deletions src/App.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
}
}

.image {
width:"40%";

div.carousel.slide {
width:1300px;

}
25 changes: 13 additions & 12 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,15 +171,16 @@ export default class App extends Component {
role="navigation"
aria-label="main navigation"
>
<div className="navbar-brand">
<Link to="/products">
<Link to="/products">
<Figure.Image
width={200}
height={200}
width={300}
height={300}
src={logo}
alt="brandonImage"
alt="logo"
/>
</Link>
<div className="navbar-brand">

<b className="navbar-item is-size-4 "></b>
<label
role="button"
Expand All @@ -202,15 +203,15 @@ export default class App extends Component {
this.state.showMenu ? 'is-active' : ''
}`}
>
<Link to="/products" className="navbar-item">
<Link to="/products" className="navbar-item is-size-4">
Home
</Link>
{this.state.user && this.state.user.accessLevel < 1 && (
<Link to="/add-product" className="navbar-item">
<Link to="/add-product" className="navbar-item is-size-4">
Add Product
</Link>
)}
<Link to="/cart" className="navbar-item">
<Link to="/cart" className="navbar-item is-size-4">
Cart
<span
className="tag is-primary"
Expand All @@ -219,19 +220,19 @@ export default class App extends Component {
{Object.keys(this.state.cart).length}
</span>
</Link>
<Link to="/checkout" className="navbar-item">
<Link to="/checkout" className="navbar-item is-size-4">
Checkout
<span style={{ marginLeft: '5px' }}></span>
</Link>
<Link to="/aboutus" className="navbar-item">
<Link to="/aboutus" className="navbar-item is-size-4">
About the Team
</Link>
{!this.state.user ? (
<Link to="/login" className="navbar-item">
<Link to="/login" className="navbar-item is-size-4">
Login
</Link>
) : (
<Link to="/" onClick={this.logout} className="navbar-item">
<Link to="/" onClick={this.logout} className="navbar-item is-size-4">
Logout
</Link>
)}
Expand Down
14 changes: 7 additions & 7 deletions src/CSS/Checkout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.padding{
/* .padding{
padding:5rem !important;
margin-left:300px;
}
.card {
margin-left:400px;
} */
/* .card {
margin-bottom: 1.5rem;
}

} */
/*
.card {
position: relative;
display: -ms-flexbox;
Expand Down Expand Up @@ -42,7 +42,7 @@
border-color: #c8ced3 !important;
outline: 0;
box-shadow: 0 0 0 #F44336;
}
} */

.carousel .item {
height: 100px;
Expand Down
7 changes: 6 additions & 1 deletion src/components/AboutUs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@ class AboutUs extends React.Component {
render() {
return(
<>
<Figure.Image width="100%"
<div className="columns is-centered">
<Figure.Image width="1300px"
max-height="50%"
src={headerTeam}
alt="product-header"
/>
</div>


<br></br>
<div className='container'>
<div className='columns is-fluid is-size-4'>
<div className='column is-half'>
<div class="card is-half ml-2">
Expand Down Expand Up @@ -145,6 +149,7 @@ class AboutUs extends React.Component {



</div>
</div>
</>

Expand Down
15 changes: 8 additions & 7 deletions src/components/Cart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,18 @@ const Cart = props => {

return (
<>
<Figure.Image width="100%"
<div className="columns is-centered">
<Figure.Image width="1300px"
max-height="50%"
src={headerCart}
alt="product-header"
/>

</div>

<div className="columns is-centered">
<div className="column ">
<Carousel>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={ad}
alt="games-sale"
Expand All @@ -36,7 +37,7 @@ const Cart = props => {
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={adTwo}
alt="produce-sale"
Expand All @@ -46,7 +47,7 @@ const Cart = props => {
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={adThree}
alt="brandonImage"
Expand All @@ -57,7 +58,7 @@ const Cart = props => {
</Carousel.Item>
</Carousel>
</div>
</div>


<div className="container">
{cartKeys.length ? (
Expand Down
27 changes: 15 additions & 12 deletions src/components/Checkout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,19 @@ const CheckoutItems = (props) => {

return (
<>
<Figure.Image width="100%"
<div className="columns is-centered">
<Figure.Image width="1300px"
max-height="50%"
src={headerCheckout}
alt="product-header"
/>
</div>

<div className="columns is-centered">
<div className="column ">

<Carousel>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={ad}
alt="games-sale"
Expand All @@ -40,7 +43,7 @@ const CheckoutItems = (props) => {
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={adTwo}
alt="produce-sale"
Expand All @@ -50,7 +53,7 @@ const CheckoutItems = (props) => {
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={adThree}
alt="brandonImage"
Expand All @@ -61,13 +64,13 @@ const CheckoutItems = (props) => {
</Carousel.Item>
</Carousel>
</div>
</div>



<div className="columns is-size-4">
<div className="column is-half ml-2 ">
<div className="card ml-6">
<div className="container">
<div className="columns">
<div className="column is-half ">
<div className="card ml-3">
<div className="card-header">
<h6 className="title"> Shipping Information</h6>
</div>
Expand Down Expand Up @@ -257,8 +260,8 @@ const CheckoutItems = (props) => {
</div>


<div className="column is-two-fifths ">
<div className="card ml-6">
<div className="column is-half ">
<div className="card ml-2 mr-3">
<div className="card-header ">
<h6 className="title m-auto"> Cart </h6>
</div>
Expand Down Expand Up @@ -297,7 +300,7 @@ const CheckoutItems = (props) => {
</div>

</div>

</div>
</>
)
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ProductItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ const ProductItem = (props) => {
</b>

<div className="is-size-6">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{product.description}</div>
{product.stock > 0 ? (
{/* {product.stock > 0 ? (
<small>{product.stock + ' Available'}</small>
) : (
<small className="has-text-danger">Out Of Stock</small>
)}
)} */}
<div className="is-clearfix">
<button
className="button is-small is-outlined is-size-6 is-primary is-pulled-right"
Expand Down
19 changes: 10 additions & 9 deletions src/components/ProductList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@ const ProductList = props => {

return (
<>

<Figure.Image width="100%"
<div className="columns is-centered">
<Figure.Image width="1300px"
max-height="30%"
src={headerProduct}
alt="product-header"
/>
</div>

<div className="columns is-centered">
<div className="column ">

<Carousel>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={ad}
alt="games-sale"
Expand All @@ -33,7 +34,7 @@ const ProductList = props => {
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={adTwo}
alt="produce-sale"
Expand All @@ -43,7 +44,7 @@ const ProductList = props => {
</Carousel.Caption>
</Carousel.Item>
<Carousel.Item>
<Figure.Image width="100%"
<Figure.Image width="1300px"
height={200}
src={adThree}
alt="brandonImage"
Expand All @@ -54,10 +55,10 @@ const ProductList = props => {
</Carousel.Item>
</Carousel>
</div>
</div>

<div className="container">
<div className="column columns is-multiline has-text-left">

<div className="container ">
<div className="column columns is-multiline is=half has-text-left">
{products && products.length ? (
products.map((product, index) => (
<ProductItem
Expand Down
2 changes: 1 addition & 1 deletion src/components/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Input } from 'semantic-ui-react';

const SearchComponent = (props) => {
return (
<div>
<div className='mt-6 mr-3'>
<Input
type="text"
placeholder="Search..."
Expand Down
Binary file modified src/images/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.