diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 703987f3..08ef2960 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -1,30 +1,55 @@ -name: Server testing - on: push: branches: [ main ] + branches: [ '*' ] # Runs on any branch pull_request: branches: [ main ] + branches: [ '*' ] jobs: test: runs-on: ubuntu-latest - + steps: - uses: actions/checkout@v3 - name: Set up python + - name: Set up Python uses: actions/setup-python@v3 with: python-version: '3.9' + python-version: '3.11' - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt + pip install -r server/requirements.txt # - name: Run tests # run: | # python manage.py test - + - name: Check for errors + if [ -f server/requirements.txt ]; then + python -m pip install --upgrade pip + pip install -r server/requirements.txt + else + echo "requirements.txt not found. Skipping dependency installation." + fi + - name: Run Django tests + run: | + if [ -f manage.py ]; then + python manage.py test + else + echo "manage.py not found. Skipping tests." + fi + - name: Run Django checks for errors + run: | + if [ -f manage.py ]; then + python manage.py check + else + echo "manage.py not found. Skipping Django checks." + fi + - name: Lint code run: | - python manage.py check \ No newline at end of file + python manage.py check + pip install flake8 + flake8 . diff --git a/frontend/public/logo.png b/frontend/public/logo.png index 0cead49e..f084126b 100644 Binary files a/frontend/public/logo.png and b/frontend/public/logo.png differ diff --git a/frontend/src/assets/image/b1.jpg b/frontend/src/assets/image/b1.jpg index c2855f97..d91f1cad 100644 Binary files a/frontend/src/assets/image/b1.jpg and b/frontend/src/assets/image/b1.jpg differ diff --git a/frontend/src/assets/image/logo.png b/frontend/src/assets/image/logo.png index 0cead49e..f084126b 100644 Binary files a/frontend/src/assets/image/logo.png and b/frontend/src/assets/image/logo.png differ diff --git a/frontend/src/assets/image/logo.svg b/frontend/src/assets/image/logo.svg index 6188e7fb..339e149c 100644 --- a/frontend/src/assets/image/logo.svg +++ b/frontend/src/assets/image/logo.svg @@ -1,365 +1,84 @@ - - - - - -Created by potrace 1.16, written by Peter Selinger 2001-2019 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +