Skip to content

pull from branch #42

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.

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
wants to merge 98 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
cf57b7b
Update README.md
JohnnyCortez Oct 24, 2023
2aa97cc
Update user_stories.md
JohnnyCortez Oct 24, 2023
4ca6ebc
Update README.md
JohnnyCortez Oct 24, 2023
5d51204
Update README.md
JohnnyCortez Oct 24, 2023
27c30ab
Update milestone1.md
JohnnyCortez Oct 24, 2023
e872436
Update user_stories.md
JohnnyCortez Oct 24, 2023
e76e89b
Update user_stories.md
JohnnyCortez Oct 24, 2023
a2c7a59
Update user_stories.md
JohnnyCortez Oct 24, 2023
987f052
Update README.md
JohnnyCortez Oct 24, 2023
53c452f
Update milestone1.md
JohnnyCortez Oct 24, 2023
336543f
Update user_stories.md
JohnnyCortez Oct 24, 2023
9f449e7
Update milestone2.md
JohnnyCortez Oct 31, 2023
585bf6d
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
e9c950f
Add files via upload
JohnnyCortez Oct 31, 2023
7fd15fd
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
b0df4ab
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
3130d08
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
08aeee9
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
af1c783
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
795c314
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
1c2c61b
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
a8778fb
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
5a25021
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
091ff14
Update entity_relationship_diagram.md
JohnnyCortez Oct 31, 2023
b115892
Add files via upload
JohnnyCortez Oct 31, 2023
ab9923e
Update wireframes.md
JohnnyCortez Oct 31, 2023
bf71edc
Update milestone3.md
JohnnyCortez Nov 7, 2023
755fa74
Update README.md
JohnnyCortez Nov 7, 2023
54ed1dd
Update milestone3.md
JohnnyCortez Nov 7, 2023
c3fb757
set up frontend enviornment and some backend
JohnnyCortez Nov 7, 2023
242f820
created trip controllers
JohnnyCortez Nov 7, 2023
aae183a
tweak on item controllers
JohnnyCortez Nov 7, 2023
975f953
added items route
JohnnyCortez Nov 7, 2023
c1c5bca
updated rest.js
JohnnyCortez Nov 7, 2023
116dc89
created home page with styling
JohnnyCortez Nov 10, 2023
d7d6f8a
debugged react router dom issues
JohnnyCortez Nov 10, 2023
63419cf
css changes
JohnnyCortez Nov 11, 2023
edbf3e5
landing page changes
JohnnyCortez Nov 11, 2023
12150a0
added product card
JohnnyCortez Nov 11, 2023
56a52af
added style to the product catalog
JohnnyCortez Nov 11, 2023
93ac3ca
added social media icons to home page
JohnnyCortez Nov 11, 2023
38023a3
added filters to catalog page
JohnnyCortez Nov 12, 2023
8337f9d
added product view
JohnnyCortez Nov 12, 2023
70b6051
implemented liked page
JohnnyCortez Nov 12, 2023
0388dc3
created singup and login pages
JohnnyCortez Nov 12, 2023
f9a0c55
nav and home page styling
JohnnyCortez Nov 13, 2023
e2ccdcb
added cart page
JohnnyCortez Nov 13, 2023
ebc4c00
added user authentication
JohnnyCortez Nov 13, 2023
b659448
responsivness fix
JohnnyCortez Nov 13, 2023
4c79ce4
added 3 new user routes
JohnnyCortez Nov 14, 2023
e9d92e7
user added to database after verification
JohnnyCortez Nov 14, 2023
d1df497
test
JohnnyCortez Nov 14, 2023
9053957
Update milestone4.md
JohnnyCortez Nov 14, 2023
34e5d5a
Add files via upload
JohnnyCortez Nov 14, 2023
11faee8
Update README.md
JohnnyCortez Nov 14, 2023
3c265fe
Add files via upload
JohnnyCortez Nov 14, 2023
880cd53
Update README.md
JohnnyCortez Nov 14, 2023
87a8c1b
Update README.md
JohnnyCortez Nov 14, 2023
fc4fbbf
added filtering route to catalog
JohnnyCortez Nov 16, 2023
7827268
Merge branch 'main' of github.com:JohnnyCortez/JewelryStore
JohnnyCortez Nov 16, 2023
4645664
added filtering
JohnnyCortez Nov 16, 2023
2389ed3
made the catalog page more responsive
JohnnyCortez Nov 17, 2023
1912999
connected catalog page to productview
JohnnyCortez Nov 17, 2023
3546d92
added edit page
JohnnyCortez Nov 17, 2023
8481d8d
completed editing and deletion function
JohnnyCortez Nov 18, 2023
3cc1ebb
created add post feature
JohnnyCortez Nov 18, 2023
a8c3e2d
added likes page
JohnnyCortez Nov 18, 2023
f81c585
connected uid to id
JohnnyCortez Nov 18, 2023
2463a7c
added ability to like items
JohnnyCortez Nov 18, 2023
b3319d8
added all routing
JohnnyCortez Nov 18, 2023
a1ecbfe
Update README.md
JohnnyCortez Nov 21, 2023
8f9694d
Update milestone5.md
JohnnyCortez Nov 21, 2023
54060d8
Add files via upload
JohnnyCortez Nov 21, 2023
791a2df
Update README.md
JohnnyCortez Nov 21, 2023
796c3e5
Add files via upload
JohnnyCortez Nov 21, 2023
c3d06d2
Update README.md
JohnnyCortez Nov 21, 2023
33283ed
Add files via upload
JohnnyCortez Nov 21, 2023
228f7f4
Update README.md
JohnnyCortez Nov 21, 2023
68227dc
Add files via upload
JohnnyCortez Nov 21, 2023
cbe9c61
Update README.md
JohnnyCortez Nov 21, 2023
dc60507
Update milestone5.md
JohnnyCortez Nov 21, 2023
1360f76
Update milestone5.md
JohnnyCortez Nov 21, 2023
f4e4725
Add files via upload
JohnnyCortez Nov 21, 2023
26f254f
Update milestone5.md
JohnnyCortez Nov 21, 2023
9b57b8e
Update milestone5.md
JohnnyCortez Nov 21, 2023
6d9926d
Update milestone5.md
JohnnyCortez Nov 21, 2023
ac70784
Update milestone5.md
JohnnyCortez Nov 21, 2023
ec5c354
Update milestone5.md
JohnnyCortez Nov 21, 2023
65037a1
Delete jewelryStore7.gif
JohnnyCortez Nov 21, 2023
8285799
Add files via upload
JohnnyCortez Nov 21, 2023
5e904ed
Update milestone5.md
JohnnyCortez Nov 21, 2023
88f3a1d
added fearures for file uploads
JohnnyCortez Dec 7, 2023
f2cfaa3
Merge branch 'main' of github.com:JohnnyCortez/JewelryStore
JohnnyCortez Dec 7, 2023
acae272
fixed add and edit img uploader
JohnnyCortez Dec 7, 2023
6ef204e
added add card and upload and edit icons
JohnnyCortez Dec 8, 2023
0f5890f
made guests able to view catalog
JohnnyCortez Dec 26, 2023
1fc4f87
added productview auto scroll to product feature
JohnnyCortez Dec 26, 2023
5654871
fixed like issue
JohnnyCortez Dec 28, 2023
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
48 changes: 32 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,64 @@
# [your app name here]
# Princesa Azul

