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

Merge to main #866

Merged
merged 377 commits into from
Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
377 commits
Select commit Hold shift + click to select a range
743d7f4
solved conflict and added tags
yunusemrealtug Dec 18, 2023
2b07fd2
Merge pull request #745 from bounswe/feature/MB/744/merge-user-search…
kardelenerdal Dec 18, 2023
95797be
Merge pull request #736 from bounswe/feature/MB/689/fixing-image-size…
kardelenerdal Dec 18, 2023
ba6d566
Merge pull request #684 from bounswe/bugfix/MB/605/like-dislike-2
kardelenerdal Dec 18, 2023
36836ed
Add GroupPage route to App.js
mtkamiloglu Dec 18, 2023
ed8f5d1
Merge remote-tracking branch 'origin' into feature/FE/650/group-page
mtkamiloglu Dec 18, 2023
80da332
added request logger
omersafakbebek Dec 18, 2023
d2200db
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
omersafakbebek Dec 18, 2023
11fd222
maxnumberofmembers bugfix
yunusemrealtug Dec 18, 2023
7e52abe
membercheck fixed
yunusemrealtug Dec 18, 2023
f57c2a2
Merge pull request #747 from bounswe/feature/FE/708/create-group
mtkamiloglu Dec 18, 2023
6e11ed3
Merge remote-tracking branch 'origin' into feature/FE/650/group-page
mtkamiloglu Dec 18, 2023
393da3e
created group page
mtkamiloglu Dec 18, 2023
ea2ee8a
Refactor code to improve performance and readability
mtkamiloglu Dec 19, 2023
be9dc75
Add Edit Group functionality and dialog
mtkamiloglu Dec 19, 2023
e51c143
Refactor GroupPage layout and add tags
mtkamiloglu Dec 19, 2023
82bafcc
Add secondary text to display admin status in member list
mtkamiloglu Dec 19, 2023
73dfb56
removed the unused platforms
haticerk Dec 19, 2023
389b8b8
Remove unused state variables and optimize API calls
mtkamiloglu Dec 19, 2023
a020517
annotation start
kardelenerdal Dec 19, 2023
d0486a0
Merge pull request #749 from bounswe/feature/FE/650/group-page
yunusemrealtug Dec 19, 2023
d4001c6
Create lab_report_10.md
elifkizilky Dec 19, 2023
288fca9
Update lab_report_10.md
yunusemrealtug Dec 19, 2023
519549f
Update lab_report_10.md
kardelenerdal Dec 19, 2023
1c393f6
Update lab_report_10.md
haticerk Dec 19, 2023
ed019ca
Added last week's and this week's jobs
mtkamiloglu Dec 19, 2023
8ccc861
Merge pull request #763 from bounswe/lab-report-10
haticerk Dec 19, 2023
9d48ff4
added footer
elifkizilky Dec 21, 2023
6080865
added annotation service
omersafakbebek Dec 21, 2023
cc5e75d
added annotation endpoints
omersafakbebek Dec 21, 2023
21b4b91
fixed lint errors
omersafakbebek Dec 21, 2023
32b0b4b
Merge pull request #776 from bounswe/feature/BE/706/annotation
melihgezerr Dec 21, 2023
3206d47
#751 last activities implemented in user profile pages
frknlke Dec 22, 2023
e11f0c1
changed style of group topic/added suggested games
elifkizilky Dec 22, 2023
c7247a3
edit game page fixed.
senaal Dec 22, 2023
685090e
notifications button is removed.
senaal Dec 22, 2023
9d4aeb0
Upcoming titles page is ready and waiting for the endpoint to complet…
senaal Dec 23, 2023
4a86c4e
Added user pages associated games and companies.
senaal Dec 23, 2023
fc258fc
added create annotation in thread page
elifkizilky Dec 23, 2023
76ed380
fixed create annotation url/added fetch annotation
elifkizilky Dec 23, 2023
71475ad
made the thread component more appealing
elifkizilky Dec 23, 2023
0c0e713
threadCompId unique/comment annotatable
elifkizilky Dec 23, 2023
8683316
thread title annotatable, problematic
elifkizilky Dec 23, 2023
4233a21
gameBio and Thread annotations implemented
kardelenerdal Dec 23, 2023
2a73d72
entity description object changed
kardelenerdal Dec 23, 2023
d97b585
getUserIdByUsername
melihgezerr Dec 23, 2023
e8aa56c
Delete annotation by id
tacettinburakeren Dec 23, 2023
e511c7a
entity annotation is implemented and annotation style is changed
kardelenerdal Dec 23, 2023
4e52a78
visualization-of-review-and-comment-endpoints
melihgezerr Dec 23, 2023
7224df1
fixed the rating
haticerk Dec 23, 2023
7241cbe
added annotation to gamebio
elifkizilky Dec 23, 2023
b5339f8
visualization-of-review-and-comment-endpoints
melihgezerr Dec 23, 2023
1d5941d
fix the duplicates
elifkizilky Dec 23, 2023
0f0670a
changed the name of the gamebio annotation
elifkizilky Dec 23, 2023
5169999
Merge pull request #788 from bounswe/feature/772/BE/reviews-and-comme…
omersafakbebek Dec 23, 2023
5827dad
Merge pull request #785 from bounswe/feature/770/BE/username-id-endpoint
omersafakbebek Dec 23, 2023
331b177
Merge pull request #786 from bounswe/feature/BE/783/delete-annotation…
omersafakbebek Dec 23, 2023
eeff73f
added group search
omersafakbebek Dec 23, 2023
d9e930e
Merge branch 'development'into home-page-suggested
elifkizilky Dec 23, 2023
647bbc4
Merge pull request #791 from bounswe/feature/BE/790/groups-in-search
melihgezerr Dec 23, 2023
ccc73d4
Merge branch 'development' into FE/761/footer
elifkizilky Dec 23, 2023
6e1a2f3
fixed versions
elifkizilky Dec 23, 2023
668d5f2
synced email with mobile
elifkizilky Dec 23, 2023
a21a0c1
fixed recogito install package
elifkizilky Dec 23, 2023
64a94c6
Merge branch 'development' into annotation-thread
elifkizilky Dec 23, 2023
a848b51
Merge pull request #789 from bounswe/feature/FE/782/game-bio-annotation
yunusemrealtug Dec 23, 2023
584e8d7
fixed multiple recogito initialization
elifkizilky Dec 23, 2023
6a4b626
Merge pull request #792 from bounswe/feature/FE/756/home-page-suggested
mtkamiloglu Dec 23, 2023
05bdeaf
annotation is added and entity page is revised
mtkamiloglu Dec 23, 2023
d8e09e9
upcoming titles feature added
melihgezerr Dec 23, 2023
549cbe9
create group functionality
haticerk Dec 23, 2023
0b9c5f2
made images annotatable
elifkizilky Dec 23, 2023
34ce7e3
Refactor Header component to include group navigation
mtkamiloglu Dec 23, 2023
ed3bac4
Merge pull request #795 from bounswe/feature/707/BE/upcoming-titles
omersafakbebek Dec 23, 2023
5430734
Merge pull request #800 from bounswe/enhancement/FE/774/add-group-sea…
elifkizilky Dec 23, 2023
4c5e1e9
made upcomingTitle nullable
omersafakbebek Dec 23, 2023
5a7ebbe
Update image source in EntityPage.js
mtkamiloglu Dec 23, 2023
9b99183
Merge pull request #802 from bounswe/feature/707/BE/upcoming-titles
omersafakbebek Dec 23, 2023
fecd6be
Merge pull request #793 from bounswe/feature/FE/761/footer
mtkamiloglu Dec 23, 2023
296f9d6
Merge pull request #796 from bounswe/feature/FE/794/entity-page-annot…
elifkizilky Dec 23, 2023
9adcfbd
get and post annotations are added
yunusemrealtug Dec 24, 2023
70a88cb
#658 resolved conflicts
frknlke Dec 24, 2023
83d485f
created groups page
haticerk Dec 24, 2023
8c633da
fixed the average rating bug
haticerk Dec 24, 2023
ea27599
Merge branch 'development' into annotation-thread
elifkizilky Dec 24, 2023
8f366eb
added the name of the forum and # of comments of comments
haticerk Dec 24, 2023
ac92568
edit responses
melihgezerr Dec 24, 2023
5d84dba
edit responses
melihgezerr Dec 24, 2023
5b46539
Merge pull request #808 from bounswe/feature/807/BE/edit-responses
omersafakbebek Dec 24, 2023
630dcd0
delete annotation is added
elifkizilky Dec 24, 2023
ce7f4f0
Merge branch 'development' into annotation-thread
elifkizilky Dec 24, 2023
d9ba6eb
falsely commit fix
elifkizilky Dec 24, 2023
ddc9d86
comment annotation created
tacettinburakeren Dec 24, 2023
d82f9ea
added profile picture to the threads and comments
haticerk Dec 24, 2023
3fd03a8
Merge pull request #810 from bounswe/feature/BE/809/Comment-annotation
omersafakbebek Dec 24, 2023
8656faa
added delete gamebio annotation
elifkizilky Dec 24, 2023
615814a
revision of tags
haticerk Dec 24, 2023
d8334db
Merge pull request #743 from bounswe/feature/MB/658/redirecting
haticerk Dec 24, 2023
a01cb54
Merge branch 'development' into feature/MB/751/last-activity-in-mobil…
haticerk Dec 24, 2023
5bae59a
resolved conflicts
haticerk Dec 24, 2023
a2c752e
Merge pull request #777 from bounswe/feature/MB/751/last-activity-in-…
haticerk Dec 24, 2023
365b6a7
Merge pull request #780 from bounswe/feature/MB/752/remove_notf
haticerk Dec 24, 2023
7c9c518
added endpoints for image annotations to annotation service
omersafakbebek Dec 24, 2023
b02364d
refactor
omersafakbebek Dec 24, 2023
8a712e0
added endpoints for image annotations to backend
omersafakbebek Dec 24, 2023
4c690a7
added upcoming titles initially
elifkizilky Dec 24, 2023
225e9e9
i changed the post and get requests about post. also, i connected the…
senaal Dec 24, 2023
72cba30
developer check
senaal Dec 24, 2023
cfc3ee3
Merge pull request #816 from bounswe/feature/BE/815/image-annotations
omersafakbebek Dec 24, 2023
69cd8a7
Remove unused state variables and useEffect in GameCard.js
mtkamiloglu Dec 24, 2023
9b78eda
Merge pull request #813 from bounswe/feature/FE/782/game-bio-annotation
mtkamiloglu Dec 24, 2023
79082f1
Add game trivia annotation functionality
mtkamiloglu Dec 24, 2023
7ea5067
forum topic made upcoming title suitable
elifkizilky Dec 24, 2023
939126c
changed CMD in Dockerfile (BE)
omersafakbebek Dec 24, 2023
5c7fb7c
changing style
senaal Dec 24, 2023
c96e23f
Merge pull request #820 from bounswe/feature/FE/798/annotation-game-t…
elifkizilky Dec 24, 2023
2664b56
Merge pull request #819 from bounswe/bugfix/FE/818/fix-gamecard
elifkizilky Dec 24, 2023
a65ff7c
Merge branch 'development' into feature/MB/687/removr_platforms
kardelenerdal Dec 24, 2023
fe22ae0
Merge pull request #750 from bounswe/feature/MB/687/removr_platforms
kardelenerdal Dec 24, 2023
459730a
added upcoming titles and made styling
elifkizilky Dec 24, 2023
28a14d3
solved conflict create thread form and thread page
elifkizilky Dec 24, 2023
59a5fc0
Merge pull request #799 from bounswe/feature/MB/692/create_group
kardelenerdal Dec 24, 2023
2d2b8f9
deleted unnecessary file
elifkizilky Dec 24, 2023
8cea954
only developer can create upcoming title
elifkizilky Dec 24, 2023
dc5b2ee
updated join/leave
haticerk Dec 24, 2023
78db1b1
Merge pull request #821 from bounswe/feature/FE/714/upcoming-titles
mtkamiloglu Dec 24, 2023
bef6776
Merge pull request #804 from bounswe/feature/MB/693/groups_page
kardelenerdal Dec 24, 2023
9756946
changed thread type
senaal Dec 24, 2023
8c89958
resolved conflicts in threadcomponent and gamecard
elifkizilky Dec 24, 2023
c78d7af
changed CMD command (BE)
omersafakbebek Dec 24, 2023
82ad8f4
changed db connection parameters (BE)
omersafakbebek Dec 24, 2023
25e7380
refactor (BE)
omersafakbebek Dec 24, 2023
ff3c8f7
added upcoming titles and fixed game card with issues
mtkamiloglu Dec 24, 2023
c65caf7
refactor db configuration (BE)
omersafakbebek Dec 24, 2023
74b8755
removed postgres from docker-compose.test.yml
omersafakbebek Dec 24, 2023
46bd5b4
added image annotation and comment annotation
elifkizilky Dec 24, 2023
3aa2831
bugfix create annotation for comment endpoint (BE)
omersafakbebek Dec 24, 2023
7a07dcb
merged backend changes
elifkizilky Dec 24, 2023
e486a9f
page refreshed after navigating
elifkizilky Dec 25, 2023
16ea578
added semantic search service
omersafakbebek Dec 25, 2023
e574205
Merge pull request #811 from bounswe/feature/FE/779/annotation-thread
mtkamiloglu Dec 25, 2023
07d55aa
Merge remote-tracking branch 'origin' into feature/FE/714/upcoming-ti…
mtkamiloglu Dec 25, 2023
0e8c3e4
Update GamesPage styling and remove unused code
mtkamiloglu Dec 25, 2023
b03c69f
Merge pull request #823 from bounswe/feature/FE/714/upcoming-titles
elifkizilky Dec 25, 2023
e11e8f4
initial commit
haticerk Dec 25, 2023
4f5ad91
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
omersafakbebek Dec 25, 2023
57a5a18
Merge branch 'development' into bugfix/MB/694/avg_rating
kardelenerdal Dec 25, 2023
525fb76
added relatedgameslink
yunusemrealtug Dec 25, 2023
94fe2cb
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
yunusemrealtug Dec 25, 2023
57b4647
bug hopefully fixed
haticerk Dec 25, 2023
8505eab
optimize the reviews
haticerk Dec 25, 2023
d47ddba
Merge pull request #827 from bounswe/bugfix/MB/826/review_revision
kardelenerdal Dec 25, 2023
630f3eb
Merge branch 'development' into feature/MB/769/entity_description
kardelenerdal Dec 25, 2023
da2b97e
added if check to set search key
elifkizilky Dec 25, 2023
a7f37ce
bugfix search
elifkizilky Dec 25, 2023
8af2064
nested anntotation
kardelenerdal Dec 25, 2023
c963b47
fixed search issues
omersafakbebek Dec 25, 2023
39c3a60
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
omersafakbebek Dec 25, 2023
0517e9d
Merge pull request #784 from bounswe/feature/MB/769/entity_description
haticerk Dec 25, 2023
254e76f
added semantic search endpoint
omersafakbebek Dec 25, 2023
443d53e
removed deploy.sh
omersafakbebek Dec 25, 2023
756f941
Merge pull request #831 from bounswe/bugfix/FE/830/games-search-null-fix
mtkamiloglu Dec 25, 2023
5fadc98
Merge pull request #829 from bounswe/bugfix/FE/828/create-thread-grou…
mtkamiloglu Dec 25, 2023
a180139
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
yunusemrealtug Dec 25, 2023
5d88b5d
added emptyPage
yunusemrealtug Dec 25, 2023
006db55
resolved conflicts
haticerk Dec 25, 2023
9ed8c1a
Merge branch 'development' into feature/MB/685/annotation
haticerk Dec 25, 2023
936a1da
Merge pull request #837 from bounswe/feature/FE/765/pred-successor-im…
mtkamiloglu Dec 25, 2023
38597ff
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
yunusemrealtug Dec 25, 2023
dad4599
Merge pull request #787 from bounswe/feature/MB/685/annotation
haticerk Dec 25, 2023
81da596
Merge branch 'development' into feature/MB/754/user_company
kardelenerdal Dec 25, 2023
e17cd2a
Merge pull request #781 from bounswe/feature/MB/754/user_company
kardelenerdal Dec 25, 2023
b0ffcbd
changed thread type
senaal Dec 25, 2023
348df27
Merge branch 'development' into bugfix/MB/694/avg_rating
kardelenerdal Dec 25, 2023
89ea7aa
Merge pull request #806 from bounswe/bugfix/MB/694/avg_rating
kardelenerdal Dec 25, 2023
e1b9df4
Add semantic search option and update data retrieval based on semanti…
mtkamiloglu Dec 25, 2023
2875f42
Merge pull request #814 from bounswe/bugfix/MB/768/tag_revision
kardelenerdal Dec 25, 2023
69bc6ee
Merge pull request #838 from bounswe/feature/FE/797/story-guide-annot…
elifkizilky Dec 25, 2023
4b0c74d
Merge branch 'development' into feature/MB/696/forum_revision
kardelenerdal Dec 25, 2023
a315a4c
added revisions
yunusemrealtug Dec 25, 2023
8244946
bugfix
yunusemrealtug Dec 25, 2023
2803e71
thread empty check implemented
kardelenerdal Dec 25, 2023
addbbbe
Merge pull request #812 from bounswe/feature/MB/696/forum_revision
kardelenerdal Dec 25, 2023
f0ef716
Merge pull request #840 from bounswe/feature/FE/839/semantic-search
elifkizilky Dec 25, 2023
bb197f2
Changed backend request url
elifkizilky Dec 25, 2023
7ca0415
Merge pull request #825 from bounswe/bugfix/728/redirecting-game-afte…
yunusemrealtug Dec 25, 2023
02a8ba5
Merge branch 'development' into feature/MB/753/upcoming_titles
haticerk Dec 25, 2023
4e980d4
Merge pull request #842 from bounswe/feature/FE/832/change-backend-url
yunusemrealtug Dec 25, 2023
1f0ea3a
Added detailed search to games page
mtkamiloglu Dec 25, 2023
1d6217b
Merge branch 'development' into feature/MB/753/upcoming_titles
kardelenerdal Dec 25, 2023
04379ca
When the user logged out and press back button, it returns as logged …
senaal Dec 25, 2023
651c220
#841 resolved last activities bug in mobile app
frknlke Dec 25, 2023
7ac1f0a
resolved conflicts
kardelenerdal Dec 25, 2023
e66d7db
image annotation bugfix
elifkizilky Dec 25, 2023
e7f79af
resolved bugs
kardelenerdal Dec 25, 2023
4a63b54
Merge pull request #817 from bounswe/feature/MB/753/upcoming_titles
kardelenerdal Dec 25, 2023
f6017be
Merge pull request #848 from bounswe/feature/FE/779/annotation-thread
yunusemrealtug Dec 25, 2023
abb6412
Merge branch 'development' into bugfix/MB/845/logout
kardelenerdal Dec 25, 2023
d45b02c
Merge pull request #846 from bounswe/bugfix/MB/845/logout
kardelenerdal Dec 25, 2023
448394f
Merge pull request #844 from bounswe/feature/FE/649/detailed-search
elifkizilky Dec 25, 2023
540a778
conflicts resolved
kardelenerdal Dec 25, 2023
2102058
Merge pull request #849 from bounswe/bugfix/MB/845/logout
senaal Dec 25, 2023
8e001fa
Merge pull request #835 from bounswe/feature/BE/824/semantic-search
melihgezerr Dec 25, 2023
4048816
profile page revised with user types
yunusemrealtug Dec 25, 2023
ce9a4dd
comment annotation added
kardelenerdal Dec 25, 2023
35e5b57
Merge pull request #852 from bounswe/feature/MB/851/comment_annotation
senaal Dec 25, 2023
fb5b9ea
implemented group functions
haticerk Dec 25, 2023
9ebb292
Merge branch 'development' into Bugfix/MB/841/last-activities-bug-mobile
senaal Dec 25, 2023
3865b52
Merge pull request #847 from bounswe/Bugfix/MB/841/last-activities-bu…
senaal Dec 25, 2023
16df668
Merge pull request #850 from bounswe/feature/FE/764/user-profile-revi…
mtkamiloglu Dec 25, 2023
9ab4481
connected trending games to backend
elifkizilky Dec 25, 2023
b1c5a23
changed name of the slider
elifkizilky Dec 25, 2023
f305a62
Merge branch 'development' into 843/trending-games
elifkizilky Dec 25, 2023
bc8169e
Add predefinedTags and handleTagSelect function
mtkamiloglu Dec 25, 2023
3087670
updated groups
haticerk Dec 25, 2023
987d69f
Merge pull request #854 from bounswe/feature/FE/843/trending-games
yunusemrealtug Dec 25, 2023
6486c62
Merge branch 'development' into feature/MB/804/group_functionalities
kardelenerdal Dec 25, 2023
4eae69b
Merge branch 'development' of https://github.com/bounswe/bounswe2023g…
yunusemrealtug Dec 25, 2023
dfe4503
fixed group topic gap in groups page
elifkizilky Dec 25, 2023
1b76101
fixed login page height problem
elifkizilky Dec 25, 2023
2d7c600
Merge pull request #853 from bounswe/feature/MB/804/group_functionali…
kardelenerdal Dec 25, 2023
3869257
added link to title wrapper in forum topics
elifkizilky Dec 25, 2023
24e0ae8
Merge pull request #855 from bounswe/feature/FE/797/story-guide-annot…
elifkizilky Dec 25, 2023
36b26f3
detailed search added to the forums page
mtkamiloglu Dec 25, 2023
32d780b
Merge pull request #856 from bounswe/enhancement/FE/727/UI-enhancement
yunusemrealtug Dec 25, 2023
c9dcedc
Create README.md
omersafakbebek Dec 25, 2023
44444aa
Update README.md
omersafakbebek Dec 25, 2023
dd4f515
Update README.md
omersafakbebek Dec 25, 2023
f076b70
solved conflicts in the search for details search
elifkizilky Dec 25, 2023
e5a1459
Merge pull request #857 from bounswe/feature/FE/649/detailed-search
elifkizilky Dec 25, 2023
80e2c74
Added group tab to the game page
elifkizilky Dec 25, 2023
75e6e2a
Merge pull request #858 from bounswe/feature/FE/649/detailed-search
yunusemrealtug Dec 25, 2023
c28d777
Update README.md
elifkizilky Dec 25, 2023
2afd81b
Update README.md
omersafakbebek Dec 25, 2023
f3829cd
Update README.md
elifkizilky Dec 25, 2023
6af56c3
fixes
haticerk Dec 25, 2023
2623c7c
Merge pull request #859 from bounswe/feature/MB/999/final_push
senaal Dec 25, 2023
9500006
Update README.md
omersafakbebek Dec 25, 2023
9803502
Update ForumTopic import and usage
mtkamiloglu Dec 25, 2023
b7527c5
Merge pull request #860 from bounswe/feature/FE/649/detailed-search
elifkizilky Dec 25, 2023
96812cc
Refactor handleDescriptionChange in CreateEntityForm.js
mtkamiloglu Dec 25, 2023
4e6e6b9
Merge pull request #861 from bounswe/feature/FE/649/detailed-search
elifkizilky Dec 25, 2023
5c68482
final fix to .apk
haticerk Dec 25, 2023
611da9a
Merge pull request #862 from bounswe/feature/MB/998/final_fix
senaal Dec 25, 2023
f9cc442
edit comment fixed
elifkizilky Dec 25, 2023
479b05c
Merge pull request #864 from bounswe/feature/FE/654-655/like-dislike-…
elifkizilky Dec 25, 2023
54b0f9e
changed semantic search relevance to 0.3
omersafakbebek Dec 26, 2023
493124f
Merge branch 'feature/BE/824/semantic-search' of https://github.com/b…
omersafakbebek Dec 26, 2023
67ce6cd
fixed entity tab bug
yunusemrealtug Dec 26, 2023
18166f3
Merge pull request #867 from bounswe/feature/FE/797/story-guide-annot…
elifkizilky Dec 26, 2023
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
4 changes: 2 additions & 2 deletions .github/workflows/frontend-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v2

