diff --git a/CLI/student.py b/CLI/student.py index b44d3a6..f587230 100644 --- a/CLI/student.py +++ b/CLI/student.py @@ -14,22 +14,28 @@ import datetime # get teacher info from api def getStudent(ion_user, password): + """ + Get's student information from the api + :param ion_user: a student + :return: student information or error + """ URL = "http://127.0.0.1:8000/api/students/" + ion_user + "/" r = requests.get(url=URL, auth=(ion_user, password)) if (r.status_code == 200): data = r.json() return data - elif (r.status_code == 404): + elif r.status_code == 404: return None print("Make new account!") - elif (r.status_code == 403): + elif r.status_code == 403: return None print("Invalid username/password") else: return None print(r.status_code) -#makes a GET request to given url, returns dict + +# makes a GET request to given url, returns dict def getDB(user, pwd, url): """ Sends a GET request to the URL @@ -37,9 +43,10 @@ def getDB(user, pwd, url): """ r = requests.get(url=url, auth=(user, pwd)) print("GET:" + str(r.status_code)) - return(r.json()) + return r.json() -#makes a PATCH (updates instance) request to given url, returns dict + +# makes a PATCH (updates instance) request to given url, returns dict def patchDB(user, pwd, data, url): """ Sends a PATCH request to the URL @@ -51,7 +58,7 @@ def patchDB(user, pwd, data, url): return r.json() -#makes a POST (makes new instance) request to given url, returns dict +# makes a POST (makes new instance) request to given url, returns dict def postDB(user, pwd, data, url): """ Sends a POST request to the URL @@ -63,7 +70,7 @@ def postDB(user, pwd, data, url): return r.json() -#makes a PUT (overwrites instance) request to given url, returns dict +# makes a PUT (overwrites instance) request to given url, returns dict def putDB(user, pwd, data, url): """ Sends a PUT request to the URL @@ -75,7 +82,7 @@ def putDB(user, pwd, data, url): return r.json() -#makes a DELETE (delete instance) request to given url, returns dict +# makes a DELETE (delete instance) request to given url, returns dict def delDB(user, pwd, url): """ Sends a DELETE request to the URL @@ -87,6 +94,10 @@ def delDB(user, pwd, url): def command(command): + """ + Runs a shell command + :param command: shell command + """ ar = [] command = command.split(" ") for c in command: @@ -105,6 +116,10 @@ class Student: def __init__(self, data, password): # teacher info already stored in API # intitialze fields after GET request + """ + Initializes a Student with data from the api + :param data: api data + """ self.git = data['git'] self.username = data['ion_user'] self.url = "http://127.0.0.1:8000/api/students/" + self.username + "/" @@ -151,8 +166,8 @@ class Student: self.snew = str(data['added_to']) self.repo = data['repo'] - if (os.path.isdir(self.username) == False): - if (self.repo == ""): + if os.path.isdir(self.username) == False: + if self.repo == "": user = self.git pwd = input("Enter Github password: ") # curl -i -u USER:PASSWORD -d '{"name":"REPO"}' https://api.github.com/user/repos @@ -176,11 +191,18 @@ class Student: print("Synced to " + self.username) def getClasses(self): + """ + Gets a lists of classes the student is enrolled in + """ classes = self.classes for c in classes: print(c['name']) - def getAssignments(self, course, span): + def getAssignments(self, span): + """ + Gets a list of assignments the student has + :param span: time span to check + """ span = datetime.timedelta(span, 0) classes = self.classes for c in classes: @@ -195,7 +217,7 @@ class Student: diff = now - due zero = datetime.timedelta(0, 0) # check due ddate is in span range is now past date (- timdelta) - if (diff < span and diff > zero): + if diff < span and diff > zero: print(a + " due in:" + str(now - due)) except Exception as e: @@ -204,6 +226,9 @@ class Student: # update API and Github, all assignments / classes def update(self): + """ + Updates the api, github, and all assignments and classes with new information + """ cdir = os.getcwd() os.chdir(self.username) command("git checkout master") @@ -226,7 +251,11 @@ class Student: # updates 1 class, does not switch to master def updateClass(self, course): - if ((course in self.sclass) == False): + """ + Updates a class with new information + :param course: class name in the format _ + """ + if (course in self.sclass) == False: print("Class not found") return cdir = os.getcwd() @@ -241,16 +270,20 @@ class Student: # add classes from 'new' field def addClass(self, cid): - + """ + Add student to a class + :param cid: the id number of the class + :return: data from the class, None if an error occures + """ data = getDB(self.username, self.password,'http://127.0.0.1:8000/api/classes/' + str(cid)) if ((cid in self.snew) == False or (self.username in data['confirmed'])): print("Already enrolled in this class.") return None - if ((cid in self.sclass) or (self.username in data['unconfirmed']) == False): + if (cid in self.sclass) or not (self.username in data['unconfirmed']): print("Not added by teacher yet.") return None - # add class teacher as cocllaborator to student repo + # add class teacher as collaborator to student repo print(os.getcwd()) pwd = input("Enter Github password: ") tgit = getDB(self.username, self.password,"http://127.0.0.1:8000/api/teachers/" + data['teacher'] + "/")['git'] @@ -270,7 +303,7 @@ class Student: # os.chdir(self.username) # push to git, start at master - #os.chdir(self.username) + # os.chdir(self.username) command("git checkout master") command("git branch " + data['name']) command("git commit -m initial") @@ -292,7 +325,7 @@ class Student: user = self.git self.classes.append(data) - if (len(self.sclass) == 0): + if len(self.sclass) == 0: self.sclass = data['name'] else: self.sclass = self.sclass + "," + str(data['name']) @@ -301,7 +334,7 @@ class Student: snew = "" new = [] for i in range(len(self.new)): - if (self.new[i]['name'] == data['name']): + if self.new[i]['name'] == data['name']: del self.new[i] # recreate sclass field, using ids for c in self.new: @@ -321,46 +354,12 @@ class Student: print(patchDB(self.username, self.password,data, self.url)) return data - def submit(self, path): - # 2022rkhondak/English11_eharris1/Essay1 - # check if valid assignment - parts = path.split("/") - if (len(parts) != 3): - print("Assignment path too short") - return - isclass = False - for c in self.classes: - if (c['name'] == parts[1]): - isclass == True - break - if (parts[0] != self.username and isclass and os.path.isdir(path) == False): - print("Not valid assignment") - return - if ((parts[1] + "/" + parts[2]) in self.completed): - print(parts[2] + " already submited. ") - # return - resp = input("Are you sure you want to submit? You cannot do this again.(y/N) ") - if (resp == 'y'): - os.chdir(self.username + "/" + parts[1]) - command("git add .") - command("git commit -m submit") - command("git tag " + parts[1] + "-final") - command("git push -u origin " + self.username + " --tags") - self.completed = self.completed + "," + parts[1] + "/" + parts[2] - data = { - 'user': self.user, - 'git': self.git, - 'ion_user': self.username, - 'student_id': self.student_id, - 'added_to': self.snew, - 'url': self.url, - 'classes': self.sclass, - 'grade': self.grade, - 'completed': self.completed - } - # print(putDB(data, "http://127.0.0.1:8000/api/students/" + self.username + "/")) - def viewClass(self, courses): + """ + Sets the current git branch to view each class in courses + :param courses: a list of classes + :return: + """ self.update() cdir = os.getcwd() os.chdir(self.username) @@ -375,11 +374,20 @@ class Student: return def exitCLI(self): + """ + Exits the cli + """ print(os.getcwd()) self.update() command("git checkout master") def submit(self, course, assignment): + """ + Submits an assignment + :param course: the class the assignment belongs to + :param assignment: the assignment + :return: + """ cdir = os.getcwd() os.chdir(self.username) print(os.getcwd()) @@ -394,7 +402,7 @@ class Student: inclass = True oname = a + "_" + course break - if (inclass == False): + if inclass == False: print(assignment + " not an assignment of " + course) command('git checkout master') os.chdir(cdir) diff --git a/CLI/teacher.py b/CLI/teacher.py index 88c0608..cde7e7f 100644 --- a/CLI/teacher.py +++ b/CLI/teacher.py @@ -96,7 +96,7 @@ def putDB(user, pwd, data, url): :param user: a string :param password: a string :param url: URL for request - """ + """ r = requests.put(url=url, data=data, auth=(user, pwd)) print("PUT:" + str(r.status_code)) return r.json() diff --git a/Website/skoolos/forms.py b/Website/skoolos/forms.py index 2f498c0..f314f54 100644 --- a/Website/skoolos/forms.py +++ b/Website/skoolos/forms.py @@ -53,20 +53,6 @@ class ClassCreationForm (forms.ModelForm): # a list of primary key for the selected data. initial['unconfirmed'] = [t.pk for t in kwargs['instance'].unconfirmed.all()] - # Overriding save allows us to process the value of 'unconfirmed' field - def save(self, username=""): - cleaned_data = self.cleaned_data - print(self) - - # Get the unsave Class instance - instance = forms.ModelForm.save(self) - instance.unconfirmed.clear() - instance.unconfirmed.add(*cleaned_data['unconfirmed']) - instance.name = cleaned_data['subject'] + str(cleaned_data['period']) + "_" + username - print("Class name: " + instance.name) - - return instance - class Meta: model = Class fields = ['subject', 'period', 'description', 'unconfirmed'] diff --git a/Website/skoolos/static/skoolos/styles.css b/Website/skoolos/static/skoolos/styles.css index 0f86d92..db1e636 100644 --- a/Website/skoolos/static/skoolos/styles.css +++ b/Website/skoolos/static/skoolos/styles.css @@ -92,3 +92,13 @@ a.article-title:hover { .account-heading { font-size: 2.5rem; } + +.class-card { + text-decoration: none; + color: gray; +} + +.class-card:hover { + text-decoration: none; + color: black; +} diff --git a/Website/skoolos/templates/skoolos/base.html b/Website/skoolos/templates/skoolos/base.html index fa2f42c..65c0801 100644 --- a/Website/skoolos/templates/skoolos/base.html +++ b/Website/skoolos/templates/skoolos/base.html @@ -35,7 +35,6 @@
{% if user.is_authenticated %} {% if isTeacher %} - Create Assignment Create Class {% else %} diff --git a/Website/skoolos/templates/skoolos/home.html b/Website/skoolos/templates/skoolos/home.html index 45dfedc..591668a 100644 --- a/Website/skoolos/templates/skoolos/home.html +++ b/Website/skoolos/templates/skoolos/home.html @@ -3,9 +3,15 @@
{% for class in classes %}
- +
-
{{ class.name }}
+
{{ class.subject }}
+ {% if class.period != 0 %} + Period: {{ class.period }}
 + {% endif %} + {% if class.name %} + {{ class.name }} + {% endif %}