CodePath WEB103 Final Project

Designed and developed by: [your names here]
Designed and developed by: Johnny Cortez

🔗 Link to deployed app:

## About

### Description and Purpose

[text goes here]
This website is for my godmother who is a Jeweler and sells Jewelry. She currently displays and sells her Jewelry on Instagram and Facebook. However, it can be difficult for users interested in buying to sift through her inventory and make purchases. This website will fix all of that and allow users to view and purchase her Jewelry in a seamless and pleasant experience.

### Inspiration

[text goes here]
I was once looking through my godmother's Jewelry page on Instagram to purchase a golden necklace. I wanted a specific type of necklace that either had a holy cross or a Virgin Mary piece on it. However, it was difficult as there were so many items, but no way to filter results and know what had been sold. I had to ask my godmother directly if she had this specific necklace on hand, which felt very inefficient. I then had the idea, what if I made her a website to alleviate this issue and help her business grow by being on a more organized platform?

## Tech Stack

Frontend:
Frontend: React.js, HTML, CSS

Backend:
Backend: PostgreSQL, Firebase

## Features

### [Name of Feature 1]
### User-friendly and pleasant shopping experience with UI/UX in mind ✅

[short description goes here]
Pleasant store pages for shopping and great user experience

[gif goes here]
<img src='jewelryStore2.gif' />

### [Name of Feature 2]
### Admin Control ✅

[short description goes here]
Using specific login credentials, an admin can upload, delete, and edit current items in stock

[gif goes here]
<img src='jewelryStore3.gif' />

### [Name of Feature 3]
### Account Creation ✅

[short description goes here]
Users can create accounts with email verification to make purchases, view purchase history, and perform other features

[gif goes here]
<img src='jewelryStore1.gif' />

### [ADDITIONAL FEATURES GO HERE - ADD ALL FEATURES HERE IN THE FORMAT ABOVE; you will check these off and add gifs as you complete them]
### Stock browsing ✅

Users can browse current inventory(with a corresponding product page) that is updated regularly

<img src='jewelryStore4.gif' />

### Stock filtering ✅

Users can filter stock by price, metal, Jewelry type, etc

<img src='jewelryStore5.gif' />

### Like Items ✅

Users can like items for later purchase

<img src='jewelryStore6.gif' />

## Installation Instructions

Expand Down
26 changes: 26 additions & 0 deletions codebase/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local
.env
firebase.js

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
20 changes: 20 additions & 0 deletions codebase/client/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module.exports = {
root: true,
env: { browser: true, es2020: true },
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
],
ignorePatterns: ['dist', '.eslintrc.cjs'],
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
settings: { react: { version: '18.2' } },
plugins: ['react-refresh'],
rules: {
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
}
8 changes: 8 additions & 0 deletions codebase/client/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# React + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
13 changes: 13 additions & 0 deletions codebase/client/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
Loading