Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/search and filter #363

Merged
merged 12 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/linting-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Linting Workflow
on:
pull_request:
branches:
- develop
# - develop
- main

jobs:
Expand All @@ -26,14 +26,14 @@ jobs:
uses: github/super-linter@v4
env:
VALIDATE_ALL_CODEBASE: false
# VALIDATE_KOTLIN: true
VALIDATE_KOTLIN: true
VALIDATE_JAVA: true
VALIDATE_JAVASCRIPT_ES: true
VALIDATE_JAVASCRIPT_STANDARD: true
VALIDATE_TYPESCRIPT_ES: true
VALIDATE_TYPESCRIPT_STANDARD: true
VALIDATE_DART: false
VALIDATE_FLUTTER: false
VALIDATE_DART: true
VALIDATE_FLUTTER: true
DEFAULT_BRANCH: develop
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ACTIONS_RUNNER_DEBUG: true
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/testing-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,18 @@ jobs:
rm -f src/notification-service/.env
rm -f src/storage-service/.env

# - name: Convert Jacoco report to lcov
# run: |
# python3 scripts/jacoco2lcov.py ./src/Backend/build/reports/jacoco/report.xml backend.lcov.info
- name: Convert Jacoco report to lcov
run: |
python3 scripts/jacoco2lcov.py ./src/Backend/build/reports/jacoco/report.xml backend.lcov.info

# - name: Merge coverage reports
# run: |
# lcov -a backend.lcov.info -o merged.lcov.info
- name: Merge coverage reports
run: |
lcov -a ./src/Frontend/coverage/lcov.info -a backend.lcov.info -o merged.lcov.info

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: codeCoverageReport
files: merged.lcov.info
flags: unittests
name: codecov-umbrella
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,8 @@ secrets.yml
.git-hooks/
node_modules
.env
**/.vuepress/.temp/
**/.vuepress/.cache/
public/
**/.vuepress/.temp/**
**/.vuepress/.cache/**


File renamed without changes.
2 changes: 1 addition & 1 deletion docs/VuePress/.idea/modules.xml → .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
![GitHub Languages](https://img.shields.io/github/languages/count/COS301-SE-2024/WhatsOn-UP)
![GitHub Last Commit](https://img.shields.io/github/last-commit/COS301-SE-2024/WhatsOn-UP)
![GitHub RepoSize](https://img.shields.io/github/repo-size/COS301-SE-2024/WhatsOn-UP)
[![Testing Pipeline](https://github.com/COS301-SE-2024/WhatsOn-UP/actions/workflows/testing-workflow.yml/badge.svg)](https://github.com/COS301-SE-2024/WhatsOn-UP/actions/workflows/testing-workflow.yml)
[![CI Pipeline](https://github.com/COS301-SE-2024/WhatsOn-UP/actions/workflows/ci.yml/badge.svg)](https://github.com/COS301-SE-2024/WhatsOn-UP/actions/workflows/ci.yml)
[![codecov](https://codecov.io/github/COS301-SE-2024/WhatsOn-UP/branch/develop/graph/badge.svg?token=NCfwbRRGxD)](https://codecov.io/github/COS301-SE-2024/WhatsOn-UP)
## Project description
WhatsOn@UP system aims to be a central hub for all University of Pretoria events, providing a centralized platform for students and guests to easily find and manage events.
Expand Down
3 changes: 1 addition & 2 deletions docs/VuePress/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 57 additions & 7 deletions docs/VuePress/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions docs/VuePress/docs/.vuepress/.cache/deps/@vue_devtools-api.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

136 changes: 136 additions & 0 deletions docs/VuePress/docs/.vuepress/.cache/deps/@vuepress_shared.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading