Skip to content

Jan 2 #40

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.

Sign up for GitHub

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
janine-kang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Jan 2 #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
232eab1
update css
janine-kang Apr 26, 2021
2703a16
modified css
janine-kang Apr 26, 2021
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
2 changes: 1 addition & 1 deletion app/base/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions app/base/static/assets/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/base/static/assets/css/argon.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Binary file removed app/base/static/assets/img/brand/blue.png
View file
Open in desktop
Binary file not shown.
Binary file added app/base/static/assets/img/brand/logo1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/base/static/assets/img/brand/logo2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/base/static/assets/img/brand/transparent.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/base/static/assets/img/brand/users.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions app/base/templates/accounts/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
<div class="container">
<div class="login-page clearfix">
<div class="logged-in-box auth0-box logged-in">
<h1 id="logo"><img src="//cdn.auth0.com/samples/auth0_logo_final_blue_RGB.png" /></h1>
<h1 id="logo"><img src="/static/assets/img/brand/transparent.png" /></h1>
<img class="avatar" src="{{userinfo['picture']}}"/>
<h2>Welcome {{userinfo['name']}}</h2>
<a id="qsLogoutBtn" class="btn btn-primary btn-lg btn-logout btn-block" href="/register_admin">관리자 등록</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-lg btn-logout btn-block" href="/register_org">주최자 등록</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-lg btn-logout btn-block" href="/register_seller">판매자 등록</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-lg btn-logout btn-block" href="/register_customer">구매자 등록</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-lg btn-logout btn-block" href="/index_login">메인페이지 바로가기</a>
<h2>안녕하세요, {{userinfo['name']}}님!</h2>
<a id="qsLogoutBtn" class="btn btn-primary btn-sm btn-logout btn-block" href="/register_admin">관리자 등록</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-sm btn-logout btn-block" href="/register_org">주최자 등록</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-sm btn-logout btn-block" href="/register_seller">판매자 등록</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-sm btn-logout btn-block" href="/register_customer">구매자 등록</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-sm btn-logout btn-block" href="/index">메인페이지로 이동</a>
</div>
</div>
</div>
Expand Down
6 changes: 2 additions & 4 deletions app/base/templates/accounts/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@
<div class="container">
<div class="login-page clearfix">
<div class="login-box auth0-box before">
<img src="https://i.cloudup.com/StzWWrY34s.png" />
<h3>User Login</h3>
<p>Google, Kakao, Accounts</p>
<a id="qsLoginBtn" class="btn btn-primary btn-lg btn-login btn-block" href="/login_auth">Log In</a>
<img src="/static/assets/img/brand/users.png">
<a id="qsLoginBtn" class="btn btn-primary btn-lg btn-login btn-block" href="/login_auth">로그인하기</a>
</div>
</div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions app/base/templates/accounts/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h6 class="h2 text-white d-inline-block mb-0">개발의 민족</h6>
<div class="card-header border-0">
<div class="row align-items-center">
<div class="col">
<h3 class="mb-0">Festivals</h3>
<h3 class="mb-0">페스티벌 선택하기</h3>
</div>
</div>
</div>
Expand All @@ -42,12 +42,12 @@ <h3 class="mb-0">Festivals</h3>
<table class="table">
<thead class="thead-light">
<tr>
<th scope="col">Company name</th>
<th scope="col">Festival name</th>
<th scope="col">period</th>
<th scope="col">Location</th>
<th scope="col">Homepage</th>
<th scope="col">Food Lists</th>
<th scope="col">주최기관</th>
<th scope="col">페스티벌명</th>
<th scope="col">기간</th>
<th scope="col">장소</th>
<th scope="col">홈페이지</th>
<th scope="col">가게 보러가기</th>
</tr>
</thead>
<tbody>
Expand All @@ -58,7 +58,7 @@ <h3 class="mb-0">Festivals</h3>
<td>{{ datas[4] }}</td>
<td>{{ datas[5] }}</td>
<td><a href="{{ datas[6] }}">{{ datas[6] }}</td>
<td><a href="/storeMenuList" class="btn btn-sm btn-primary">See Foods</a></td>
<td><a href="/login_user" class="btn btn-sm btn-primary">음식주문</a></td>
</tr>
{% endfor %}
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions app/base/templates/accounts/register_admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<div class="container">
<div class="login-page clearfix">
<div class="logged-in-box auth0-box logged-in">
<h1 id="logo"><img src="//cdn.auth0.com/samples/auth0_logo_final_blue_RGB.png" /></h1>
<h1 id="logo"><img src="/static/assets/img/brand/transparent.png" /></h1>
<img class="avatar" src="{{userinfo['picture']}}"/>
<h2>Welcome {{userinfo['name']}}</h2>
<h2>관리자 {{userinfo['name']}}님, 안녕하세요!</h2>
{% if is_admin %}
<h2>관리자 등록이 완료되었습니다.</h2>
{% else %}
Expand Down
6 changes: 3 additions & 3 deletions app/base/templates/accounts/register_customer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
<div class="container">
<div class="login-page clearfix">
<div class="logged-in-box auth0-box logged-in">
<h1 id="logo"><img src="//cdn.auth0.com/samples/auth0_logo_final_blue_RGB.png" /></h1>
<h1 id="logo"><img src="/static/assets/img/brand/transparent.png"/></h1>
<img class="avatar" src="{{userinfo['picture']}}"/>
<h2>Welcome {{userinfo['name']}}</h2>
<h2>{{userinfo['name']}}님, 안녕하세요!</h2>
{% if is_buyer %}
<h2>구매자 등록이 완료되었습니다.</h2>
{% else %}
<h2>이미 등록되었습니다.</h2>
{% endif %}
{% if user == "customer" %}
<a id="qsLogoutBtn" class="btn btn-primary btn-lg btn-logout btn-block" href="/index_login">홈페이지</a>
<a id="qsLogoutBtn" class="btn btn-primary btn-lg btn-logout btn-block" href="/index_login">홈페이지로 이동</a>
{% else%}
<a id="qsLogoutBtn" class="btn btn-primary btn-lg btn-logout btn-block" href="/dashboard">
올바른 권한이 아닙니다.
Expand Down
4 changes: 2 additions & 2 deletions app/base/templates/accounts/register_org.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<div class="container">
<div class="login-page clearfix">
<div class="logged-in-box auth0-box logged-in">
<h1 id="logo"><img src="//cdn.auth0.com/samples/auth0_logo_final_blue_RGB.png" /></h1>
<h1 id="logo"><img src="/static/assets/img/brand/transparent.png" /></h1>
<img class="avatar" src="{{userinfo['picture']}}"/>
<h2>Welcome {{userinfo['name']}}</h2>
<h2>주최자 {{userinfo['name']}}님, 안녕하세요!</h2>
{% if is_org %}
<h2>주최자 등록이 완료되었습니다.</h2>
{% else %}
Expand Down
4 changes: 2 additions & 2 deletions app/base/templates/accounts/register_seller.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<div class="container">
<div class="login-page clearfix">
<div class="logged-in-box auth0-box logged-in">
<h1 id="logo"><img src="//cdn.auth0.com/samples/auth0_logo_final_blue_RGB.png" /></h1>
<h1 id="logo"><img src="/static/assets/img/brand/transparent.png" /></h1>
<img class="avatar" src="{{userinfo['picture']}}"/>
<h2>Welcome {{userinfo['name']}}</h2>
<h2>판매자 {{userinfo['name']}}님, 안녕하세요!</h2>
{% if is_seller %}
<h2>판매자 등록이 완료되었습니다.</h2>
{% else %}
Expand Down
6 changes: 3 additions & 3 deletions app/base/templates/includes/footer-fullscreen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<div class="col-xl-6">
<div class="copyright text-center text-xl-left text-muted">
<a target="_blank"
href="https://www.creative-tim.com/product/argon-dashboard-flask"
href=#!
class="font-weight-bold ml-1" target="_blank">개발의 민족 PROJECT</a>
</div>
</div>
<div class="col-xl-6">
<div class="text-center text-xl-right text-muted">
<a href="https://www.creative-tim.com"
<a href=#!
class="font-weight-bold ml-1" target="_blank"> &copy; Creative-개발의 민족</a>
- coded by <a target="_blank" href="https://appseed.us">AppSeed</a>
- coded by <a target="_blank" href="https://github.com/Dev-People-Project">Us</a>
</div>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/base/templates/includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<div class="col-xl-6">
<div class="text-center text-xl-left text-muted">
<a target="_blank"
href="https://www.creative-tim.com/product/argon-dashboard-flask"
href=#!
class="font-weight-bold ml-1" target="_blank">개발의 민족 프로젝트</a>
</div>
</div>
<div class="col-xl-6">
<div class="text-center text-xl-right text-muted">
<a href="https://www.creative-tim.com"
<a href=#!
class="font-weight-bold ml-1" target="_blank"> &copy; Creative-개발의 민족</a>
- coded by <a target="_blank" href="https://appseed.us">AppSeed</a>
- coded by <a target="_blank" href="https://github.com/Dev-People-Project">Us</a>
</div>
</div>
</div>
Expand Down
24 changes: 5 additions & 19 deletions app/base/templates/includes/navigation-fullscreen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<nav id="navbar-main" class="navbar navbar-horizontal navbar-transparent navbar-main navbar-expand-lg navbar-light">
<div class="container">
<a class="navbar-brand" href="/">
<img src="/static/assets/img/brand/white.png" alt="Argon Design - Jinja Template Logo.">
<img src="/static/assets/img/brand/logo1.png" alt="Argon Design - Jinja Template Logo.">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse" aria-controls="navbar-collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
Expand All @@ -11,7 +11,7 @@
<div class="row">
<div class="col-6 collapse-brand">
<a href="dashboard.html">
<img src="/static/assets/img/brand/blue.png">
<img src="/static/assets/img/brand/logo1.png">
</a>
</div>
<div class="col-6 collapse-close">
Expand All @@ -23,32 +23,18 @@
</div>
</div>
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a target="_blank"
href="https://www.creative-tim.com/product/argon-dashboard-flask" class="nav-link">
<span class="nav-link-inner--text">Product Info</span>
</a>
</li>

