meiri/alkator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: meiri:fe6ef0d4a198a71498b49986f1afff4c42032855
Branches Tags
meiri:beta
meiri:master
..
compare: meiri:7c7f554fd0dead6a7d7d306b190e989637ad4d66
Branches Tags
meiri:beta
meiri:master

No commits in common. "fe6ef0d4a198a71498b49986f1afff4c42032855" and "7c7f554fd0dead6a7d7d306b190e989637ad4d66" have entirely different histories.
fe6ef0d4a1 ... 7c7f554fd0

2 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

8
alkator/settings.py
View File

@ -32,7 +32,6 @@ CSRF_TRUSTED_ORIGINS = ['https://alkator.cz', 'https://beta.alkator.cz']
# Application definition
INSTALLED_APPS = [
'daphne',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
@ -71,7 +70,6 @@ TEMPLATES = [
]
WSGI_APPLICATION = 'alkator.wsgi.application'
ASGI_APPLICATION = 'alkator.asgi.application'
SESSION_COOKIE_SECURE = True
@ -86,9 +84,9 @@ DATABASES = {
}
COMGATE_MERCHANT = 485044
COMGATE_TEST = False
COMGATE_SECRET = '4c36b7faf40575073b26570066ca2a9f'
COMGATE_MERCHANT = 484757
COMGATE_TEST = True
COMGATE_SECRET = '2c07bfabd1a5e4a312dc49929de60aa2'
ADMINS = [('Martin Quarda', 'martin@quarda.cz')]

4
frontend/src/scripts/index.js
View File

@ -304,7 +304,7 @@ class Main extends Component {
<li class="nav-item">
<a class="nav-link" href="#payment">Platba</a>
</li>
{/*Object.keys(this.state.login_status).length === 0 &&
{Object.keys(this.state.login_status).length === 0 &&
<li class="nav-item">
<a class="nav-link" href="#login">Přihlášení</a>
</li>
@ -338,7 +338,7 @@ class Main extends Component {
<li class="nav-item">
<a class="nav-link" href="#cart">Košík</a>
</li>
*/}
}
</ul>
</div>
</nav>