Merge pull request #11 from codingburgas/feature/student

Feature/student

Author: AMZheleva21

.github/workflows/feature-student_mypathteam9.yml

@@ -0,0 +1,81 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
+
+name: Build and deploy Python app to Azure Web App - MyPathTeam9
+
+on:
+  push:
+    branches:
+      - feature/student
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Create and start virtual environment
+        run: |
+          python -m venv venv
+          source venv/bin/activate
+      
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+        
+      # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
+
+      - name: Zip artifact for deployment
+        run: zip release.zip ./* -r
+
+      - name: Upload artifact for deployment jobs
+        uses: actions/upload-artifact@v4
+        with:
+          name: python-app
+          path: |
+            release.zip
+            !venv/
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'Production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+    permissions:
+      id-token: write #This is required for requesting the JWT
+      contents: read #This is required for actions/checkout
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v4
+        with:
+          name: python-app
+
+      - name: Unzip artifact for deployment
+        run: unzip release.zip
+
+      
+      - name: Login to Azure
+        uses: azure/login@v2
+        with:
+          client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID_47B771A6D4EF40798F7D83ECD157A32C }}
+          tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID_4AC4E0BB098949FF8DA8568B7168F2FE }}
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID_4B5361A8AA16407EA7EF65B224104413 }}
+
+      - name: 'Deploy to Azure Web App'
+        uses: azure/webapps-deploy@v3
+        id: deploy-to-webapp
+        with:
+          app-name: 'MyPathTeam9'
+          slot-name: 'Production'
+          

My_path_team9/__init__.py

@@ -16,8 +16,10 @@ def create_app(config):
 
     from .auth import auth_bp
     from .main import main_bp
+    from .student import student_bp
 
     app.register_blueprint(auth_bp)
     app.register_blueprint(main_bp)
+    app.register_blueprint(student_bp)
 
     return app

My_path_team9/app.py

@@ -4,8 +4,8 @@
 
 app = create_app(Config)
 
-"""with app.app_context():
-    db.create_all()"""
+with app.app_context():
+    db.create_all()
 
 if __name__ == '__main__':
     app.run()

My_path_team9/auth/models.py

@@ -7,7 +7,7 @@ class User(db.Model, UserMixin):
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(80), unique=True, nullable=False)
     email = db.Column(db.String(120), unique=True, nullable=False)
-    __password = db.Column("password", db.String(128), nullable=False)
+    __password = db.Column("password", db.String(300), nullable=False)
     role = db.Column(db.String(20), nullable=False)
 
     @property

My_path_team9/auth/routes.py

@@ -1,3 +1,5 @@
+from urllib import request
+
 from flask import render_template, redirect, url_for, flash
 from flask_login import login_user, logout_user, current_user, login_required
 from . import auth_bp
@@ -21,7 +23,7 @@ def login():
             login_user(user)
 
             if user.role == 'student':
-                return redirect(url_for('student_bp.student_dashboard'))
+                return redirect(url_for('student.survey'))
 
             elif user.role == 'teacher':
                 return redirect(url_for('teacher_bp.teacher_dashboard'))
@@ -71,5 +73,5 @@ def register():
 @login_required
 def logout():
     logout_user()
-    flash('Logged out successfully.', 'info')
-    return redirect(url_for("main_bp.index"))
+    print('Logged out successfully.')
+    return redirect(url_for("main.home"))

My_path_team9/config.py

@@ -6,8 +6,7 @@
 class Config:
     SECRET_KEY = os.environ.get('SECRET_KEY') or 'your-secret-key-here'
 
-    SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL') or \
-    'sqlite:///' + os.path.join(basedir, 'app.db')
+    SQLALCHEMY_DATABASE_URI = 'mssql+pyodbc://CloudSAd5c2a932:Viktoriq21@mypath.database.windows.net/mypath?driver=ODBC+Driver+17+for+SQL+Server'
 
 
     SQLALCHEMY_TRACK_MODIFICATIONS = False

My_path_team9/main/templates/index.html

@@ -4,7 +4,9 @@
 
 {% block content %}
 <div class="text-center">
-<h1>Welcome to <span style="font-family: 'Courier New', monospace; color: #17416D;">My_Path</span></h1>
+<h1>Welcome to My Path</h1>
+     <h4>Our goal is to make teaching easier and learning more engaging through <br>an innovative platform that offers high-quality,
+         teacher-approved video lessons tailored to the school curriculum. </h4>
 <p><a href="{{ url_for('auth.login') }}" class="btn btn-primary mt-3">Login to Continue</a></p>
 </div>
 

My_path_team9/static/logo.png

@@ -0,0 +1,5 @@
+from flask import Blueprint
+
+student_bp = Blueprint('student', __name__, template_folder='templates',url_prefix = '/student')
+
+from . import routes

My_path_team9/student/__init__.py

@@ -0,0 +1,130 @@
+from flask_wtf import FlaskForm
+from wtforms import RadioField, SelectField, SelectMultipleField, widgets, SubmitField
+from wtforms import StringField, PasswordField, SubmitField
+from wtforms.validators import DataRequired, Length, EqualTo, Email, Optional
+from wtforms.validators import URL
+
+class MultiCheckboxField(SelectMultipleField):
+    widget = widgets.ListWidget(prefix_label=False)
+    option_widget = widgets.CheckboxInput()
+
+class SurveyForm(FlaskForm):
+    class_section = RadioField('Which class and section are you in?', choices=[
+        ('9A', '9A'), ('9B', '9B'), ('9C', '9V'), ('9D', '9G')
+    ])
+
+    study_time = RadioField('How many hours a day do you study outside school?', choices=[
+        ('under_1', 'Less than 1 hour'),
+        ('1_2', '1–2 hours'),
+        ('2_3', '2–3 hours'),
+        ('over_3', 'More than 3 hours')
+    ])
+
+    interest_level = RadioField('How interested are you in the school material?', choices=[
+        ('very_high', 'Very high'),
+        ('medium', 'Medium'),
+        ('low', 'Low'),
+        ('none', 'Not interested')
+    ])
+
+    confidence = RadioField('How confident do you feel before tests/exams?', choices=[
+        ('very', 'Very confident'),
+        ('moderate', 'Moderately confident'),
+        ('low', 'Not very confident'),
+        ('stressed', 'Stressed')
+    ])
+
+    memory_method = RadioField('What’s your easiest way to remember information?', choices=[
+        ('notes', 'Taking notes'),
+        ('videos', 'Watching videos'),
+        ('repetition', 'Repeating information')
+    ])
+
+    online_learning = RadioField('How often do you use online learning resources?', choices=[
+        ('daily', 'Daily'),
+        ('few_times', 'Several times a week'),
+        ('rarely', 'Rarely'),
+        ('never', 'Never')
+    ])
+
+    hardest_subject = SelectField('Which subject do you find most difficult?', choices=[
+        ('Natural sciences', 'Natural sciences'),
+        ('mathematics', 'Mathematics'),
+        ('languages', 'Languages'),
+        ('social sciences', 'Social sciences'),
+        ('other', 'Other')
+    ])
+
+    favorite_subject = SelectField('What is your favorite school subject?', choices=[
+        ('Natural sciences', 'Natural sciences'),
+        ('mathematics', 'Mathematics'),
+        ('languages', 'Languages'),
+        ('social sciences', 'Social sciences'),
+        ('other', 'Other')
+    ])
+
+    social_time = RadioField('How much time do you spend on social media/games daily?', choices=[
+        ('under_1', 'Less than 1 hour'),
+        ('1_3', '1–3 hours'),
+        ('over_3', 'More than 3 hours')
+    ])
+
+    video_platforms = MultiCheckboxField('Which platforms do you use most for video lessons?', choices=[
+        ('youtube', 'YouTube'),
+        ('ucha_se', 'Ucha.se'),
+        ('khan', 'Khan Academy'),
+        ('online_school', 'Online School')
+    ])
+
+    video_helpful = RadioField('Do video lessons help you understand the material better?', choices=[
+        ('very', 'Very much'),
+        ('somewhat', 'Somewhat'),
+        ('not_much', 'Not really'),
+        ('not_at_all', 'Not at all')
+    ])
+
+    lesson_quality = MultiCheckboxField('What are the most important qualities of a good video lesson?', choices=[
+        ('short_clear', 'Short and clear'),
+        ('examples', 'With examples and exercises'),
+        ('visuals', 'With visuals and animations'),
+        ('slow_clear', 'Explained slowly and clearly')
+    ])
+
+    ideal_length = RadioField('What is the ideal length of a video lesson?', choices=[
+        ('under_5', 'Less than 5 minutes'),
+        ('5_10', '5–10 minutes'),
+        ('10_20', '10–20 minutes'),
+        ('doesnt_matter', 'Doesn’t matter as long as it’s useful')
+    ])
+
+    videos_for_tests = RadioField('Do you watch video lessons when preparing for tests?', choices=[
+        ('always', 'Always'),
+        ('sometimes', 'Sometimes'),
+        ('only_if_needed', 'Only if I don’t understand'),
+        ('never', 'Never')
+    ])
+
+    review_before_class = RadioField('How often do you review lessons before class?', choices=[
+        ('always', 'Always'),
+        ('sometimes', 'Sometimes'),
+        ('never', 'Never')
+    ])
+
+    submit = SubmitField('Submit')
+
+
+class SettingsForm(FlaskForm):
+    username = StringField('Username', validators=[DataRequired()])
+    email = StringField('Email', validators=[DataRequired(), Email()])
+    current_password = PasswordField('Current Password', validators=[Optional()])
+    new_password = PasswordField('New Password', validators=[Optional()])
+    confirm_password = PasswordField('Confirm New Password', validators=[
+        Optional(),
+        EqualTo('new_password', message='Passwords must match')
+    ])
+    submit = SubmitField('Save Changes')
+class VideoSubmissionForm(FlaskForm):
+    video_link = StringField('Video Link', validators=[
+        DataRequired(), URL(), Length(max=500)
+    ])
+    submit = SubmitField('Submit')