diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 7c33e76..ef698e2 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -2,29 +2,29 @@ name: Deploy to Lambda with Zappa on: push: - branches: - - master + branches: + - master jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Set up Python 3.8 - uses: actions/setup-python@v1 - with: - python-version: 3.8 - - name: run venv - run: | - python -m venv venv - source venv/bin/activate - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - - name: deploy with zappa - env: - AWS_ACCESS_KEY_ID: ${{ secrets.EVERY_CAL_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.EVERY_CAL_SECRET_KEY_ID }} - run: | - zappa update dev + - uses: actions/checkout@v1 + - name: Set up Python 3.8 + uses: actions/setup-python@v1 + with: + python-version: 3.8 + - name: run venv + run: | + python -m venv venv + source venv/bin/activate + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + - name: deploy with zappa + env: + AWS_ACCESS_KEY_ID: ${{ secrets.EVERY_CAL_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.EVERY_CAL_SECRET_KEY_ID }} + run: | + zappa update dev diff --git a/README.md b/README.md index 07d2df4..a54aa33 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Every2Cal은 Everytime 시간표를 .ics 형식으로 내보내주는 Python 프로그램입니다. Everytime 앱 보다 캘린더로 일정을 관리하는게 편한 마음에 항상 Everytime 시간표를 수기로 캘린더에 적곤 했습니다. - + 그 수고로움을 덜고자 개발했습니다. ## 어떻게 사용하나요? diff --git a/convert.py b/convert.py index f7ad1a9..8d0b3e1 100644 --- a/convert.py +++ b/convert.py @@ -52,7 +52,6 @@ def get_calendar(self, timetable, start_date, end_date, id): event.add('rrule', {'freq': 'WEEKLY', 'until': parser.parse(end_date)}) cal.add_component(event) - if len(str(cal.to_ical())) <= 39: return None else: diff --git a/everycal.drawio.svg b/everycal.drawio.svg index 2bdf714..3733d44 100644 --- a/everycal.drawio.svg +++ b/everycal.drawio.svg @@ -1,4 +1,190 @@ -
Client
Client
kro.kr
kro.kr
API Gate Way
API Gate Way
Lambda
Lambda
S3
S3

AWS

AWSViewer does not support full SVG 1.1 \ No newline at end of file + + + + + + + + + + +
+
+
+ Client +
+
+
+ + + Client + + + + + + + + + +
+
+
+ kro.kr +
+
+
+ + + kro.kr + + + + + + + + + + +
+
+
+ API Gate Way +
+
+
+ + + API Gate Way + + + + + + + + + + +
+
+
+ Lambda +
+
+
+ + + Lambda + + + + + + + + + + + + +
+
+
+ S3 +
+
+
+ + + S3 + + + + + + + + + + + +
+
+
+

+ AWS +

+
+
+
+ + + AWS + + + + + + + + Viewer does not support full SVG 1.1 + + + \ No newline at end of file diff --git a/index.py b/index.py index 79e7e24..5841025 100644 --- a/index.py +++ b/index.py @@ -1,6 +1,5 @@ -import os - import boto3 +import os from flask import Flask from flask import render_template from flask import request @@ -83,13 +82,16 @@ def privacy_policy(): def opensource_license(): return render_template('opensourcelicense.html') + @app.route('/robots.txt', methods=['GET']) def robots_txt(): return render_template('robots.txt') + @app.route('/sitemap.xml', methods=['GET']) def sitemap_xml(): return render_template('sitemap.xml') + if __name__ == '__main__': app.run(host='0.0.0.0', port=8888, debug=False) diff --git a/static/javascript/GetTableXML.js b/static/javascript/GetTableXML.js index 3ccfa28..6177aff 100644 --- a/static/javascript/GetTableXML.js +++ b/static/javascript/GetTableXML.js @@ -9,9 +9,9 @@ function getTableXML(userid, password, semester, year) { console.log("Call getTableXML function") xmlHttp.onreadystatechange = function () { - if (this.status === 200 && this.readyState === this.DONE) { - console.log(xmlHttp.responseText) - } + if (this.status === 200 && this.readyState === this.DONE) { + console.log(xmlHttp.responseText) + } } // xmlHttp.open('CONNECT','https://everytime.kr', true) diff --git a/templates/index.html b/templates/index.html index ad0b034..a380582 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,10 +4,10 @@ EveryCal: 에브리타임 시간표를 나의 캘린더로! -{# #} + {# #} - +
@@ -25,7 +25,8 @@

학기가 시작하는 날과 끝나는 날을 넣어주세요.

-
@@ -34,7 +35,8 @@

학기가 시작하는 날과 끝나는 날을 넣어주세요.

-
diff --git a/zappa_settings.json b/zappa_settings.json index 80c029d..ada3bc5 100644 --- a/zappa_settings.json +++ b/zappa_settings.json @@ -1,10 +1,10 @@ { - "dev": { - "app_function": "index.app", - "aws_region": "ap-northeast-2", - "project_name": "every2cal", - "domain": "everycal.com", - "runtime": "python3.8", - "s3_bucket": "brainer-everycal-static" - } + "dev": { + "app_function": "index.app", + "aws_region": "ap-northeast-2", + "project_name": "every2cal", + "domain": "everycal.com", + "runtime": "python3.8", + "s3_bucket": "brainer-everycal-static" + } }