S3 support added

Author: Mobmaker55

conditional/blueprints/major_project_submission.py

@@ -1,5 +1,9 @@
 import json
+import os
+
 import requests
+import boto3
+from botocore.exceptions import ClientError
 
 from flask import Blueprint
 from flask import request
@@ -9,6 +13,7 @@
 from sqlalchemy import desc
 
 import structlog
+from werkzeug.utils import secure_filename
 
 from conditional.util.context_processors import get_member_name
 
@@ -53,6 +58,25 @@ def display_major_project(user_dict=None):
                            major_projects_len=major_projects_len,
                            username=user_dict['username'])
 
+@major_project_bp.route('/major_project/upload', methods=['POST'])
+@auth.oidc_auth
+@get_user
+def upload_major_project_files(user_dict=None):
+    log = logger.new(request=request, auth_dict=user_dict)
+    log.info('Uploading Major Project File(s)')
+
+    file = request.files['file']
+    if not file:
+        return "No file", 400
+
+    # Temporarily save files to a place, to be uploaded on submit
+
+    safe_name = secure_filename(file.filename)
+    filename = f"/tmp/{user_dict['username']}/{safe_name}"
+
+    os.makedirs(os.path.dirname(filename), exist_ok=True)
+    file.save(filename)
+
 
 @major_project_bp.route('/major_project/submit', methods=['POST'])
 @auth.oidc_auth
@@ -65,10 +89,19 @@ def submit_major_project(user_dict=None):
     name = post_data['projectName']
     description = post_data['projectDescription']
 
-    if name == "" or description == "":
+    if name == "" or len(description.strip().split()) < 50:
         return jsonify({"success": False}), 400
     project = MajorProject(user_dict['username'], name, description)
 
+    # Acquire S3 Bucket instance
+    s3 = boto3.resource("s3")
+    bucket = s3.create_bucket(Bucket="major-project-media")
+    # Collect all the locally cached files and put them in the bucket
+    for file in os.listdir(f"/tmp/{user_dict['username']}"):
+        bucket.upload_file(file, file.split("/")[-1])
+        os.remove(file)
+    os.rmdir(f"/tmp/{user_dict['username']}")
+
     username = user_dict['username']
     send_slack_ping({"text":f"<!subteam^S5XENJJAH> *{get_member_name(username)}* ({username})"
                             f" submitted their major project, *{name}*!"})

conditional/templates/major_project_submission.html

@@ -1,6 +1,6 @@
 {% extends "nav.html" %}
 {% block extraHeader %}
-<script src="https://unpkg.com/dropzone@5/dist/min/dropzone.min.js"></script>
+    <script src="https://unpkg.com/dropzone@5/dist/min/dropzone.min.js"></script>
 {% endblock %}
 {% block title %}
     Major Project Form
@@ -12,13 +12,13 @@ <h3 class="page-title">Major Project Form</h3>
         <!--TODO: put a box explaining major project -->
         <div class="panel panel-default">
             <div class="panel-body">
-                <p class="lead">This talks about major project submission guidelines. Rubber cheese chalk and cheese
-                    pepper jack. Lancashire monterey jack say cheese roquefort stinking bishop danish fontina manchego
-                    cheese and wine. Cheeseburger cow dolcelatte feta fondue pecorino roquefort cauliflower cheese. St.
-                    agur blue cheese danish fontina emmental stilton smelly cheese bavarian bergkase fromage cheesy
-                    feet. Paneer stilton halloumi ricotta macaroni cheese stinking bishop cottage cheese camembert de
-                    normandie. Danish fontina cheese triangles squirty cheese cheese on toast camembert de
-                    normandie.</p>
+                <p class="lead">Hi! Welcome to the Major Project submission form. We're excited to read about your major
+                    project. For us(E-Board) to best evaluate your project, please give us as much detail as possible.
+                    Don't feel pressured to write full paragraphs though, good bullet points are plenty!<br>Generally,
+                    major projects are most likely to pass when they meet three of the 4 Major Project Pillars -
+                    spending considerable time on your project, benefiting House, learning new things, and applying hard
+                    skills. And of course, after you submit, please try to talk to E-Board members (in-person or over
+                    Slack) so we are familiar with your project and can ask you questions!</p>
             </div>
         </div>
         <form data-module="majorProjectForm">
@@ -33,23 +33,25 @@ <h3 class="page-title">Major Project Form</h3>
                     <div class="row">
                         <div class="col-lg-6">
                             <label class="form-label" for="skills-applied">Skills Applied</label>
-                            <textarea id="skills-applied" name="skills-applied" class="form-control" rows="5"
-                                      placeholder="A comma-separated list of skills, similar to what you'd put on a resume."></textarea>
+                            <textarea id="skills-applied" name="skills-applied" class="form-control form-textarea"
+                                      rows="5"
+                                      placeholder="List what skills you used for this project (at least 2!), similar to what you'd put on a resume."></textarea>
                         </div>
                         <div class="col-lg-6">
                             <label class="form-label" for="time-commitment">Time Commitment</label>
-                            <textarea id="time-commitment" name="time-commitment" class="form-control" rows="5"
+                            <textarea id="time-commitment" name="time-commitment" class="form-control form-textarea"
+                                      rows="5"
                                       wrap="hard"
-                                      placeholder="Tell us about how much time you spent on the project."></textarea>
+                                      placeholder="We're looking for a considerable amount of time spent on your major project, we suggest ~5 hours minimum."></textarea>
                         </div>
                     </div>
                     <label class="form-label" for="description">Detailed Description</label>
-                    <textarea id="description" name="description" class="form-control" rows="10"
+                    <textarea id="description" name="description" class="form-control form-textarea" rows="10"
                               placeholder="Tell us everything! More information is better than less."></textarea>
                     <div class="row">
                         <div class="col-lg-5">
                             <label class="form-label" for="links">Project Links</label>
-                            <textarea id="links" name="links" class="form-control" rows="2"
+                            <textarea id="links" name="links" class="form-control form-textarea" rows="2"
                                       placeholder="If you have links (GitHub, YouTube, etc.), put them here!"></textarea>
                         </div>
                         <div class="col-lg-4">

config.env.py

@@ -25,6 +25,10 @@
 LDAP_BIND_DN = env.get("CONDITIONAL_LDAP_BIND_DN", "cn=conditional,ou=Apps,dc=csh,dc=rit,dc=edu")
 LDAP_BIND_PW = env.get("CONDITIONAL_LDAP_BIND_PW", "")
 
+# S3 information
+AWS_ACCESS_KEY_ID = env.get("AWS_ACCESS_KEY_ID", "")
+AWS_SECRET_ACCESS_KEY = env.get("AWS_SECRET_ACCESS_KEY", "")
+
 # Sentry config
 # Not required for local development, but if you set it, make sure the
 # SENTRY_ENV is 'local-development'

frontend/stylesheets/pages/_major-project.scss

@@ -6,4 +6,8 @@
   margin-bottom: 0;
   margin-top: 1.25rem;
   font-size: 2rem;
+}
+
+.form-textarea {
+  resize: vertical;
 }

requirements.in

@@ -1,6 +1,8 @@
 alembic~=0.9.8
 astroid~=2.4.0
 blinker~=1.4
+boto3==1.35.13
+botocore==1.35.13
 click~=7.1
 csh_ldap>=2.3.1
 ddtrace~=1.1.4

requirements.txt

@@ -22,6 +22,8 @@ blinker==1.4
     # via
     #   -r requirements.in
     #   sentry-sdk
+boto3==1.35.13
+botocore==1.35.13
 certifi==2022.5.18.1
     # via
     #   requests