Merge pull request #202 from jamescurtin/add-pre-commit

Add pre-commit hook

.devcontainer/devcontainer.json

@@ -7,6 +7,7 @@
 	],
 	"service": "dev",
 	"workspaceFolder": "/workspace",
+	"postCreateCommand": ". /workspace/.devcontainer/post-create.sh",
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	"features": {
 		"ghcr.io/devcontainers/features/common-utils:2": {},

.devcontainer/post-create.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+cd /workspace
+pre-commit install-hooks

.env.example

@@ -32,4 +32,3 @@ RECAPTCHA_PRIVATE_KEY='secret'
 GOOGLE_OAUTH_LINK="secret.apps.googleusercontent.com"
 HTTP_PORT="80"
 SSL_PORT="443"
-

.github/workflows/test.yml

@@ -12,3 +12,10 @@ jobs:
       - uses: actions/checkout@v4
       - run: ./.github/scripts/prepare-ci.sh
       - run: docker compose run --rm test --ci
+  pre-commit:
+    name: pre-commit validation
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v5
+    - uses: pre-commit/[email protected]

.gitignore

@@ -7,4 +7,4 @@ media/
 auctions/templates/ads.txt
 swag/
 mediafiles/
-staticfiles/
+staticfiles/

.pre-commit-config.yaml

@@ -0,0 +1,19 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.6.3
+  hooks:
+    # Run the linter.
+    - id: ruff
+      args: [ --fix ]
+    # Run the formatter.
+    - id: ruff-format

Dockerfile

@@ -60,6 +60,7 @@ RUN pip install -r requirements-test.txt
 FROM builder AS dev
 COPY ./requirements*.txt .
 RUN pip install -r requirements.txt
+RUN pip install -r requirements-test.txt
 
 #########
 # FINAL #

auctions/static/admin/css/dark_mode.css

@@ -2,31 +2,31 @@
     :root {
       --primary: #264b5d;
       --primary-fg: #f7f7f7;
-  
+
       --body-fg: #eeeeee;
       --body-bg: #121212;
       --body-quiet-color: #e0e0e0;
       --body-loud-color: #ffffff;
-  
+
       --breadcrumbs-link-fg: #e0e0e0;
       --breadcrumbs-bg: var(--primary);
-  
+
       --link-fg: #81d4fa;
       --link-hover-color: #4ac1f7;
       --link-selected-fg: #6f94c6;
-  
+
       --hairline-color: #272727;
       --border-color: #353535;
-  
+
       --error-fg: #e35f5f;
       --message-success-bg: #006b1b;
       --message-warning-bg: #583305;
       --message-error-bg: #570808;
-  
+
       --darkened-bg: #212121;
       --selected-bg: #1b1b1b;
       --selected-row: #00363a;
-  
+
       --close-button-bg: #333333;
       --close-button-hover-bg: #666666;
     }

auctions/static/admin/js/SelectFilter2.js

@@ -96,7 +96,7 @@ Requires core.js and SelectBox.js.
                     [field_name]
                 )
             );
-            
+
             const filter_selected_p = quickElement('p', selector_chosen, '', 'id', field_id + '_filter_selected');
             filter_selected_p.className = 'selector-filter';
 
@@ -115,11 +115,11 @@ Requires core.js and SelectBox.js.
 
             const to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', '', 'size', from_box.size, 'name', from_box.name);
             to_box.className = 'filtered';
-            
+
             const warning_footer = quickElement('div', selector_chosen, '', 'class', 'list-footer-display');
             quickElement('span', warning_footer, '', 'id', field_id + '_list-footer-display-text');
             quickElement('span', warning_footer, ' (click to clear)', 'class', 'list-footer-display__clear');
-            
+
             const clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_remove_all_link');
             clear_all.className = 'selector-clearall';
 

auctions/static/admin/js/admin/RelatedObjectLookups.js

@@ -11,15 +11,15 @@
         relatedWindows.forEach(function(win) {
             if(!win.closed) {
                 win.dismissChildPopups();
-                win.close();    
+                win.close();
             }
         });
     }
 
     function setPopupIndex() {
         if(document.getElementsByName("_popup").length > 0) {
             const index = window.name.lastIndexOf("__") + 2;
-            popupIndex = parseInt(window.name.substring(index));   
+            popupIndex = parseInt(window.name.substring(index));
         } else {
             popupIndex = 0;
         }