Merge pull request #247 from aopell/develop

Verison 7.0

.build/build.py

@@ -1,16 +1,23 @@
 import argparse
 import json
 import os
+import sys
 import shutil
 import copy
 import errno
 
+try:
+    import sass
+except ModuleNotFoundError:
+    print("ERROR: Missing SASS library. Please install using 'pip install libsass'")
+    sys.exit(1)
+
 class BuildRules:
     def __init__(self, config):
         self.excluded_files = config["excluded_files"] or []
         self.properties = config["properties"] or {}
 
-EXCLUDED_FILES = [".build", ".git", ".github", ".vscode", "SchoologyPlus.zip", "webstore-description.txt"]
+EXCLUDED_FILES = [".build", ".git", ".github", ".vscode", "SchoologyPlus.zip", "webstore-description.txt", "sass"]
 
 chrome_rules = BuildRules({
     "excluded_files": [],
@@ -33,7 +40,7 @@ def __init__(self, config):
 }
 
 parser = argparse.ArgumentParser(description="Schoology Plus build script")
-parser.add_argument("target", choices=list(targets.keys()) + ["all"], help="Which target to build")
+parser.add_argument("target", choices=list(targets.keys()) + ["all", "dev"], help="Which target to build")
 args = parser.parse_args()
 
 os.chdir(os.path.dirname(__file__) + "/..")
@@ -68,6 +75,17 @@ def copyFileOrDirectory(src, dst):
             shutil.copy(src, dst)
         else: raise
 
+def compileSCSS():
+    scss_dirs = [('scss/modern', 'css/modern')]
+    for dir_pair in scss_dirs:
+        print(f"Compiling SCSS in directory '{dir_pair[0]}' to directory '{dir_pair[1]}'")
+        sass.compile(dirname=dir_pair, output_style='expanded')
+
+compileSCSS()
+
+if args.target == "dev":
+    sys.exit()
+
 for target in targets:
     if args.target != "all" and args.target != target:
         continue

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,17 +8,20 @@ assignees: ''
 
 ---
 
-**Describe the bug**
-A clear and concise description of what the bug is.
+### Describe the bug
+> A clear and concise description of what the bug is.
 
-**To Reproduce**
-Steps to reproduce the behavior
+### Steps to reproduce
+> Detailed steps to reproduce the behavior you describe
 
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+### Expected behavior
+> A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
+### Screenshots
+> If applicable, add screenshots to help explain your problem.
 
-**Additional context**
-Add any other context about the problem here.
+### Additional context
+> Add any other context about the problem here.
+
+### Platform
+> Please include your browser name, browser version, Schoology URL (if you feel comfortable), and Schoology Plus version

CONTRIBUTING.md

@@ -3,22 +3,22 @@
 Thank you for your interest in contributing to Schoology Plus! This is an open source passion project, so any help we can get is highly appreciated. Here are some of the ways you can contribute to Schoology Plus:
 
 ## Pull Requests
-Pull requests are welcomed! If you would like to add a new feature, the best way of doing so is to submit a pull request. All pull requests will be considered and reviewed thoroughly.
+Pull requests are welcomed! If you would like to add a new feature, the best way of doing so is to submit a pull request. All pull requests will be considered and reviewed thoroughly. Contact us in the `#contributions` channel in our [Discord server](https://discord.schoologypl.us) for help deciphering the code!
 
 ## Bug Reports
 There are two ways you can report bugs you find in Schoology Plus:
 
 1. Create a detailed [GitHub issue](https://github.com/aopell/SchoologyPlus/issues/new) describing the bug. Please provide detailed **steps to reproduce** and **screenshots** of the issue if applicable.
-2. Send a message in the #bugs-and-features channel of our [Discord server](https://discord.schoologypl.us).
+2. Send a message in the `#bug-reports` channel of our [Discord server](https://discord.schoologypl.us).
 
 ## Feature Requests
-To avoid the problem of issue spam, we'd appreciate if you kept all feature requests in the `#bugs-and-features` channel of our [Discord server](https://discord.schoologypl.us). Please **do not create GitHub issues for feature requests**.
+To avoid the problem of issue spam, we'd appreciate if you kept all feature requests in the `#feature-requests` channel of our [Discord server](https://discord.schoologypl.us). Please **do not create GitHub issues for feature requests**.
 
 ## Documentation
-If you would like to help write documentation for Schoology Plus, please contact us in either the `#support` or `#bugs-and-features` channel of our [Discord server](https://discord.schoologypl.us). We really appreciate all documentation contributions!
+If you would like to help write documentation for Schoology Plus, please contact us in either the `#contributions` channel of our [Discord server](https://discord.schoologypl.us). We really appreciate all documentation contributions!
 
 ## Content
-If you would like to submit content for Schoology Plus (including, but not limited to: course icons, themes, and other assets) please contact us in either the `#support` or `#bugs-and-features` channel of our [Discord server](https://discord.schoologypl.us).
+If you would like to submit content for Schoology Plus (including, but not limited to: course icons, themes, and other assets) please contact us in either the `#contributions` channel of our [Discord server](https://discord.schoologypl.us).
 
 ## Other Contributions
-If you can think of another way of contributing to Schoology Plus that isn't listed here, please contact us in our [Discord server](https://discord.schoologypl.us)!
+If you can think of another way of contributing to Schoology Plus that isn't listed here, please contact us in our [Discord server](https://discord.schoologypl.us)!

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2020 Aaron Opell and Glen Husman
+Copyright (c) 2017-2021 Aaron Opell and Glen Husman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PRIVACY.md

@@ -2,34 +2,36 @@
 
 ## Introduction
 
-It is Schoology Plus's policy to respect your privacy regarding any information we may collect while operating our browser extension. This Privacy Policy applies to the Schoology Plus browser extension for Chrome, Firefox, and Microsoft Edge (hereinafter, "us", "we", "the Extension", or "Schoology Plus"). We respect your privacy and are committed to protecting personally identifiable information accessible to us through the Extension. We have adopted this privacy policy ("Privacy Policy") to explain what information may be collected by our Extension, how we use this information, and under what circumstances we may disclose the information to third parties. This Privacy Policy applies only to information we collect through the Extension and does not apply to our collection of information from other sources.
+**Updated 5/26/2020**
+
+It is Schoology Plus's policy to respect your privacy regarding any information we may collect while using our website or operating our browser extension. This Privacy Policy applies to the Schoology Plus website and browser extension for Chrome, Firefox, and Microsoft Edge (hereinafter, "us", "we", or "Schoology Plus"). We respect your privacy and are committed to protecting personally identifiable information accessible to us through usage of Schoology Plus. We have adopted this privacy policy ("Privacy Policy") to explain what information may be collected by our Extension, how we use this information, and under what circumstances we may disclose the information to third parties. This Privacy Policy applies only to information we collect through the website and browser extension and does not apply to our collection of information from other sources.
 
 ## Non Personally Identifying Information
 
-Like most website operators, Schoology Plus collects non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, language preference, referring site, and the date and time of each user request. Schoology Plus's purpose in collecting non-personally identifying information is to better understand how Schoology Plus's users use the Extension. From time to time, Schoology Plus may release non-personally-identifying information in the aggregate, e.g., by publishing a report on trends in the usage of the Extension.
+Like most website operators, Schoology Plus collects non-personally-identifying information of the sort that web browsers and servers typically make available, such as the browser type, language preference, referring site, and the date and time of each user request. Schoology Plus's purpose in collecting non-personally identifying information is to better understand how Schoology Plus's users use the website and extension. From time to time, Schoology Plus may release non-personally-identifying information in the aggregate, e.g., by publishing a report on trends in the usage of the website and/or the extension.
 
-Schoology Plus uses Google Analytics to collect information for these purposes. If you would like to opt-out of tracking, you can install the [Google Analytics Opt-out Add-on](https://chrome.google.com/webstore/detail/google-analytics-opt-out/fllaojicojecljbmefodhfapmkghcbnh?hl=en) or another tracking-prevention extension.
+Schoology Plus uses Google Analytics to collect information for these purposes. If you would like to opt-out of tracking on our website, you can install the [Google Analytics Opt-out Add-on](https://chrome.google.com/webstore/detail/google-analytics-opt-out/fllaojicojecljbmefodhfapmkghcbnh?hl=en) or another tracking-prevention extension. If you would like to opt-out of tracking in our extension, you can change the "Anonymous Usage Statistics" setting to "Disabled" in Schoology Plus settings.
 
 ## Personally Identifying Information
 
-By using Schoology Plus, you grant us access to view and modify the contents of the Schoology website in your web browser. However, we DO NOT harvest or collect any information that can personally identify you longer than absolutely necessary to perform calculations or page enhancements. This information (including, but not limited to: school name, grades, and assignment details) is only modified locally and never leaves your computer. 
+By using Schoology Plus, you grant us access to view and modify the contents of the Schoology website in your web browser. However, we DO NOT harvest or collect any information that can personally identify you longer than absolutely necessary to perform calculations or page enhancements. This information (including, but not limited to, name, grades, and assignment details) is only modified locally and never leaves your computer. 
 
 ## Aggregated Statistics
 
 Schoology Plus may collect statistics about the behavior of users. Schoology Plus may display this information publicly or provide it to others. However, Schoology Plus does not disclose your personally-identifying information.
 
 ## Cookies
 
-To enrich and perfect your online experience, Schoology Plus uses "Cookies", similar technologies and services provided by others to display personalized content and store your preferences on your computer. A cookie is a string of information that a website stores on a user's computer, and that the user's browser provides to the website each time the user returns. Schoology Plus uses cookies to help us identify and track users' extension preferences. Schoology Plus users who do not wish to have cookies placed on their computers should set their browsers to refuse cookies before using the Extension, with the drawback that certain features of Schoology Plus may not function properly without the aid of cookies. By continuing to use the Extension without changing your cookie settings, you hereby acknowledge and agree to Schoology Plus's use of cookies.
+To enrich and perfect your online experience, Schoology Plus uses "Cookies" and similar technologies and services provided by others to display personalized content and store your preferences on your computer. A cookie is a string of information that a website stores on a user's computer, and that the user's browser provides to the website each time the user returns. Schoology Plus uses cookies to help us identify and track users' extension preferences. Schoology Plus users who do not wish to have cookies placed on their computers should set their browsers to refuse cookies before using Schoology Plus, with the drawback that certain features of Schoology Plus may not function properly without the aid of cookies. By continuing to use Schoology Plus without changing your cookie settings, you hereby acknowledge and agree to Schoology Plus's use of cookies.
 
 ## Privacy Policy Changes
 
-Although most changes are likely to be minor, Schoology Plus may change its Privacy Policy from time to time, and in Schoology Plus's sole discretion. Schoology Plus encourages users to frequently check this page for any changes to its Privacy Policy. Your continued use of the Extension after any change in this Privacy Policy will constitute your acceptance of such change. Any major changes will be prominently announced.
+Although most changes are likely to be minor, Schoology Plus may change its Privacy Policy from time to time, and in Schoology Plus's sole discretion. Schoology Plus encourages users to frequently check this page for any changes to its Privacy Policy. Your continued use of Schoology Plus after any change in this Privacy Policy will constitute your acceptance of such change. Any major changes will be prominently announced.
 
 ## Disclaimer
 
 Schoology Plus is not affiliated with Schoology Inc. or the Los Angeles Unified School District. Schoology, the SCHOOLOGY® wordmark, and the S logo are registered and unregistered trademarks of Schoology, Inc. in the United States. All product names, logos, and brands are property of their respective owners.
 
 ## Contact
 
-The developers of Schoology Plus can be contacted by email at [hello@schoologypl.us](mailto:hello@schoologypl.us) or through Discord at [this link](https://discord.schoologypl.us).
+The developers of Schoology Plus can be contacted by email at [privacy@schoologypl.us](mailto:privacy@schoologypl.us) or through Discord at [this link](https://schoologypl.us/discord).

README.md

@@ -9,14 +9,14 @@
 [![Discord](https://img.shields.io/discord/526898202495025172.svg?color=7289da&label=discord)](http://discord.schoologypl.us)
 [![Changelog](https://img.shields.io/github/release/aopell/SchoologyPlus.svg?label=changelog&colorB=lightgrey)](https://schoologypl.us/changelog)
 
-[![Download for Chrome](https://developer.chrome.com/webstore/images/ChromeWebStore_Badge_v2_206x58.png)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
+[![Download for Chrome](https://i.imgur.com/h2VYS6X.png)](https://chrome.google.com/webstore/detail/schoology-plus/fbfppoaockpecjpbdmldojdehdpepfef)
 [<img src="https://imgur.com/hVupcaT.png" height="58" alt="Download for Firefox">](https://addons.mozilla.org/en-US/firefox/addon/schoology-plus/)
 [<img src="https://imgur.com/Fn7zy9o.png" height="58" alt="Download for Microsoft Edge">](https://microsoftedge.microsoft.com/addons/detail/fflijjibhgbhdgjgjkbbnamafdelcoal)
 
 #### Contents
 - [Features](#features)
   - [Interface Improvements](#interface-improvements)
-    - [Blue Theme](#blue-theme)
+    - [Brand New Dark and Light Themes](#brand-new-dark-and-light-themes)
     - [Custom Themes](#custom-themes)
       - [Course Icons](#course-icons)
     - [Quick Access](#quick-access)
@@ -47,12 +47,13 @@
 ## Interface Improvements
 > ***All features below marked with an asterisk\* can be changed or customized with a setting***
 
-### Blue Theme
+### Brand New Dark and Light Themes
+![Dark Theme](https://i.imgur.com/DL9Cwja.png)
 
-![Navigation Bar](https://i.imgur.com/VbTn30Y.png)
-
-*Image: The blue Schology Plus navigation bar*
-- Replaces your school's theme with a blue theme
+*Image: Examples of the modern dark and light themes*
+- Dark Theme for Schoology! No more blinding whites!
+- Modern Light Theme which revitalizes the late 2000s interface to look modern and new 
+- Many other theme options as well, or make your own!
 - Replaces your school's logo with the Schoology logo
 
 ### Custom Themes
@@ -86,10 +87,11 @@
 
 ### Check Marks for Submitted Upcoming Assignments
 
-![Upcoming Check Marks](https://i.imgur.com/mrE2Iec.png)
+![Upcoming Check Marks](https://i.imgur.com/5kdO2cb.png)
 
 *Image: Upcoming assignments with check marks*
 - By default, green check marks ✔ are shown on all assignments you've submitted*
+- You can also manually check off assignments as you complete them
 - There are also options for putting a ~~strikethrough~~ through the assignment title or hiding the assignments completely.
 
 ### Tooltips