diff --git a/README.md b/README.md index a956987..1a3ded9 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# web103_unit4_project \ No newline at end of file +# Unit 4 Project: Starter Code \ No newline at end of file diff --git a/client/index.html b/client/index.html index 3cab620..6484c84 100644 --- a/client/index.html +++ b/client/index.html @@ -2,9 +2,9 @@ - + - BOLT BUCKET + CUSTOM ITEMS
diff --git a/client/public/lightning.png b/client/public/lightning.png deleted file mode 100644 index 26ada1c..0000000 Binary files a/client/public/lightning.png and /dev/null differ diff --git a/client/public/starstruck.png b/client/public/starstruck.png new file mode 100644 index 0000000..ec50bfb Binary files /dev/null and b/client/public/starstruck.png differ diff --git a/client/src/App.jsx b/client/src/App.jsx index 193dbe6..63b3b35 100644 --- a/client/src/App.jsx +++ b/client/src/App.jsx @@ -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: + element: }, { - path:'/customcars', - element: + path:'/customitems', + element: }, { - path: '/customcars/:id', - element: + path: '/customitems/:id', + element: }, { path: '/edit/:id', - element: + element: } ]) diff --git a/client/src/assets/background.jpg b/client/src/assets/background.jpg index c4a955c..b05f2c7 100644 Binary files a/client/src/assets/background.jpg and b/client/src/assets/background.jpg differ diff --git a/client/src/components/Navigation.jsx b/client/src/components/Navigation.jsx index 2516366..e36372c 100644 --- a/client/src/components/Navigation.jsx +++ b/client/src/components/Navigation.jsx @@ -6,12 +6,12 @@ const Navigation = () => { return ( diff --git a/client/src/css/Navigation.css b/client/src/css/Navigation.css index b248e91..70d7080 100644 --- a/client/src/css/Navigation.css +++ b/client/src/css/Navigation.css @@ -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; diff --git a/client/src/index.css b/client/src/index.css index 0c83a57..6c591b2 100644 --- a/client/src/index.css +++ b/client/src/index.css @@ -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); @@ -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 { diff --git a/client/src/pages/CreateCar.jsx b/client/src/pages/CreateItem.jsx similarity index 100% rename from client/src/pages/CreateCar.jsx rename to client/src/pages/CreateItem.jsx diff --git a/client/src/pages/EditCar.jsx b/client/src/pages/EditItem.jsx similarity index 100% rename from client/src/pages/EditCar.jsx rename to client/src/pages/EditItem.jsx diff --git a/client/src/pages/CarDetails.jsx b/client/src/pages/ItemDetails.jsx similarity index 100% rename from client/src/pages/CarDetails.jsx rename to client/src/pages/ItemDetails.jsx diff --git a/client/src/pages/ViewCars.jsx b/client/src/pages/ViewItems.jsx similarity index 100% rename from client/src/pages/ViewCars.jsx rename to client/src/pages/ViewItems.jsx diff --git a/package-lock.json b/package-lock.json index 218d939..4eada6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "boltbucket", + "name": "customitems", "version": "0.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "boltbucket", + "name": "customitems", "dependencies": { "@picocss/pico": "^1.5.7", "concurrently": "^7.6.0", diff --git a/package.json b/package.json index c771cd9..e6b082c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "boltbucket", + "name": "customitems", "type": "module", "scripts": { "dev": "concurrently \"cd client && vite\" \"cd server && nodemon server\"", diff --git a/server/server.js b/server/server.js index 37079f4..cc202c3 100644 --- a/server/server.js +++ b/server/server.js @@ -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')) }