Skip to content

Unit 4 Project Starter #2

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
jamjamgobambam wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Unit 4 Project Starter #2

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: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# web103_unit4_project
# Unit 4 Project: Starter Code
4 changes: 2 additions & 2 deletions client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/lightning.png" />
<link rel="icon" type="image/svg+xml" href="/starstruck.png" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>BOLT BUCKET</title>
<title>CUSTOM ITEMS</title>
</head>
<body>
<div id="root"></div>
Expand Down
Binary file removed client/public/lightning.png
View file
Open in desktop
Binary file not shown.
Binary file added client/public/starstruck.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.
20 changes: 10 additions & 10 deletions client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
import React from 'react'
import { useRoutes } from 'react-router-dom'
import Navigation from './components/Navigation'
import ViewCars from './pages/ViewCars'
import EditCar from './pages/EditCar'
import CreateCar from './pages/CreateCar'
import CarDetails from './pages/CarDetails'
import ViewItems from './pages/ViewItems'
import EditItem from './pages/EditItem'
import CreateItem from './pages/CreateItem'
import ItemDetails from './pages/ItemDetails'
import './App.css'

const App = () => {
let element = useRoutes([
{
path: '/',
element: <CreateCar title='BOLT BUCKET | Customize' />
element: <CreateItem title='CUSTOM ITEMS | Customize' />
},
{
path:'/customcars',
element: <ViewCars title='BOLT BUCKET | Custom Cars' />
path:'/customitems',
element: <ViewItems title='CUSTOM ITEMS | Custom Items' />
},
{
path: '/customcars/:id',
element: <CarDetails title='BOLT BUCKET | View' />
path: '/customitems/:id',
element: <ItemDetails title='CUSTOM ITEMS | View' />
},
{
path: '/edit/:id',
element: <EditCar title='BOLT BUCKET | Edit' />
element: <EditItem title='CUSTOM ITEMS | Edit' />
}
])

Expand Down
Binary file modified client/src/assets/background.jpg
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.
4 changes: 2 additions & 2 deletions client/src/components/Navigation.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ const Navigation = () => {
return (
<nav>
<ul>
<li><h1>Bolt Bucket 🏎️</h1></li>
<li><h1>Custom Items</h1></li>
</ul>

<ul>
<li><a href='/' role='button'>Customize</a></li>
<li><a href='/customcars' role='button'>View Cars</a></li>
<li><a href='/customitems' role='button'>View Items</a></li>
</ul>

</nav>
Expand Down
2 changes: 1 addition & 1 deletion client/src/css/Navigation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
nav {
background-color: rgba(0, 0, 0, 0.8);
background-color: rgb(239, 239, 239);
width: 100vw;
padding-left: 50px;
padding-right: 50px;
Expand Down
7 changes: 4 additions & 3 deletions client/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

#root {
--font-family: Rubik, Verdana, sans-serif;
--primary: rgb(115, 2, 12);
--primary-hover: black;
--color: white;
--primary: rgb(223, 212, 212);
--primary-hover: rgb(211, 215, 216);
--color: black;
--h1-color: var(--color);
--h2-color: var(--color);
--h3-color: var(--color);
Expand Down Expand Up @@ -39,6 +39,7 @@
border: 2px solid transparent;
margin: 10px;
width: max-content;
color: black;
}

#root [role=button]:hover, #root button:hover, #root input[type=submit]:hover {
Expand Down
0 client/src/pages/CreateCar.jsx → client/src/pages/CreateItem.jsx
View file
Open in desktop
File renamed without changes.
0 client/src/pages/EditCar.jsx → client/src/pages/EditItem.jsx
View file
Open in desktop
File renamed without changes.
0 client/src/pages/CarDetails.jsx → client/src/pages/ItemDetails.jsx
View file
Open in desktop
File renamed without changes.
0 client/src/pages/ViewCars.jsx → client/src/pages/ViewItems.jsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "boltbucket",
"name": "customitems",
"type": "module",
"scripts": {
"dev": "concurrently \"cd client && vite\" \"cd server && nodemon server\"",
Expand Down
4 changes: 2 additions & 2 deletions server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ const app = express()
app.use(express.json())

if (process.env.NODE_ENV === 'development') {
app.use(favicon(path.resolve('../', 'client', 'public', 'lightning.png')))
app.use(favicon(path.resolve('../', 'client', 'public', 'starstruck.png')))
}
else if (process.env.NODE_ENV === 'production') {
app.use(favicon(path.resolve('public', 'lightning.png')))
app.use(favicon(path.resolve('public', 'starstruck.png')))
app.use(express.static('public'))
}

Expand Down