- name: Build the Docker image
run: docker build ludos/frontend -t frontend --target=prod --build-arg REACT_APP_API_URL=3.125.225.39:8080
run: docker build ludos/frontend -t frontend --target=prod --build-arg REACT_APP_API_URL=164.92.195.35:8080

- name: Save Docker image
run: docker save frontend | gzip > frontend.tar.gz
Expand All @@ -42,4 +42,4 @@ jobs:
cd ~/frontend
sudo docker load -i frontend.tar.gz
sudo docker run -p 3000:3000 --name frontend -d frontend
docker image prune -af && docker builder prune -f && docker builder prune -af --filter until=10m && docker volume prune -af
docker image prune -af && docker builder prune -f && docker builder prune -af --filter until=10m && docker volume prune -af
1 change: 1 addition & 0 deletions bounswe2023group7
Submodule bounswe2023group7 added at 32b0b4
4 changes: 2 additions & 2 deletions ludos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Before you begin, ensure you have the following installed:


### Deployed Version of frontend
Go to our website link which is http://51.20.170.143:3000/.
Go to our website link which we shared via Discord channel of the course.

## How to run mobile app?
- You can download APK version of the app from [here](https://drive.google.com/file/d/1h2x1MLO_yyUC1Tq7dmDcOutZYBKyXXKt/view?usp=sharing) and directly run it in your Android device.
Expand All @@ -47,7 +47,7 @@ Go to our website link which is http://51.20.170.143:3000/.
- Then you can easily run the application on Android Studio following [this guide](https://www.geeksforgeeks.org/how-to-import-existing-flutter-project-in-android-studio/).

## How to run backend application?
Deployed Swagger Documentation: http://3.125.225.39:8080/api
Deployed Swagger Documentation: http://164.92.195.35:8080/api

```WORKDIR=./ludos/backend```<br/>
1. Create a .env file for the environment variables. Please ask for the variables. The name of the variables are included in .env.example file. <br/>
Expand Down
2 changes: 2 additions & 0 deletions ludos/annotation/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
dist/
25 changes: 25 additions & 0 deletions ludos/annotation/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module.exports = {
parser: '@typescript-eslint/parser',
parserOptions: {
project: 'tsconfig.json',
tsconfigRootDir: __dirname,
sourceType: 'module',
},
plugins: ['@typescript-eslint/eslint-plugin'],
extends: [
'plugin:@typescript-eslint/recommended',
'plugin:prettier/recommended',
],
root: true,
env: {
node: true,
jest: true,
},
ignorePatterns: ['.eslintrc.js'],
rules: {
'@typescript-eslint/interface-name-prefix': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
};
37 changes: 37 additions & 0 deletions ludos/annotation/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# compiled output
/dist
/node_modules

# Logs
logs
*.log
npm-debug.log*
pnpm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# OS
.DS_Store

# Tests
/coverage
/.nyc_output

# IDEs and editors
/.idea
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace

# IDE - VSCode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

.env
4 changes: 4 additions & 0 deletions ludos/annotation/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"singleQuote": true,
"trailingComma": "all"
}
7 changes: 7 additions & 0 deletions ludos/annotation/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM node:19
WORKDIR /app
COPY package.json /app/
COPY package-lock.json /app/
RUN npm install
CMD [ "npm", "start" ]
COPY . /app/
6 changes: 6 additions & 0 deletions ludos/annotation/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# LUDOS Annotation Server
Deployed Swagger Documentation: http://35.157.67.64:8090/api
## How to run?
```WORKDIR=./ludos/annotation```<br/>
1. Run ```docker compose up --build``` <br/>
2. Now, the api is available with localhost:8090 base url.
22 changes: 22 additions & 0 deletions ludos/annotation/docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
version: '3.9'

services:
annotation:
image: ludos-annotation
build: .
ports:
- 8090:8090
links:
- postgres
postgres:
image: postgres:14-alpine
ports:
- 45432:5432
volumes:
- postgres:/var/lib/postgresql/data
environment:
- POSTGRES_PASSWORD=password
- POSTGRES_USER=user
- POSTGRES_DB=annotation
volumes:
postgres:
25 changes: 25 additions & 0 deletions ludos/annotation/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
version: '3.9'

services:
annotation:
image: ludos-annotation
build: .
command: "npm run start:dev"
volumes:
- ./src:/app/src
ports:
- 8090:8090
links:
- postgres
postgres:
image: postgres:14-alpine
ports:
- 45432:5432
volumes:
- postgres:/var/lib/postgresql/data
environment:
- POSTGRES_PASSWORD=password
- POSTGRES_USER=user
- POSTGRES_DB=annotation
volumes:
postgres:
10 changes: 10 additions & 0 deletions ludos/annotation/nest-cli.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"$schema": "https://json.schemastore.org/nest-cli",
"collection": "@nestjs/schematics",
"sourceRoot": "src",
"compilerOptions": {
"deleteOutDir": true,
"builder":"swc",
"typeCheck": true
}
}
Loading
Loading