</ul>
<hr class="d-lg-none" />
<ul class="navbar-nav align-items-lg-center ml-lg-auto">
</li>
<li class="nav-item">
<li class="nav-item d-none d-lg-block ml-lg-4">
<a class="nav-link nav-link-icon"
href="https://github.com/creativetimofficial/argon-dashboard-flask"
href="https://github.com/Dev-People-Project"
target="_blank" data-toggle="tooltip" data-original-title="Star us on Github">
<i class="fab fa-github"></i>
<span class="nav-link-inner--text d-lg-none">Github</span>
</a>
</li>
<li class="nav-item d-none d-lg-block ml-lg-4">
<a href="https://www.creative-tim.com/templates/flask" target="_blank" class="btn btn-neutral btn-icon">
<span class="btn-inner--icon">
<i class="fas fa-shopping-cart mr-2"></i>
</span>
<span class="nav-link-inner--text">More Starters</span>
</a>
</li>
</ul>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion app/base/templates/includes/navigation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
</span>
<div class="media-body ml-2 d-none d-lg-block">
<span class="mb-0 text-sm font-weight-bold">
{{ user_data }}님
</span>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/base/templates/includes/sidenav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<div class="scrollbar-inner">
<!-- Brand -->
<div class="sidenav-header align-items-center">
<a class="navbar-brand" href="/index_login">
<img src="/static/assets/img/brand/blue.png" class="navbar-brand-img"
<a class="navbar-brand" href="/index">
<img src="/static/assets/img/brand/logo1.png" class="navbar-brand-img"
alt="Argon Dashboard - Flask Template Logo.">
</a>
</div>
Expand All @@ -15,7 +15,7 @@
<li class="nav-item">
<a class="nav-link {% if 'index2' in segment %} active {% endif %}" href="/orderState">
<i class="ni ni-tv-2 text-primary"></i>
<span class="nav-link-text">주문 상세</span>
<span class="nav-link-text">서비스 보기</span>
</a>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions app/base/templates/includes/sidenav_init.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- Brand -->
<div class="sidenav-header align-items-center">
<a class="navbar-brand" href="/index">
<img src="/static/assets/img/brand/blue.png" class="navbar-brand-img" alt="Argon Dashboard - Flask Template Logo.">
<img src="/static/assets/img/brand/logo1.png" class="navbar-brand-img">
</a>
</div>
<div class="navbar-inner">
Expand All @@ -14,7 +14,7 @@
<li class="nav-item">
<a class="nav-link {% if 'index2' in segment %} active {% endif %}" href="/order_state">
<i class="ni ni-tv-2 text-primary"></i>
<span class="nav-link-text">order_state</span>
<span class="nav-link-text">서비스 보기</span>
</a>
</li>
</ul>
Expand Down
8 changes: 1 addition & 7 deletions app/base/templates/layouts/base-fullscreen.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,8 @@
<div class="col-lg-5 col-md-6">
<h1 class="text-white">
<h1 class="text-white">
<a target="_blank" class="text-white"
href="https://www.creative-tim.com/product/argon-dashboard-flask">Argon Dashboard Flask</a>
<a>🍔 개발의 민족팀 Service 🍔</a>
</h1>
<p class="text-lead text-light">
UI-Ready open-source admin panel enhanced with database and authentication -
Coded by <a target="_blank" class="text-white" href="https://www.creative-tim.com/">Creative-Tim</a>
and <a target="_blank" class="text-white" href="https://appseed.us">AppSeed</a>.
</p>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/home/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


