diff --git a/app/base/routes.py b/app/base/routes.py index e043750..553d30c 100644 --- a/app/base/routes.py +++ b/app/base/routes.py @@ -78,7 +78,7 @@ def decorated(*args, **kwargs): config = { - 'host': '172.20.0.3', + 'host': '172.20.0.2', 'port': 3306, 'user': 'root', 'database': 'mydb', diff --git a/app/base/static/assets/css/app.css b/app/base/static/assets/css/app.css index ea069a9..f04c505 100644 --- a/app/base/static/assets/css/app.css +++ b/app/base/static/assets/css/app.css @@ -41,11 +41,11 @@ body { outline: 0; } .btn { - font-size: 140%; + font-size: 120%; text-transform: uppercase; letter-spacing: 1px; border: 0; - background-color: #16214D; + background-color: #47008a; color: white; } .btn:hover { diff --git a/app/base/static/assets/css/argon.css b/app/base/static/assets/css/argon.css index 79e7290..0e0d9d2 100644 --- a/app/base/static/assets/css/argon.css +++ b/app/base/static/assets/css/argon.css @@ -4339,7 +4339,7 @@ fieldset:disabled a.btn .btn-sm, .btn-group-sm > .btn { - font-size: .75rem; + font-size: .50rem; line-height: 1.5; padding: .25rem .5rem; diff --git a/app/base/static/assets/img/brand/blue.png b/app/base/static/assets/img/brand/blue.png deleted file mode 100644 index 88f515f..0000000 Binary files a/app/base/static/assets/img/brand/blue.png and /dev/null differ diff --git a/app/base/static/assets/img/brand/logo1.png b/app/base/static/assets/img/brand/logo1.png new file mode 100644 index 0000000..9390530 Binary files /dev/null and b/app/base/static/assets/img/brand/logo1.png differ diff --git a/app/base/static/assets/img/brand/logo2.png b/app/base/static/assets/img/brand/logo2.png new file mode 100644 index 0000000..114a243 Binary files /dev/null and b/app/base/static/assets/img/brand/logo2.png differ diff --git a/app/base/static/assets/img/brand/transparent.png b/app/base/static/assets/img/brand/transparent.png new file mode 100644 index 0000000..6f68298 Binary files /dev/null and b/app/base/static/assets/img/brand/transparent.png differ diff --git a/app/base/static/assets/img/brand/users.png b/app/base/static/assets/img/brand/users.png new file mode 100644 index 0000000..23aa0a0 Binary files /dev/null and b/app/base/static/assets/img/brand/users.png differ diff --git a/app/base/templates/accounts/dashboard.html b/app/base/templates/accounts/dashboard.html index 1ebbee7..8758152 100644 --- a/app/base/templates/accounts/dashboard.html +++ b/app/base/templates/accounts/dashboard.html @@ -11,14 +11,14 @@
-

+

-

Welcome {{userinfo['name']}}

- 관리자 등록 - 주최자 등록 - 판매자 등록 - 구매자 등록 - 메인페이지 바로가기 +

안녕하세요, {{userinfo['name']}}님!

+ 관리자 등록 + 주최자 등록 + 판매자 등록 + 구매자 등록 + 메인페이지로 이동
diff --git a/app/base/templates/accounts/home.html b/app/base/templates/accounts/home.html index ae39318..717d280 100644 --- a/app/base/templates/accounts/home.html +++ b/app/base/templates/accounts/home.html @@ -13,10 +13,8 @@
diff --git a/app/base/templates/accounts/index.html b/app/base/templates/accounts/index.html index 25e25d9..a546602 100644 --- a/app/base/templates/accounts/index.html +++ b/app/base/templates/accounts/index.html @@ -33,7 +33,7 @@
개발의 민족
-

Festivals

+

페스티벌 선택하기

@@ -42,12 +42,12 @@

Festivals

- - - - - - + + + + + + @@ -58,7 +58,7 @@

Festivals

- + {% endfor %} diff --git a/app/base/templates/accounts/register_admin.html b/app/base/templates/accounts/register_admin.html index 63efc52..3fecce9 100644 --- a/app/base/templates/accounts/register_admin.html +++ b/app/base/templates/accounts/register_admin.html @@ -11,9 +11,9 @@
-

+

-

Welcome {{userinfo['name']}}

+

관리자 {{userinfo['name']}}님, 안녕하세요!

{% if is_admin %}

관리자 등록이 완료되었습니다.

{% else %} diff --git a/app/base/templates/accounts/register_customer.html b/app/base/templates/accounts/register_customer.html index 828827d..5668cd0 100644 --- a/app/base/templates/accounts/register_customer.html +++ b/app/base/templates/accounts/register_customer.html @@ -11,16 +11,16 @@
주최기관 리스트
- + diff --git a/app/home/templates/index_login.html b/app/home/templates/index_login.html index 43321a9..91f9cf7 100644 --- a/app/home/templates/index_login.html +++ b/app/home/templates/index_login.html @@ -33,7 +33,7 @@
개발의 민족
-

Festivals

+

페스티벌 선택하기

@@ -42,12 +42,12 @@

Festivals

Company nameFestival nameperiodLocationHomepageFood Lists주최기관페스티벌명기간장소홈페이지가게 보러가기
{{ datas[4] }} {{ datas[5] }} {{ datas[6] }}See Foods음식주문
주체기관 명주최기관 명 담당자 담당자 연락처 페스티벌 명
- - - - - - + + + + + + @@ -69,7 +69,7 @@

Festivals

{{ datas[6] }} {% endfor %} diff --git a/app/home/templates/order.html b/app/home/templates/order.html index 6f7780a..076431f 100644 --- a/app/home/templates/order.html +++ b/app/home/templates/order.html @@ -9,7 +9,7 @@
-
Tables
+
결제 페이지
Company nameFestival nameperiodLocationHomepageFood Lists주최기관페스티벌명기간장소홈페이지가게 보러가기
- See Foods + 음식주문
- - - - - + + + + {% for datas in data_list %} @@ -72,4 +67,4 @@

가게 선택하기

{% block javascripts %} -{% endblock javascripts %} +{% endblock javascripts %} \ No newline at end of file diff --git a/app/home/templates/storeMenuList.html b/app/home/templates/storeMenuList.html index 4a0e3ec..a34b3fd 100644 --- a/app/home/templates/storeMenuList.html +++ b/app/home/templates/storeMenuList.html @@ -9,7 +9,7 @@
-
Tables
+
메뉴 선택하기
-
가게 이름가게 설명
가게 이름가게 설명
@@ -48,9 +46,6 @@

가게 선택하기

- 		- {{ datas[1] }} - {{ datas[2] }}
- - - - - - - + + + + + + {% for datas in data_list%} diff --git a/docker-compose.yml b/docker-compose.yml index 5f7c38c..faacb98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,8 @@ services: image: project ports: - "5005:5005" + depends_on: + - mysql-app networks: - project_netowrk @@ -17,7 +19,7 @@ services: volumes: - ./mysql-data:/var/lib/mysql ports: - - 3306:3306 + - 23306:3306 environment: MYSQL_DATABASE: mydb MYSQL_ALLOW_EMPTY_PASSWORD: 'True' @@ -29,4 +31,4 @@ networks: driver: bridge ipam: config: - - subnet: 172.20.0.1/16 + - subnet: 172.20.0.1/16 \ No newline at end of file diff --git a/media/argon-dashboard-flask-intro.gif b/media/argon-dashboard-flask-intro.gif deleted file mode 100644 index 53a31f1..0000000 Binary files a/media/argon-dashboard-flask-intro.gif and /dev/null differ diff --git a/media/argon-dashboard-flask-screen-icons.png b/media/argon-dashboard-flask-screen-icons.png deleted file mode 100644 index e1b6c9f..0000000 Binary files a/media/argon-dashboard-flask-screen-icons.png and /dev/null differ diff --git a/media/argon-dashboard-flask-screen-login.png b/media/argon-dashboard-flask-screen-login.png deleted file mode 100644 index f2a51c1..0000000 Binary files a/media/argon-dashboard-flask-screen-login.png and /dev/null differ diff --git a/media/argon-dashboard-flask-screen-register.png b/media/argon-dashboard-flask-screen-register.png deleted file mode 100644 index 2e818fa..0000000 Binary files a/media/argon-dashboard-flask-screen-register.png and /dev/null differ diff --git a/media/argon-dashboard-flask-screen-tables.png b/media/argon-dashboard-flask-screen-tables.png deleted file mode 100644 index bf10eb2..0000000 Binary files a/media/argon-dashboard-flask-screen-tables.png and /dev/null differ diff --git a/media/argon-dashboard-flask-screen-widgets.png b/media/argon-dashboard-flask-screen-widgets.png deleted file mode 100644 index 398a914..0000000 Binary files a/media/argon-dashboard-flask-screen-widgets.png and /dev/null differ diff --git a/media/argon-dashboard-flask-screen.png b/media/argon-dashboard-flask-screen.png deleted file mode 100644 index 1d92942..0000000 Binary files a/media/argon-dashboard-flask-screen.png and /dev/null differ diff --git a/mysql-data/ib_buffer_pool b/mysql-data/ib_buffer_pool index 03e2509..8157c79 100644 --- a/mysql-data/ib_buffer_pool +++ b/mysql-data/ib_buffer_pool @@ -1,49 +1,44 @@ -54,49 -54,48 -54,47 -54,46 -54,45 -54,44 -54,43 -54,42 -54,41 -54,40 -54,39 -54,38 -54,37 -54,36 -54,35 -3,2 -10,252 -10,270 -10,112 -10,150 -10,16 -10,218 -10,282 -10,308 -10,2 -10,3 +0,403 +0,402 +0,401 +0,400 +0,386 +61,49 +61,48 +61,47 +61,46 +61,45 +61,44 +61,43 +61,42 +61,41 +61,40 +61,39 +61,38 +61,37 +61,36 +61,35 +0,273 +0,270 +3,1 +3,3 +10,130 +10,280 +10,92 +10,158 +10,146 +10,202 +10,34 +10,310 11,5 -11,20 -11,8 -11,29 -11,6 -11,7 +11,2 +11,3 +9,7 9,6 +9,1 9,4 -9,2 -9,3 -8,6 -8,16 -8,8 -8,4 -8,14 -8,10 -8,12 -8,7 -8,2 -8,3 +8,5 +8,9 52,5 52,4 52,3 @@ -73,10 +68,15 @@ 48,1 48,0 47,4 -47,1 47,3 47,2 +47,1 20,3 20,2 20,1 19,3 +19,2 +19,1 +18,3 +18,1 +14,3 diff --git a/mysql-data/ib_logfile0 b/mysql-data/ib_logfile0 index b98c0c4..849d30a 100644 Binary files a/mysql-data/ib_logfile0 and b/mysql-data/ib_logfile0 differ diff --git a/mysql-data/ibdata1 b/mysql-data/ibdata1 index 3ec35d8..7fa16b0 100644 Binary files a/mysql-data/ibdata1 and b/mysql-data/ibdata1 differ diff --git a/mysql-data/mydb/festival.ibd b/mysql-data/mydb/festival.ibd index 7d6d332..669680b 100644 Binary files a/mysql-data/mydb/festival.ibd and b/mysql-data/mydb/festival.ibd differ diff --git a/mysql-data/mydb/menu.ibd b/mysql-data/mydb/menu.ibd index 97d975d..2d15fb6 100644 Binary files a/mysql-data/mydb/menu.ibd and b/mysql-data/mydb/menu.ibd differ diff --git a/mysql-data/mydb/order_detail.ibd b/mysql-data/mydb/order_detail.ibd index 5679aba..99099c2 100644 Binary files a/mysql-data/mydb/order_detail.ibd and b/mysql-data/mydb/order_detail.ibd differ diff --git a/mysql-data/mydb/orders.ibd b/mysql-data/mydb/orders.ibd index 03904bd..cdfc270 100644 Binary files a/mysql-data/mydb/orders.ibd and b/mysql-data/mydb/orders.ibd differ diff --git a/mysql-data/mydb/store.ibd b/mysql-data/mydb/store.ibd index a143e8e..0ca2525 100644 Binary files a/mysql-data/mydb/store.ibd and b/mysql-data/mydb/store.ibd differ diff --git a/mysql-data/mydb/users.ibd b/mysql-data/mydb/users.ibd index ef512e9..44c0a14 100644 Binary files a/mysql-data/mydb/users.ibd and b/mysql-data/mydb/users.ibd differ diff --git a/mysql-data/mysql/innodb_index_stats.ibd b/mysql-data/mysql/innodb_index_stats.ibd index ff80b2e..a798b51 100644 Binary files a/mysql-data/mysql/innodb_index_stats.ibd and b/mysql-data/mysql/innodb_index_stats.ibd differ diff --git a/mysql-data/mysql/innodb_table_stats.ibd b/mysql-data/mysql/innodb_table_stats.ibd index c5377c0..dc1f3d2 100644 Binary files a/mysql-data/mysql/innodb_table_stats.ibd and b/mysql-data/mysql/innodb_table_stats.ibd differ
-
메뉴이름가격수량선택
메뉴이름가격수량선택