Skip to content
This repository was archived by the owner on May 11, 2024. It is now read-only.

Commit a0c8b9b

Browse files
hardingadonishardingadonis
committed
Re-structure project
1 parent e6bdbea commit a0c8b9b

37 files changed

+48
-21
lines changed

‎.gitignore

+32-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,32 @@
1-
/project_team2/target/
1+
# Compiled class file
2+
*.class
3+
4+
# Log file
5+
*.log
6+
7+
# BlueJ files
8+
*.ctxt
9+
10+
# Mobile Tools for Java (J2ME)
11+
.mtj.tmp/
12+
13+
# Package Files #
14+
*.jar
15+
*.war
16+
*.nar
17+
*.ear
18+
*.zip
19+
*.tar.gz
20+
*.rar
21+
22+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
23+
hs_err_pid*
24+
replay_pid*
25+
26+
# Maven
27+
target/
28+
29+
# NetBeans
30+
nbproject/
31+
nb-configuration.xml
32+
server/*.war

‎README.md

+16-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
1-
# PRJ301_Team2
1+
# Flower Shop
2+
![GitHub top language](https://img.shields.io/github/languages/top/bakaqc/flower)
3+
![GitHub repo size](https://img.shields.io/github/repo-size/bakaqc/flower)
4+
![GitHub License](https://img.shields.io/github/license/bakaqc/flower)
5+
6+
## Requirements
7+
- JDK 8
8+
- MySQL 8.1.0
9+
- Tomcat 8.5
10+
- Maven 3+
11+
12+
## Contributors:
13+
14+
<a href="https://github.com/bakaqc/flower/graphs/contributors">
15+
<img src="https://contrib.rocks/image?repo=bakaqc/flower" />
16+
</a>

‎project_team2/pom.xml ‎pom.xml

File renamed without changes.

‎project_team2/nb-configuration.xml

-19
This file was deleted.

‎project_team2/src/main/java/com/bakaqc/flower/controller/AdminController.java ‎src/main/java/com/bakaqc/flower/controller/AdminController.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/controller/CategoriesController.java ‎src/main/java/com/bakaqc/flower/controller/CategoriesController.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/controller/HomeController.java ‎src/main/java/com/bakaqc/flower/controller/HomeController.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/dao/AdminDAO.java ‎src/main/java/com/bakaqc/flower/dao/AdminDAO.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/dao/CartDAO.java ‎src/main/java/com/bakaqc/flower/dao/CartDAO.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/dao/CategoriesDAO.java ‎src/main/java/com/bakaqc/flower/dao/CategoriesDAO.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/dao/DAO.java ‎src/main/java/com/bakaqc/flower/dao/DAO.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/dao/DataOrderDAO.java ‎src/main/java/com/bakaqc/flower/dao/DataOrderDAO.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/dao/OrderDAO.java ‎src/main/java/com/bakaqc/flower/dao/OrderDAO.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/dao/ProductDAO.java ‎src/main/java/com/bakaqc/flower/dao/ProductDAO.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/dao/UserDAO.java ‎src/main/java/com/bakaqc/flower/dao/UserDAO.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/Admin.java ‎src/main/java/com/bakaqc/flower/model/Admin.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/Cart.java ‎src/main/java/com/bakaqc/flower/model/Cart.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/Categories.java ‎src/main/java/com/bakaqc/flower/model/Categories.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/DataOrder.java ‎src/main/java/com/bakaqc/flower/model/DataOrder.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/Order.java ‎src/main/java/com/bakaqc/flower/model/Order.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/Product.java ‎src/main/java/com/bakaqc/flower/model/Product.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/User.java ‎src/main/java/com/bakaqc/flower/model/User.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/option/AdminRole.java ‎src/main/java/com/bakaqc/flower/model/option/AdminRole.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/option/OrderStatus.java ‎src/main/java/com/bakaqc/flower/model/option/OrderStatus.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/option/Payment.java ‎src/main/java/com/bakaqc/flower/model/option/Payment.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/option/UserGender.java ‎src/main/java/com/bakaqc/flower/model/option/UserGender.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/model/option/UserStatus.java ‎src/main/java/com/bakaqc/flower/model/option/UserStatus.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/service/Convert.java ‎src/main/java/com/bakaqc/flower/service/Convert.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/service/Hash.java ‎src/main/java/com/bakaqc/flower/service/Hash.java

File renamed without changes.

‎project_team2/src/main/java/com/bakaqc/flower/service/JDBC.java ‎src/main/java/com/bakaqc/flower/service/JDBC.java

File renamed without changes.

‎project_team2/src/main/webapp/META-INF/context.xml ‎src/main/webapp/META-INF/context.xml

File renamed without changes.

‎project_team2/src/main/webapp/WEB-INF/web.xml ‎src/main/webapp/WEB-INF/web.xml

File renamed without changes.

‎project_team2/src/main/webapp/img/banner.png ‎src/main/webapp/img/banner.png

File renamed without changes.

‎project_team2/src/main/webapp/style/admin.css ‎src/main/webapp/style/admin.css

File renamed without changes.

‎project_team2/src/main/webapp/style/home.css ‎src/main/webapp/style/home.css

File renamed without changes.

‎project_team2/src/main/webapp/view/admin.jsp ‎src/main/webapp/view/admin.jsp

File renamed without changes.

‎project_team2/src/main/webapp/view/home.jsp ‎src/main/webapp/view/home.jsp

File renamed without changes.

0 commit comments

Comments
 (0)