Merge branch 'development' of github.com:Rushilwiz/SkoolOS into development

This commit is contained in:
Nathaniel Kenschaft 2020-06-16 21:35:44 -04:00
commit 2ff0cc1a14
13 changed files with 166261 additions and 5 deletions

View File

@ -1 +1 @@
{"username": "2023rumareti", "grade": 9, "is_student": true, "password": "a"} {"username": "2022rkhondak", "grade": 9, "is_student": true, "password": "hackgroup1"}

View File

@ -1 +1 @@
{"username": "sstern1", "is_student": false, "password": "Riya2011"} {"username": "eharris1", "is_student": false, "password": "hackgroup1"}

@ -1 +0,0 @@
Subproject commit ca356ef8532873bf52ec67a647fbb91a25ca1cb7

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

3
bgservice/bgservice.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
python3 bgservice.py

2
bgservice/run.py Normal file
View File

@ -0,0 +1,2 @@
import bgservice as bg
bg.watch_dir()

View File

@ -12,4 +12,46 @@ the registration button bellow and create an account. Once you create an account
Enter SkoolOS Username: Enter SkoolOS Username:
Enter SkoolOS Password: Enter SkoolOS Password:
Enter the valid SkoolOS username and password. Congratialations, you have successfully logged in.
1. CLI as a teacher:
============
Start the CLI and select your username. For instance, teacher 'eharris1'
python skoolos.py
? Select User: (Use arrow keys)
1) 2022rkhondak
2) eharris1
3) Make new user
You will then be given the choice to select an existing class, Make a new class, or exit the CLI:
? Select class: (Use arrow keys)
Art12_eharris1
English12_eharris1
History12_eharris1
Make New Class
Exit SkoolOS
1. Making a new class:
-------
Select 'Make a New Class'. You will then be prompted to enter a class name. The format for every class must be <subject>_<teacher_username> (Example: Art12_eharris1).
? Select class: (Use arrow keys)
Art12_eharris1
English12_eharris1
History12_eharris1
Make New Class
Exit SkoolOS

View File

View File

@ -603,7 +603,7 @@ def authenticate():
print("Linux") print("Linux")
system = input("Enter OS: ") system = input("Enter OS: ")
while(system.lower() != "Linux" and system.lower() != "macos"): while(system.lower() != "linux" and system.lower() != "macos"):
print("Not valid OS") print("Not valid OS")
system = input("Enter OS: ") system = input("Enter OS: ")
if(system.lower() == 'macos'): if(system.lower() == 'macos'):

View File

@ -1 +0,0 @@
Subproject commit ca356ef8532873bf52ec67a647fbb91a25ca1cb7

View File