Skip to content

Commit eae454e

Browse files
authored
Merge pull request #103 from pythonkr/devdev
후원사 목록 추가
2 parents d334536 + b39771a commit eae454e

File tree

80 files changed

+2374
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2374
-100
lines changed

.github/workflows/deploy_on_dev.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ on:
77

88
jobs:
99
build:
10-
10+
if: github.repository_owner == 'pythonkr'
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
1414
python-version: [3.9]
1515

1616
steps:
1717
- uses: actions/checkout@v2
18-
- uses: psf/black@stable
19-
with:
20-
options: "--check --verbose"
18+
#- uses: psf/black@stable
19+
# with:
20+
# options: "--check --verbose"
2121

2222
- name: Set up Python ${{ matrix.python-version }}
2323
uses: actions/setup-python@v2
@@ -62,23 +62,23 @@ jobs:
6262
- name: Setup Auth for Private Repo
6363
uses: webfactory/[email protected]
6464
with:
65-
ssh-private-key: ${{ secrets.SSH_SECRET_GOLONY }}
65+
ssh-private-key: ${{ secrets.SSH_SECRET_GOLONY }}
6666
# ssh-private-key: ${{ secrets.GH_PYCONKR_SECRETS }}
6767

6868
- name: update pyconkr-secretes
6969
run: |
70-
chmod 775 ./update_secrets.sh
71-
./update_secrets.sh
72-
73-
# - name: Test with Django Test
74-
# run: |
75-
# source ./zappa-env/bin/activate
76-
# python manage.py test
77-
#
78-
# - name: Test with pytest
79-
# run: |
80-
# source ./zappa-env/bin/activate
81-
# pytest .
70+
chmod 775 ./update_secrets.sh
71+
./update_secrets.sh
72+
73+
# - name: Test with Django Test
74+
# run: |
75+
# source ./zappa-env/bin/activate
76+
# python manage.py test
77+
#
78+
# - name: Test with pytest
79+
# run: |
80+
# source ./zappa-env/bin/activate
81+
# pytest .
8282

8383
- name: Configure AWS Credentials
8484
uses: aws-actions/configure-aws-credentials@v1
@@ -94,8 +94,7 @@ jobs:
9494
run: |
9595
source ./zappa-env/bin/activate
9696
zappa update dev2023
97-
# zappa manage dev2023 "collectstatic --no-input"
98-
97+
# zappa manage dev2023 "collectstatic --no-input"
9998
- name: Collect Static Files to S3
10099
env:
101100
AWS_ACCESS_KEY_ID: ${{ secrets.PYCON_DEV_2023_AWS_KEY }}

.github/workflows/deploy_on_prod.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ on:
77

88
jobs:
99
build:
10+
if: github.repository_owner == 'pythonkr'
1011
runs-on: ubuntu-latest
1112
strategy:
1213
matrix:
1314
python-version: [3.9]
1415

1516
steps:
1617
- uses: actions/checkout@v2
17-
- uses: psf/black@stable
18-
with:
19-
options: "--check --verbose"
18+
#- uses: psf/black@stable
19+
# with:
20+
# options: "--check --verbose"
2021

2122
- name: Set up Python ${{ matrix.python-version }}
2223
uses: actions/setup-python@v2
@@ -61,23 +62,23 @@ jobs:
6162
- name: Setup Auth for Private Repo
6263
uses: webfactory/[email protected]
6364
with:
64-
ssh-private-key: ${{ secrets.SSH_SECRET_GOLONY }}
65+
ssh-private-key: ${{ secrets.SSH_SECRET_GOLONY }}
6566
# ssh-private-key: ${{ secrets.GH_PYCONKR_SECRETS }}
6667

6768
- name: update pyconkr-secretes
6869
run: |
69-
chmod 775 ./update_secrets.sh
70-
./update_secrets.sh
71-
72-
# - name: Test with Django Test
73-
# run: |
74-
# source ./zappa-env/bin/activate
75-
# python manage.py test
76-
#
77-
# - name: Test with pytest
78-
# run: |
79-
# source ./zappa-env/bin/activate
80-
# pytest .
70+
chmod 775 ./update_secrets.sh
71+
./update_secrets.sh
72+
73+
# - name: Test with Django Test
74+
# run: |
75+
# source ./zappa-env/bin/activate
76+
# python manage.py test
77+
#
78+
# - name: Test with pytest
79+
# run: |
80+
# source ./zappa-env/bin/activate
81+
# pytest .
8182

