Merge pull request #536 from KSP-SpaceDock/alpha

Merge dark mode Alpha into Beta

Author: V1TA5

KerbalStuff/blueprints/admin.py

@@ -36,17 +36,22 @@ def profiling(page: int) -> Union[str, werkzeug.wrappers.Response]:
     if page < 1:
         return redirect(url_for('admin.profiling', page=1, **request.args))
     prof_dir = _cfg('profile-dir')
-    profilings = [] if not prof_dir else list(map(
-        parse_prof_filename,
-        sorted(Path(prof_dir).glob('*.prof'),
-               key=lambda p: -p.stat().st_mtime)))
+    # this directory can hold a huge number of profile files, so do as little
+    # per file as possible sort on the timestamp that's already in the
+    # filename (no stat() per file) and on ly parse the page we actually show.
+    # The old code stat()'d and parsed every file on every load  which made
+    # opening the admin panel hang and tie up workers 
+    files = sorted(Path(prof_dir).glob('*.prof'),
+                   key=lambda p: p.name.split('.')[-2],
+                   reverse=True) if prof_dir else []
     query = request.args.get('query', type=str)
     if query:
         terms = query.split(' ')
-        profilings = [p for p in profilings
-                      if all(map(lambda t: query_term_matches(t, p), terms))]
-    total_pages = max(1, math.ceil(len(profilings) / ITEMS_PER_PAGE))
-    profilings = profilings[(page - 1) * ITEMS_PER_PAGE : page * ITEMS_PER_PAGE]
+        files = [f for f in files
+                 if all(query_term_matches(t, parse_prof_filename(f)) for t in terms)]
+    total_pages = max(1, math.ceil(len(files) / ITEMS_PER_PAGE))
+    page_files = files[(page - 1) * ITEMS_PER_PAGE : page * ITEMS_PER_PAGE]
+    profilings = [parse_prof_filename(f) for f in page_files]
     return render_template("admin-profiling.html",
                            profilings=profilings, query=query,
                            page=page, total_pages=total_pages)

KerbalStuff/objects.py

@@ -367,7 +367,8 @@ class ModListItem(Base):  # type: ignore
     mod = relationship('Mod', backref=backref('mod_list_items', passive_deletes=True))
     mod_list_id = Column(Integer, ForeignKey('modlist.id', ondelete='CASCADE'), nullable=False)
     mod_list = relationship('ModList',
-                            backref=backref('mods', passive_deletes=True, order_by="asc(ModListItem.sort_index)"))
+                            backref=backref('mods', passive_deletes=True, cascade="all, delete-orphan",
+                                            order_by="asc(ModListItem.sort_index)"))
     sort_index = Column(Integer, default=0, nullable=False)
 
     def __repr__(self) -> str:

frontend/coffee/global.coffee

@@ -63,6 +63,42 @@ $('#alert-error').on 'close.bs.alert', () ->
     $('#alert-error').addClass 'hidden'
     return false
 
+# Dark mode an explicit toggle choice is saved in localStorage (and applied
+# early in layout.html) with no saved choice we follow the OS theme
+darkModeToggle = document.getElementById('dark-mode-toggle')
+if darkModeToggle?
+    root = document.documentElement
+    updateDarkModeButton = () ->
+        active = root.classList.contains('dark-mode')
+        darkModeToggle.setAttribute('aria-pressed', active.toString())
+    updateDarkModeButton()
+    darkModeToggle.addEventListener('click', (e) ->
+        e.preventDefault()
+        active = root.classList.toggle('dark-mode')
+        try
+            localStorage.setItem('dark-mode', active.toString())
+        catch error
+            # localStorage can be blocked (private mode)
+        updateDarkModeButton()
+    , false)
+
+    # Follow the OS theme live but only until the user makes an explicit choice
+    if window.matchMedia?
+        mq = window.matchMedia('(prefers-color-scheme: dark)')
+        applySystemTheme = (e) ->
+            explicit = false
+            try
+                explicit = localStorage.getItem('dark-mode') isnt null
+            catch error
+                explicit = false
+            unless explicit
+                root.classList.toggle('dark-mode', e.matches)
+                updateDarkModeButton()
+        if mq.addEventListener?
+            mq.addEventListener('change', applySystemTheme)
+        else if mq.addListener?
+            mq.addListener(applySystemTheme)
+
 $('.search-tips-button').on 'click', (e) ->
     $('.search-tips').addClass 'search-tips-visible'
 

frontend/static/css/bootstrap-theme.css

@@ -53,7 +53,7 @@
 }
 
 html body {
-    font: 4mm "glacial_indifferenceregular";
+    font: 4mm "glacial_indifferenceregular", "Helvetica Neue", Helvetica, Arial, sans-serif;
     color: #333333;
 }
 
@@ -879,7 +879,7 @@ div.header .vert-text {
 }
 
 div.tab-container {
-    margin: 2.5mm;
+    margin: 9px 0;
 
 }
 

frontend/styles/create.scss

@@ -73,3 +73,40 @@
         }
     }
 }
+
+.chosen-container.chosen-container-single .chosen-single {
+    height: 34px;
+    line-height: 34px;
+    padding: 0 12px;
+    border-radius: 0;
+    box-shadow: none;
+
+    span {
+        line-height: 34px;
+    }
+
+    div {
+        height: 34px;
+
+        b {
+            background-position: 0 11px;
+        }
+    }
+}
+.chosen-container.chosen-container-active.chosen-with-drop .chosen-single {
+    border-radius: 0;
+}
+.chosen-container.chosen-container-single .chosen-drop {
+    border-radius: 0;
+}
+
+.notification {
+    font-weight: normal;
+
+    input[type="checkbox"] {
+        margin-right: 8px;
+    }
+    .glyphicon {
+        margin-left: 8px;
+    }
+}