{{ class.description }}

 diff --git a/Website/skoolos/urls.py b/Website/skoolos/urls.py index 8fa2724..485187c 100644 --- a/Website/skoolos/urls.py +++ b/Website/skoolos/urls.py @@ -8,5 +8,4 @@ urlpatterns = [ path('profile/', views.profile, name='profile'), path("class/", views.classDetail, name="class"), path("create-class/", views.createClass, name="create-class"), - path("create-assignment/", views.createAssignment, name="create-assignment"), ] diff --git a/Website/skoolos/views.py b/Website/skoolos/views.py index ff00036..fb6f9b6 100644 --- a/Website/skoolos/views.py +++ b/Website/skoolos/views.py @@ -143,8 +143,15 @@ def createClassHelper(request): if classForm.is_valid(): cleaned_data = classForm.clean() print(cleaned_data) - classForm.save(username=teacher.user.username) + newClass = classForm.save(commit=False) + newClass.owner = request.user + newClass.teacher = request.user.username + newClass.name = cleaned_data['subject'].replace(' ', '')[:8].lower() + str(cleaned_data['period']) + "_" + teacher.user.username.lower() + newClass.save() + classObj = classForm.save_m2m() messages.success(request, cleaned_data['subject'].capitalize() + " has been created!") + print (newClass) + teacher.classes.add(newClass) return redirect('home') else: classForm = ClassCreationForm() @@ -157,7 +164,3 @@ def createClassHelper(request): } return render(request, "skoolos/createClass.html", context) - -@login_required() -def createAssignment (request): - pass diff --git a/skoolos.py b/skoolos.py index 704cef6..34d4cac 100644 --- a/skoolos.py +++ b/skoolos.py @@ -25,7 +25,12 @@ scope = ["read"] USER = "" PWD = "" + def main(): + """ + The Command Line Interface (CLI) for SkoolOS + Serves to allow both teachers and students to access the majority of the features of SkoolOS + """ print("") print("░██████╗██╗░░██╗░█████╗░░█████╗░██╗░░░░░  ░█████╗░░██████╗") print("██╔════╝██║░██╔╝██╔══██╗██╔══██╗██║░░░░░  ██╔══██╗██╔════╝") @@ -40,13 +45,13 @@ def main(): if not ("profile" in str(profiles)): try: URL = "http://127.0.0.1:8000/api/" - r = requests.get(url = URL) + r = requests.get(url=URL) except: print("Run Django server on http://127.0.0.1:8000/ before continuing") sys.exit(0) input("Welcome to SkoolOS. Press any key to create an account") - #webbrowser.open("http://127.0.0.1:8000/login", new=2) + # webbrowser.open("http://127.0.0.1:8000/login", new=2) authenticate() else: profiles = os.listdir() @@ -55,93 +60,113 @@ def main(): count = 1 for i in range(len(profiles)): p = profiles[i] - if('profile' in p): - f = open(p,'r') + if 'profile' in p: + f = open(p, 'r') d = json.loads(f.read()) f.close() info.append(d) users.append(str(count) + ") " + d['username']) - count = count+1 + count = count + 1 users.append(str(count) + ") Make new user") user = [ - { - 'type': 'list', - 'name': 'user', - 'choices':users, - 'message': 'Select User: ', - }, + { + 'type': 'list', + 'name': 'user', + 'choices': users, + 'message': 'Select User: ', + }, ] - u = int(prompt(user)['user'].split(")")[0]) -1 - if(u+1 == count): + u = int(prompt(user)['user'].split(")")[0]) - 1 + if u + 1 == count: authenticate() return data = info[u] PWD = data['password'] USER = data['username'] print(data['username']) - if(data['is_student']): + if data['is_student']: studentCLI(USER, PWD) else: teacherCLI(USER, PWD) - + + #################################################################################################### STUDENT METHODS def studentCLI(user, password): + """ + The CLI for students to access + :param user: student username + :param password: student password + """ from CLI import student data = getUser(user, password, 'student') student = student.Student(data, password) student.update() EXIT = False - while(not EXIT): + while not EXIT: course = chooseClassStudent(student) - if(course == "Exit SkoolOS"): + if course == "Exit SkoolOS": return EXIT = classOptionsStudent(student, course) -#return class -def chooseClassStudent(student): + +# return class +def chooseClassStudent(student): + """ + Chooses a class for a student to view and work on + :param student: a student + :return: a course prompt + """ carray = student.sclass.split(",") - if(len(carray) == 1 and carray[0] == ""): + if len(carray) == 1 and carray[0] == "": carray.remove("") print("No classes") - + carray.append("Exit SkoolOS") courses = [ - { - 'type': 'list', - 'name': 'course', - 'choices':carray, - 'message': 'Select class: ', - }, + { + 'type': 'list', + 'name': 'course', + 'choices': carray, + 'message': 'Select class: ', + }, ] course = prompt(courses)['course'] print(course) return course + def classOptionsStudent(student, course): + """ + Allows students to choose what they want to do related to a class + The student can save, exit, or go back + :param student: a student + :param course: a course + :return: True if exiting, False if going back + """ student.viewClass(course) student.getAssignments(course, 100) choices = ["Save","Submit assignment","Back","Exit SkoolOS"] options = [ - { - 'type': 'list', - 'name': 'option', - 'choices':choices, - 'message': 'Select: ', - }, + { + 'type': 'list', + 'name': 'option', + 'choices': choices, + 'message': 'Select: ', + }, ] option = prompt(options)['option'] - if(option == "Save"): + if option == "Save": student.update() print("Saved!") classOptionsStudent(student, course) - if(option == "Back"): + if option == "Back": student.exitCLI() - #dont exit cli + # dont exit cli return False - if(option == "Exit SkoolOS"): + if option == "Exit SkoolOS": student.exitCLI() - #exit cli + # exit cli return True if(option == "Submit assignment"): assignments = os.listdir(student.username) @@ -171,9 +196,14 @@ def classOptionsStudent(student, course): student.submit(course, ass) return False - + #################################################################################################### TEACHER METHODS def teacherCLI(user, password): + """ + The CLI for teachers to access + :param user: teachers username + :param password: teachers password + """ from CLI import teacher data = getUser(user, password, 'teacher') print(data) @@ -184,27 +214,28 @@ def teacherCLI(user, password): # 3. Get progress logs on a student # 2. make an assignment for a class # 3. view student submissions for an assignment - while(not EXIT): - #Options: '1) Request Student', "2) Add assignment", "3) View student information", "4) Exit" + while not EXIT: + # Options: '1) Request Student', "2) Add assignment", "3) View student information", "4) Exit" course = chooseGeneralTeacher(teacher) if course == "Exit SkoolOS": EXIT = True elif course == "Make New Class": EXIT = makeClassTeacher(teacher) - #selected a class + # selected a class else: #Pull confirmed students directory teacher.getStudents(course) option = classOptionsTeacher(teacher, course) - if(option == '1'): + if option == '1': EXIT = addStudentsTeacher(teacher, course) - elif(option == '2'): + elif option == '2': EXIT = addAssignmentTeacher(teacher, course) - elif(option == '3'): + elif option == '3': EXIT = viewStudentsTeacher(teacher, course) else: EXIT = True + def chooseGeneralTeacher(teacher): carray = [] for c in teacher.classes: @@ -212,56 +243,57 @@ def chooseGeneralTeacher(teacher): carray.append("Make New Class") carray.append("Exit SkoolOS") courses = [ - { - 'type': 'list', - 'name': 'course', - 'choices':carray, - 'message': 'Select class: ', - }, + { + 'type': 'list', + 'name': 'course', + 'choices': carray, + 'message': 'Select class: ', + }, ] course = prompt(courses)['course'] return course + def makeClassTeacher(teacher): questions = [ - { - 'type': 'input', - 'name': 'cname', - 'message': 'Class Name (Must be: _): ', - }, - ] - cname = prompt(questions)['cname'] - print(cname) - while(not ("_" + teacher.username) in cname): - print("Incorrect naming format") - questions = [ { 'type': 'input', 'name': 'cname', 'message': 'Class Name (Must be: _): ', }, + ] + cname = prompt(questions)['cname'] + print(cname) + while not ("_" + teacher.username) in cname: + print("Incorrect naming format") + questions = [ + { + 'type': 'input', + 'name': 'cname', + 'message': 'Class Name (Must be: _): ', + }, ] cname = prompt(questions)['cname'] teacher.makeClass(cname) soption = ["1) Add individual student", "2) Add list of students through path", "3) Exit"] questions = [ - { - 'type': 'list', - 'choices':soption, - 'name': 'students', - 'message': 'Add Students): ', - }, + { + 'type': 'list', + 'choices': soption, + 'name': 'students', + 'message': 'Add Students): ', + }, ] choice = prompt(questions)['students'].split(")")[0] - if("1" == choice): + if "1" == choice: s = input("Student name: ") teacher.addStudent(s, cname) - if("2" == choice): + if "2" == choice: print("File must be .txt and have 1 student username per line") path = input("Relative Path: ") - while(not os.path.exists(path)): - if(path == 'N'): + while not os.path.exists(path): + if path == 'N': return True print(path + " is not a valid path") path = input("Enter file path ('N' to exit): ") @@ -270,6 +302,7 @@ def makeClassTeacher(teacher): teacher.reqAddStudentList(students, cname) return False + def classOptionsTeacher(teacher, course): print("Class: " + course) unconf = getDB(teacher.username, teacher.password, "http://localhost:8000/api/classes/" + course)['unconfirmed'] @@ -277,49 +310,50 @@ def classOptionsTeacher(teacher, course): teacher.addStudent(s, course) options = ['1) Request Student', "2) Add assignment", "3) View student information", "4) Exit"] questions = [ - { - 'type': 'list', - 'name': 'course', - 'choices':options, - 'message': 'Select option: ', - }, + { + 'type': 'list', + 'name': 'course', + 'choices': options, + 'message': 'Select option: ', + }, ] option = prompt(questions)['course'].split(")")[0] return option + def addStudentsTeacher(teacher, course): soption = ["1) Add individual student", "2) Add list of students through path", "3) Exit"] questions = [ - { - 'type': 'list', - 'choices':soption, - 'name': 'students', - 'message': 'Add list of students (input path): ', - }, + { + 'type': 'list', + 'choices': soption, + 'name': 'students', + 'message': 'Add list of students (input path): ', + }, ] schoice = prompt(questions)['students'].split(")")[0] - if(schoice == '1'): + if schoice == '1': questions = [ - { - 'type': 'input', - 'name': 'student', - 'message': 'Student Name: ', - }, + { + 'type': 'input', + 'name': 'student', + 'message': 'Student Name: ', + }, ] s = prompt(questions)['student'] teacher.reqStudent(s, course) return False - if(schoice == '2'): + if schoice == '2': questions = [ - { - 'type': 'input', - 'name': 'path', - 'message': 'Path: ', - }, + { + 'type': 'input', + 'name': 'path', + 'message': 'Path: ', + }, ] path = prompt(questions)['path'] - while(not os.path.exists(path)): - if(path == 'N'): + while not os.path.exists(path): + if path == 'N': sys.exit(0) print(path + " is not a valid path") path = input("Enter file path ('N' to exit): ") @@ -330,6 +364,7 @@ def addStudentsTeacher(teacher, course): else: return True + def addAssignmentTeacher(teacher, course): nlist = os.listdir(teacher.username + "/" + course) alist = getDB(teacher.username, teacher.password, "http://localhost:8000/api/classes/" + course)['assignments'] @@ -339,36 +374,36 @@ def addAssignmentTeacher(teacher, course): for n in nlist: b = True print(teacher.username + "/" + course + "/" + n) - for a in alist: - if(n in a or n == a): - #print("Assignments: " + n) + for a in alist: + if n in a or n == a: + # print("Assignments: " + n) b = False - if(not os.path.isdir(teacher.username + "/" + course + "/" + n)): + if not os.path.isdir(teacher.username + "/" + course + "/" + n): b = False - if(b): + if b: tlist.append(n) - nlist = tlist - if(len(nlist) == 0): + if len(nlist) == 0: print("No new assignments found") - print("To make an assignment: make a subdirectory in the " + course + " folder. Add a file within the new folder") + print( + "To make an assignment: make a subdirectory in the " + course + " folder. Add a file within the new folder") return False questions = [ - { - 'type': 'list', - 'choices':nlist, - 'name': 'assignment', - 'message': 'Select new assignment: ', - }, + { + 'type': 'list', + 'choices': nlist, + 'name': 'assignment', + 'message': 'Select new assignment: ', + }, ] ass = prompt(questions)['assignment'] apath = teacher.username + "/" + course + "/" + ass due = input("Enter due date (Example: 2020-08-11 16:58): ") - due = due + ":33.383124" + due = due + ":33.383124" due = due.strip() f = False - while(not f): + while not f: try: datetime.datetime.strptime(due, '%Y-%m-%d %H:%M:%S.%f') f = True @@ -376,10 +411,11 @@ def addAssignmentTeacher(teacher, course): print("Due-date format is incorrect.") print(due) due = input("Enter due date (Example: 2020-08-11 16:58): ") - due = due + ":33.383124" + due = due + ":33.383124" teacher.addAssignment(apath, course, due) return False + def viewStudentsTeacher(teacher, course): data = getDB(teacher.username, teacher.password, "http://127.0.0.1:8000/api/classes/" + course) students = data["confirmed"] @@ -416,93 +452,113 @@ def viewStudentsTeacher(teacher, course): #put log stuff - ############################################################################################################################################ def getUser(ion_user, password, utype): - if('student' in utype): - URL = "http://127.0.0.1:8000/api/students/" + ion_user + "/" - else: - URL = "http://127.0.0.1:8000/api/teachers/" + ion_user + "/" + """ + Returns user information + :param ion_user: user + :param password: user's password + :param utype: type of user (student or teacher + :return: api user information + """ + if 'student' in utype: + URL = "http://127.0.0.1:8000/api/students/" + ion_user + "/" + else: + URL = "http://127.0.0.1:8000/api/teachers/" + ion_user + "/" print(URL) - r = requests.get(url = URL, auth=(ion_user,password)) - print(r.json()) - if(r.status_code == 200): - data = r.json() - print(200) - return data - elif(r.status_code == 404): - print("Make new account!") - return None - elif(r.status_code == 403): - print("Invalid username/password") - return None - else: - print(r.status_code) - return None + r = requests.get(url=URL, auth=(ion_user, password)) + print(r.json()) + if r.status_code == 200: + data = r.json() + print(200) + return data + elif r.status_code == 404: + print("Make new account!") + return None + elif r.status_code == 403: + print("Invalid username/password") + return None + else: + print(r.status_code) + return None + def patchDB(USER, PWD, url, data): - r = requests.patch(url = url, data=data, auth=(USER,PWD)) + r = requests.patch(url=url, data=data, auth=(USER, PWD)) print("PATH:" + str(r.status_code)) - return(r.json()) + return r.json() + def getDB(USER, PWD, url): - r = requests.get(url = url, auth=(USER,PWD)) + r = requests.get(url=url, auth=(USER, PWD)) print("GET:" + str(r.status_code)) - return(r.json()) + return r.json() + def postDB(USER, PWD, url, data): - r = requests.post(url = url, data=data, auth=(USER,PWD)) + r = requests.post(url=url, data=data, auth=(USER, PWD)) print("POST:" + str(r.status_code)) - return(r.json()) + return r.json() + def putDB(USER, PWD, url, data): - r = requests.put(url = url, data=data, auth=(USER,PWD)) + r = requests.put(url=url, data=data, auth=(USER, PWD)) print("PUT:" + str(r.status_code)) - return(r.json()) + return r.json() + def delDB(USER, PWD, url): - r = requests.delete(url = url, auth=(USER,PWD)) + r = requests.delete(url=url, auth=(USER, PWD)) print("DELETE:" + str(r.status_code)) return None + def makePass(): + """ + Prompts the user to create a password + :return: the password + """ questions = [ - { - 'type': 'password', - 'name': 'pwd', - 'message': 'Enter SkoolOS Password (NOT ION PASSWORD): ', - }, + { + 'type': 'password', + 'name': 'pwd', + 'message': 'Enter SkoolOS Password (NOT ION PASSWORD): ', + }, ] pwd = prompt(questions)['pwd'] - while(len(pwd) < 7): + while len(pwd) < 7: print("Password too short (Must be over 6 characters)") pwd = prompt(questions)['pwd'] conf = [ - { - 'type': 'password', - 'name': 'pwd', - 'message': 'Re-enter password: ', - }, + { + 'type': 'password', + 'name': 'pwd', + 'message': 'Re-enter password: ', + }, ] pwd2 = prompt(conf)['pwd'] - while(not pwd == pwd2): + while not pwd == pwd2: print("Passwords do not match.") pwd2 = prompt(conf)['pwd'] else: print("PASSWORD SAVED") return pwd + def authenticate(): + """ + Authenticates the user via Ion OAuth + """ oauth = OAuth2Session(client_id=client_id, redirect_uri=redirect_uri, scope=scope) authorization_url, state = oauth.authorization_url("https://ion.tjhsst.edu/oauth/authorize/") cdir = os.getcwd() - #Linux: chromdriver-linux - #Macos: chromdriver-mac - #Windows: chromdriver.exe - path = os.path.join(os.getcwd(),'chromedriver','chromedriver-mac') + # Linux: chromdriver-linux + # Macos: chromdriver-mac + # Windows: chromdriver.exe + path = os.path.join(os.getcwd(), 'chromedriver', 'chromedriver-mac') browser = webdriver.Chrome(path) @@ -513,7 +569,8 @@ def authenticate(): url = browser.current_url gets = url_decode(url.replace("http://localhost:8000/login/?", "")) - while "http://localhost:8000/login/?username=" not in browser.current_url and (not browser.current_url == "http://localhost:8000/"): #http://localhost:8000/ + while "http://localhost:8000/login/?username=" not in browser.current_url and ( + not browser.current_url == "http://localhost:8000/"): # http://localhost:8000/ time.sleep(0.25) url = browser.current_url @@ -524,42 +581,42 @@ def authenticate(): # print("states good") browser.quit() questions = [ - { - 'type': 'input', - 'name': 'username', - 'message': 'Enter SkoolOS Username (Same as ION Username): ', - }, - { - 'type': 'password', - 'name': 'pwd', - 'message': 'Enter SkoolOS Password (NOT ION PASSWORD): ', - }, + { + 'type': 'input', + 'name': 'username', + 'message': 'Enter SkoolOS Username (Same as ION Username): ', + }, + { + 'type': 'password', + 'name': 'pwd', + 'message': 'Enter SkoolOS Password (NOT ION PASSWORD): ', + }, ] - data =prompt(questions) + data = prompt(questions) pwd = data['pwd'] user = data['username'] - r = requests.get(url = "http://localhost:8000/api/", auth=(user,pwd)) - while(r.status_code != 200): + r = requests.get(url="http://localhost:8000/api/", auth=(user, pwd)) + while r.status_code != 200: print("INCORRECT LOGIN CREDENTIALS") - r = requests.get(url = "http://localhost:8000/api/", auth=(user,pwd)) - data =prompt(questions) + r = requests.get(url="http://localhost:8000/api/", auth=(user, pwd)) + data = prompt(questions) pwd = data['pwd'] user = data['username'] print(r.status_code) - r = requests.get(url = "http://localhost:8000/api/students/" + user + "/", auth=(user,pwd)) + r = requests.get(url="http://localhost:8000/api/students/" + user + "/", auth=(user, pwd)) is_student = False - if(r.status_code == 200): + if r.status_code == 200: is_student = True print("Welcome, student " + user) - r = requests.get(url = "http://localhost:8000/api/students/" + user + "/", auth=(user,pwd)) + r = requests.get(url="http://localhost:8000/api/students/" + user + "/", auth=(user, pwd)) profile = r.json() username = profile['ion_user'] grade = profile['grade'] profile = { - 'username':username, - 'grade':grade, - 'is_student':is_student, - 'password':pwd, + 'username': username, + 'grade': grade, + 'is_student': is_student, + 'password': pwd, } fname = "." + username + "profile" profileFile = open(fname, "w") @@ -568,13 +625,13 @@ def authenticate(): else: print("Welcome, teacher " + user) - r = requests.get(url = "http://localhost:8000/api/teachers/" + user + "/", auth=(user,pwd)) + r = requests.get(url="http://localhost:8000/api/teachers/" + user + "/", auth=(user, pwd)) profile = r.json() username = profile['ion_user'] profile = { - 'username':username, - 'is_student':is_student, - 'password':pwd, + 'username': username, + 'is_student': is_student, + 'password': pwd, } fname = "." + username + "profile" profileFile = open(fname, "w") @@ -585,11 +642,15 @@ def authenticate(): def create_server(): + """ + Creates a simple HTTP server for creating api requests from the CLI + """ port = 8000 handler = http.server.SimpleHTTPRequestHandler httpd = socketserver.TCPServer(("", port), handler) print("serving at port:" + str(port)) httpd.serve_forever() + if __name__ == "__main__": main()