Form is almost done i think

Author: pikachu0542

conditional/blueprints/major_project_submission.py

@@ -4,6 +4,7 @@
 import boto3
 
 from conditional.models.models import MajorProject, MajorProjectSkill
+from conditional.util.user_dict import user_dict_is_eval_director
 from config import AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY
 from flask import Blueprint
 from flask import request
@@ -65,7 +66,7 @@ def display_major_project(user_dict=None):
             "time_spent": p.timeSpent,
             "skills": p.skills,
             "desc": p.description,
-            "links": p.links,
+            "links": list(filter(None, p.links.split("\n"))),
             "status": p.status,
             "is_owner": bool(user_dict["username"] == p.uid)
         }
@@ -208,7 +209,7 @@ def submit_major_project(user_dict=None):
 def major_project_review(user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
 
-    if not ldap_is_eval_director(user_dict["account"]):
+    if not user_dict_is_eval_director(user_dict["account"]):
         return redirect("/dashboard", code=302)
 
     post_data = request.get_json()
@@ -236,7 +237,7 @@ def major_project_delete(pid, user_dict=None):
     major_project = MajorProject.query.filter(MajorProject.id == pid).first()
     creator = major_project.uid
 
-    if creator == user_dict["username"] or ldap_is_eval_director(user_dict["account"]):
+    if creator == user_dict["username"] or user_dict_is_eval_director(user_dict["account"]):
         MajorProject.query.filter(MajorProject.id == pid).delete()
 
         db.session.flush()

conditional/templates/major_project_submission.html

@@ -125,7 +125,7 @@ <h3 class="mb-4">Major Project Form</h3>
                             id="links"
                             name="links"
                             rows="2"
-                            class="form-control"
+                            class="form-control form-textarea"
                             placeholder="If you have links (GitHub, YouTube, etc.), put them here!"
                         ></textarea>
                     </div>
@@ -184,15 +184,15 @@ <h3 class="mb-4">All Major Projects</h3>
 
 {% for p in major_projects %}
 
-<div class="card shadow-lg bg-white mb-4">
+<div class="card shadow-lg proj-listing bg-white mb-4">
     <div class="card-body mb-extra px-5">
 
         <div class="container-fluid px-0 px-extra">
 
             <!-- HEADER ROW -->
             <div class="row d-flex align-items-center">
                 <!-- Title -->
-                <div class="col-md-11" style="margin-bottom: 1em;">
+                <div class="col-md-10" style="margin-bottom: 1em;">
                     <h4 class="font-weight-bold mb-1">
                         <strong>{{p['proj_name']}}</strong>
                     </h4>
@@ -209,10 +209,10 @@ <h4 class="font-weight-bold mb-1">
                 </div>
 
                 <!-- Status -->
-                <div class="col-md-1">
+                <div class="col-md-2">
                     {% if is_eval_director %}
                     <div
-                        class="btn-group btn-group-sm"
+                        class="btn-group btn-group-md"
                         data-module="majorProjectStatus"
                         data-id="{{p['id']}}"
                     >
@@ -281,23 +281,31 @@ <h5><strong>Time Commitment</strong></h5>
                 <div class="row">
                     <div class="col-md-6 mb-3">
                         <h5><strong>Skills</strong></h5>
-                        {% for s in p['skills'] %}
-                            <span class="h6 skill-display p-2 mr-1 mb-1">
-                                {{s}}
-                            </span>
-                        {% endfor %}
+                        <div class="skill-group">
+                            {% for s in p['skills'] %}
+                                <span class="h6 skill-display p-2 mr-1 mb-1">
+                                    {{s}}
+                                </span>
+                            {% endfor %}
+                        </div>
                     </div>
 
                     <div class="col-md-6 mb-3">
-                        <strong>Links</strong>
-                        <p class="mb-0">{{p['links']}}</p>
+                        <h5><strong>Links</strong></h5>
+                        {% for l in p['links'] %}
+                            {% set href = l %}
+                            {% if not href.startswith('http://') and not href.startswith('https://') %}
+                                {% set href = 'https://' + href %}
+                            {% endif %}
+                            <p class="line-short h6"><a href="{{ href }}" class="mb-0">{{ href }}</a></p>
+                        {% endfor %}
                     </div>
                 </div>
 
                 <div class="row">
                     <div class="col-md-9 ">
-                        <strong>Description</strong>
-                        <p class="mb-0">{{p['desc']}}</p>
+                        <h5><strong>Description</strong></h5>
+                        <p class="mb-0 h6 line-med">{{p['desc']}}</p>
                     </div>
                 </div>
             </div>

frontend/javascript/modules/majorProjectForm.js

@@ -51,9 +51,7 @@ export default class MajorProjectForm {
         let skills = [];
 
         Array.from(this.form.getElementsByClassName('skill-tag')).forEach(tag => skills.push(tag.firstChild.data))
-
-        console.log("Links: " + this.form.querySelector('textarea[name=links]').value);
-
+        
         let payload = {
             projectName: this.form.querySelector('input[name=name]').value,
             projectTldr: this.form.querySelector('input[name=tldr]').value,

frontend/javascript/modules/majorProjectStatus.js

@@ -44,7 +44,7 @@ export default class MajorProjectStatus {
           $(dashboardContainer).hide();
         } else {
           // Major projects page button
-          $(this.control.closest(".panel")).fadeOut();
+          $(this.control.closest(".card")).fadeOut();
         }
       });
     } else {

frontend/stylesheets/pages/_major-project.scss

@@ -52,7 +52,7 @@
 
 .proj-listing {
   background-color: #fff;
-  padding: 0.5em;
+  box-shadow: 1px 1px 2px grey;
 }
 
 .rounded-circle {
@@ -67,10 +67,10 @@
 .skill-tag {
   display: block;
   float: left;
-  background: #d979e3;
+  background: #b0197e;
   padding: 4px 30px 4px 8px;
   margin: 2px 3px;
-  color: #444;
+  color: #fff;
   border-radius: 5px;
   transition: .5s all;
 }
@@ -88,14 +88,28 @@
 .skill-display {
   display: block;
   float: left;
-  background: #d979e3;
+  background: #b0197e;
   padding: 4px 8px 4px 8px;
   margin: 2px 3px;
-  color: #444;
+  color: #fff;
+  font-weight: 600;
   border-radius: 5px;
   transition: .5s all;
 }
 
 .skill-tag:hover {
   box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+}
+
+.skill-group {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.line-short {
+  line-height: 0.5em;
+}
+
+.line-med {
+  line-height: 1.5em;
 }