config = {
'host': '172.20.0.3',
'host': '172.20.0.2',
'port': 3306,
'user': 'root',
'database': 'mydb',
Expand Down
2 changes: 1 addition & 1 deletion app/home/templates/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h3 class="mb-0">관리자 메인 리스트</h3>

<tr>
<h5 class="mb-0">주최기관 리스트</h5>
<th scope="col">주체기관 명</th>
<th scope="col">주최기관 명</th>
<th scope="col">담당자</th>
<th scope="col">담당자 연락처</th>
<th scope="col">페스티벌 명</th>
Expand Down
16 changes: 8 additions & 8 deletions app/home/templates/index_login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h6 class="h2 text-white d-inline-block mb-0">개발의 민족</h6>
<div class="card-header border-0">
<div class="row align-items-center">
<div class="col">
<h3 class="mb-0">Festivals</h3>
<h3 class="mb-0">페스티벌 선택하기</h3>
</div>
</div>
</div>
Expand All @@ -42,12 +42,12 @@ <h3 class="mb-0">Festivals</h3>
<table class="table align-items-center table-flush">
<thead class="thead-light">
<tr>
<th scope="col">Company name</th>
<th scope="col">Festival name</th>
<th scope="col">period</th>
<th scope="col">Location</th>
<th scope="col">Homepage</th>
<th scope="col">Food Lists</th>
<th scope="col">주최기관</th>
<th scope="col">페스티벌명</th>
<th scope="col">기간</th>
<th scope="col">장소</th>
<th scope="col">홈페이지</th>
<th scope="col">가게 보러가기</th>
</tr>
</thead>
<tbody>
Expand All @@ -69,7 +69,7 @@ <h3 class="mb-0">Festivals</h3>
<a href="{{ datas[6] }}">{{ datas[6] }}
</td>
<td>
<a href="storeList/{{datas[0]}}" class="btn btn-sm btn-primary">See Foods</a>
<a href="storeList/{{datas[0]}}" class="btn btn-sm btn-primary">음식주문</a>
</td>
</tr>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion app/home/templates/order.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="header-body">
<div class="row align-items-center py-4">
<div class="col-lg-6 col-7">
<h6 class="h2 text-white d-inline-block mb-0">Tables</h6>
<h6 class="h2 text-white d-inline-block mb-0">결제 페이지</h6>
<nav aria-label="breadcrumb" class="d-none d-md-inline-block ml-md-4">
<ol class="breadcrumb breadcrumb-links breadcrumb-dark">
<li class="breadcrumb-item"><a href="/index_login"><i class="fas fa-home"></i></a></li>
Expand Down
2 changes: 1 addition & 1 deletion app/home/templates/orderState.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="header-body">
<div class="row align-items-center py-4">
<div class="col-lg-6 col-7">
<h6 class="h2 text-white d-inline-block mb-0">Tables</h6>
<h6 class="h2 text-white d-inline-block mb-0">주문 상세 페이지</h6>
<nav aria-label="breadcrumb" class="d-none d-md-inline-block ml-md-4">
<ol class="breadcrumb breadcrumb-links breadcrumb-dark">
<li class="breadcrumb-item"><a href="/index_login"><i class="fas fa-home"></i></a></li>
Expand Down
Loading