From b9adf638f11d8f32757dd209255e1ba27398a792 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Tue, 28 May 2024 14:31:48 -0400 Subject: [PATCH 01/41] form update --- instance/database.db | Bin 0 -> 20480 bytes website/__init__.py | 9 ++++---- website/auth.py | 30 +++++++++++++++++++++----- website/forms.py | 9 ++++++++ website/models.py | 9 ++++++++ website/templates/questionnaire.html | 31 +++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 instance/database.db create mode 100644 website/forms.py create mode 100644 website/templates/questionnaire.html diff --git a/instance/database.db b/instance/database.db new file mode 100644 index 0000000000000000000000000000000000000000..63508f89ec6a946aa3b7941f4ab560b843375adb GIT binary patch literal 20480 zcmeI&O;6h}7zgmA@#(xeGoXj#gtK^UP->MoTVJ0p}P(4>Ry zGJ*E}wiBOW-(Wi~DXTk)3``Bq8|EwPDc7Jc%k2&$eevigP6&?zrC~OcS z2*UJDO>V=IO|DZn?er%8)*jcK7FLhG%;&!gQ}a)R{Nw!Rg?7?FfdB*`009U<00Izz z00bcLKMGu~Pt6ugQ~b0T)6OwJ9q=gj!yur3pSSxwIthblOmuqFv8qjrG^@33i;RAf z6mxSvBMrN0ZCMVncbmjM*xr6ha&v=-_uFIoZr@BMudB}Hi>gypB&l@g@!KKF--oE< zhrDtcJ5{GeURo_u^jRrQtiJ15jV(Kk6>pL(5yz@qj%9CJ`y`DG2j@x`>)F}D(vo=D z8tMgM%+oq`M<$K@!GY13{!CDok}}L933Kv1@ohGCtPx&m=wGvcCSGS>9cG`-E3KJ3 z*?-me^^bq0uU#j9LZj#`?6Z3vp5Kq+c0halUe~C}9N3M$1B(=gpHj+|Rx&e% z^(9g81IEvz)8k}s-=>2&9KLR+skY_xn(pNvq+hrBq-GYr3HkHnf&u{uKmY;|fB*y_ z009U<00I!0EP;=i8DZt3^@w$KeWUNYe3i4oNvF#^Wi2|Sil(pW=}CjMY#-E=T0K1C zb#BU)?(VYd88SB|UDi7t*EK4vLrvL`4O2B`YI5!wo@*)^Qw`mfrR2P#B6*w{s>jM+ zS(TNuVY!$VX9Vq{RbXA(XNNR8^f%t7M+K{H*c+J$j|{I?IS$|Sf_ES4wze!8M#s}U zh3cBiSXouM(oxG2RXI0QMKj8>n{;TJCQD^zR>~?*MkKvDb7f|BWJZJFeJ)woO#Vv9 zU**3}))Hej5P$##AOHafKmY;|fB*y_0D(ytSj?`7caAnPg{(F=>Zl?8{XhBBKMDjO z009U<00Izz00bZa0SG_<0uwBN{r?0nE~W+n2tWV=5P$##AOHafKmY;|xDogPw(UCo literal 0 HcmV?d00001 diff --git a/website/__init__.py b/website/__init__.py index 8d24a3dd..e523c2f2 100644 --- a/website/__init__.py +++ b/website/__init__.py @@ -6,7 +6,6 @@ db = SQLAlchemy() DB_NAME = "database.db" - def create_app(): app = Flask(__name__) app.config['SECRET_KEY'] = 'hjshjhdjah kjshkjdhjs' @@ -14,12 +13,13 @@ def create_app(): db.init_app(app) from .views import views - from .auth import auth + from .auth import auth, questionnaire app.register_blueprint(views, url_prefix='/') - app.register_blueprint(auth, url_prefix='/') + app.register_blueprint(auth, url_prefix='/auth') + app.register_blueprint(questionnaire, url_prefix='/questionnaire') - from .models import User, Note + from .models import User, Note, QuestionnaireResponse with app.app_context(): db.create_all() @@ -34,7 +34,6 @@ def load_user(id): return app - def create_database(app): if not path.exists('website/' + DB_NAME): db.create_all(app=app) diff --git a/website/auth.py b/website/auth.py index 8c65752e..3932affc 100644 --- a/website/auth.py +++ b/website/auth.py @@ -1,12 +1,12 @@ from flask import Blueprint, render_template, request, flash, redirect, url_for -from .models import User +from .models import User, QuestionnaireResponse from werkzeug.security import generate_password_hash, check_password_hash -from . import db ##means from __init__.py import db +from . import db from flask_login import login_user, login_required, logout_user, current_user - +from .forms import QuestionnaireForm auth = Blueprint('auth', __name__) - +questionnaire = Blueprint('questionnaire', __name__) @auth.route('/login', methods=['GET', 'POST']) def login(): @@ -56,7 +56,7 @@ def sign_up(): flash('Password must be at least 7 characters.', category='error') else: new_user = User(email=email, first_name=first_name, password=generate_password_hash( - password1, method='sha256')) + password1, method='pbkdf2:sha256')) db.session.add(new_user) db.session.commit() login_user(new_user, remember=True) @@ -64,3 +64,23 @@ def sign_up(): return redirect(url_for('views.home')) return render_template("sign_up.html", user=current_user) + + +@questionnaire.route('/questionnaire', methods=['GET', 'POST']) +@login_required +def show_questionnaire(): + form = QuestionnaireForm() + if form.validate_on_submit(): + response = QuestionnaireResponse( + user_id=current_user.id, + question1=form.question1.data, + question2=form.question2.data, + question3=form.question3.data + # Add more fields as needed + ) + db.session.add(response) + db.session.commit() + flash('Thank you for completing the questionnaire!', 'success') + return redirect(url_for('views.home')) # Adjust as needed + + return render_template('questionnaire.html', form=form) diff --git a/website/forms.py b/website/forms.py new file mode 100644 index 00000000..e1cd40b8 --- /dev/null +++ b/website/forms.py @@ -0,0 +1,9 @@ +from flask_wtf import FlaskForm +from wtforms import StringField, SubmitField +from wtforms.validators import DataRequired + +class QuestionnaireForm(FlaskForm): + question1 = StringField('Question 1', validators=[DataRequired()]) + question2 = StringField('Question 2', validators=[DataRequired()]) + question3 = StringField('Question 3', validators=[DataRequired()]) + submit = SubmitField('Submit') \ No newline at end of file diff --git a/website/models.py b/website/models.py index 79c17e6f..e3af232e 100644 --- a/website/models.py +++ b/website/models.py @@ -16,3 +16,12 @@ class User(db.Model, UserMixin): password = db.Column(db.String(150)) first_name = db.Column(db.String(150)) notes = db.relationship('Note') + +class QuestionnaireResponse(db.Model): + id = db.Column(db.Integer, primary_key=True) + user_id = db.Column(db.Integer, db.ForeignKey('user.id'), nullable=False) + question1 = db.Column(db.String(200), nullable=False) + question2 = db.Column(db.String(200), nullable=False) + question3 = db.Column(db.String(200), nullable=False) + # Add more fields for additional questions + user = db.relationship('User', backref=db.backref('responses', lazy=True)) diff --git a/website/templates/questionnaire.html b/website/templates/questionnaire.html new file mode 100644 index 00000000..9824bf9f --- /dev/null +++ b/website/templates/questionnaire.html @@ -0,0 +1,31 @@ + + + + + Questionnaire + + + +
+

Questionnaire

+
+ {{ form.hidden_tag() }} +
+ {{ form.question1.label }}
+ {{ form.question1(size=40) }}
+
+
+ {{ form.question2.label }}
+ {{ form.question2(size=40) }}
+
+
+ {{ form.question3.label }}
+ {{ form.question3(size=40) }}
+
+
+ {{ form.submit() }} +
+
+
+ + From 17b8e8e3afd8486e96d8fe0b6fa850ac3c26ddda Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Wed, 29 May 2024 14:47:13 -0400 Subject: [PATCH 02/41] wWWW --- instance/database.db | Bin 20480 -> 20480 bytes website/__init__.py | 2 +- website/templates/base.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance/database.db b/instance/database.db index 63508f89ec6a946aa3b7941f4ab560b843375adb..8aa887a47e1d9a7e7685760c703e90a1a2506ab5 100644 GIT binary patch delta 85 zcmZozz}T>Wae_1>*F+g-My`zsEA*N8A8i&ixWTU>!^p}YY|NOFR%v8lWTI delta 42 ucmZozz}T>Wae_1>>qHr6M%Il9EA%%DJ3Qi_I6;h!mjMU_HVZmD0dWBm1`JUE diff --git a/website/__init__.py b/website/__init__.py index e523c2f2..fd669a4b 100644 --- a/website/__init__.py +++ b/website/__init__.py @@ -17,7 +17,7 @@ def create_app(): app.register_blueprint(views, url_prefix='/') app.register_blueprint(auth, url_prefix='/auth') - app.register_blueprint(questionnaire, url_prefix='/questionnaire') + app.register_blueprint(questionnaire, url_prefix='/') from .models import User, Note, QuestionnaireResponse diff --git a/website/templates/base.html b/website/templates/base.html index fbbd3854..b1f76362 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -31,7 +31,7 @@
{% if user.is_authenticated %} Home - Logout + Logout {% else %} Login Sign Up From 7240748f07abc8401412456090d5f08b75de3c06 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Wed, 29 May 2024 15:06:12 -0400 Subject: [PATCH 03/41] q form --- website/templates/base.html | 2 +- website/templates/home.html | 38 +++++++++++++++------------- website/templates/questionnaire.html | 2 +- website/views.py | 34 +++++++++++++------------ 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/website/templates/base.html b/website/templates/base.html index b1f76362..ef8da43e 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -34,7 +34,7 @@ Logout {% else %} Login - Sign Up + Notes -
    - {% for note in user.notes %} -
  • - {{ note.data }} - -
    • - {% endfor %} -
-
- -
-
- +{% extends "base.html" %} +{% block title %}Home{% endblock %} +{% block content %} +

Questionnaire

+ + {{ form.hidden_tag() }} +
+ {{ form.question1.label }}
+ {{ form.question1(size=40) }}
+
+
+ {{ form.question2.label }}
+ {{ form.question2(size=40) }}
+
+
+ {{ form.question3.label }}
+ {{ form.question3(size=40) }}
+
+
+ {{ form.submit() }}
{% endblock %} diff --git a/website/templates/questionnaire.html b/website/templates/questionnaire.html index 9824bf9f..d1f3d685 100644 --- a/website/templates/questionnaire.html +++ b/website/templates/questionnaire.html @@ -28,4 +28,4 @@

Questionnaire

