chk conflict

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: CTFd

.github/workflows/lint.yml

@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.11']
 
     name: Linting
     steps:
@@ -24,8 +24,8 @@ jobs:
         run: |
             python -m pip install --upgrade pip
             python -m pip install -r linting.txt
-            sudo yarn install --non-interactive
-            sudo yarn global add prettier@1.17.0
+            sudo yarn --cwd CTFd/themes/admin install --non-interactive
+            sudo yarn global add prettier@3.2.5
 
       - name: Lint
         run: make lint
@@ -39,6 +39,9 @@ jobs:
 
       - name: Lint docker-compose
         run: |
-            python -m pip install docker-compose==1.26.0
-            docker-compose -f docker-compose.yml config
+            docker compose -f docker-compose.yml config
+
+      - name: Lint translations
+        run: |
+          make translations-lint
 

.github/workflows/mariadb.yml

@@ -0,0 +1,59 @@
+---
+name: CTFd MariaDB CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    services:
+      mariadb:
+        image: mariadb:10.11
+        env:
+          MYSQL_ROOT_PASSWORD: password
+          MYSQL_DATABASE: ctfd
+        ports:
+          - 3306
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+
+    strategy:
+      matrix:
+        python-version: ['3.11']
+
+    name: Python ${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+      - name: Install dependencies
+        run: |
+            python -m pip install --upgrade pip
+            python -m pip install -r development.txt
+            sudo yarn install --non-interactive
+
+      - name: Test
+        run: |
+            sudo rm -f /etc/boto.cfg
+            make test
+        env:
+            AWS_ACCESS_KEY_ID: AKIAIOSFODNN7EXAMPLE
+            AWS_SECRET_ACCESS_KEY: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+            TESTING_DATABASE_URL: mysql+pymysql://root:password@localhost:${{ job.services.mariadb.ports[3306] }}/ctfd
+
+      - name: Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          file: ./coverage.xml

.github/workflows/mirror-core-theme.yml

@@ -0,0 +1,30 @@
+name: Mirror core-theme
+on:
+  push:
+    branches: 
+      - main
+  workflow_dispatch:
+
+jobs:
+  mirror:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # need full history for subtree
+
+      - name: Setup SSH for deploy key
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.CORE_THEME_DEPLOY_KEY }}" > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
+          ssh-keyscan github.com >> ~/.ssh/known_hosts
+
+      - name: Setup git identity
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "[email protected]"
+
+      - name: Push subtree
+        run: |
+          git subtree push --prefix="CTFd/themes/core" "[email protected]:CTFd/core-theme.git" main

.github/workflows/mysql.yml

@@ -1,7 +1,13 @@
 ---
 name: CTFd MySQL CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
@@ -22,7 +28,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.11']
 
     name: Python ${{ matrix.python-version }}
     steps:
@@ -48,6 +54,6 @@ jobs:
             TESTING_DATABASE_URL: mysql+pymysql://root:password@localhost:${{ job.services.mysql.ports[3306] }}/ctfd
 
       - name: Codecov
-        uses: codecov/codecov-action@v1.0.11
+        uses: codecov/codecov-action@v5
         with:
           file: ./coverage.xml

.github/workflows/mysql8.yml

@@ -0,0 +1,59 @@
+---
+name: CTFd MySQL 8.0 CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:8.0
+        env:
+          MYSQL_ROOT_PASSWORD: password
+        ports:
+          - 3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+
+    strategy:
+      matrix:
+        python-version: ['3.11']
+
+    name: Python ${{ matrix.python-version }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup python
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+      - name: Install dependencies
+        run: |
+            python -m pip install --upgrade pip
+            python -m pip install -r development.txt
+            sudo yarn install --non-interactive
+
+      - name: Test
+        run: |
+            sudo rm -f /etc/boto.cfg
+            make test
+        env:
+            AWS_ACCESS_KEY_ID: AKIAIOSFODNN7EXAMPLE
+            AWS_SECRET_ACCESS_KEY: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+            TESTING_DATABASE_URL: mysql+pymysql://root:password@localhost:${{ job.services.mysql.ports[3306] }}/ctfd
+
+      - name: Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          file: ./coverage.xml

.github/workflows/postgres.yml

@@ -1,7 +1,13 @@
 ---
 name: CTFd Postgres CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
@@ -29,7 +35,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.11']
 
     name: Python ${{ matrix.python-version }}
     steps:
@@ -55,7 +61,7 @@ jobs:
             TESTING_DATABASE_URL: postgres://postgres:password@localhost:${{ job.services.postgres.ports[5432] }}/ctfd
 
       - name: Codecov
-        uses: codecov/codecov-action@v1.0.11
+        uses: codecov/codecov-action@v5
         with:
           file: ./coverage.xml
 

.github/workflows/sqlite.yml

@@ -1,7 +1,13 @@
 ---
 name: CTFd SQLite CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
@@ -10,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.11']
 
     name: Python ${{ matrix.python-version }}
     steps:
@@ -37,7 +43,7 @@ jobs:
             TESTING_DATABASE_URL: 'sqlite://'
 
       - name: Codecov
-        uses: codecov/codecov-action@v1.0.11
+        uses: codecov/codecov-action@v5
         with:
           file: ./coverage.xml
 

.github/workflows/verify-themes.yml

@@ -0,0 +1,38 @@
+---
+name: Theme Verification
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    name: Theme Verification
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.19
+
+      - name: Verify admin theme
+        run: |
+            pwd
+            yarn install --non-interactive
+            yarn verify 
+        working-directory: ./CTFd/themes/admin
+
+      # TODO: Replace in 4.0 with deprecation of previous core theme
+      - name: Verify core theme
+        run: |
+            pwd
+            yarn install --non-interactive
+            yarn verify
+        working-directory: ./CTFd/themes/core

.prettierignore

@@ -1,5 +1,8 @@
 CTFd/themes/**/vendor/
+CTFd/themes/core-deprecated/
+CTFd/themes/core/static/
 CTFd/themes/core-beta/**/*
+CTFd/themes/admin/static/**/*
 *.html
 *.njk
 *.png