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

Version 1.0.0 #94

Merged
merged 89 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
2ce1196
SMA-0: Update CONTRIBUTING.md (#1)
MatejFrnka Jan 20, 2024
67a14a0
SMA-6: intialized react app (#2)
ivamach Jan 20, 2024
f3e07ae
SMA-4: initialize java spring boot application (#3)
markpernia Jan 20, 2024
7b413cd
Sma 11 implement database entities and repos add mock data (#4)
ivamach Jan 21, 2024
221e00c
SMA-7: Added swagger dependencies and enable swagger (#5)
Johna91 Jan 21, 2024
b164eb5
SMA-18: fixed SportsmatchApplication (#6)
ivamach Jan 21, 2024
22fda43
Sma 19 fix dependencies in react app (#7)
MatejFrnka Jan 21, 2024
3a75518
SMA-14: Implement upcoming game component (#8)
markpernia Jan 23, 2024
349ff1d
SMA 23: upgraded React to the latest version added Vite and React Rou…
ivamach Jan 24, 2024
d967a2b
Sma 12 add routing to react (#11)
ivamach Jan 25, 2024
4557757
SMA-3: User registration and login (#13)
markpernia Jan 27, 2024
dfcd478
Sma 16 crud controller for events (#9)
Johna91 Jan 27, 2024
fc267da
Sma 29 set up test environment for the front end (#15)
ivamach Jan 27, 2024
74388d2
Sma 20 add build and style checks to GitHub (#17)
ivamach Jan 28, 2024
2f3772e
SMA-31: lint errors fixed (#18)
ivamach Jan 28, 2024
7228f5a
SMA-30: User Logout (#16)
markpernia Jan 30, 2024
5f8d217
Sma 17 implement login screen (#20)
DeakCsaba0124 Feb 1, 2024
91c3322
SMA-22: Add endpoint that returns upcoming events (#21)
Johna91 Feb 1, 2024
210a1f7
Sma 21 add endpoint that returns all sports (#14)
kz44 Feb 3, 2024
8506e26
Sma 24 add automatic client generation on frontend (#23)
ivamach Feb 3, 2024
da8bd6f
SMA-32: Implement upcoming match and match in progress (#22)
markpernia Feb 3, 2024
022c2c9
SMA-27: Made H2 Data Persistent (#24)
markpernia Feb 6, 2024
d94d6fc
SMA-: 33 implement match history item (#27)
Johna91 Feb 7, 2024
5259f1e
SMA-44: Unify CSS & declare CSS variables (#26)
markpernia Feb 7, 2024
fb0f9ef
Frontend new user profile page added and little fixing on login and s…
DeakCsaba0124 Feb 8, 2024
4548dd6
SMA-35: Put the pieces together for user home page (#29)
markpernia Feb 12, 2024
1ebba8c
Sma 25 implement the top bar component (#28)
kz44 Feb 14, 2024
2fdb940
SMA-52: Added frontend to the CORS policy (#32)
MatejFrnka Feb 17, 2024
32aa061
SMA-37: implement the more sports page (#31)
ivamach Feb 17, 2024
f0594f8
Sma 50 connect login screen with backend (#34)
Johna91 Feb 17, 2024
51f5c45
Sma 42 sports should also have their emoji stored and the link to the…
ivamach Feb 17, 2024
e66a174
SMA-45: user should be able to rate other users and fill in score of …
markpernia Feb 20, 2024
7cc6bc2
Sma 53 update the more sports page (#36)
ivamach Feb 22, 2024
cb08d8a
Sma 54 make search bar from more sports page reusable (#38)
ivamach Feb 23, 2024
cdbf044
SMA-57: add page not found page when unknown route is used (#40)
ivamach Feb 24, 2024
14bacf8
SMA-47: user should be able to fill in their info after they sign up …
markpernia Feb 24, 2024
1c631a8
Sma 43 add event history endpoint (#37)
kz44 Feb 27, 2024
434ffcd
Sma 41 make login screen work (connect backend and frontend) (#41)
Johna91 Feb 27, 2024
d3f648a
Sma 58 refactor backend (#44)
MatejFrnka Mar 4, 2024
8ca7221
Sma 26 (#42)
MatejFrnka Mar 4, 2024
37cda92
SMA-59: added docker with cockroach db (#43)
MatejFrnka Mar 5, 2024
94242f9
Sma 46 user should be able to register (#45)
kz44 Mar 7, 2024
c4d1323
SMA-65: update register endpoint now returns access token (#46)
markpernia Mar 9, 2024
151e24f
SMA-56: handle logic that redirects the user to login page if the use…
ivamach Mar 11, 2024
e5c4553
SMA-63: add user button to navbar (#48)
ivamach Mar 12, 2024
486c396
SMA-49: user should be able to fill in their info after they sign up …
markpernia Mar 14, 2024
8320d17
SMA-60: implement api v1 rating check (#50)
ivamach Mar 14, 2024
b9e66f1
Sma 62 implement places backend (#51)
kz44 Mar 17, 2024
a6d85d9
SMA-61: implement rate game popup window (#52)
ivamach Mar 19, 2024
44690e2
SMA-64: make main page sports filtration work (#53)
markpernia Mar 20, 2024
b9759bb
SMA-72: add endpoint for joining an event (#54)
ivamach Mar 21, 2024
f0f7d7e
SMA-75: add user info endpoint (#55)
markpernia Mar 24, 2024
126c327
SMA-76: implement join event on frontend (#56)
ivamach Mar 25, 2024
46eb23f
SMA-78: updated id generation to be sequential (#57)
MatejFrnka Mar 30, 2024
1e61317
SMA-68: create endpoint about user ratings (#59)
ivamach Mar 31, 2024
b63fa44
SMA-79: fixed sign up alignment to center (#58)
markpernia Apr 1, 2024
a92b345
SMA-73: implement frontend for user ratings (#60)
markpernia Apr 4, 2024
54c8fd0
Sma 69 create endpoint for nearby events (#61)
kz44 Apr 7, 2024
0058278
SMA-83: arranged frontend url and removed test routes (#62)
markpernia Apr 10, 2024
0b3c861
Sma 85 make the let s play button on index page work (#63)
markpernia Apr 10, 2024
f91bfdf
SMA-89-Remove-String-location-from-EventDTO (#65)
MatejFrnka Apr 12, 2024
6984f61
Sma 90 endpoint api v1 event upcoming events returns 403 no matter wh…
MatejFrnka Apr 12, 2024
4e1eff0
SMA-74: make history view and upcoming match work with the backend (#66)
ivamach Apr 12, 2024
ebb3071
UserDTO from the me endpoint has wrong list of sports (#70)
kz44 Apr 13, 2024
36e0a0c
SMA-87-Add Annotation to the Pageable object (#64)
kz44 Apr 13, 2024
abc4d33
SMA-102: nearby events don t work (#73)
ivamach Apr 13, 2024
47bc342
SMA-81: use sports from the api v1 sports all in the register page (#72)
ivamach Apr 13, 2024
d645db6
WIP: SMA-84: update modal position to fixed (#68)
markpernia Apr 13, 2024
6e3eb16
Sma 36 implement the host event page (#69)
Johna91 Apr 15, 2024
0fc029e
SMA-80: allow logging in and signing up with expired jwt token (#71)
ivamach Apr 15, 2024
3372bc2
SMA-82 unify font sizes (#74)
markpernia Apr 16, 2024
979a4dc
Sma 99 add favicon and page title (#75)
Johna91 Apr 18, 2024
f8c645d
SMA-86: make the more sports work (#76)
ivamach Apr 18, 2024
81dd891
Sma 100 add list of available events to host event (#77)
markpernia Apr 21, 2024
a2ce89d
SMA 99 added favicon.png (#78)
Johna91 Apr 21, 2024
75bd46b
SMA-104: sports button filter doesn t filter nearby events when all e…
ivamach Apr 22, 2024
258e350
SMA-101: added env variables for different environments (#80)
MatejFrnka Apr 23, 2024
4a1f9d1
SMA-106: handle logged out user in join event popup window (#82)
ivamach Apr 23, 2024
73ad94f
SMA-91 rest api should return 400 when data is invalid (#81)
markpernia Apr 23, 2024
e9da8dc
Sma 95 profile should redirect you to your profile (#83)
Johna91 Apr 23, 2024
5f0b700
SMA-92: Move the user icon to the right corner (#85)
markpernia Apr 24, 2024
8cf269e
SMA-109: the check rating endpoint returns also future events (#86)
ivamach Apr 26, 2024
0e9bd08
SMA-67: add rating does not work if user has multiple events (#87)
ivamach Apr 27, 2024
61ffced
SMA-108: fix the date in rate game popup window (#88)
ivamach Apr 30, 2024
1321614
Sma 111 fix image paths (#89)
Johna91 Apr 30, 2024
adcd6b5
SMA-105: connect the places filter with backend (#90)
ivamach May 3, 2024
0f46900
SMA-107: the main page should use user s location (#91)
ivamach May 6, 2024
058542a
SMA-112: fixed isEventValid in RankService to handle null score (#92)
ivamach May 6, 2024
3dbe490
Version increased (#93)
MatejFrnka May 23, 2024
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
36 changes: 36 additions & 0 deletions .github/workflows/build-gradle.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle


name: Java CI with Gradle

on:
[push, pull_request]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest
defaults:
run:
working-directory: ./backend/sportsmatch

steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Execute Gradle build
run: ./gradlew build
28 changes: 28 additions & 0 deletions .github/workflows/build-react.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Build and Test React

on: [ push, pull_request ]

jobs:
build:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./frontend/sportsmatch-app

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/[email protected]
with:
node-version: latest

- name: Install dependencies
run: npm install

- name: Build frontend
run: npm run build

- name: Run test
run: npm test
25 changes: 25 additions & 0 deletions .github/workflows/checkstyle-react.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Check the React source code

on: [ push, pull_request ]

jobs:
test:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./frontend/sportsmatch-app

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/[email protected]
with:
node-version: latest

- name: Install dependencies
run: npm install

- name: Lint
run: npm run lint
33 changes: 0 additions & 33 deletions .github/workflows/gradle.yml

This file was deleted.

6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
## Workflow

1. Create a feature branch when you start to work on a story and commit your changes to this
- the branch should be named `<id of the ticket>: <subject>`, for example `TB-3: Add login endpoint`
- the commits should also be named `<id of the ticket>: <subject>`, for example `TB-3: added unit tests`
- the branch should be named `<id of the ticket>: <subject>`, for example `SMA 3 Add login endpoint`
- the commits should also be named `<id of the ticket>: <subject>`, for example `SMA 3 added unit tests`
2. Push this frequently to the remote repository from your local
2. When the feature is done, create a Pull Request from the `feature_branch` to `development`, follow the guidelines
3. When the PR is approved, merge it, and delete your feature branch
Expand All @@ -19,7 +19,7 @@ Read this article how to write meaningful commit messages:
[How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/)

We follow the rules below:
- **Commit message format**: `TB-{id}: <subject>`
- **Commit message format**: `SMA {id} <subject>`
- **id**: Id of the ticket you are working on (in jira)
- **Subject**: Changes in the commit

Expand Down
41 changes: 41 additions & 0 deletions backend/sportsmatch/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
HELP.md
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/

### VS Code ###
.vscode/

### h2 database ###
./sportsmatch
*.db
61 changes: 61 additions & 0 deletions backend/sportsmatch/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.1.7'
id 'io.spring.dependency-management' version '1.1.4'
id 'checkstyle'
}

group = 'com'
version = '1.0.0'

java {
sourceCompatibility = '17'
}
checkstyle {
configDirectory = file("$rootProject.projectDir/../../config/checkstyle")
toolVersion '10.12.7'
}
checkstyleMain {
source = 'src/main/java'
}
checkstyleTest {
source = 'src/test/java'
}

configurations {
compileOnly {
extendsFrom annotationProcessor
}
}

repositories {
mavenCentral()
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-web'
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.h2database:h2'
implementation 'org.postgresql:postgresql:42.7.3'

annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
implementation group: 'org.modelmapper', name: 'modelmapper', version: '3.1.1'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
implementation 'org.springframework.boot:spring-boot-starter-security'
testImplementation 'org.springframework.security:spring-security-test'
implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3'
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3'
implementation 'org.springframework.boot:spring-boot-starter-validation'
}

tasks.named('bootBuildImage') {
builder = 'paketobuildpacks/builder-jammy-base:latest'
}

tasks.named('test') {
useJUnitPlatform()
}
17 changes: 17 additions & 0 deletions backend/sportsmatch/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: '3.8'

services:

crdb:
container_name: crdb
hostname: crdb
image: cockroachdb/cockroach:latest
command: start-single-node --cluster-name=example-single-node --logtostderr=WARNING --log-file-verbosity=WARNING --insecure
ports:
- "26257:26257"
- "8888:8080"
volumes:
- roach-single:/cockroach/cockroach-data

volumes:
roach-single:
Binary file not shown.
7 changes: 7 additions & 0 deletions backend/sportsmatch/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading