Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
f2ef0d7
Updated Group Members
sreyaskodukulla Mar 29, 2023
aee6899
init
sreyaskodukulla Mar 29, 2023
6e377a2
updated group members
sreyaskodukulla Mar 29, 2023
262d4de
update to introduction
sreyaskodukulla Mar 29, 2023
a9935e4
Create testinggithub.txt
MercereBaker Mar 29, 2023
6f3a896
Delete testinggithub.txt
MercereBaker Mar 29, 2023
fdd6e47
delete introduction update
sreyaskodukulla Mar 29, 2023
cef680b
group.md file commit
sreyaskodukulla Mar 29, 2023
d7459f2
Added SRS
BlaiseThomas20 Mar 29, 2023
2446402
Test 2
BlaiseThomas20 Mar 29, 2023
7562086
TEST 2
BlaiseThomas20 Mar 29, 2023
a885a46
Update to introduction
sreyaskodukulla Mar 29, 2023
4d6164f
Update Constraint 1 (line 57)
sreyaskodukulla Mar 29, 2023
480d2c6
Update constraint 2 (line 58)
sreyaskodukulla Mar 29, 2023
e582998
update constratint 2 (line 58)
sreyaskodukulla Mar 29, 2023
a433951
Constraint 7/8. Line 63/64
MercereBaker Mar 29, 2023
fda1da4
Constraint
BlaiseThomas20 Mar 29, 2023
31e4570
10, 59, 60
oneofthejosephs Mar 29, 2023
c4ab64c
main branch test
BlaiseThomas20 Mar 29, 2023
f37cd84
Create group.md
oneofthejosephs Mar 29, 2023
ac83a0a
Create group.md
MercereBaker Mar 29, 2023
458561b
Update group.md
MercereBaker Mar 29, 2023
744fb4d
Update SRS.md
MercereBaker Mar 30, 2023
a52142d
Update SRS.md
MercereBaker Mar 30, 2023
1fb52eb
SRS BLAISE CHANGE FROM MAC
BlaiseThomas20 Mar 30, 2023
ded70e4
MACH CHANGE
BlaiseThomas20 Mar 30, 2023
d97fe23
srs mac chang
BlaiseThomas20 Mar 30, 2023
03927e6
Update SRS.md
MercereBaker Mar 30, 2023
8ad4e3b
update requirements, constraints, use cases, etc.
sreyaskodukulla Mar 30, 2023
bc05347
Final Draft srs Blaise
BlaiseThomas20 Mar 30, 2023
4219ff1
Update SRS.md
oneofthejosephs Mar 30, 2023
27f1445
Final Draft
BlaiseThomas20 Mar 30, 2023
a162d8d
Final Draft v2
BlaiseThomas20 Mar 30, 2023
a63a289
Final draft v3
BlaiseThomas20 Mar 30, 2023
15ca49d
Final Draft Main
BlaiseThomas20 Mar 30, 2023
5ac8344
Final Draft Main v2
BlaiseThomas20 Mar 30, 2023
e001fea
Final Draft Main V3
BlaiseThomas20 Mar 30, 2023
b06ee45
Final Draft Main V4
BlaiseThomas20 Mar 30, 2023
2fff1d2
Final Draft V5
BlaiseThomas20 Mar 30, 2023
01c9050
Final Draft For Real This Time
BlaiseThomas20 Mar 30, 2023
804d959
Final Draft, The reckoning
BlaiseThomas20 Mar 30, 2023
744efac
Create diagrams.md
MercereBaker Apr 4, 2023
3a561c6
Merge remote-tracking branch 'origin/main' into mercere
MercereBaker Apr 4, 2023
d4315da
Diagram Update
MercereBaker Apr 6, 2023
7737567
classes.png update
MercereBaker Apr 6, 2023
76c87d1
Updated Requirements
BlaiseThomas20 Apr 6, 2023
a73656d
Merge branch 'BlaiseThomas20' of https://github.com/BlaiseThomas20/on…
BlaiseThomas20 Apr 6, 2023
06acbb1
Task 2 changes
BlaiseThomas20 Apr 7, 2023
90c469d
updated testing diagrams packages.puml
sreyaskodukulla Apr 7, 2023
01fb953
updated use case diagrams and sequence diagrams
sreyaskodukulla Apr 11, 2023
4c2d14a
Design update 4/11/23
BlaiseThomas20 Apr 11, 2023
09d1eea
update login.puml
sreyaskodukulla Apr 11, 2023
535d905
Merge branch 'mercere' into skbranch
MercereBaker Apr 11, 2023
da49fd0
Merge pull request #1 from BlaiseThomas20/skbranch
MercereBaker Apr 11, 2023
79a1cb5
Merge branch 'BlaiseThomas20' into mercere
BlaiseThomas20 Apr 11, 2023
1ba2b3e
Merge pull request #2 from BlaiseThomas20/mercere
BlaiseThomas20 Apr 11, 2023
ab42fd6
Diagrams
oneofthejosephs Apr 12, 2023
a80b988
3 of 4
BlaiseThomas20 Apr 12, 2023
bbce8cf
Updated diagrams
oneofthejosephs Apr 12, 2023
5532624
updates to style.css and home.html
sreyaskodukulla Apr 13, 2023
e101017
update to style.css
sreyaskodukulla Apr 13, 2023
b244e05
update to style.css
sreyaskodukulla Apr 13, 2023
3f3a40f
update style.css
sreyaskodukulla Apr 13, 2023
75e20ed
update to style.css hover
sreyaskodukulla Apr 13, 2023
8f35d70
Merge branch 'skbranch' of https://github.com/BlaiseThomas20/onlineSt…
BlaiseThomas20 Apr 13, 2023
f438f32
finalized images, description, and hover feature
sreyaskodukulla Apr 13, 2023
b654939
final version of hover feature
sreyaskodukulla Apr 14, 2023
f871f32
Navigation bar implementation
oneofthejosephs Apr 14, 2023
bb142f7
Update style.css
oneofthejosephs Apr 14, 2023
da54b2d
temp
BlaiseThomas20 Apr 14, 2023
1bdd486
IT
BlaiseThomas20 Apr 14, 2023
14532ee
FINAL HOVER IMPLEMENTATION
sreyaskodukulla Apr 18, 2023
7cdf04d
clearing
BlaiseThomas20 Apr 18, 2023
78682b5
clearing
BlaiseThomas20 Apr 18, 2023
3e7828a
Merge branch 'skbranch' of https://github.com/BlaiseThomas20/onlineSt…
BlaiseThomas20 Apr 18, 2023
8dfe2d5
syreas changes
BlaiseThomas20 Apr 18, 2023
0514f19
Modification of navigation bar and implementation of confirmation mes…
oneofthejosephs Apr 24, 2023
97cabe6
Merge pull request #8 from BlaiseThomas20/skbranch
MercereBaker Apr 25, 2023
999482c
Changes
MercereBaker Apr 25, 2023
e28a318
Changes
MercereBaker Apr 25, 2023
3b498f5
Merge branch 'mercere' into BlaiseThomas20
MercereBaker Apr 25, 2023
21e35a2
Merge pull request #9 from BlaiseThomas20/BlaiseThomas20
MercereBaker Apr 25, 2023
c5ca8c0
Merge branch 'mercere' into Akan
MercereBaker Apr 25, 2023
ce9fa1d
Merge pull request #10 from BlaiseThomas20/Akan
MercereBaker Apr 25, 2023
c2bdaf4
Updates
MercereBaker Apr 25, 2023
8cb17e2
Validations
oneofthejosephs Apr 26, 2023
3fff068
Merge branch 'Akan' of https://github.com/BlaiseThomas20/onlineStoreT…
oneofthejosephs Apr 26, 2023
d53a02e
Final Updates
MercereBaker Apr 26, 2023
d8ba329
Merge branch 'Akan' into mercere
oneofthejosephs Apr 26, 2023
6ee7777
Update layout.html
MercereBaker Apr 26, 2023
3d19d61
Update checkout.html
MercereBaker Apr 26, 2023
479414a
Update home.html
MercereBaker Apr 26, 2023
da634b2
Update home.html
MercereBaker Apr 26, 2023
50d5513
Update home.html
MercereBaker Apr 26, 2023
99cbc9e
Update layout.html
MercereBaker Apr 26, 2023
626378c
Updates
MercereBaker Apr 26, 2023
2d0afa6
Create Mercere.txt
MercereBaker Apr 27, 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
346 changes: 346 additions & 0 deletions SRS.md

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion app.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ def index_page():
"""
return render_template('index.html', username=username, products=products, sessions=sessions)

@app.route('/')
def index_page2():
return render_template('indexItem.html')

@app.route('/login')
def login_page():
Expand Down Expand Up @@ -138,4 +141,4 @@ def checkout():


if __name__ == '__main__':
app.run(debug=True, host=HOST, port=PORT)
app.run(debug=True, host=HOST, port=PORT)
Binary file added authentication/packages.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions authentication/packages.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
@startuml packages
set namespaceSeparator none
package "authentication" as authentication #aliceblue {
}
package "authentication.authTools" as authentication.authTools #aliceblue {
}
package "authentication.login" as authentication.login #aliceblue {
class "Sessions" {
username : str
db : Database
add_new_session(self, username: str, db: Database) -> None
get_session(self, username: str) -> UserSession
remove_session(self, username: str) -> None
get_all_sessions(self) -> dict
}

class "AuthTools" {
username : str
password : str
key : str
salt : str
hash_password(password: str, salt: str = None) -> tuple
username_exists(username: str) -> bool
update_passwords(username: str, key: str, salt: str)
check_password(password: str, salt: str, key: str) -> bool
login_pipeline(username: str, password: str) -> bool

}
}
@enduml
Binary file added authentication/packages_initial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions authentication/packages_initial.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@startuml packages
set namespaceSeparator none
package "authentication" as authentication #aliceblue {
}
package "authentication.authTools" as authentication.authTools #aliceblue {
}
@enduml
4 changes: 3 additions & 1 deletion authentication/passwords.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
aturing:0d911297a1e34f4fcce78537f9aaa66a:b93727798b520dc10d145b53909c061f082ff14cd5f8cb4ab24c3b71bfa57d7e12e1296029be74c06a0d91ba32756f9fc978047fbe7232be67f94dfc1de9ced9
dritchie:e11d3b1a66b1ad362223c30b78138519:67aff785bd17ac24448d491926ff7aadd8fa75e51a2f7a9bfc31889bad0adcd2989061a27ccd9eff9e5e31f2bc14b5c193727e116dc8dc48259acb3919171cd4
llamport:89d0e5fe8d06ec113839c8f319d7033e:9171d14954eeda4e70777c23d98e349818125cdaeb884ff97ebf8cc0a9c7778f54ce394256588148132a03ebea891e44077c659e6c0132fa87a8cf77e436ae11
bliskov:e71dda285effa69e1c29ac810fe7a986:1e4b9ae956cad1385cfa6fffd8323dd16c3fe18c54e6447e49bddef2138d042e84e1505a541c6ef19a5026e684b2559efd366145870a0a8d4d4173c0877f6cd2
bliskov:e71dda285effa69e1c29ac810fe7a986:1e4b9ae956cad1385cfa6fffd8323dd16c3fe18c54e6447e49bddef2138d042e84e1505a541c6ef19a5026e684b2559efd366145870a0a8d4d4173c0877f6cd2

Kiwi:f65a78d14f405f820a0cd4a1c250b42c:7caa8eb94a03c88251da64e1a18dd2baa1124daa80fdbd7499d246e6b68face2973ffa29570f0b9a35c85fcb6be9c9ed19bec9cbc4a6f94e466f5abc216d9ad2
Binary file added core/classes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions core/classes.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@startuml classes
set namespaceSeparator none
class "Sessions" as core.session.Sessions #aliceblue {
sessions : dict
add_new_session(username: str, db: Database) -> None
get_all_sessions() -> dict
get_session(username: str) -> UserSession
remove_session(username: str) -> None
}
class "UserSession" as core.session.UserSession #aliceblue {
cart : dict
date : datetime, NoneType
db : Database
total_cost : int
username : str
add_new_item(id: str, name: str, price: int, quantity: int, discount: float, tax_rate: float) -> None
empty_cart() -> dict
is_item_in_cart(id: str) -> bool
remove_item(id: str) -> None
submit_cart() -> None
update_item_quantity(id: str, change_to_quantity: int) -> None
update_total_cost() -> None
}
@enduml
Binary file added core/classes_initial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions core/classes_initial.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
@startuml classes
set namespaceSeparator none
class "Sessions" as core.session.Sessions #aliceblue {
sessions : dict
add_new_session(username: str, db: Database) -> None
get_all_sessions() -> dict
get_session(username: str) -> UserSession
remove_session(username: str) -> None
}
class "UserSession" as core.session.UserSession #aliceblue {
cart : dict
date : datetime, NoneType
db : Database
total_cost : int
username : str
add_new_item(id: str, name: str, price: int, quantity: int, discount: float, tax_rate: float) -> None
empty_cart() -> dict
is_item_in_cart(id: str) -> bool
remove_item(id: str) -> None
submit_cart() -> None
update_item_quantity(id: str, change_to_quantity: int) -> None
update_total_cost() -> None
}
@enduml
Binary file added core/packages.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions core/packages.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@startuml packages
set namespaceSeparator none
package "core" as core #aliceblue {
}
package "core.session" as core.session #aliceblue {
}
package "core.utils" as core.utils #aliceblue {
}
core.session --> core.utils
@enduml
Binary file added core/packages_initial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions core/packages_initial.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@startuml packages
set namespaceSeparator none
package "core" as core #aliceblue {
}
package "core.session" as core.session #aliceblue {
}
package "core.utils" as core.utils #aliceblue {
}
core.session --> core.utils
@enduml
Binary file added database/classes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions database/classes.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
@startuml classes
set namespaceSeparator none
class "Database" as database.db.Database #aliceblue {
connection
cursor
database_path : str
get_all_item_ids()
get_all_user_information()
get_cost_by_sale_id(sale_id: int)
get_email_by_username(username: str)
get_first_name_by_username(username: str)
get_full_inventory()
get_full_sale_by_id(sale_id: int)
get_full_sales_information()
get_item_category_by_id(item_id: int)
get_item_id_by_sale_id(sale_id: int)
get_item_image_url_by_id(item_id: int)
get_item_info_by_id(item_id: int)
get_item_name_by_id(item_id: int)
get_item_price_by_id(item_id: int)
get_item_stock_by_id(item_id: int)
get_last_name_by_username(username: str)
get_password_hash_by_username(username: str)
get_quantity_by_sale_id(sale_id: int)
get_sale_date_by_sale_id(sale_id: int)
get_sales_by_cost_range(start_cost: float, end_cost: float)
get_sales_by_date_range(start_date: dt.date, end_date: dt.date)
get_sales_by_item_id(item_id: int)
get_sales_by_quantity_range(start_quantity: int, end_quantity: int)
get_sales_by_transaction_id(transaction_id: int)
get_sales_by_username(username: str)
get_transaction_id_by_sale_id(sale_id: int)
get_username_by_sale_id(sale_id: int)
insert_new_item(item_name: str, price: int, info: str) -> None
insert_new_sale(transaction_id: int, username: str, item_id: int, quantity: int, sale_date: dt.date, cost: float)
insert_user(username: str, password_hash: str, email: str, first_name: str, last_name: str) -> None
set_email(username: str, new_email: str)
set_first_name(username: str, new_first_name: str)
set_item_category(item_id: int, new_category: str)
set_item_image_url(item_id: int, new_image_url: str)
set_item_info(item_id: int, new_info: str)
set_item_name(item_id: int, new_name: str)
set_item_price(item_id: int, new_price: float)
set_item_stock(item_id: int, new_stock: int)
set_last_name(username: str, new_last_name: str)
set_password_hash(username: str, new_password_hash: str)
set_sale_cost(sale_id: int, discount: float, tax: float)
set_sale_date(sale_id: int, new_sale_date: dt.date)
set_sale_item_id(sale_id: int, new_item_id: int)
set_sale_quantity(sale_id: int, new_quantity: int)
set_sale_transaction_id(sale_id: int, new_transaction_id: int)
set_sale_username(sale_id: int, new_username: str)
}
@enduml
2 changes: 1 addition & 1 deletion database/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -718,4 +718,4 @@ def set_sale_cost(self, sale_id: int, discount: float = 0, tax: float = 0.05):

self.cursor.execute(
"UPDATE sales SET cost = ? WHERE id = ?", (new_cost, sale_id))
self.connection.commit()
self.connection.commit()
Binary file added database/diagrams/PullFromDatabase.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions database/diagrams/PullFromDatabase.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@startuml
left to right direction
skinparam packageStyle rectangle
actor customer
actor Database
rectangle checkout {
customer -- (checkout)
(checkout) .> (payment) : include
(checkout) .> (Inventory -1)
(Database) .> (checkout) : extends
(checkout) -- Database
}
@enduml
Binary file added database/diagrams/sequences/UpdatingDatabase.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions database/diagrams/sequences/UpdatingDatabase.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@startuml
participant Participant as Sequence
actor Customer as Sequence1
boundary CartReview as Sequence2
control Payment as Sequence3
entity InventoryReduction as Sequence4
database DatabaseInventoryUpdate as Sequence5
collections NewInventory as Sequence6
queue ConfirmationRestart as Sequence7
Sequence -> Sequence1 : to actor
Sequence -> Sequence2 : To boundary
Sequence -> Sequence3 : To control
Sequence -> Sequence4 : To entity
Sequence -> Sequence5 : To database
Sequence -> Sequence6 : To collections
Sequence -> Sequence7 : To queue
@enduml
Binary file added database/packages.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions database/packages.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@startuml packages
set namespaceSeparator none
package "store.database" as database #aliceblue {
}
package "store.database.db" as database.db #aliceblue {
}
@enduml
3 changes: 1 addition & 2 deletions database/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ CREATE TABLE sales (
cost DECIMAL(10,2) NOT NULL,
FOREIGN KEY (username) REFERENCES users(username),
FOREIGN KEY (item_id) REFERENCES inventory(id)
);

);
8 changes: 4 additions & 4 deletions database/startingData.sql
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ INSERT into `users` (`username`, `password_hash`, `email`, `first_name`, `last_n
VALUES ('bliskov', '1e4b9ae956cad1385cfa6fffd8323dd16c3fe18c54e6447e49bddef2138d042e84e1505a541c6ef19a5026e684b2559efd366145870a0a8d4d4173c0877f6cd2', 'barbara@thor.com', 'Barbara', 'Liskov');

INSERT into `inventory` (`item_name`, `info`, `price`, `stock`, `image_url`, `category`)
VALUES ('Apples', 'An edible cultivation of the Malus genus.', 2.00, 100, 'static/images/apple.jpeg', 'Fruit');
VALUES ('Diamond Ring', 'A luxurious ring with a sparkling diamond as the centerpiece.', 5000.00, 50, 'static/images/diamond_ring.jpeg', 'Jewelry');

INSERT into `inventory` (`item_name`, `info`, `price`, `stock`, `image_url`, `category`)
VALUES ('Bananas', 'A long curved fruit which grows in clusters and has soft pulpy flesh and yellow skin when ripe.', 1.00, 100, 'static/images/banana.jpeg', 'Fruit');
VALUES ('Cuban Link Chain', 'A stylish chain with tightly interlocking links, made of high-quality materials.', 12000.00, 100, 'static/images/cuban_chain.jpeg', 'Jewelry');

INSERT into `inventory` (`item_name`, `info`, `price`, `stock`, `image_url`, `category`)
VALUES ('Mangos', 'The best fruit on the planet.', 4.00, 100, 'static/images/mango.jpeg', 'Fruit');
VALUES ('Diamond Earring', 'Elegant earrings featuring dazzling diamonds that catch the light beautifully.', 3000.00, 100, 'static/images/diamond_earring.jpeg', 'Jewelry');

INSERT into `sales` (`transaction_id`, `username`, `item_id`, `quantity`, `sale_date`, `cost`)
VALUES ('1', 'aturing', '1', 10, '2022-12-21 7:30:30', 5.50);
Expand All @@ -26,4 +26,4 @@ INSERT into `sales` (`transaction_id`, `username`, `item_id`, `quantity`, `sale_
VALUES ('2', 'dritchie', '2', 10, '2022-12-21 7:30:30', 5.50);

INSERT into `sales` (`transaction_id`, `username`, `item_id`, `quantity`, `sale_date`, `cost`)
VALUES ('3', 'llamport', '3', 10, '2022-12-21 7:30:30', 5.50);
VALUES ('3', 'llamport', '3', 10, '2022-12-21 7:30:30', 5.50);
Loading