Merge pull request #120 from TAS-scorchedshadow/updating-dependency

Updating dependency

app/auth/forms.py

@@ -1,7 +1,6 @@
 # -- Dylan Huynh --
 from flask_wtf import FlaskForm
-from wtforms import StringField, IntegerField, SelectField, PasswordField, SubmitField, BooleanField
-from wtforms.fields.html5 import EmailField
+from wtforms import StringField, IntegerField, SelectField, PasswordField, SubmitField, BooleanField, EmailField
 from wtforms.validators import InputRequired, DataRequired, EqualTo, NumberRange
 
 

app/profile/forms.py

@@ -1,7 +1,7 @@
 # -- Dylan Huynh --
 from flask_wtf import FlaskForm
-from wtforms import StringField, IntegerField, SelectField, PasswordField, SubmitField, BooleanField, HiddenField
-from wtforms.fields.html5 import EmailField, DateField
+from wtforms import StringField, IntegerField, SelectField, PasswordField, SubmitField, BooleanField, HiddenField, \
+    EmailField, DateField
 from wtforms.validators import InputRequired, DataRequired, EqualTo, NumberRange
 
 

app/templates/upload/upload.html

@@ -40,8 +40,8 @@
         <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-fileinput/5.1.2/js/fileinput.min.js"></script>
         <!-- optionally if you need a theme like font awesome theme you can include it as mentioned below -->
         <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-fileinput/5.1.2/themes/fa/theme.js"></script>
-        <!-- optionally if you need translation for your language then include  locale file as mentioned below -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-fileinput/5.1.2/js/locales/(lang).js"></script>
+        <!-- optionally if you need translation for your language then include  locale file as mentioned below
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-fileinput/5.1.2/js/locales/(lang).js"></script>-->
 
     </head>
     {% if alert[0] %}
@@ -112,14 +112,12 @@
                             <!-- Code from https://plugins.krajee.com/file-theme-demo -->
                             <!-- FONT AWESOME THEME -->
                             <!-- load the JS files in the right order -->
-                            <script src="../../node_modules/bootstrap/bootstrap-fileinput/js/fileinput.js"></script>
-                            <script src="../../node_modules/bootstrap-fileinput/themes/fa/theme.js"></script>
                             {{ form.csrf_token }}
                             {{ form.weeks.label }}
                             {{ form.weeks }}
                             <!--Create upload button-->
                             <div class="file-loading">
-                                {{ form.file(id="input-fa", name_="input-fa[]", multiple_type="file") }}
+                                {{ form.file(id="input-fa", multiple_type="file") }}
                             </div>
                             <script>
                                 $("#input-fa").fileinput({

app/upload/forms.py

@@ -19,6 +19,7 @@ class uploadForm(FlaskForm):
     stageDump = HiddenField("Data")
     success = HiddenField("Success")
     weeks = SelectField(u'Uploading Shot Data From',
-                        choices=[(1, 'Last Week'), (4, 'Last Month'), (12, 'Last 3 Months'), (56, 'Last Year')])
+                        choices=[(1, 'Last Week'), (4, 'Last Month'), (12, 'Last 3 Months'), (56, 'Last Year'),
+                                 (4000, "All Time")])
     total = HiddenField("Total")
 

requirements.txt

@@ -1,61 +1,60 @@
-alembic==1.4.3
-arrow==0.17.0
+alembic==1.11.3
+arrow==1.2.3
 binaryornot==0.4.4
-blinker==1.4
-certifi==2020.11.8
-cffi==1.14.4
-chardet==3.0.4
-click==7.1.2
-cookiecutter==1.7.2
-cryptography==3.2.1
-cycler==0.10.0
-dmgbuild==1.4.2
-ds-store==1.3.0
-Flask==1.1.1
-Flask-Login==0.5.0
+blinker==1.6.2
+certifi==2023.7.22
+cffi==1.15.1
+chardet==5.2.0
+click==8.1.7
+cookiecutter==2.3.0
+cryptography==41.0.3
+cycler==0.11.0
+dmgbuild==1.6.1
+ds-store==1.3.1
+Flask==2.3.2
+Flask-Login==0.6.2
 Flask-Mail==0.9.1
-Flask-Migrate==2.5.3
-flask-talisman==1.0.0
-Flask-SQLAlchemy==2.4.4
-Flask-WTF==1.0.1
-gunicorn==20.0.4
-h11==0.11.0
-httpcore==0.12.2
-httpx==0.16.1
-idna==2.10
-importlib-resources==3.3.0
-itsdangerous==1.1.0
-Jinja2==2.11.1
+Flask-Migrate==4.0.4
+flask-talisman==1.1.0
+Flask-SQLAlchemy==3.0.5
+Flask-WTF==1.1.1
+gunicorn==21.2.0
+h11==0.14.0
+httpcore==0.17.3
+httpx==0.24.1
+idna==3.4
+importlib-resources==6.0.1
+itsdangerous==2.1.2
+Jinja2==3.1.2
 jinja2-time==0.2.0
-kiwisolver==1.3.1
-mac-alias==2.2.0
-Mako==1.1.3
-MarkupSafe==1.1.1
-matplotlib==3.3.3
-numpy==1.19.3
-Pillow==8.0.1
-pkginfo==1.6.1
+kiwisolver==1.4.4
+mac-alias==2.2.2
+Mako==1.2.4
+MarkupSafe==2.1.3
+matplotlib==3.7.2
+numpy==1.25.2
+Pillow==10.0.0
+pkginfo==1.9.6
 poyo==0.5.0
-psycopg2-binary==2.8.6
-pycparser==2.20
-PyJWT==2.0.0
-pyparsing==2.4.7
-python-dateutil==2.8.1
-python-dotenv==0.15.0
+psycopg2-binary==2.9.7
+pycparser==2.21
+PyJWT==2.8.0
+pyparsing==3.0.0
+python-dateutil==2.8.2
+python-dotenv==1.0.0
 python-editor==1.0.4
-python-slugify==4.0.1
-requests==2.25.0
-rfc3986==1.4.0
-six==1.15.0
-snowballstemmer==2.0.0
-sniffio==1.2.0
-SQLAlchemy==1.3.20
+python-slugify==8.0.1
+requests==2.31.0
+rfc3986==2.0.0
+six==1.16.0
+snowballstemmer==2.2.0
+sniffio==1.3.0
+SQLAlchemy==2.0.20
 text-unidecode==1.3
-urllib3==1.26.2
-Werkzeug==1.0.0
-WTForms==2.3.3
-zstandard==0.14.1
-pytz~=2020.5
-scikit-learn~=0.24.2
-pytest~=7.1.2
+urllib3==2.0.4
+Werkzeug==2.3.7
+WTForms==3.0.1
+zstandard==0.21.0
+pytz==2023.3
+pytest==7.4.0
 fpdf~=1.7.2