Refactor

brainer3220 · Dec 18, 2023 · 293dda5 · 293dda5
1 parent c916fc5
commit 293dda5
Show file tree

Hide file tree

Showing 8 changed files with 230 additions and 41 deletions.
diff --git 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
@@ -7,7 +7,7 @@
 Every2Cal은 Everytime 시간표를 .ics 형식으로 내보내주는 Python 프로그램입니다.
 
 Everytime 앱 보다 캘린더로 일정을 관리하는게 편한 마음에 항상 Everytime 시간표를 수기로 캘린더에 적곤 했습니다.
- 
+
 그 수고로움을 덜고자 개발했습니다.
 
 ## 어떻게 사용하나요?

diff --git 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
diff --git 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
@@ -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
@@ -4,10 +4,10 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>EveryCal: 에브리타임 시간표를 나의 캘린더로!</title>
-{#    <link rel="stylesheet" href="../static/css/OneUI-Web/oui.css">#}
+    {#    <link rel="stylesheet" href="../static/css/OneUI-Web/oui.css">#}
     <link rel="stylesheet" href="https://brainer-everycal-static.s3.ap-northeast-2.amazonaws.com/css/OneUI-Web/oui.css">
     <meta name="description" content="에브리타임의 시간표를 ical 형태로 바꿔 원하는 캘린더 앱에서 사용이 가능해요!">
-    <meta name="naver-site-verification" content="9704ef6a11cd925c2bd35f0ace81dfab4ed4484d" />
+    <meta name="naver-site-verification" content="9704ef6a11cd925c2bd35f0ace81dfab4ed4484d"/>
 </head>
 <body>
 <main class="container">
@@ -25,7 +25,8 @@ <h1>학기가 시작하는 날과 끝나는 날을 넣어주세요.</h1>
                         <label for="start_date">시작하는 날</label>
                     </div>
                     <div class="input">
-                        <input type="date" name="start_date" value="2023-03-02" id="start_date" class="input-text" placeholder="dd/mm/yyyy"
+                        <input type="date" name="start_date" value="2023-03-02" id="start_date" class="input-text"
+                               placeholder="dd/mm/yyyy"
                                required="required">
                     </div>
                 </div>
@@ -34,7 +35,8 @@ <h1>학기가 시작하는 날과 끝나는 날을 넣어주세요.</h1>
                         <label for="end_date">끝나는 날</label>
                     </div>
                     <div class="input">
-                        <input type="date" name="end_date" value="2023-06-22" id="end_date" class="input-text" placeholder="dd/mm/yyyy"
+                        <input type="date" name="end_date" value="2023-06-22" id="end_date" class="input-text"
+                               placeholder="dd/mm/yyyy"
                                required="required">
                     </div>
                 </div>

diff --git 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"
+  }
 }