fixed?

Author: atauln

conditional/blueprints/major_project_submission.py

@@ -3,16 +3,7 @@
 
 from flask import Flask, Blueprint, request, jsonify, redirect
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 from conditional import app
-
-=======
->>>>>>> 855042d (Added CHANNEL_ID variable (needs to be set to a value) in config.env.py, and created a webhook Slack integration that posts to CHANNEL_ID when a major project is submitted (major_project_submission.py))
-=======
-from conditional import app
-
->>>>>>> db584f4 (obtained app via init.py)
 import requests, json
 
 from sqlalchemy import desc
@@ -74,16 +65,7 @@ def submit_major_project(user_dict=None):
         return jsonify({"success": False}), 400
     project = MajorProject(user_dict['username'], name, description)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    send_slack_ping({"text":f"<!subteam^S5XENJJAH> {user_dict['username']} submitted their major project, *{name}*!"})
-=======
-    send_slack_ping({"text":f"{user_dict['username']} submitted their major project, *{name}*!"})
->>>>>>> 855042d (Added CHANNEL_ID variable (needs to be set to a value) in config.env.py, and created a webhook Slack integration that posts to CHANNEL_ID when a major project is submitted (major_project_submission.py))
-=======
     send_slack_ping({"text":f"<!subteam^S5XENJJAH> {user_dict['username']} submitted their major project, *{name}*!"})
->>>>>>> 0f7f14c (added a ping for eboard)
-
     db.session.add(project)
     db.session.commit()
     return jsonify({"success": True}), 200
@@ -139,16 +121,4 @@ def major_project_delete(pid, user_dict=None):
     return "Must be project owner to delete!", 401
 
 def send_slack_ping(payload):
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    return requests.post(app.config['WEBHOOK_URL'], json.dumps(payload))
-=======
-    return requests.post(app.config['CHANNEL_ID'], json.dumps(payload))
->>>>>>> 855042d (Added CHANNEL_ID variable (needs to be set to a value) in config.env.py, and created a webhook Slack integration that posts to CHANNEL_ID when a major project is submitted (major_project_submission.py))
-=======
-    return requests.post(app.config['WEBHOOK_URL'], json.dumps(payload))
->>>>>>> b828e44 (updated the conf variable)
-=======
     return requests.post(app.config['WEBHOOK_URL'], json.dumps(payload))
->>>>>>> ba4071a (Added newline)

config.env.py

@@ -14,15 +14,7 @@
 APP_NAME = "conditional"
 IP = env.get("CONDITIONAL_IP", "0.0.0.0")
 PORT = env.get("CONDITIONAL_PORT", 6969)
-<<<<<<< HEAD
-<<<<<<< HEAD
 WEBHOOK_URL = env.get("CONDITIONAL_WEBHOOK_URL", "INSERT URL HERE")
-=======
-CHANNEL_ID = env.get("CONDITIONAL_CHANNEL_ID", "INSERT URL HERE")
->>>>>>> 855042d (Added CHANNEL_ID variable (needs to be set to a value) in config.env.py, and created a webhook Slack integration that posts to CHANNEL_ID when a major project is submitted (major_project_submission.py))
-=======
-WEBHOOK_URL = env.get("CONDITIONAL_WEBHOOK_URL", "INSERT URL HERE")
->>>>>>> b828e44 (updated the conf variable)
 
 # DB Info
 SQLALCHEMY_DATABASE_URI = env.get("SQLALCHEMY_DATABASE_URI", "")