8283
- name: Configure AWS Credentials
8384
uses: aws-actions/configure-aws-credentials@v1
@@ -93,8 +94,7 @@ jobs:
9394
run: |
9495
source ./zappa-env/bin/activate
9596
zappa update prod2023
96-
# zappa manage prod2023 "collectstatic --no-input"
97-
97+
# zappa manage prod2023 "collectstatic --no-input"
9898
- name: Collect Static Files to S3
9999
env:
100100
AWS_ACCESS_KEY_ID: ${{ secrets.PYCON_DEV_2023_AWS_KEY }}
@@ -103,4 +103,4 @@ jobs:
103103
AWS_S3_SECRET_ACCESS_KEY: ${{ secrets.PYCON_DEV_2023_AWS_SECRET }}
104104
run: |
105105
source ./zappa-env/bin/activate
106-
python manage.py collectstatic --no-input --settings=pyconkr.settings-prod
106+
python manage.py collectstatic --no-input --settings=pyconkr.settings-prod

.github/workflows/pull-request-merge-precondition.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ jobs:
2020
persist-credentials: true # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
2121
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
2222

23-
- uses: psf/black@stable
24-
with:
25-
options: "--check --verbose"
23+
#- uses: psf/black@stable
24+
# with:
25+
# options: "--check --verbose"
2626

27-
- uses: isort/isort-action@master
28-
with:
29-
configuration: "--check-only --diff"
30-
requirementsFiles: "requirements.txt"
27+
#- uses: isort/isort-action@master
28+
# with:
29+
# configuration: "--check-only --diff"
30+
# requirementsFiles: "requirements.txt"
3131

3232
- name: install dependencies
3333
run: |

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
* mysql-client 설치
1010
* mac
1111
* brew install mysql-client
12-
* pip install -r requirements.txt
12+
* pip install -r requirements-local.txt
13+
* based on sqlite3
1314

1415
## how to run localtesting ( sqlite3 based )
1516
```

account/__init__.py

Whitespace-only changes.

account/apps.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from django.apps import AppConfig
2+
3+
4+
class AccountConfig(AppConfig):
5+
default_auto_field = "django.db.models.BigAutoField"
6+
name = "account"

account/logics.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import base64
2+
3+
4+
def get_basic_auth_token(username: str, password: str) -> str:
5+
userpass = username + ':' + password
6+
encoded_u = base64.b64encode(userpass.encode()).decode()
7+
8+
return encoded_u

account/migrations/__init__.py

Whitespace-only changes.

account/templates/_base.html

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{% load static %}
2+
<!DOCTYPE html>
3+
<html lang="en">
4+
<head>
5+
<title>
6+
{% block title %}
7+
{% endblock title %}
8+
</title>
9+
<meta charset="UTF-8">
10+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
11+
<script src="https://cdn.tailwindcss.com"></script>
12+
<script>
13+
tailwind.config = {
14+
theme: {
15+
extend: {
16+
colors: {
17+
clifford: '#da373d',
18+
}
19+
}
20+
}
21+
}
22+
</script>
23+
</head>
24+
<body class="bg-green-50">
25+
<div class="container mx-auto mt-4">
26+
{% block content %}
27+
{% endblock content %}
28+
</div>
29+
</body>
30+
</html>
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{% extends "_base.html" %}
2+
{% block content %}
3+
<table class="table-auto">
4+
<thead>
5+
<tr>
6+
<th>id </th>
7+
<th>user</th>
8+
<th>금액</th>
9+
<th>결제일 </th>
10+
<th>취소</th>
11+
</tr>
12+
</thead>
13+
<tbody>
14+
{% for ticket in ticket_list %}
15+
<tr>
16+
<td>{{ ticket.id }}</td>
17+
<td>{{ ticket.payment.money }}</td>
18+
<td>{{ ticket.create_at }}</td>
19+
<td>
20+
<button class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
21+
Button
22+
</button>
23+
24+
</td>
25+
</tr>
26+
{% endfor %}
27+
</tbody>
28+
</table>
29+
{% endblock content %}

0 commit comments

Comments
 (0)