- + \ No newline at end of file diff --git a/website/views.py b/website/views.py index d17a938e..acc6202a 100644 --- a/website/views.py +++ b/website/views.py @@ -1,28 +1,30 @@ -from flask import Blueprint, render_template, request, flash, jsonify +from flask import Blueprint, render_template, request, flash, redirect, jsonify from flask_login import login_required, current_user -from .models import Note +from .models import QuestionnaireResponse from . import db import json +from .forms import QuestionnaireForm views = Blueprint('views', __name__) - @views.route('/', methods=['GET', 'POST']) @login_required def home(): - if request.method == 'POST': - note = request.form.get('note')#Gets the note from the HTML - - if len(note) < 1: - flash('Note is too short!', category='error') - else: - new_note = Note(data=note, user_id=current_user.id) #providing the schema for the note - db.session.add(new_note) #adding the note to the database - db.session.commit() - flash('Note added!', category='success') - - return render_template("home.html", user=current_user) - + form = QuestionnaireForm() + if form.validate_on_submit(): + response = QuestionnaireResponse( + user_id=current_user.id, + question1=form.question1.data, + question2=form.question2.data, + question3=form.question3.data + # Add more fields as needed + ) + db.session.add(response) + db.session.commit() + flash('Thank you for completing the questionnaire!', 'success') + return redirect(url_for('views.home')) + + return render_template("home.html", user=current_user, form=form) @views.route('/delete-note', methods=['POST']) def delete_note(): From 32e5a794a047f00a892a481c8ba79b795929e570 Mon Sep 17 00:00:00 2001 From: atipre Date: Wed, 29 May 2024 15:12:02 -0400 Subject: [PATCH 04/41] Yuh --- website/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/base.html b/website/templates/base.html index ef8da43e..a0995883 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -34,7 +34,7 @@ Logout {% else %} Login - Sign Up {% endif %}
From fb77eaeaab0dcdd0422910efd0f9f9a18c5fead5 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Wed, 29 May 2024 15:33:47 -0400 Subject: [PATCH 05/41] multiple choice --- instance/database.db | Bin 20480 -> 20480 bytes main.py | 2 +- website/auth.py | 11 ++++------- website/forms.py | 10 +++++----- website/models.py | 3 --- website/templates/home.html | 18 +++++++++--------- website/views.py | 17 ++--------------- 7 files changed, 21 insertions(+), 40 deletions(-) diff --git a/instance/database.db b/instance/database.db index 8aa887a47e1d9a7e7685760c703e90a1a2506ab5..428001372af043ae8a90dd6eabce2d6ac8e056f8 100644 GIT binary patch delta 74 zcmZozz}T>Wae_1>_e2?IM(&LXOYAwA_-`=qf91ciSWae_1>*F+g-My`zsOYGSg`M)yof88u-aFKuF1SxJ#Mm7dcet!P)@^Sz} C4Gg>h diff --git a/main.py b/main.py index 45d99ebf..a50e760a 100644 --- a/main.py +++ b/main.py @@ -3,4 +3,4 @@ app = create_app() if __name__ == '__main__': - app.run(debug=True) + app.run(debug=True) \ No newline at end of file diff --git a/website/auth.py b/website/auth.py index 3932affc..fc361a78 100644 --- a/website/auth.py +++ b/website/auth.py @@ -27,14 +27,12 @@ def login(): return render_template("login.html", user=current_user) - @auth.route('/logout') @login_required def logout(): logout_user() return redirect(url_for('auth.login')) - @auth.route('/sign-up', methods=['GET', 'POST']) def sign_up(): if request.method == 'POST': @@ -65,7 +63,6 @@ def sign_up(): return render_template("sign_up.html", user=current_user) - @questionnaire.route('/questionnaire', methods=['GET', 'POST']) @login_required def show_questionnaire(): @@ -73,14 +70,14 @@ def show_questionnaire(): if form.validate_on_submit(): response = QuestionnaireResponse( user_id=current_user.id, - question1=form.question1.data, - question2=form.question2.data, - question3=form.question3.data + question1=','.join(form.question1.data), + question2=','.join(form.question2.data), + question3=','.join(form.question3.data) # Add more fields as needed ) db.session.add(response) db.session.commit() flash('Thank you for completing the questionnaire!', 'success') - return redirect(url_for('views.home')) # Adjust as needed + return redirect(url_for('views.home')) return render_template('questionnaire.html', form=form) diff --git a/website/forms.py b/website/forms.py index e1cd40b8..4b2d7f4b 100644 --- a/website/forms.py +++ b/website/forms.py @@ -1,9 +1,9 @@ from flask_wtf import FlaskForm -from wtforms import StringField, SubmitField +from wtforms import RadioField, SubmitField from wtforms.validators import DataRequired class QuestionnaireForm(FlaskForm): - question1 = StringField('Question 1', validators=[DataRequired()]) - question2 = StringField('Question 2', validators=[DataRequired()]) - question3 = StringField('Question 3', validators=[DataRequired()]) - submit = SubmitField('Submit') \ No newline at end of file + question1 = RadioField('Question 1', choices=[('option1', 'Option 1'), ('option2', 'Option 2'), ('option3', 'Option 3')], validators=[DataRequired()]) + question2 = RadioField('Question 2', choices=[('option1', 'Option 1'), ('option2', 'Option 2'), ('option3', 'Option 3')], validators=[DataRequired()]) + question3 = RadioField('Question 3', choices=[('option1', 'Option 1'), ('option2', 'Option 2'), ('option3', 'Option 3')], validators=[DataRequired()]) + submit = SubmitField('Submit') diff --git a/website/models.py b/website/models.py index e3af232e..bc20b10c 100644 --- a/website/models.py +++ b/website/models.py @@ -2,14 +2,12 @@ from flask_login import UserMixin from sqlalchemy.sql import func - class Note(db.Model): id = db.Column(db.Integer, primary_key=True) data = db.Column(db.String(10000)) date = db.Column(db.DateTime(timezone=True), default=func.now()) user_id = db.Column(db.Integer, db.ForeignKey('user.id')) - class User(db.Model, UserMixin): id = db.Column(db.Integer, primary_key=True) email = db.Column(db.String(150), unique=True) @@ -23,5 +21,4 @@ class QuestionnaireResponse(db.Model): question1 = db.Column(db.String(200), nullable=False) question2 = db.Column(db.String(200), nullable=False) question3 = db.Column(db.String(200), nullable=False) - # Add more fields for additional questions user = db.relationship('User', backref=db.backref('responses', lazy=True)) diff --git a/website/templates/home.html b/website/templates/home.html index 9b4fdb3d..2f7f4e9d 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -4,17 +4,17 @@

Questionnaire

{{ form.hidden_tag() }} -
- {{ form.question1.label }}
- {{ form.question1(size=40) }}
+
+
+ {{ form.question1 }}
-
- {{ form.question2.label }}
- {{ form.question2(size=40) }}
+
+
+ {{ form.question2 }}
-
- {{ form.question3.label }}
- {{ form.question3(size=40) }}
+
+
+ {{ form.question3 }}
{{ form.submit() }} diff --git a/website/views.py b/website/views.py index acc6202a..14566848 100644 --- a/website/views.py +++ b/website/views.py @@ -1,9 +1,9 @@ -from flask import Blueprint, render_template, request, flash, redirect, jsonify +from flask import Blueprint, render_template, request, flash, redirect, jsonify, url_for from flask_login import login_required, current_user from .models import QuestionnaireResponse +from .forms import QuestionnaireForm from . import db import json -from .forms import QuestionnaireForm views = Blueprint('views', __name__) @@ -17,7 +17,6 @@ def home(): question1=form.question1.data, question2=form.question2.data, question3=form.question3.data - # Add more fields as needed ) db.session.add(response) db.session.commit() @@ -25,15 +24,3 @@ def home(): return redirect(url_for('views.home')) return render_template("home.html", user=current_user, form=form) - -@views.route('/delete-note', methods=['POST']) -def delete_note(): - note = json.loads(request.data) # this function expects a JSON from the INDEX.js file - noteId = note['noteId'] - note = Note.query.get(noteId) - if note: - if note.user_id == current_user.id: - db.session.delete(note) - db.session.commit() - - return jsonify({}) From eb7feb853d674def336d38a9eea5d58a1511d227 Mon Sep 17 00:00:00 2001 From: atipre Date: Wed, 29 May 2024 15:39:34 -0400 Subject: [PATCH 06/41] login fixed --- instance/database.db | Bin 20480 -> 20480 bytes website/templates/base.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/instance/database.db b/instance/database.db index 428001372af043ae8a90dd6eabce2d6ac8e056f8..07f066b515575eeb5ac3bf84c9371fa67c541a55 100644 GIT binary patch delta 252 zcmZozz}T>Wae_1>??f4AM&6AHOZd5%`EnWfEBLH=fYHaN0sgj(OY?z#AnQCHWZed|)o@S9~Zjoka zWNDaUVVInnYH692l9*&*Xl`nfY-pUCl$xAkW@>7YVv(9;X=s*|V&n)md-HcWUPdlv z{yhx**Z5!X@7XMj?nW?_%Kp%724@7f}5g femNPSqZy^8rJ3^!N;32F3?Y;egfgCd!(Rgc_VGWae_1>_e2?IM(&LXOZYjM_`WmnSMYt`EU56BZ}WFKUPcZk{%Z{U*Z5y- f7Bo1;zxkTJo&Zqj1_S?B{u@A{GyIcp_-gHome Logout {% else %} - Login + Login Sign Up {% endif %}
From 6da3b6d8a009abd48099f3fe4edf86e3ba7edbea Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Wed, 29 May 2024 15:40:11 -0400 Subject: [PATCH 07/41] button --- website/templates/home.html | 32 +++++++++---------- website/templates/questionnaire.html | 47 ++++++++++------------------ 2 files changed, 32 insertions(+), 47 deletions(-) diff --git a/website/templates/home.html b/website/templates/home.html index 2f7f4e9d..fc704b8a 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -1,23 +1,21 @@ {% extends "base.html" %} {% block title %}Home{% endblock %} {% block content %} -

Questionnaire

- - {{ form.hidden_tag() }} -
-
- {{ form.question1 }} +

Welcome!

+ +
+
+

Welcome to the homepage!

-
-
- {{ form.question2 }} +
+ {% include 'questionnaire.html' %}
-
-
- {{ form.question3 }} -
-
- {{ form.submit() }} -
- +
{% endblock %} diff --git a/website/templates/questionnaire.html b/website/templates/questionnaire.html index d1f3d685..44af1927 100644 --- a/website/templates/questionnaire.html +++ b/website/templates/questionnaire.html @@ -1,31 +1,18 @@ - - - - - Questionnaire - - - -
-

Questionnaire

-
- {{ form.hidden_tag() }} -
- {{ form.question1.label }}
- {{ form.question1(size=40) }}
-
-
- {{ form.question2.label }}
- {{ form.question2(size=40) }}
-
-
- {{ form.question3.label }}
- {{ form.question3(size=40) }}
-
-
- {{ form.submit() }} -
-
+
+ {{ form.hidden_tag() }} +
+
+ {{ form.question1 }}
- - \ No newline at end of file +
+
+ {{ form.question2 }} +
+
+
+ {{ form.question3 }} +
+
+ {{ form.submit() }} +
+
From 603eaefbf3528eeccd033a8ca81302aa50fb2f38 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Wed, 29 May 2024 15:43:03 -0400 Subject: [PATCH 08/41] w --- website/templates/home.html | 7 ++----- website/templates/questionnaire.html | 7 ++++++- website/views.py | 9 +++++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/website/templates/home.html b/website/templates/home.html index fc704b8a..066dfc2c 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -4,18 +4,15 @@

Welcome!

Welcome to the homepage!

-
- {% include 'questionnaire.html' %} -
{% endblock %} diff --git a/website/templates/questionnaire.html b/website/templates/questionnaire.html index 44af1927..b1fb0c78 100644 --- a/website/templates/questionnaire.html +++ b/website/templates/questionnaire.html @@ -1,4 +1,8 @@ -
+{% extends "base.html" %} +{% block title %}Questionnaire{% endblock %} +{% block content %} +

Questionnaire

+ {{ form.hidden_tag() }}

@@ -16,3 +20,4 @@ {{ form.submit() }}
+{% endblock %} diff --git a/website/views.py b/website/views.py index 14566848..1ab2a35f 100644 --- a/website/views.py +++ b/website/views.py @@ -10,6 +10,11 @@ @views.route('/', methods=['GET', 'POST']) @login_required def home(): + return render_template("home.html", user=current_user) + +@views.route('/questionnaire', methods=['GET', 'POST']) +@login_required +def questionnaire(): form = QuestionnaireForm() if form.validate_on_submit(): response = QuestionnaireResponse( @@ -21,6 +26,6 @@ def home(): db.session.add(response) db.session.commit() flash('Thank you for completing the questionnaire!', 'success') - return redirect(url_for('views.home')) + return redirect(url_for('views.questionnaire')) - return render_template("home.html", user=current_user, form=form) + return render_template("questionnaire.html", user=current_user, form=form) From 44944dbf21ced483e607647c4d246fc1ef61c8b1 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Wed, 29 May 2024 16:07:10 -0400 Subject: [PATCH 09/41] w --- instance/database.db | Bin 20480 -> 20480 bytes website/templates/home.html | 7 +++++-- website/templates/split.html | 35 +++++++++++++++++++++++++++++++++++ website/views.py | 10 +++++++--- 4 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 website/templates/split.html diff --git a/instance/database.db b/instance/database.db index 07f066b515575eeb5ac3bf84c9371fa67c541a55..c7cbfd5a333d537c514ba50d511dd592d009e180 100644 GIT binary patch delta 71 zcmZozz}T>Wae_1>-$WT_M!t;+OYC`A_~$b4f91cyzl(qFW^Wae_1>??f4AM&6AHOYFIr`FAn!f91cyziYFg!5aR_yZqe%^xF*y diff --git a/website/templates/home.html b/website/templates/home.html index 066dfc2c..81b0afb0 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -1,14 +1,17 @@ {% extends "base.html" %} {% block title %}Home{% endblock %} {% block content %} -

Welcome!

+

Welcome, {{ user.first_name }}!

diff --git a/website/templates/split.html b/website/templates/split.html new file mode 100644 index 00000000..81ea4033 --- /dev/null +++ b/website/templates/split.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} +{% block title %}Workout Split{% endblock %} +{% block content %} +
+

Workout Split

+
+ +

Workout 1, Workout 2, etc.

+
+
+ +

Workout 1, Workout 2, etc.

+
+
+ +

Workout 1, Workout 2, etc.

+
+
+ +

Workout 1, Workout 2, etc.

+
+
+ +

Workout 1, Workout 2, etc.

+
+
+ +

Workout 1, Workout 2, etc.

+
+
+ +

Workout 1, Workout 2, etc.

+
+
+{% endblock %} diff --git a/website/views.py b/website/views.py index 1ab2a35f..f15ed9a4 100644 --- a/website/views.py +++ b/website/views.py @@ -1,13 +1,12 @@ -from flask import Blueprint, render_template, request, flash, redirect, jsonify, url_for +from flask import Blueprint, render_template, request, flash, redirect, url_for from flask_login import login_required, current_user from .models import QuestionnaireResponse from .forms import QuestionnaireForm from . import db -import json views = Blueprint('views', __name__) -@views.route('/', methods=['GET', 'POST']) +@views.route('/', methods=['GET']) @login_required def home(): return render_template("home.html", user=current_user) @@ -29,3 +28,8 @@ def questionnaire(): return redirect(url_for('views.questionnaire')) return render_template("questionnaire.html", user=current_user, form=form) + +@views.route('/split', methods=['GET']) +@login_required +def split(): + return render_template("split.html", user=current_user) From 59bc0daecbd965edf6a3e33c6212bf24b43ab94a Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Wed, 29 May 2024 18:55:45 -0400 Subject: [PATCH 10/41] w --- instance/database.db | Bin 20480 -> 20480 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/instance/database.db b/instance/database.db index c7cbfd5a333d537c514ba50d511dd592d009e180..8c5d338f843a3c1bf82cda2186b2a6945ba3d6d5 100644 GIT binary patch delta 50 zcmV-20L}k^paFoO0gxL350M;00S~cYq(2S?4}bs<^$*w&x(}TXfU^-GZVv(*1(Tmo I8Wae_1>-$WT_M!t;+OYC`A_~$b4f91cyzl(qFWgLwlK~5o4Q>Dc From cbe00e22bc75a3558b5a849a29da913f60d387e1 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Thu, 30 May 2024 12:23:26 -0400 Subject: [PATCH 11/41] tracker --- website/templates/base.html | 15 +-------------- website/templates/home.html | 3 +++ website/templates/tracker.html | 35 ++++++++++++++++++++++++++++++++++ website/views.py | 5 +++++ 4 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 website/templates/tracker.html diff --git a/website/templates/base.html b/website/templates/base.html index 00cb243c..cf37f0bd 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -74,18 +74,5 @@ integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous" > - -{% block javascript %} - -{% endblock %} - - + diff --git a/website/templates/home.html b/website/templates/home.html index 81b0afb0..cf94c62e 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -12,6 +12,9 @@

Welcome, {{ user.first_name }}!

  • Workout Split
    • +
  • + Workout Tracker +
    • diff --git a/website/templates/tracker.html b/website/templates/tracker.html new file mode 100644 index 00000000..2862e768 --- /dev/null +++ b/website/templates/tracker.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} +{% block title %}Workout Tracker{% endblock %} +{% block content %} +
    +

    Workout Tracker

    +
    + +

    Day 1, Day 2, etc.

    +
    +
    + +

    Day 1, Day 2, etc.

    +
    +
    + +

    Day 1, Day 2, etc.

    +
    +
    + +

    Day 1, Day 2, etc.

    +
    +
    + +

    Day 1, Day 2, etc.

    +
    +
    + +

    Day 1, Day 2, etc.

    +
    +
    + +

    Day 1, Day 2, etc.

    +
    +
    +{% endblock %} diff --git a/website/views.py b/website/views.py index f15ed9a4..77681d87 100644 --- a/website/views.py +++ b/website/views.py @@ -33,3 +33,8 @@ def questionnaire(): @login_required def split(): return render_template("split.html", user=current_user) + +@views.route('/tracker', methods=['GET']) +@login_required +def tracker(): + return render_template("tracker.html", user=current_user) \ No newline at end of file From bb9b97a0a9deb63748b79a302300c9f85e05e5b3 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Thu, 30 May 2024 13:06:06 -0400 Subject: [PATCH 12/41] w --- instance/database.db | Bin 20480 -> 20480 bytes website/forms.py | 10 +++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/instance/database.db b/instance/database.db index 8c5d338f843a3c1bf82cda2186b2a6945ba3d6d5..0054ae95a29d6ac38cc89d0e27b2eabf68a73788 100644 GIT binary patch delta 75 zcmZozz}T>Wae_3Xz(g5mMuCk9OY8;M_>&pWae_1>|3n#QM*fWnOYHer`5PGczw+PU-^D+dzhSeWLLUF*2LA>CB7hCX diff --git a/website/forms.py b/website/forms.py index 4b2d7f4b..464e71c1 100644 --- a/website/forms.py +++ b/website/forms.py @@ -3,7 +3,11 @@ from wtforms.validators import DataRequired class QuestionnaireForm(FlaskForm): - question1 = RadioField('Question 1', choices=[('option1', 'Option 1'), ('option2', 'Option 2'), ('option3', 'Option 3')], validators=[DataRequired()]) - question2 = RadioField('Question 2', choices=[('option1', 'Option 1'), ('option2', 'Option 2'), ('option3', 'Option 3')], validators=[DataRequired()]) - question3 = RadioField('Question 3', choices=[('option1', 'Option 1'), ('option2', 'Option 2'), ('option3', 'Option 3')], validators=[DataRequired()]) + question1 = RadioField('How many days a week would you like to workout?', choices=[('option1', '1'), ('option2', '2'), ('option3', '3'), + ('option4', '4'), ('option5', '5'), + ('option6', '6'), ('option7', '7')], validators=[DataRequired()]) + question2 = RadioField('What body parts would you NOT like to exercise?', choices=[('option1', 'Chest'), ('option2', 'Back'), ('option3', 'Arms') + , ('option4', 'Shoulders'), ('option5', 'Legs')], validators=[DataRequired()]) + question3 = RadioField('Which body part would you like to focus on?', choices=[('option1', 'Chest'), ('option2', 'Back'), ('option3', 'Arms') + , ('option4', 'Shoulders'), ('option5', 'Legs')], validators=[DataRequired()]) submit = SubmitField('Submit') From dc5ba0adbc83057c1685077568f70c6afa5dc04b Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Thu, 30 May 2024 13:37:17 -0400 Subject: [PATCH 13/41] multi --- .DS_Store | Bin 0 -> 6148 bytes main.py | 2 +- website/.DS_Store | Bin 0 -> 6148 bytes website/__init__.py | 15 +++++++-- website/auth.py | 1 - website/forms.py | 16 ++++------ website/templates/base.html | 3 +- website/templates/question2.html | 11 +++++++ website/templates/questionnaire.html | 12 ++------ website/views.py | 44 +++++++++++++++------------ 10 files changed, 59 insertions(+), 45 deletions(-) create mode 100644 .DS_Store create mode 100644 website/.DS_Store create mode 100644 website/templates/question2.html diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..7784241d244e05937acf91b79e0a0d2d497fb76e GIT binary patch literal 6148 zcmeHKTZ_{`6h71K+LT4;gTg)rd|haDt0=yNY<&|Eqw9l8&6uzoHk&EA7)mMRS^to~ z#NXpLmx|l2?3;+5Q|5eU&LuPRCCqe)NQ6ytpJ+rx9-7A95b7Gyaou*L=REsBVV;pu zO{r|Fh0J%d+3`0rpx@nqT1rV$MZdg1B@y{17kO6IlgW3{+w1S&8h8Wm!21xLt2V0R zx~amre5ZS_mCEJDj^$~Vw)4@Q6IIl4R-~mV$dVK(@84!cqS{b3MN*mC$OgQjH=K_S zSF7oCa^ydp9!Ek|-uUUO`9*$Ns4tdEfv?WUZHF893S(pHgYO2|NXUOS*tn zQbOmz3OYk(2z>^v;9t^9#1;A_GV}=7&E|!h&DK13b3aFAk*neikqs3vS(pK4fEl=n z0k>s%2R9{hoEcyS{yPTr{@|l&3>d1|$kj*jA(|2ReQf{(hn+=u QApA$b(7=ir_@fN`07IpCGynhq literal 0 HcmV?d00001 diff --git a/main.py b/main.py index a50e760a..45d99ebf 100644 --- a/main.py +++ b/main.py @@ -3,4 +3,4 @@ app = create_app() if __name__ == '__main__': - app.run(debug=True) \ No newline at end of file + app.run(debug=True) diff --git a/website/.DS_Store b/website/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..199134a07976a74a30cd645e24591086c8d910ea GIT binary patch literal 6148 zcmeHKOHRWu5PdEcBO~I#4da8z!f+jD|lmDC27(n z2%#Bi{2XWA*m<_>7=W2?ic??;AfgM7Vip4?@5OsI3N6AjE=P`QAZC)jo6wvv zqMb0p4Qf2%0jt6I*PZy7ku?e~wrUUKV~26bxHZSL#y#@xXhyd?u`#1c_ON7jVU$>P z88{>3ttH3+qb){+Cw5!nd3dl+-*!4?S5pO40af6K6p$^N7EL^AsS2n9s=!tO*&i%j zFbUXrbXx}tcLgAh+3bvU`B@Z>4VVOMJn{|Acq-9TO}JthPiMOgaY?|&qo>1!%ZCX) zn{Y!hu6O3QE*vKDsHG~P3Un1X@Q+hD|Ihc||GOl8QUz3jf2DvKFD@5zeo{DFdmkrf tt)*Yl#U!rrxTUb-j$+2jQG85y#&# - + + diff --git a/website/templates/question2.html b/website/templates/question2.html new file mode 100644 index 00000000..1f22b8e6 --- /dev/null +++ b/website/templates/question2.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} +{% block title %}Question 2{% endblock %} +{% block content %} +

    Question 2: {{ days }}

    +
    + {{ form.hidden_tag() }} +
    + {{ form.submit() }} +
    +
    +{% endblock %} diff --git a/website/templates/questionnaire.html b/website/templates/questionnaire.html index b1fb0c78..ede167fd 100644 --- a/website/templates/questionnaire.html +++ b/website/templates/questionnaire.html @@ -5,16 +5,8 @@

    Questionnaire

    {{ form.hidden_tag() }}
    -
    - {{ form.question1 }} -
    -
    -
    - {{ form.question2 }} -
    -
    -
    - {{ form.question3 }} + {{ form.days.label }}
    + {{ form.days }}
    {{ form.submit() }} diff --git a/website/views.py b/website/views.py index 77681d87..edf8d3c6 100644 --- a/website/views.py +++ b/website/views.py @@ -1,33 +1,37 @@ -from flask import Blueprint, render_template, request, flash, redirect, url_for +from flask import Blueprint, render_template, request, flash, redirect, url_for, session from flask_login import login_required, current_user from .models import QuestionnaireResponse -from .forms import QuestionnaireForm from . import db +from .forms import InitialQuestionForm, SecondQuestionForm +# Initialize the Blueprint views = Blueprint('views', __name__) -@views.route('/', methods=['GET']) -@login_required -def home(): - return render_template("home.html", user=current_user) - +# Define the routes within the Blueprint @views.route('/questionnaire', methods=['GET', 'POST']) -@login_required def questionnaire(): - form = QuestionnaireForm() + form = InitialQuestionForm() if form.validate_on_submit(): - response = QuestionnaireResponse( - user_id=current_user.id, - question1=form.question1.data, - question2=form.question2.data, - question3=form.question3.data - ) - db.session.add(response) - db.session.commit() - flash('Thank you for completing the questionnaire!', 'success') + days = form.days.data + session['days'] = days + return redirect(url_for('views.question2')) + return render_template('questionnaire.html', form=form) + +@views.route('/question2', methods=['GET', 'POST']) +def question2(): + days = session.get('days') + if days is None: return redirect(url_for('views.questionnaire')) + form = SecondQuestionForm() + if form.validate_on_submit(): + # Process the form data and redirect to the next question or a results page + return redirect(url_for('views.questionnaire')) # For now, redirect back to the start + return render_template('question2.html', days=days, form=form) - return render_template("questionnaire.html", user=current_user, form=form) +@views.route('/', methods=['GET']) +@login_required +def home(): + return render_template("home.html", user=current_user) @views.route('/split', methods=['GET']) @login_required @@ -37,4 +41,4 @@ def split(): @views.route('/tracker', methods=['GET']) @login_required def tracker(): - return render_template("tracker.html", user=current_user) \ No newline at end of file + return render_template("tracker.html", user=current_user) From 4de0fcd5b6cff11698ac3ff490b92eb540998cca Mon Sep 17 00:00:00 2001 From: atipre Date: Thu, 30 May 2024 14:09:45 -0400 Subject: [PATCH 14/41] Weight Tracker + graph+ --- website/templates/home.html | 13 +++++- website/templates/weight_tracker.html | 66 +++++++++++++++++++++++++++ website/views.py | 5 ++ 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 website/templates/weight_tracker.html diff --git a/website/templates/home.html b/website/templates/home.html index cf94c62e..7b911f9a 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -15,10 +15,21 @@

    Welcome, {{ user.first_name }}!

  • Workout Tracker
    • +
  • + Weight Tracker +
    • -

    Welcome to the homepage!

    +

    Welcome to PhySeek: Your Personalized Fitness Destination! + + At PhySeek, we believe that achieving your fitness goals should be personalized, convenient, and effective. That's why we've created a platform where you can embark on your fitness journey with confidence. + + Whether you're looking to build muscle, lose weight, improve endurance, or simply enhance your overall health, our custom-tailored workouts are designed to fit your unique needs and goals. Say goodbye to generic routines and hello to workouts that evolve with you. + + Track your progress effortlessly with our intuitive tools and charts, allowing you to see your achievements in real-time and stay motivated every step of the way. Whether you're a seasoned gym-goer or just starting out, PhySeek is here to support you on your path to a healthier, happier you. + + So, are you ready to unleash your full potential? Let's get started on your journey to a fitter, stronger, and more vibrant you. Welcome to PhySeek! Fill out the Questionnaire and start lifting today!

    {% endblock %} diff --git a/website/templates/weight_tracker.html b/website/templates/weight_tracker.html new file mode 100644 index 00000000..e85cdcea --- /dev/null +++ b/website/templates/weight_tracker.html @@ -0,0 +1,66 @@ +{% extends "base.html" %} + +{% block title %} + Workout Split +{% endblock %} + +{% block content %} +
    +

    Weight Tracker

    + + + +
    + +
    +
    + + + +{% endblock %} diff --git a/website/views.py b/website/views.py index edf8d3c6..ff2b28c5 100644 --- a/website/views.py +++ b/website/views.py @@ -42,3 +42,8 @@ def split(): @login_required def tracker(): return render_template("tracker.html", user=current_user) + +@views.route('/weight_tracker', methods=['GET']) +@login_required +def weight_tracker(): + return render_template("weight_tracker.html", user=current_user) From 5f23649150c503b30c124f2e874ed0e81d86ba25 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Thu, 30 May 2024 14:10:32 -0400 Subject: [PATCH 15/41] dynamic --- website/forms.py | 7 +- website/templates/dynamic_question.html | 16 +++ website/templates/question2.html | 11 -- website/views.py | 137 +++++++++++++++++++++--- 4 files changed, 144 insertions(+), 27 deletions(-) create mode 100644 website/templates/dynamic_question.html delete mode 100644 website/templates/question2.html diff --git a/website/forms.py b/website/forms.py index e03d1423..10cf5bee 100644 --- a/website/forms.py +++ b/website/forms.py @@ -5,5 +5,8 @@ class InitialQuestionForm(FlaskForm): days = RadioField('How many days a week do you want to workout?', choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7')], coerce=int) submit = SubmitField('Next') -class SecondQuestionForm(FlaskForm): - submit = SubmitField('Next') +def create_dynamic_form(question): + class DynamicForm(FlaskForm): + answer = RadioField(question['text'], choices=question['choices'], coerce=str) + submit = SubmitField('Next') + return DynamicForm diff --git a/website/templates/dynamic_question.html b/website/templates/dynamic_question.html new file mode 100644 index 00000000..be662f41 --- /dev/null +++ b/website/templates/dynamic_question.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} +{% block title %}Dynamic Question{% endblock %} +{% block content %} +

    {{ question.text }}

    + + {{ form.hidden_tag() }} +
    + {{ form.answer.label }}
    + {{ form.answer }} +
    +
    + + +
    + +{% endblock %} diff --git a/website/templates/question2.html b/website/templates/question2.html deleted file mode 100644 index 1f22b8e6..00000000 --- a/website/templates/question2.html +++ /dev/null @@ -1,11 +0,0 @@ -{% extends "base.html" %} -{% block title %}Question 2{% endblock %} -{% block content %} -

    Question 2: {{ days }}

    -
    - {{ form.hidden_tag() }} -
    - {{ form.submit() }} -
    -
    -{% endblock %} diff --git a/website/views.py b/website/views.py index edf8d3c6..f70e1c65 100644 --- a/website/views.py +++ b/website/views.py @@ -1,32 +1,141 @@ -from flask import Blueprint, render_template, request, flash, redirect, url_for, session +from flask import Blueprint, render_template, request, redirect, url_for, session from flask_login import login_required, current_user +from .forms import InitialQuestionForm, create_dynamic_form from .models import QuestionnaireResponse -from . import db -from .forms import InitialQuestionForm, SecondQuestionForm # Initialize the Blueprint views = Blueprint('views', __name__) -# Define the routes within the Blueprint +# Sample nested questions data +questions_data = { + '1': { + 'text': 'Question 2: How many times a week do you want to do cardio?', + 'choices': [('1', '1'), ('2', '2'), ('3', '3')], + 'next': { + '1': '1.1', # Follow-up questions for answer '1' + '2': '1.2', # Follow-up questions for answer '2' + '3': '1.3' # Follow-up questions for answer '3' + } + }, + '1.1': { + 'text': 'Follow-up Question 1.1: [Placeholder]', + 'choices': [('A', 'A'), ('B', 'B'), ('C', 'C')], + 'next': { + 'A': '1.1.1', + 'B': '1.1.2', + 'C': '1.1.3' + } + }, + '1.2': { + 'text': 'Follow-up Question 1.2: [Placeholder]', + 'choices': [('A', 'A'), ('B', 'B'), ('C', 'C')], + 'next': { + 'A': '1.2.1', + 'B': '1.2.2', + 'C': '1.2.3' + } + }, + '1.3': { + 'text': 'Follow-up Question 1.3: [Placeholder]', + 'choices': [('A', 'A'), ('B', 'B'), ('C', 'C')], + 'next': { + 'A': '1.3.1', + 'B': '1.3.2', + 'C': '1.3.3' + } + }, + '1.1.1': { + 'text': 'Follow-up Question 1.1.1: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + }, + '1.1.2': { + 'text': 'Follow-up Question 1.1.2: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + }, + '1.1.3': { + 'text': 'Follow-up Question 1.1.3: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + }, + '1.2.1': { + 'text': 'Follow-up Question 1.2.1: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + }, + '1.2.2': { + 'text': 'Follow-up Question 1.2.2: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + }, + '1.2.3': { + 'text': 'Follow-up Question 1.2.3: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + }, + '1.3.1': { + 'text': 'Follow-up Question 1.3.1: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + }, + '1.3.2': { + 'text': 'Follow-up Question 1.3.2: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + }, + '1.3.3': { + 'text': 'Follow-up Question 1.3.3: [Placeholder]', + 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], + 'next': {} + } + # Add more questions as needed +} + @views.route('/questionnaire', methods=['GET', 'POST']) def questionnaire(): form = InitialQuestionForm() if form.validate_on_submit(): days = form.days.data session['days'] = days - return redirect(url_for('views.question2')) + session['current_question'] = '1' # Start with question id '1' + session['history'] = [] # Initialize history + return redirect(url_for('views.dynamic_question')) return render_template('questionnaire.html', form=form) -@views.route('/question2', methods=['GET', 'POST']) -def question2(): - days = session.get('days') - if days is None: +@views.route('/dynamic_question', methods=['GET', 'POST']) +def dynamic_question(): + current_question_id = session.get('current_question') + if current_question_id is None: return redirect(url_for('views.questionnaire')) - form = SecondQuestionForm() - if form.validate_on_submit(): - # Process the form data and redirect to the next question or a results page - return redirect(url_for('views.questionnaire')) # For now, redirect back to the start - return render_template('question2.html', days=days, form=form) + + question = questions_data.get(current_question_id) + if question is None: + return redirect(url_for('views.questionnaire')) # Redirect to start if question not found + + DynamicForm = create_dynamic_form(question) + form = DynamicForm() + + if request.method == 'POST': + if 'next' in request.form: + if form.validate(): + answer = form.answer.data + next_question_id = question['next'].get(answer) + if next_question_id: + session['history'].append(current_question_id) + session['current_question'] = next_question_id + return redirect(url_for('views.dynamic_question')) + else: + return redirect(url_for('views.questionnaire')) # Redirect to start if no next question + elif 'back' in request.form: + if session['history']: + previous_question_id = session['history'].pop() + session['current_question'] = previous_question_id + return redirect(url_for('views.dynamic_question')) + else: + return redirect(url_for('views.questionnaire')) + + return render_template('dynamic_question.html', question=question, form=form) @views.route('/', methods=['GET']) @login_required From 2f9388fe0f5571bf5a67b89e6b297c0c10d4aa29 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Thu, 30 May 2024 14:34:40 -0400 Subject: [PATCH 16/41] multiselect --- website/forms.py | 8 ++- website/templates/dynamic_question.html | 9 ++- website/views.py | 80 ++++--------------------- 3 files changed, 25 insertions(+), 72 deletions(-) diff --git a/website/forms.py b/website/forms.py index 10cf5bee..8b1b7382 100644 --- a/website/forms.py +++ b/website/forms.py @@ -1,5 +1,6 @@ from flask_wtf import FlaskForm -from wtforms import RadioField, SubmitField +from wtforms import RadioField, SelectMultipleField, SubmitField +from wtforms.widgets import ListWidget, CheckboxInput class InitialQuestionForm(FlaskForm): days = RadioField('How many days a week do you want to workout?', choices=[('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7')], coerce=int) @@ -7,6 +8,9 @@ class InitialQuestionForm(FlaskForm): def create_dynamic_form(question): class DynamicForm(FlaskForm): - answer = RadioField(question['text'], choices=question['choices'], coerce=str) + if question.get('multi'): + answer = SelectMultipleField(question['text'], choices=question['choices'], option_widget=CheckboxInput(), widget=ListWidget(prefix_label=False)) + else: + answer = RadioField(question['text'], choices=question['choices'], coerce=str) submit = SubmitField('Next') return DynamicForm diff --git a/website/templates/dynamic_question.html b/website/templates/dynamic_question.html index be662f41..af2fd316 100644 --- a/website/templates/dynamic_question.html +++ b/website/templates/dynamic_question.html @@ -5,8 +5,13 @@

    {{ question.text }}

    {{ form.hidden_tag() }}
    - {{ form.answer.label }}
    - {{ form.answer }} + {{ form.answer.label }}
    + {% for subfield in form.answer %} +
    + {{ subfield() }} + {{ subfield.label }} +
    + {% endfor %}
    diff --git a/website/views.py b/website/views.py index 60373f39..c6a95651 100644 --- a/website/views.py +++ b/website/views.py @@ -9,87 +9,29 @@ # Sample nested questions data questions_data = { '1': { - 'text': 'Question 2: How many times a week do you want to do cardio?', - 'choices': [('1', '1'), ('2', '2'), ('3', '3')], + 'text': 'Are there any muscle groups you DO NOT want to exercise?', + 'choices': [('1', 'Yes'), ('2', 'No')], 'next': { '1': '1.1', # Follow-up questions for answer '1' - '2': '1.2', # Follow-up questions for answer '2' - '3': '1.3' # Follow-up questions for answer '3' + '2': '1.2' # Follow-up questions for answer '2' } }, '1.1': { - 'text': 'Follow-up Question 1.1: [Placeholder]', - 'choices': [('A', 'A'), ('B', 'B'), ('C', 'C')], + 'text': 'Select all muscle groups you DO NOT want to exercise', + 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('A', 'Shoulders'), ('B', 'Legs')], + 'multi': True, 'next': { 'A': '1.1.1', 'B': '1.1.2', 'C': '1.1.3' } }, - '1.2': { - 'text': 'Follow-up Question 1.2: [Placeholder]', - 'choices': [('A', 'A'), ('B', 'B'), ('C', 'C')], - 'next': { - 'A': '1.2.1', - 'B': '1.2.2', - 'C': '1.2.3' - } - }, - '1.3': { - 'text': 'Follow-up Question 1.3: [Placeholder]', - 'choices': [('A', 'A'), ('B', 'B'), ('C', 'C')], - 'next': { - 'A': '1.3.1', - 'B': '1.3.2', - 'C': '1.3.3' - } - }, '1.1.1': { 'text': 'Follow-up Question 1.1.1: [Placeholder]', 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], 'next': {} }, - '1.1.2': { - 'text': 'Follow-up Question 1.1.2: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} - }, - '1.1.3': { - 'text': 'Follow-up Question 1.1.3: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} - }, - '1.2.1': { - 'text': 'Follow-up Question 1.2.1: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} - }, - '1.2.2': { - 'text': 'Follow-up Question 1.2.2: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} - }, - '1.2.3': { - 'text': 'Follow-up Question 1.2.3: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} - }, - '1.3.1': { - 'text': 'Follow-up Question 1.3.1: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} - }, - '1.3.2': { - 'text': 'Follow-up Question 1.3.2: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} - }, - '1.3.3': { - 'text': 'Follow-up Question 1.3.3: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} - } - # Add more questions as needed + # ... other questions ... } @views.route('/questionnaire', methods=['GET', 'POST']) @@ -120,7 +62,11 @@ def dynamic_question(): if 'next' in request.form: if form.validate(): answer = form.answer.data - next_question_id = question['next'].get(answer) + if isinstance(answer, list): + # Handle multi-select answers + next_question_id = question['next'].get(answer[0]) # Choose appropriate logic for multi-select + else: + next_question_id = question['next'].get(answer) if next_question_id: session['history'].append(current_question_id) session['current_question'] = next_question_id @@ -132,8 +78,6 @@ def dynamic_question(): previous_question_id = session['history'].pop() session['current_question'] = previous_question_id return redirect(url_for('views.dynamic_question')) - else: - return redirect(url_for('views.questionnaire')) return render_template('dynamic_question.html', question=question, form=form) From 15251db76fed6db16a94fb80e39fbfaeaa7629e8 Mon Sep 17 00:00:00 2001 From: atipre Date: Thu, 30 May 2024 14:36:19 -0400 Subject: [PATCH 17/41] Weight Tracker + how to update weight --- website/templates/weight_tracker.html | 66 ++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/website/templates/weight_tracker.html b/website/templates/weight_tracker.html index e85cdcea..86be3752 100644 --- a/website/templates/weight_tracker.html +++ b/website/templates/weight_tracker.html @@ -9,10 +9,15 @@

    Weight Tracker

    - + + +
    +
    + +
    @@ -20,19 +25,68 @@

    Weight Tracker

    // Initialize an empty array to store weight data let weights = []; - // Function to add weight data - function addWeight() { + // Function to add or update weight data + function addOrUpdateWeight() { const weightInput = document.getElementById('weightInput'); const weight = parseFloat(weightInput.value); if (!isNaN(weight)) { - weights.push(weight); + const today = new Date().toLocaleDateString(); + let weightUpdated = false; + weights.forEach(entry => { + if (entry.date === today) { + entry.weight = weight; + weightUpdated = true; + } + }); + if (!weightUpdated) { + weights.push({ weight: weight, date: today }); + } weightInput.value = ''; // Clear input field updateChart(); + updateWeightLog(); + } else { + alert('Please enter a valid weight.'); + } + } + + // Function to undo the last weight entry + function undoWeight() { + if (weights.length > 0) { + weights.pop(); + updateChart(); + updateWeightLog(); + } + } + + // Function to update the weight when input field changes + function updateWeight() { + const weightInput = document.getElementById('weightInput'); + const weight = parseFloat(weightInput.value); + if (!isNaN(weight)) { + // Update the weight log without adding a new entry + updateWeightLog(); + // Update the chart with the updated weight + const today = new Date().toLocaleDateString(); + weights.forEach(entry => { + if (entry.date === today) { + entry.weight = weight; + } + }); + updateChart(); } else { alert('Please enter a valid weight.'); } } + // Function to update the weight log + function updateWeightLog() { + const weightLog = document.getElementById('weightLog'); + weightLog.innerHTML = ''; + weights.forEach((entry, index) => { + weightLog.innerHTML += `Day ${index + 1} (${entry.date}): ${entry.weight} lbs
    `; + }); + } + // Function to update the chart function updateChart() { const ctx = document.getElementById('weightChart').getContext('2d'); @@ -40,8 +94,8 @@

    Weight Tracker

    const data = { labels: labels, datasets: [{ - label: 'Weight (kg)', - data: weights, + label: 'Weight (lbs)', + data: weights.map(entry => entry.weight), backgroundColor: 'rgba(54, 162, 235, 0.2)', borderColor: 'rgba(54, 162, 235, 1)', borderWidth: 1 From db66c7a3fe20c0ecf66f7ae85cdc445346144006 Mon Sep 17 00:00:00 2001 From: atipre Date: Thu, 30 May 2024 14:42:32 -0400 Subject: [PATCH 18/41] Fixed update weight button --- website/templates/weight_tracker.html | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/website/templates/weight_tracker.html b/website/templates/weight_tracker.html index 86be3752..4d4418d9 100644 --- a/website/templates/weight_tracker.html +++ b/website/templates/weight_tracker.html @@ -24,6 +24,10 @@

    Weight Tracker

    {% endblock %} From 622b15adbaac6c639e9933632d5fe1d087fd4a59 Mon Sep 17 00:00:00 2001 From: atipre Date: Thu, 30 May 2024 15:00:18 -0400 Subject: [PATCH 19/41] Fixed undo weight --- website/templates/weight_tracker.html | 88 ++++++++++++--------------- 1 file changed, 39 insertions(+), 49 deletions(-) diff --git a/website/templates/weight_tracker.html b/website/templates/weight_tracker.html index 4d4418d9..ab73d88c 100644 --- a/website/templates/weight_tracker.html +++ b/website/templates/weight_tracker.html @@ -9,8 +9,9 @@

    Weight Tracker

    - - + + +
    @@ -24,61 +25,53 @@

    Weight Tracker

    {% endblock %} From 2e4236ac2d4eda37e95fee8a2d29f15fd6ba4e58 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Thu, 30 May 2024 15:00:41 -0400 Subject: [PATCH 20/41] q1 changes --- website/templates/split.html | 74 +++++++++++++++++++++--------------- website/views.py | 27 ++++++++----- 2 files changed, 61 insertions(+), 40 deletions(-) diff --git a/website/templates/split.html b/website/templates/split.html index 81ea4033..2f562244 100644 --- a/website/templates/split.html +++ b/website/templates/split.html @@ -1,35 +1,47 @@ {% extends "base.html" %} {% block title %}Workout Split{% endblock %} {% block content %} -
    -

    Workout Split

    -
    - -

    Workout 1, Workout 2, etc.

    -
    -
    - -

    Workout 1, Workout 2, etc.

    -
    -
    - -

    Workout 1, Workout 2, etc.

    -
    -
    - -

    Workout 1, Workout 2, etc.

    -
    -
    - -

    Workout 1, Workout 2, etc.

    -
    -
    - -

    Workout 1, Workout 2, etc.

    -
    -
    - -

    Workout 1, Workout 2, etc.

    -
    -
    +

    Your Customized Workout Split

    + +

    Based on your preferences, here is your workout plan:

    + +
      + {% for key, answer in responses.items() %} +
    • Question {{ key }}: {{ answer }}
      • + {% endfor %} +
    + +

    Workout Plan:

    +{% if '1.1' in responses %} +

    You have selected to not work on the following muscle groups:

    +
      + {% if 'A' in responses['1.1'] %} +
    • Chest
      • + {% endif %} + {% if 'B' in responses['1.1'] %} +
    • Back
      • + {% endif %} + {% if 'C' in responses['1.1'] %} +
    • Arms
      • + {% endif %} + {% if 'D' in responses['1.1'] %} +
    • Shoulders
      • + {% endif %} + {% if 'E' in responses['1.1'] %} +
    • Legs
      • + {% endif %} +
    +{% else %} +

    Full Body Workout

    +{% endif %} + + + + {% endblock %} diff --git a/website/views.py b/website/views.py index c6a95651..668711fa 100644 --- a/website/views.py +++ b/website/views.py @@ -13,17 +13,19 @@ 'choices': [('1', 'Yes'), ('2', 'No')], 'next': { '1': '1.1', # Follow-up questions for answer '1' - '2': '1.2' # Follow-up questions for answer '2' + '2': 'end' # Redirect to workout split for answer '2' } }, '1.1': { 'text': 'Select all muscle groups you DO NOT want to exercise', - 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('A', 'Shoulders'), ('B', 'Legs')], + 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('D', 'Shoulders'), ('E', 'Legs')], 'multi': True, 'next': { - 'A': '1.1.1', - 'B': '1.1.2', - 'C': '1.1.3' + 'A': 'end', + 'B': 'end', + 'C': 'end', + 'D': 'end', + 'E': 'end' } }, '1.1.1': { @@ -42,6 +44,7 @@ def questionnaire(): session['days'] = days session['current_question'] = '1' # Start with question id '1' session['history'] = [] # Initialize history + session['responses'] = {} # Initialize responses return redirect(url_for('views.dynamic_question')) return render_template('questionnaire.html', form=form) @@ -62,12 +65,15 @@ def dynamic_question(): if 'next' in request.form: if form.validate(): answer = form.answer.data + session['responses'][current_question_id] = answer if isinstance(answer, list): # Handle multi-select answers - next_question_id = question['next'].get(answer[0]) # Choose appropriate logic for multi-select + next_question_id = question['next'].get(answer[0], None) # Choose appropriate logic for multi-select else: - next_question_id = question['next'].get(answer) - if next_question_id: + next_question_id = question['next'].get(answer, None) + if next_question_id == 'end': + return redirect(url_for('views.split')) # Redirect to workout split tab at the end of the branch + elif next_question_id: session['history'].append(current_question_id) session['current_question'] = next_question_id return redirect(url_for('views.dynamic_question')) @@ -89,7 +95,10 @@ def home(): @views.route('/split', methods=['GET']) @login_required def split(): - return render_template("split.html", user=current_user) + # Use session['responses'] to customize the workout split + responses = session.get('responses', {}) + # Process responses to customize the workout split + return render_template("split.html", user=current_user, responses=responses) @views.route('/tracker', methods=['GET']) @login_required From 24fd354626ac5b2d0b6c8ed54df3a450f7c2194c Mon Sep 17 00:00:00 2001 From: atipre Date: Thu, 30 May 2024 15:44:24 -0400 Subject: [PATCH 21/41] Trying to get weight to store --- instance/database.db | Bin 20480 -> 24576 bytes website/__init__.py | 23 ++++++++++++++--------- website/auth.py | 2 ++ website/models.py | 8 ++++++++ website/weight_tracker.py | 24 ++++++++++++++++++++++++ 5 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 website/weight_tracker.py diff --git a/instance/database.db b/instance/database.db index 0054ae95a29d6ac38cc89d0e27b2eabf68a73788..36ef2639ad37c76ada2e2f6a073e6ffe51b7a4e4 100644 GIT binary patch delta 187 zcmZozz}Rqrae}m3B?npaX(iOgnm4svx2aa9O$bni` z5m0dR@plYS@bd@aP#+&11uo8%#FEtb#FUiOl*#+};x{Yu-gjc-1vyS&v!KC6{)rPb E0Rh!Dk^lez delta 61 zcmZoTz}T>Wae}m<00RR9D-go~^F$qEQ2_?MtP8ySKNwhe6&d(t`Oovk^D1r@6j;l% JS&{d?697&k3@!iw diff --git a/website/__init__.py b/website/__init__.py index dc6cad7d..ce1ac23c 100644 --- a/website/__init__.py +++ b/website/__init__.py @@ -3,38 +3,49 @@ from os import path from flask_login import LoginManager +# Create SQLAlchemy instance db = SQLAlchemy() DB_NAME = "database.db" -from flask_login import current_user - def create_app(): app = Flask(__name__) app.config['SECRET_KEY'] = 'hjshjhdjah kjshkjdhjs' app.config['SQLALCHEMY_DATABASE_URI'] = f'sqlite:///{DB_NAME}' + + # Initialize SQLAlchemy with the Flask app db.init_app(app) + # Import blueprints from .views import views from .auth import auth + from .weight_tracker import weight_tracker_bp # Import the weight tracker blueprint + # Register blueprints app.register_blueprint(views, url_prefix='/') app.register_blueprint(auth, url_prefix='/auth') + app.register_blueprint(weight_tracker_bp, url_prefix='/weight') # Register the weight tracker blueprint - from .models import User, Note, QuestionnaireResponse + # Import models + from .models import User, Note, QuestionnaireResponse, WeightEntry with app.app_context(): + # Create database tables if they don't exist db.create_all() + # Initialize LoginManager login_manager = LoginManager() login_manager.login_view = 'auth.login' login_manager.init_app(app) + # Define the user loader function @login_manager.user_loader def load_user(id): return User.query.get(int(id)) + # Inject current_user into templates @app.context_processor def inject_user(): + from flask_login import current_user return dict(user=current_user) return app @@ -43,9 +54,3 @@ def create_database(app): if not path.exists('website/' + DB_NAME): db.create_all(app=app) print('Created Database!') - - -def create_database(app): - if not path.exists('website/' + DB_NAME): - db.create_all(app=app) - print('Created Database!') diff --git a/website/auth.py b/website/auth.py index 40d322a3..55abaf57 100644 --- a/website/auth.py +++ b/website/auth.py @@ -80,3 +80,5 @@ def show_questionnaire(): return redirect(url_for('views.home')) return render_template('questionnaire.html', form=form) + + diff --git a/website/models.py b/website/models.py index bc20b10c..7d34233b 100644 --- a/website/models.py +++ b/website/models.py @@ -22,3 +22,11 @@ class QuestionnaireResponse(db.Model): question2 = db.Column(db.String(200), nullable=False) question3 = db.Column(db.String(200), nullable=False) user = db.relationship('User', backref=db.backref('responses', lazy=True)) + +class WeightEntry(db.Model): + id = db.Column(db.Integer, primary_key=True) + weight = db.Column(db.Float, nullable=False) + date_added = db.Column(db.DateTime(timezone=True), default=func.now()) + user_id = db.Column(db.Integer, db.ForeignKey('user.id')) + + user = db.relationship('User', backref=db.backref('weight_entries', lazy=True)) \ No newline at end of file diff --git a/website/weight_tracker.py b/website/weight_tracker.py new file mode 100644 index 00000000..60be58b6 --- /dev/null +++ b/website/weight_tracker.py @@ -0,0 +1,24 @@ +from flask import Blueprint, render_template, request, flash, redirect, url_for +from flask_login import login_required, current_user +from .models import WeightEntry +from . import db +from datetime import datetime as dt + +weight_tracker_bp = Blueprint('weight_tracker', __name__) + +@weight_tracker_bp.route('/weight-tracker', methods=['GET', 'POST']) +@login_required +def weight_tracker(): + if request.method == 'POST': + weight = float(request.form.get('weight')) + new_weight_entry = WeightEntry(user_id=current_user.id, weight=weight) + db.session.add(new_weight_entry) + db.session.commit() + flash('Weight added successfully!', category='success') + return redirect(url_for('weight_tracker.weight_tracker')) + + return render_template('weight_tracker.html') + +# Add routes for editing and deleting weight entries if needed + +# Example model definition for WeightEntry From 08b88640b7c292ff71e247e5b225269849c8ed1e Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Thu, 30 May 2024 15:44:43 -0400 Subject: [PATCH 22/41] dynamic m --- website/templates/split.html | 39 +++--------------- website/views.py | 79 ++++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 52 deletions(-) diff --git a/website/templates/split.html b/website/templates/split.html index 2f562244..85cd0ef3 100644 --- a/website/templates/split.html +++ b/website/templates/split.html @@ -5,43 +5,14 @@

    Your Customized Workout Split

    Based on your preferences, here is your workout plan:

    +

    Workout Plan:

    +

    Days per week: {{ days }}

      - {% for key, answer in responses.items() %} -
    • Question {{ key }}: {{ answer }}
      • + {% for group in included_groups %} +
    • {{ group }}
      • {% endfor %}
    -

    Workout Plan:

    -{% if '1.1' in responses %} -

    You have selected to not work on the following muscle groups:

    -
      - {% if 'A' in responses['1.1'] %} -
    • Chest
      • - {% endif %} - {% if 'B' in responses['1.1'] %} -
    • Back
      • - {% endif %} - {% if 'C' in responses['1.1'] %} -
    • Arms
      • - {% endif %} - {% if 'D' in responses['1.1'] %} -
    • Shoulders
      • - {% endif %} - {% if 'E' in responses['1.1'] %} -
    • Legs
      • - {% endif %} -
    -{% else %} -

    Full Body Workout

    -{% endif %} - - - +

    {{ message }}

    {% endblock %} diff --git a/website/views.py b/website/views.py index 668711fa..7a7ed45b 100644 --- a/website/views.py +++ b/website/views.py @@ -13,7 +13,7 @@ 'choices': [('1', 'Yes'), ('2', 'No')], 'next': { '1': '1.1', # Follow-up questions for answer '1' - '2': 'end' # Redirect to workout split for answer '2' + '2': 'end_condition1' # Redirect to workout split for answer '2' } }, '1.1': { @@ -21,21 +21,51 @@ 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('D', 'Shoulders'), ('E', 'Legs')], 'multi': True, 'next': { - 'A': 'end', - 'B': 'end', - 'C': 'end', - 'D': 'end', - 'E': 'end' + 'A': 'end_condition2', + 'B': 'end_condition2', + 'C': 'end_condition2', + 'D': 'end_condition2', + 'E': 'end_condition2' } }, - '1.1.1': { - 'text': 'Follow-up Question 1.1.1: [Placeholder]', - 'choices': [('X', 'X'), ('Y', 'Y'), ('Z', 'Z')], - 'next': {} + '2': { + 'text': 'Are there any muscle groups you DO NOT want to exercise?', + 'choices': [('1', 'Yes'), ('2', 'No')], + 'next': { + '1': '2.1', # Follow-up questions for answer '1' + '2': 'end_condition3' # Redirect to workout split for answer '2' + } }, + '2.1': { + 'text': 'Select all muscle groups you DO NOT want to exercise', + 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('D', 'Shoulders'), ('E', 'Legs')], + 'multi': True, + 'next': { + 'A': 'end_condition3', + 'B': 'end_condition3', + 'C': 'end_condition3', + 'D': 'end_condition3', + 'E': 'end_condition3' + } + }, + '2.2': { + 'text': 'Do you want to workout on back to back days?', + 'choices': [('1', 'Yes'), ('2', 'No')], + 'next': { + '1': 'end_condition3', + '2': 'end_condition3' + } + } # ... other questions ... } +conditions_messages = { + 'condition1': 'Message for condition 1', + 'condition2': 'Message for condition 2', + 'condition3': 'Message for condition 3', + # Add more conditions and messages as needed +} + @views.route('/questionnaire', methods=['GET', 'POST']) def questionnaire(): form = InitialQuestionForm() @@ -45,6 +75,7 @@ def questionnaire(): session['current_question'] = '1' # Start with question id '1' session['history'] = [] # Initialize history session['responses'] = {} # Initialize responses + session['condition'] = '' # Initialize condition return redirect(url_for('views.dynamic_question')) return render_template('questionnaire.html', form=form) @@ -65,13 +96,13 @@ def dynamic_question(): if 'next' in request.form: if form.validate(): answer = form.answer.data + # Ensure answer is stored as a list + if not isinstance(answer, list): + answer = [answer] session['responses'][current_question_id] = answer - if isinstance(answer, list): - # Handle multi-select answers - next_question_id = question['next'].get(answer[0], None) # Choose appropriate logic for multi-select - else: - next_question_id = question['next'].get(answer, None) - if next_question_id == 'end': + next_question_id = question['next'].get(answer[0], None) + if next_question_id and next_question_id.startswith('end_condition'): + session['condition'] = next_question_id.replace('end_', '') return redirect(url_for('views.split')) # Redirect to workout split tab at the end of the branch elif next_question_id: session['history'].append(current_question_id) @@ -97,8 +128,20 @@ def home(): def split(): # Use session['responses'] to customize the workout split responses = session.get('responses', {}) - # Process responses to customize the workout split - return render_template("split.html", user=current_user, responses=responses) + condition = session.get('condition', 'condition1') # Default to condition1 + days = session.get('days', 0) + muscle_groups = { + 'A': 'Chest', + 'B': 'Back', + 'C': 'Arms', + 'D': 'Shoulders', + 'E': 'Legs' + } + excluded_groups = responses.get('1.1', []) + included_groups = [muscle_groups[key] for key in muscle_groups if key not in excluded_groups] + message = conditions_messages.get(condition, 'Default message') + + return render_template("split.html", user=current_user, included_groups=included_groups, days=days, message=message) @views.route('/tracker', methods=['GET']) @login_required From b3ef1eebc3a1a5c2676046938ac3f2cc67e345c4 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Thu, 30 May 2024 15:57:49 -0400 Subject: [PATCH 23/41] trackerstorage --- instance/database.db | Bin 24576 -> 28672 bytes website/.DS_Store | Bin 6148 -> 6148 bytes website/__init__.py | 1 + website/forms.py | 1 + website/models.py | 13 ++++-- website/templates/weight_tracker.html | 35 ++++++++++------ website/views.py | 55 +++++++++++++++----------- 7 files changed, 67 insertions(+), 38 deletions(-) diff --git a/instance/database.db b/instance/database.db index 36ef2639ad37c76ada2e2f6a073e6ffe51b7a4e4..45e8988b4d5c57b7a91cef2570f926b7b4936660 100644 GIT binary patch delta 187 zcmZoTz}WDBae}mqH%6Nnr-PtP8ySKN#4!OBncN`Oovk^D6QlyiB!ku~2NHo}wr(0|Nsi1A_nqLncEBLp%`bF%)cG$h@2xEX55L%4Eoc zNlz|h5@BL+oNUIVwpoqInXx{pytp7KCqD^j&W@yloXp}91A}XfOw25-Z0sED9NZkS z!5R7G!6k_$rNvH(MbRK$NPd1!5{#Xg6qcD<9xou`oS#>cn3KFu;EWfLsCKP3F)`3lFf}o*)lsOnGy<|sjLm9mIXOg?^{s>A zvvYFu^1FbJ0|G{%N5KH(X=KnnS&><6awap+WEEy%?y}&byqx^JbfAjKh0G?hf(+#h zsX+gyGh~2+sDz=2A(0`OAsZ-K1Pl*J_IdxoU}E9t&Fmcf9Kg^8hTwPR$^0UY96&pn MKz4185Lv?v0I^D9MF0Q* delta 95 zcmZoMXfc=|#>B)qu~2NHo}wrx0|Nsi1A_nqLo!1m5N9x?GQ@8zT+YbIx!H*&mT__= v8_(qBYzC7h+23t!C}G~r&cV+C)V^7e<2&

    Weight Tracker

    - - - + + + + + - +
    @@ -23,11 +25,24 @@

    Weight Tracker

    - - - - + + + + + + diff --git a/website/templates/home.html b/website/templates/home.html index 7b911f9a..e0d6fbc2 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -2,34 +2,13 @@ {% block title %}Home{% endblock %} {% block content %}

    Welcome, {{ user.first_name }}!

    - -
    -
    -

    Welcome to PhySeek: Your Personalized Fitness Destination! +

    Welcome to PhySeek: Your Personalized Fitness Destination! - At PhySeek, we believe that achieving your fitness goals should be personalized, convenient, and effective. That's why we've created a platform where you can embark on your fitness journey with confidence. - - Whether you're looking to build muscle, lose weight, improve endurance, or simply enhance your overall health, our custom-tailored workouts are designed to fit your unique needs and goals. Say goodbye to generic routines and hello to workouts that evolve with you. - - Track your progress effortlessly with our intuitive tools and charts, allowing you to see your achievements in real-time and stay motivated every step of the way. Whether you're a seasoned gym-goer or just starting out, PhySeek is here to support you on your path to a healthier, happier you. - - So, are you ready to unleash your full potential? Let's get started on your journey to a fitter, stronger, and more vibrant you. Welcome to PhySeek! Fill out the Questionnaire and start lifting today!

    -
    -
    +At PhySeek, we believe that achieving your fitness goals should be personalized, convenient, and effective. That's why we've created a platform where you can embark on your fitness journey with confidence. + +Whether you're looking to build muscle, lose weight, improve endurance, or simply enhance your overall health, our custom-tailored workouts are designed to fit your unique needs and goals. Say goodbye to generic routines and hello to workouts that evolve with you. + +Track your progress effortlessly with our intuitive tools and charts, allowing you to see your achievements in real-time and stay motivated every step of the way. Whether you're a seasoned gym-goer or just starting out, PhySeek is here to support you on your path to a healthier, happier you. + +So, are you ready to unleash your full potential? Let's get started on your journey to a fitter, stronger, and more vibrant you. Welcome to PhySeek! Fill out the Questionnaire and start lifting today!

    {% endblock %} diff --git a/website/templates/weight_tracker.html b/website/templates/weight_tracker.html index 960c6d48..3672870d 100644 --- a/website/templates/weight_tracker.html +++ b/website/templates/weight_tracker.html @@ -10,11 +10,11 @@

    Weight Tracker

    - +
    - + - +
    @@ -104,16 +104,26 @@

    Weight Tracker

    datasets: [{ label: 'Weight (lbs)', data: weights.map(entry => entry.weight), - backgroundColor: 'rgba(54, 162, 235, 0.2)', - borderColor: 'rgba(54, 162, 235, 1)', - borderWidth: 1 + backgroundColor: 'rgba(125, 13, 195, 0.2)', // Purple color + borderColor: 'rgba(125, 13, 195, 1)', // Purple color + borderWidth: 2, + pointRadius: 5, + pointHoverRadius: 7 }] }; const options = { scales: { yAxes: [{ ticks: { - beginAtZero: true + beginAtZero: true, + fontSize: 14, + fontColor: '#7D0DC3' // Purple color + } + }], + xAxes: [{ + ticks: { + fontSize: 14, + fontColor: '#7D0DC3' // Purple color } }] } From e642e94926da0189bb7e3e5d46c4a4e4c3ca7719 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Fri, 31 May 2024 14:08:28 -0400 Subject: [PATCH 25/41] updated d --- instance/database.db | Bin 28672 -> 28672 bytes website/templates/weight_tracker.html | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instance/database.db b/instance/database.db index 3303ec46b446ce5c541a8a0a81abd5aa2c790c5c..3b32d97f3ff0f46143ed1c4fcece34e9748afe6d 100644 GIT binary patch delta 98 zcmZp8z}WDBae_3X*hCp;MzM_vOX7K0`1=|7pYR{&U(MgYSx}*#-$IIomBE;a)5yTc jMAyJn*Vs_O(89{V#LCo&;gS?Hb~zJ6h7*&I=UV~*?p_z# delta 37 tcmZp8z}WDBae_3X$V3@uMv;vPOX4}0_>VL2KjA;VSWeight Tracker ticks: { beginAtZero: true, fontSize: 14, - fontColor: '#7D0DC3' // Purple color + fontColor: '#a317be' // Purple color } }], xAxes: [{ ticks: { fontSize: 14, - fontColor: '#7D0DC3' // Purple color + fontColor: '#a317be' // Purple color } }] } From 753774b5089d69c23e2d295d04a1d38f9deaf68c Mon Sep 17 00:00:00 2001 From: atipre Date: Fri, 31 May 2024 14:20:26 -0400 Subject: [PATCH 26/41] Aesthetics --- website/templates/home.html | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/website/templates/home.html b/website/templates/home.html index e0d6fbc2..cfae24a1 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -2,13 +2,31 @@ {% block title %}Home{% endblock %} {% block content %}

    Welcome, {{ user.first_name }}!

    -

    Welcome to PhySeek: Your Personalized Fitness Destination! -At PhySeek, we believe that achieving your fitness goals should be personalized, convenient, and effective. That's why we've created a platform where you can embark on your fitness journey with confidence. +

    +

    Welcome to PhySeek: Your Personalized Fitness Destination!

    -Whether you're looking to build muscle, lose weight, improve endurance, or simply enhance your overall health, our custom-tailored workouts are designed to fit your unique needs and goals. Say goodbye to generic routines and hello to workouts that evolve with you. +

    + At PhySeek, we believe that achieving your fitness goals should be personalized, convenient, and effective. That's why we've created a platform where you can embark on your fitness journey with confidence. +

    -Track your progress effortlessly with our intuitive tools and charts, allowing you to see your achievements in real-time and stay motivated every step of the way. Whether you're a seasoned gym-goer or just starting out, PhySeek is here to support you on your path to a healthier, happier you. +

    + Whether you're looking to build muscle, lose weight, improve endurance, or simply enhance your overall health, our custom-tailored workouts are designed to fit your unique needs and goals. Say goodbye to generic routines and hello to workouts that evolve with you. +

    -So, are you ready to unleash your full potential? Let's get started on your journey to a fitter, stronger, and more vibrant you. Welcome to PhySeek! Fill out the Questionnaire and start lifting today!

    +

    + Track your progress effortlessly with our intuitive tools and charts, allowing you to see your achievements in real-time and stay motivated every step of the way. +

    + +

    + Whether you're a seasoned gym-goer or just starting out, PhySeek is here to support you on your path to a healthier, happier you. +

    + +

    So, are you ready to unleash your full potential?

    + +

    + Let's get started on your journey to a fitter, stronger, and more vibrant you. Welcome to PhySeek! Fill out the Questionnaire and start lifting today! +

    +
    {% endblock %} + From 2c713444dda53b756fbce68a6658f79e0e128b95 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Fri, 31 May 2024 14:50:16 -0400 Subject: [PATCH 27/41] w --- .DS_Store | Bin 6148 -> 6148 bytes website/.DS_Store | Bin 6148 -> 8196 bytes website/static/style.css | 32 +++++++++++++++++++----- website/templates/base.html | 19 +++----------- website/templates/dynamic_question.html | 25 ++++++++++++------ website/templates/home.html | 6 +++-- website/templates/questionnaire.html | 23 ++++++++++++++--- website/views.py | 21 +++++++++------- 8 files changed, 83 insertions(+), 43 deletions(-) diff --git a/.DS_Store b/.DS_Store index 7784241d244e05937acf91b79e0a0d2d497fb76e..4d54cc80fdad7bbfb66a0bbe5117fa5e345fd45c 100644 GIT binary patch delta 20 bcmZoMXffC@kBQyF%uq+c#C-Eorg%{RLN5j6 delta 20 bcmZoMXffC@kBQyH#6U;E)MWEgrg%{RLDU7? diff --git a/website/.DS_Store b/website/.DS_Store index f3d149a8c9a2520b918737b03775e4149c3768f5..f767faf331f79130f214c1a3021d32eb647cbc61 100644 GIT binary patch delta 157 zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMA$iFdQH}hr%jz7$c**Q2SHn1@A zZ{}g~W1OtV$~$>JYXiH5nW2t?iTPwTHU|kdhGK>ihD0FFWJoRxF3QWv&r1iIHo1{a vd~+`ADaOs}JkOcAB)EZMt{_V`3vzsCp3E=eIoY3wgM$%bKf~sDo;l0_HXb3b delta 112 zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jG}fU^g=(?`9qWKgP*5Lc*J4 yg-$U}Y`CzPor6P=8K@En1h|2OD@fDE!tczJ`DHvoMldizj04%gusNP*4l@9A{u5OI diff --git a/website/static/style.css b/website/static/style.css index d4fa32d1..a6944532 100644 --- a/website/static/style.css +++ b/website/static/style.css @@ -90,19 +90,39 @@ body { margin: 20px auto; padding: 20px; } - +/* style.css */ +/* Button styles */ +/* style.css */ +/* Button styles */ +/* style.css */ /* Button styles */ .btn { - background-color: #a317be; /* Purple color */ - color: #fff; - border: none; + background-color: white; /* White color by default */ + color: black; /* Black text color by default */ + border: 1px solid #a317be; /* Border color to distinguish buttons */ padding: 10px 20px; cursor: pointer; border-radius: 5px; font-size: 16px; - transition: background-color 0.3s ease; + transition: background-color 0.3s ease, color 0.3s ease; + display: block; /* Make buttons block elements for vertical alignment */ + width: auto; /* Auto width to fit content */ + text-align: left; /* Align text to the left */ + margin-bottom: 10px; /* Space between buttons */ } .btn:hover { - background-color: #a317be; /* Darker purple */ + background-color: #a317be; /* Purple color on hover */ + color: white; /* White text color on hover */ +} + +.questionnaire-btn { + margin: 5px 0; /* Space between buttons */ + background-color: white; /* White by default */ + color: black; /* Black text by default */ +} + +.questionnaire-btn:hover { + background-color: #a317be; /* Purple color on hover */ + color: white; /* White text on hover */ } diff --git a/website/templates/base.html b/website/templates/base.html index d5a94159..1b304604 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -16,7 +16,8 @@
    - - - - - - + +{% endblock %} \ No newline at end of file diff --git a/website/templates/home.html b/website/templates/home.html index cfae24a1..c479315e 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -25,8 +25,10 @@

    Welcome, {{ user.first_name }}!

    So, are you ready to unleash your full potential?

    - Let's get started on your journey to a fitter, stronger, and more vibrant you. Welcome to PhySeek! Fill out the Questionnaire and start lifting today! + Let's get started on your journey to a fitter, stronger, and more vibrant you. Welcome to PhySeek!

    +
    {% endblock %} - diff --git a/website/templates/questionnaire.html b/website/templates/questionnaire.html index ede167fd..efd4387b 100644 --- a/website/templates/questionnaire.html +++ b/website/templates/questionnaire.html @@ -5,11 +5,28 @@

    Questionnaire

    {{ form.hidden_tag() }}
    - {{ form.days.label }}
    - {{ form.days }} + {{ form.days.label }}
    + {% for subfield in form.days %} + + {% endfor %} +
    - {{ form.submit() }} + {{ form.submit(class="btn") }}
    + + {% endblock %} diff --git a/website/views.py b/website/views.py index a826a1a6..3c8b3683 100644 --- a/website/views.py +++ b/website/views.py @@ -1,4 +1,4 @@ -from flask import Blueprint, render_template, request, redirect, url_for, session, jsonify +from flask import Blueprint, render_template, request, redirect, url_for, session, jsonify, flash from flask_login import login_required, current_user from .forms import InitialQuestionForm, create_dynamic_form from .models import User, Weight @@ -67,13 +67,14 @@ def questionnaire(): form = InitialQuestionForm() if form.validate_on_submit(): - days = form.days.data - session['days'] = days - session['current_question'] = '1' - session['history'] = [] - session['responses'] = {} - session['condition'] = '' - return redirect(url_for('views.dynamic_question')) + selected_option = form.days.data + if selected_option: + flash(f'You selected: {selected_option}') + session['days'] = selected_option + session['current_question'] = '1' # Assuming the first question is '1' + session['history'] = [] + session['responses'] = {} + return redirect(url_for('views.dynamic_question')) return render_template('questionnaire.html', form=form) @views.route('/dynamic_question', methods=['GET', 'POST']) @@ -92,7 +93,7 @@ def dynamic_question(): if request.method == 'POST': if 'next' in request.form: if form.validate(): - answer = form.answer.data + answer = request.form.get('answer') if not isinstance(answer, list): answer = [answer] session['responses'][current_question_id] = answer @@ -110,6 +111,8 @@ def dynamic_question(): if session['history']: previous_question_id = session['history'].pop() session['current_question'] = previous_question_id + if previous_question_id == '1': # Assuming the first question is '1' + return redirect(url_for('views.questionnaire')) return redirect(url_for('views.dynamic_question')) return render_template('dynamic_question.html', question=question, form=form) From 6252e6e92d09ae5a3aecb3dfc85022fadb2c1016 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Fri, 31 May 2024 15:15:19 -0400 Subject: [PATCH 28/41] w --- website/templates/dynamic_question.html | 42 ++++++++++++++++++------- website/views.py | 12 ++++--- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/website/templates/dynamic_question.html b/website/templates/dynamic_question.html index 6dc6536a..c9c14914 100644 --- a/website/templates/dynamic_question.html +++ b/website/templates/dynamic_question.html @@ -6,9 +6,9 @@

    {{ question.text }}

    {{ form.hidden_tag() }}
    {% for subfield in form.answer %} - + {% endfor %} - +
    @@ -17,16 +17,34 @@

    {{ question.text }}

    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/website/views.py b/website/views.py index 3c8b3683..8b871456 100644 --- a/website/views.py +++ b/website/views.py @@ -58,8 +58,8 @@ } conditions_messages = { - 'condition1': 'Message for condition 1', - 'condition2': 'Message for condition 2', + 'condition1': 'Full Body Workout', + 'condition2': 'Customized Split', 'condition3': 'Message for condition 3' } @@ -94,7 +94,9 @@ def dynamic_question(): if 'next' in request.form: if form.validate(): answer = request.form.get('answer') - if not isinstance(answer, list): + if question.get('multi'): + answer = answer.split(',') + else: answer = [answer] session['responses'][current_question_id] = answer next_question_id = question['next'].get(answer[0], None) @@ -111,9 +113,9 @@ def dynamic_question(): if session['history']: previous_question_id = session['history'].pop() session['current_question'] = previous_question_id - if previous_question_id == '1': # Assuming the first question is '1' - return redirect(url_for('views.questionnaire')) return redirect(url_for('views.dynamic_question')) + else: + return redirect(url_for('views.questionnaire')) return render_template('dynamic_question.html', question=question, form=form) From 18e9a52735a7db07404e7229bcf6686c2b4d7e89 Mon Sep 17 00:00:00 2001 From: Danny Kardhashi Date: Fri, 31 May 2024 15:24:23 -0400 Subject: [PATCH 29/41] newest --- website/views.py | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/website/views.py b/website/views.py index 8b871456..354d062f 100644 --- a/website/views.py +++ b/website/views.py @@ -28,26 +28,14 @@ } }, '2': { - 'text': 'Are there any muscle groups you DO NOT want to exercise?', - 'choices': [('1', 'Yes'), ('2', 'No')], + 'text': 'How many days a week do you want to workout?', + 'choices': [('1', '1 day'), ('2', '2 days'), ('3', '3 days'), ('4', '4 days'), ('5', '5 days'), ('6', '6 days'), ('7', '7 days')], 'next': { '1': '2.1', '2': 'end_condition3' } }, '2.1': { - 'text': 'Select all muscle groups you DO NOT want to exercise', - 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('D', 'Shoulders'), ('E', 'Legs')], - 'multi': True, - 'next': { - 'A': 'end_condition3', - 'B': 'end_condition3', - 'C': 'end_condition3', - 'D': 'end_condition3', - 'E': 'end_condition3' - } - }, - '2.2': { 'text': 'Do you want to workout on back to back days?', 'choices': [('1', 'Yes'), ('2', 'No')], 'next': { @@ -58,8 +46,8 @@ } conditions_messages = { - 'condition1': 'Full Body Workout', - 'condition2': 'Customized Split', + 'condition1': 'Message for condition 1', + 'condition2': 'Message for condition 2', 'condition3': 'Message for condition 3' } @@ -99,11 +87,18 @@ def dynamic_question(): else: answer = [answer] session['responses'][current_question_id] = answer - next_question_id = question['next'].get(answer[0], None) - if next_question_id and next_question_id.startswith('end_condition'): - session['condition'] = next_question_id.replace('end_', '') - return redirect(url_for('views.split')) - elif next_question_id: + + # Determine the next question or end condition based on all selected answers + next_question_id = None + for ans in answer: + next_id = question['next'].get(ans) + if next_id and next_id.startswith('end_condition'): + session['condition'] = next_id.replace('end_', '') + return redirect(url_for('views.split')) + elif next_id: + next_question_id = next_id + + if next_question_id: session['history'].append(current_question_id) session['current_question'] = next_question_id return redirect(url_for('views.dynamic_question')) From 58976d642aa8b54c431d9c9dba3efd05c2b32b46 Mon Sep 17 00:00:00 2001 From: dkardhashi Date: Sun, 7 Jul 2024 14:14:10 -0400 Subject: [PATCH 30/41] new ui --- .DS_Store | Bin 6148 -> 6148 bytes instance/database.db | Bin 28672 -> 28672 bytes website/.DS_Store | Bin 8196 -> 8196 bytes website/static/style.css | 36 ++++++++++++ website/templates/about.html | 7 +++ website/templates/base.html | 13 +++-- website/templates/home.html | 108 +++++++++++++++++++++++++++-------- website/templates/split.html | 24 ++++---- website/views.py | 27 +++++---- 9 files changed, 165 insertions(+), 50 deletions(-) create mode 100644 website/templates/about.html diff --git a/.DS_Store b/.DS_Store index 4d54cc80fdad7bbfb66a0bbe5117fa5e345fd45c..04fd16fbe574aeb6097c53d6c20a11fb4b464f64 100644 GIT binary patch delta 348 zcmZ9Iy$ZrW5QHZeAyEV^Vmd*42^KVZ7r~puaIxxcmF1%5&bd$IGP*1X?!{_rBQNHX1 zONTWw=rgQedYAzkLMkO=VTGeK%c)-lbr};3=`p~Vw?%fI5hvL|X%>(=Ht?{QD%_xmjbV0Pr{+zr#}5{HlXs&sTIUk5o@;HY4vP7xeHe$nqJenJMQPB Q#xB)qu~2NHo}wr#0|Nsi1A_nqLncEBLuyiaaY0hf#=_-{jI5KnSSPca w8R{sQm>X|i!kWyqvEd)nW_AvK4xskUf*jwOC-aLqasUkgnZU9+LSzjy04((t*Z=?k diff --git a/instance/database.db b/instance/database.db index 3b32d97f3ff0f46143ed1c4fcece34e9748afe6d..1bd86963907f381fd7249e2e189770021971bd12 100644 GIT binary patch delta 72 zcmZp8z}WDBae_3X_(U0JM)8daOXB%h`HLC&pYR{&U(MgoU%XjRA(3B3ij|eYn2FQK bz{o_`z#NDa3@xk-jjT+K84geG&o2Z3About PhySeek +

    Welcome to PhySeek, your personalized fitness destination!

    + +{% endblock %} diff --git a/website/templates/base.html b/website/templates/base.html index 1b304604..0ca6b21e 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -15,12 +15,10 @@
    - - + + + + diff --git a/website/templates/home.html b/website/templates/home.html index c479315e..2c435b1d 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -1,34 +1,94 @@ {% extends "base.html" %} -{% block title %}Home{% endblock %} +{% block title %}Dashboard{% endblock %} {% block content %} -

    Welcome, {{ user.first_name }}!

    +
    +
    +

    Weight Tracker

    + +
    +
    +

    Today's Workout

    +

    Loading today's workout...

    +
    +
    -
    -

    Welcome to PhySeek: Your Personalized Fitness Destination!

    + {% endblock %} diff --git a/website/templates/split.html b/website/templates/split.html index 85cd0ef3..2c5e731e 100644 --- a/website/templates/split.html +++ b/website/templates/split.html @@ -3,16 +3,20 @@ {% block content %}

    Your Customized Workout Split

    -

    Based on your preferences, here is your workout plan:

    +
    +

    Today's Workout

    +

    Chest: bench press 3 x 10, lateral raise 4 x 15, tricep pushdowns 3 x 12, dips 3 x 15.

    +
    -

    Workout Plan:

    -

    Days per week: {{ days }}

    -
      - {% for group in included_groups %} -
    • {{ group }}
      • - {% endfor %} -
    - -

    {{ message }}

    +
    +

    Rest of the Week's Workouts

    + +

    Details for the rest of the week...

    +
    +
    +

    Past Workouts

    + +

    Details of past workouts...

    +
    {% endblock %} diff --git a/website/views.py b/website/views.py index 354d062f..d28c06f4 100644 --- a/website/views.py +++ b/website/views.py @@ -6,6 +6,15 @@ views = Blueprint('views', __name__) +@views.route('/') +@login_required +def home(): + return render_template('home.html', user=current_user) + +@views.route('/about') +def about(): + return render_template('about.html') + questions_data = { '1': { 'text': 'Are there any muscle groups you DO NOT want to exercise?', @@ -114,11 +123,6 @@ def dynamic_question(): return render_template('dynamic_question.html', question=question, form=form) -@views.route('/', methods=['GET']) -@login_required -def home(): - return render_template("home.html", user=current_user) - @views.route('/split', methods=['GET']) @login_required def split(): @@ -138,11 +142,6 @@ def split(): return render_template("split.html", user=current_user, included_groups=included_groups, days=days, message=message) -@views.route('/tracker', methods=['GET']) -@login_required -def tracker(): - return render_template("tracker.html", user=current_user) - @views.route('/weight_tracker', methods=['GET', 'POST']) @login_required def weight_tracker(): @@ -161,3 +160,11 @@ def get_weights(): weights = Weight.query.filter_by(user_id=current_user.id).order_by(Weight.date).all() weights_data = [{"date": w.date.strftime("%Y-%m-%d"), "weight": w.weight} for w in weights] return jsonify(weights_data) + +import random + +@views.route('/get_todays_workout') +@login_required +def get_todays_workout(): + todays_workout = "Chest: bench press 3 x 10, lateral raise 4 x 15, tricep pushdowns 3 x 12, dips 3 x 15." + return jsonify({"todays_workout": todays_workout}) From 0500700cd7f393379f7fd96d0a73fd972d9ecc34 Mon Sep 17 00:00:00 2001 From: atipre Date: Tue, 9 Jul 2024 18:27:23 -0400 Subject: [PATCH 31/41] Cool stuff --- instance/database.db | Bin 28672 -> 28672 bytes website/templates/home.html | 83 ++++++++++++++++++++++++++++++++---- 2 files changed, 75 insertions(+), 8 deletions(-) diff --git a/instance/database.db b/instance/database.db index 1bd86963907f381fd7249e2e189770021971bd12..70aee0cad2a59fe8b992661927935198241726e1 100644 GIT binary patch delta 106 zcmZp8z}WDBae_3X + .dashboard-container { + display: flex; + flex-direction: column; + align-items: center; + height: 100vh; + justify-content: center; + } + .workout-split { + width: 50%; + height: 50%; + margin: 20px 0; + text-align: center; + background-color: #f9f9f9; + padding: 20px; + border-radius: 10px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); + display: flex; + flex-direction: column; + justify-content: center; + } + .weight-tracker { + width: 80%; + margin: 20px 0; + text-align: center; + } + #weightTrackerButton { + width: 100%; + background-color: #fff; + color: #7d0dc3; + border: 2px solid #7d0dc3; + padding: 10px 20px; + font-size: 16px; + border-radius: 5px; + cursor: pointer; + display: flex; + flex-direction: column; + align-items: center; + } + #weightTrackerButton:hover { + background-color: #f0f0f0; + } + .canvas-container { + position: relative; + height: 150px; + width: 100%; + } + #weightTrackerText { + margin-top: 10px; + } + +
    -
    -

    Weight Tracker

    - -

    Today's Workout

    Loading today's workout...

    +
    + +
    + + + + + diff --git a/website/templates/dynamic_question.html b/website/templates/dynamic_question.html index c9c14914..fa40e25e 100644 --- a/website/templates/dynamic_question.html +++ b/website/templates/dynamic_question.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% extends "base_questionnaire.html" %} {% block title %}Dynamic Question{% endblock %} {% block content %}

    {{ question.text }}

    diff --git a/website/templates/questionnaire.html b/website/templates/questionnaire.html index efd4387b..de6d9b78 100644 --- a/website/templates/questionnaire.html +++ b/website/templates/questionnaire.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% extends "base_questionnaire.html" %} {% block title %}Questionnaire{% endblock %} {% block content %}

    Questionnaire

    From 117559c4b4d8628bad7eec3ecf2c31de9afdffc4 Mon Sep 17 00:00:00 2001 From: atipre Date: Tue, 9 Jul 2024 19:01:31 -0400 Subject: [PATCH 35/41] Editted boxes spacing --- website/templates/home.html | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/website/templates/home.html b/website/templates/home.html index 26dd2587..d59f6164 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -4,15 +4,16 @@ From 5bc22247ed97d4de7a4f129b2f9dbe5b3f9a90ad Mon Sep 17 00:00:00 2001 From: dkardhashi Date: Tue, 9 Jul 2024 19:12:35 -0400 Subject: [PATCH 36/41] w --- website/questionnaire.py | 92 ++++++++++++++++++++++++++++++++++ website/views.py | 103 +++++---------------------------------- 2 files changed, 105 insertions(+), 90 deletions(-) create mode 100644 website/questionnaire.py diff --git a/website/questionnaire.py b/website/questionnaire.py new file mode 100644 index 00000000..b6f3a044 --- /dev/null +++ b/website/questionnaire.py @@ -0,0 +1,92 @@ +from flask import session +from .forms import InitialQuestionForm, create_dynamic_form + +questions_data = { + '1': { + 'text': 'Are there any muscle groups you DO NOT want to exercise?', + 'choices': [('1', 'Yes'), ('2', 'No')], + 'next': { + '1': '1.1', + '2': 'end_condition1' + } + }, + '1.1': { + 'text': 'Select all muscle groups you DO NOT want to exercise', + 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('D', 'Shoulders'), ('E', 'Legs')], + 'multi': True, + 'next': { + 'A': 'end_condition2', + 'B': 'end_condition2', + 'C': 'end_condition2', + 'D': 'end_condition2', + 'E': 'end_condition2' + } + }, + '2': { + 'text': 'How many days a week do you want to workout?', + 'choices': [('1', '1 day'), ('2', '2 days'), ('3', '3 days'), ('4', '4 days'), ('5', '5 days'), ('6', '6 days'), ('7', '7 days')], + 'next': { + '1': '2.1', + '2': 'end_condition3' + } + }, + '2.1': { + 'text': 'Do you want to workout on back to back days?', + 'choices': [('1', 'Yes'), ('2', 'No')], + 'next': { + '1': 'end_condition3', + '2': 'end_condition3' + } + } +} + +conditions_messages = { + 'condition1': 'Message for condition 1', + 'condition2': 'Message for condition 2', + 'condition3': 'Message for condition 3' +} + +def get_next_question_and_update_session(answer, question): + next_question_id = None + if question.get('multi'): + answer = answer.split(',') + else: + answer = [answer] + session['responses'][session['current_question']] = answer + + for ans in answer: + next_id = question['next'].get(ans) + if next_id and next_id.startswith('end_condition'): + session['condition'] = next_id.replace('end_', '') + return None # End condition reached + elif next_id: + next_question_id = next_id + + if next_question_id: + session['history'].append(session['current_question']) + session['current_question'] = next_question_id + + return next_question_id + +def initialize_questionnaire(form): + selected_option = form.days.data + if selected_option: + session['days'] = selected_option + session['current_question'] = '1' # Assuming the first question is '1' + session['history'] = [] + session['responses'] = {} + return True + return False + +def get_question_and_form(): + current_question_id = session.get('current_question') + if current_question_id is None: + return None, None + + question = questions_data.get(current_question_id) + if question is None: + return None, None + + DynamicForm = create_dynamic_form(question) + form = DynamicForm() + return question, form diff --git a/website/views.py b/website/views.py index 45f77fbe..eaa1e120 100644 --- a/website/views.py +++ b/website/views.py @@ -1,8 +1,8 @@ from flask import Blueprint, render_template, request, redirect, url_for, session, jsonify, flash from flask_login import login_required, current_user -from .forms import InitialQuestionForm, create_dynamic_form from .models import User, Weight, QuestionnaireResponse from . import db +from .questionnaire import questions_data, conditions_messages, get_next_question_and_update_session, initialize_questionnaire, get_question_and_form views = Blueprint('views', __name__) @@ -15,51 +15,6 @@ def home(): def about(): return render_template('about.html') -questions_data = { - '1': { - 'text': 'Are there any muscle groups you DO NOT want to exercise?', - 'choices': [('1', 'Yes'), ('2', 'No')], - 'next': { - '1': '1.1', - '2': 'end_condition1' - } - }, - '1.1': { - 'text': 'Select all muscle groups you DO NOT want to exercise', - 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('D', 'Shoulders'), ('E', 'Legs')], - 'multi': True, - 'next': { - 'A': 'end_condition2', - 'B': 'end_condition2', - 'C': 'end_condition2', - 'D': 'end_condition2', - 'E': 'end_condition2' - } - }, - '2': { - 'text': 'How many days a week do you want to workout?', - 'choices': [('1', '1 day'), ('2', '2 days'), ('3', '3 days'), ('4', '4 days'), ('5', '5 days'), ('6', '6 days'), ('7', '7 days')], - 'next': { - '1': '2.1', - '2': 'end_condition3' - } - }, - '2.1': { - 'text': 'Do you want to workout on back to back days?', - 'choices': [('1', 'Yes'), ('2', 'No')], - 'next': { - '1': 'end_condition3', - '2': 'end_condition3' - } - } -} - -conditions_messages = { - 'condition1': 'Message for condition 1', - 'condition2': 'Message for condition 2', - 'condition3': 'Message for condition 3' -} - @views.route('/questionnaire', methods=['GET', 'POST']) @login_required def questionnaire(): @@ -68,13 +23,7 @@ def questionnaire(): form = InitialQuestionForm() if form.validate_on_submit(): - selected_option = form.days.data - if selected_option: - flash(f'You selected: {selected_option}') - session['days'] = selected_option - session['current_question'] = '1' # Assuming the first question is '1' - session['history'] = [] - session['responses'] = {} + if initialize_questionnaire(form): return redirect(url_for('views.dynamic_question')) return render_template('questionnaire.html', form=form) @@ -84,45 +33,19 @@ def dynamic_question(): if current_user.has_completed_questionnaire: return redirect(url_for('views.home')) - current_question_id = session.get('current_question') - if current_question_id is None: - return redirect(url_for('views.questionnaire')) - - question = questions_data.get(current_question_id) + question, form = get_question_and_form() if question is None: return redirect(url_for('views.questionnaire')) - - DynamicForm = create_dynamic_form(question) - form = DynamicForm() if request.method == 'POST': - if 'next' in request.form: - if form.validate(): - answer = request.form.get('answer') - if question.get('multi'): - answer = answer.split(',') - else: - answer = [answer] - session['responses'][current_question_id] = answer - - # Determine the next question or end condition based on all selected answers - next_question_id = None - for ans in answer: - next_id = question['next'].get(ans) - if next_id and next_id.startswith('end_condition'): - session['condition'] = next_id.replace('end_', '') - current_user.has_completed_questionnaire = True - db.session.commit() - return redirect(url_for('views.home')) - elif next_id: - next_question_id = next_id - - if next_question_id: - session['history'].append(current_question_id) - session['current_question'] = next_question_id - return redirect(url_for('views.dynamic_question')) - else: - return redirect(url_for('views.questionnaire')) + if 'next' in request.form and form.validate(): + answer = request.form.get('answer') + next_question_id = get_next_question_and_update_session(answer, question) + if next_question_id is None: + current_user.has_completed_questionnaire = True + db.session.commit() + return redirect(url_for('views.home')) + return redirect(url_for('views.dynamic_question')) elif 'back' in request.form: if session['history']: previous_question_id = session['history'].pop() @@ -130,7 +53,7 @@ def dynamic_question(): return redirect(url_for('views.dynamic_question')) else: return redirect(url_for('views.questionnaire')) - + return render_template('dynamic_question.html', question=question, form=form) @views.route('/split', methods=['GET']) @@ -149,7 +72,7 @@ def split(): excluded_groups = responses.get('1.1', []) included_groups = [muscle_groups[key] for key in muscle_groups if key not in excluded_groups] message = conditions_messages.get(condition, 'Default message') - + return render_template("split.html", user=current_user, included_groups=included_groups, days=days, message=message) @views.route('/weight_tracker', methods=['GET', 'POST']) From 1ed95af196180abbe856dc10e5dddf01e17ae01f Mon Sep 17 00:00:00 2001 From: atipre Date: Tue, 9 Jul 2024 19:21:27 -0400 Subject: [PATCH 37/41] Changed Dashboard to home and logout to profile --- website/templates/base.html | 4 ++-- website/templates/home.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/website/templates/base.html b/website/templates/base.html index 0ca6b21e..7b20a078 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -15,11 +15,11 @@
      {% if current_user.is_authenticated %} -
    • Dashboard
      • +
    • Home
    • Workout Split
    • Weight Tracker
    • About
      • -
    • Logout
      • +
    • Profile
      • {% else %}
    • Login
    • Sign Up
      • diff --git a/website/templates/home.html b/website/templates/home.html index d59f6164..2d72b0df 100644 --- a/website/templates/home.html +++ b/website/templates/home.html @@ -13,7 +13,7 @@ .dashboard-item { width: 80%; height: 75%; - margin: 20px; + margin: 18px; text-align: center; background-color: #f9f9f9; padding: 20px; @@ -24,7 +24,7 @@ justify-content: center; } .dashboard-item h2 { - margin-bottom: 20px; + margin-bottom: 10px; } #weightTrackerButton { width: 100%; From 9d8ffc013b2f22ef3661b740105111b0b1f80bd0 Mon Sep 17 00:00:00 2001 From: dkardhashi Date: Tue, 9 Jul 2024 19:39:07 -0400 Subject: [PATCH 38/41] w --- questionnaire_tree | 22 ++++++++++++++++++++++ questionnaire_tree.png | Bin 0 -> 64164 bytes website/questionnaire.py | 31 ++++++++++++++++++++++++++----- website/views.py | 1 + 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 questionnaire_tree create mode 100644 questionnaire_tree.png diff --git a/questionnaire_tree b/questionnaire_tree new file mode 100644 index 00000000..003ec201 --- /dev/null +++ b/questionnaire_tree @@ -0,0 +1,22 @@ +// Questionnaire Tree +digraph { + 1 [label="Are there any muscle groups you DO NOT want to exercise?"] + 1.1 [label="Select all muscle groups you DO NOT want to exercise"] + 2 [label="How many days a week do you want to workout?"] + 2.1 [label="Do you want to workout on back to back days?"] + 1 -> 1.1 [label=1] + condition1 [label=condition1 shape=box] + 1 -> condition1 [label=2] + 1.1 -> 2 [label=A] + 1.1 -> 2 [label=B] + 1.1 -> 2 [label=C] + 1.1 -> 2 [label=D] + 1.1 -> 2 [label=E] + 2 -> 2.1 [label=1] + condition3 [label=condition3 shape=box] + 2 -> condition3 [label=2] + condition3 [label=condition3 shape=box] + 2.1 -> condition3 [label=1] + condition3 [label=condition3 shape=box] + 2.1 -> condition3 [label=2] +} diff --git a/questionnaire_tree.png b/questionnaire_tree.png new file mode 100644 index 0000000000000000000000000000000000000000..adc74048a20e55e8baa528354ad9943535ecec66 GIT binary patch literal 64164 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 literal 0 HcmV?d00001 diff --git a/website/questionnaire.py b/website/questionnaire.py index b6f3a044..3b44a7cc 100644 --- a/website/questionnaire.py +++ b/website/questionnaire.py @@ -1,4 +1,5 @@ from flask import session +from graphviz import Digraph from .forms import InitialQuestionForm, create_dynamic_form questions_data = { @@ -15,11 +16,11 @@ 'choices': [('A', 'Chest'), ('B', 'Back'), ('C', 'Arms'), ('D', 'Shoulders'), ('E', 'Legs')], 'multi': True, 'next': { - 'A': 'end_condition2', - 'B': 'end_condition2', - 'C': 'end_condition2', - 'D': 'end_condition2', - 'E': 'end_condition2' + 'A': '2', + 'B': '2', + 'C': '2', + 'D': '2', + 'E': '2' } }, '2': { @@ -90,3 +91,23 @@ def get_question_and_form(): DynamicForm = create_dynamic_form(question) form = DynamicForm() return question, form + +def generate_question_tree(output_path='questionnaire_tree'): + dot = Digraph(comment='Questionnaire Tree') + + # Add nodes for each question + for question_id, question_info in questions_data.items(): + dot.node(question_id, question_info['text']) + + # Add edges for each choice + for question_id, question_info in questions_data.items(): + for choice, next_question_id in question_info['next'].items(): + if next_question_id.startswith('end_condition'): + next_question_id = next_question_id.replace('end_', '') + dot.node(next_question_id, next_question_id, shape='box') + dot.edge(question_id, next_question_id, label=choice) + + dot.render(output_path, format='png', view=False) + +if __name__ == '__main__': + generate_question_tree() diff --git a/website/views.py b/website/views.py index eaa1e120..03dcedfc 100644 --- a/website/views.py +++ b/website/views.py @@ -99,3 +99,4 @@ def get_weights(): def get_todays_workout(): todays_workout = "Chest: bench press 3 x 10, lateral raise 4 x 15, tricep pushdowns 3 x 12, dips 3 x 15." return jsonify({"todays_workout": todays_workout}) + From 1bfc2aeb4b803c810976d93553046bda98a29e52 Mon Sep 17 00:00:00 2001 From: atipre Date: Tue, 9 Jul 2024 19:40:37 -0400 Subject: [PATCH 39/41] Colors and shi --- website/templates/base.html | 58 +++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/website/templates/base.html b/website/templates/base.html index 7b20a078..fc00d0d8 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -7,6 +7,56 @@ +
    +
    +

    © 2024 Physeek Training. All rights reserved.

    +
    + From 4771cc67e637c97cc25bd31d2244adbd16056624 Mon Sep 17 00:00:00 2001 From: dkardhashi Date: Tue, 9 Jul 2024 19:42:22 -0400 Subject: [PATCH 40/41] deez --- website/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/base.html b/website/templates/base.html index fc00d0d8..1e90b2c2 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -69,7 +69,7 @@
  • Workout Split
  • Weight Tracker
  • About
    • -
  • Logout
    • +
  • Profile
    • {% else %}
  • Login
  • Sign Up
    • From 2e62a2579921f32eb210d951db0cda543ef35727 Mon Sep 17 00:00:00 2001 From: dkardhashi Date: Tue, 9 Jul 2024 20:11:37 -0400 Subject: [PATCH 41/41] W --- website/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/templates/base.html b/website/templates/base.html index 1e90b2c2..fc00d0d8 100644 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -69,7 +69,7 @@
  • Workout Split
  • Weight Tracker
  • About
    • -
  • Profile
    • +
  • Logout
    • {% else %}
  • Login
  • Sign Up