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

First pull request to Master #373

Merged
merged 191 commits into from
Jul 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
a921b1c
Setup logger and log folder to .gitignore
ponruslan Nov 2, 2020
02a1f53
Implemented Entity mappings, added repositories
AntonMishyn Nov 3, 2020
59ba27d
Complete mapping
AntonMishyn Nov 3, 2020
0a41fee
Merge pull request #15 from ita-social-projects/feature/Setup_logger
ponruslan Nov 3, 2020
bdac07d
Changed Curd repository
AntonMishyn Nov 3, 2020
8e56162
Entity Implementation
AntonMishyn Nov 3, 2020
6ab257e
Merge branch 'develop' of https://github.com/ita-social-projects/doka…
AntonMishyn Nov 3, 2020
91ae64d
Merge pull request #20 from AntonMishyn/develop
AntonMishyn Nov 3, 2020
a88f3dc
Setup Swagger (#23)
ponruslan Nov 4, 2020
5daed2a
Flyway and helper dependecies (#21)
FHToE Nov 4, 2020
357aaf0
Lombok dependency (#26)
AntonMishyn Nov 5, 2020
fe9eb1c
Add checkstyle (#27)
ponruslan Nov 5, 2020
61d8da4
Create task.md
melnikovae87 Nov 6, 2020
d5f7319
Set up H2 database for tests (#28)
AntonMishyn Nov 6, 2020
b15b9f7
Jacoco dependency and VersionControllerTest
nickunderhill Nov 7, 2020
ef4f24f
Added SpringSecurity config class (without PasswordEncoder and config…
Nov 7, 2020
adb0748
Update task.md
melnikovae87 Nov 9, 2020
00aec7f
SonarQube plugin and setup
nickunderhill Nov 9, 2020
ffaf540
Update pull_request_template.md
VitaliiKulinskyi Nov 9, 2020
d79af6b
Update pull_request_template.md
VitaliiKulinskyi Nov 9, 2020
b730578
Merge remote-tracking branch 'origin' into feature/code-coverage-tool
nickunderhill Nov 9, 2020
c935894
add jacocoTestReport dependency to sonarqube task
nickunderhill Nov 9, 2020
524607c
Changed SpringSecurity config class for REST API.
Nov 9, 2020
ca4b786
added dto and repository query for important posts
nickunderhill Nov 10, 2020
2027a5a
create dto layer for feature
nickunderhill Nov 10, 2020
9499f36
added @Override annotation
Nov 10, 2020
1520bc4
Added first version of controller
Nov 10, 2020
4621142
rename
Nov 10, 2020
2069279
add mapper | refactor repo/dto
nickunderhill Nov 10, 2020
01a22f7
Added gradle file
Nov 11, 2020
110189c
Adjust DTOs according to pr #38
nickunderhill Nov 11, 2020
582bc7d
Spring security dependency
Nov 11, 2020
7725320
remove sonarqube config
nickunderhill Nov 11, 2020
cf01bce
Merge pull request #31 from ita-social-projects/feature/springsecurity
brmdm Nov 11, 2020
d15cd1a
Changed repository method
Nov 11, 2020
6056948
Added Pagination and Sorting
Nov 11, 2020
11b6577
Latest posts (#38)
ponruslan Nov 11, 2020
9fc296d
Changed url
Nov 11, 2020
380c96f
Update mappings and DTOs | Add global url path
nickunderhill Nov 11, 2020
09152ae
hofix Project.xml
nickunderhill Nov 12, 2020
840720a
Change code style of constructors in controller and service classes
Nov 12, 2020
065435d
Feature/#37/be api resources (posts) task (#39)
FHToE Nov 12, 2020
e3938fc
Feature/doctor preview (#41)
AntonMishyn Nov 12, 2020
c02c230
Sonarcloud setup
nickunderhill Nov 12, 2020
f788928
Import modifying
Nov 12, 2020
4a2b462
Feature/doctors preview #34 Service implementation (#44)
AntonMishyn Nov 12, 2020
9776dfb
Change sources mapping in UserEntity. Add city entity (#45)
ponruslan Nov 12, 2020
cd9ecde
Change invalid constructor in InstitutionEntity (#46)
ponruslan Nov 12, 2020
b33db8e
resolve conflicts
nickunderhill Nov 13, 2020
fd80473
resolve conflicts
nickunderhill Nov 13, 2020
14c2110
Merge branch 'develop' into feature/important-posts
nickunderhill Nov 13, 2020
6241b88
Merge pull request #40 from ita-social-projects/feature/important-posts
nickunderhill Nov 13, 2020
b70a37c
Merge branch 'develop' into feature/code-coverage-tool
nickunderhill Nov 13, 2020
a0b3062
Feature/#35/create test db data (#48)
FHToE Nov 13, 2020
fd9c515
Write tests for the latest posts task. (#47)
ponruslan Nov 13, 2020
c6a1fd7
Feature/doctor preview #34 Implementation for new DB structure (#49)
AntonMishyn Nov 13, 2020
75007bf
Merge pull request #50 from ita-social-projects/feature/code-coverage…
nickunderhill Nov 13, 2020
84e630e
Create tests for importantPost methods
brmdm Nov 15, 2020
7afa03d
Merge pull request #52 from ita-social-projects/feature/important-pos…
brmdm Nov 15, 2020
4717c7b
Feature/doctor-preview-test (#51)
AntonMishyn Nov 16, 2020
e37785d
Feature/sonarcloud setup (#53)
nickunderhill Nov 16, 2020
ec53bf3
add Github action for SonarCloud (#56)
nickunderhill Nov 17, 2020
ad25856
Feature/ci cd implementation (#57)
FHToE Nov 18, 2020
c1ddb96
- rename sonar workflow (#59)
nickunderhill Nov 19, 2020
cbba988
Feature/readme (#63)
ponruslan Nov 20, 2020
9310406
Add CORS configuration file to synchronized backend with react app (i…
brmdm Nov 25, 2020
a2703d9
fix codeStyleError
brmdm Nov 25, 2020
7a51ed1
Merge pull request #70 from ita-social-projects/feature/cors-configur…
brmdm Nov 25, 2020
9090f4f
Feature/tags (#68)
ponruslan Nov 25, 2020
f4e4d21
Feature/experts preview by direction (#71)
AntonMishyn Nov 25, 2020
0030b44
Optimize CI (#72)
ponruslan Nov 25, 2020
8417c28
Add Direction Posts functionality
brmdm Nov 25, 2020
91f37d5
Switch PostMapping to GetMapping
ponruslan Nov 25, 2020
ea51a9b
add filter by type
ponruslan Nov 25, 2020
4a7893b
Add description to method findLatestByDirection in PostController.
ponruslan Nov 26, 2020
41998a9
Add tests for PostServiceImplTest
brmdm Nov 26, 2020
ac8de7b
Change codeStyle of PostServiceImplTest
brmdm Nov 26, 2020
bf7347e
Change codeStyle of PostServiceImplTest
brmdm Nov 26, 2020
5ee3102
Merge pull request #75 from ita-social-projects/feature/posts-by-dire…
brmdm Nov 26, 2020
9aabeb7
Feature/reandom experts endpoint refactoring (#76)
AntonMishyn Nov 26, 2020
903502f
Refactored random-experts endpoint to use POST method (#79)
AntonMishyn Nov 26, 2020
cb86911
Refactor PostDTOs (#78)
ponruslan Nov 26, 2020
cfead23
Refactor findLatestByDirection (move request params to request body) …
ponruslan Nov 27, 2020
4fc4716
Refactor method findLatestByDirection in PostController (#82)
ponruslan Nov 27, 2020
e688200
Refactored user controller to use GET for random experts (#83)
AntonMishyn Nov 27, 2020
7299750
more demo data added (#85)
andrewtyshkovets Nov 27, 2020
3880be2
Add API posts by expert
brmdm Nov 30, 2020
5013fe5
Add Unit Tests
brmdm Nov 30, 2020
4ae0dd8
Add filtering by many PostTypes
brmdm Nov 30, 2020
f587b46
Merge pull request #89 from ita-social-projects/feature/posts-by-expert
brmdm Nov 30, 2020
51a5d53
Feature/expert page (#87)
AntonMishyn Nov 30, 2020
d814ef3
Fix findLatestByDirection in PostController (#91)
ponruslan Dec 1, 2020
de7e7dd
Find all directions and regions by API request (#93)
AntonMishyn Dec 2, 2020
ff246bc
Added more user by covid direction (#96)
AntonMishyn Dec 3, 2020
c3c7599
DirectionDTO used as unified DTO (#97)
AntonMishyn Dec 3, 2020
3e83bae
fix(PostRepository): correct the Queries for POST_LATEST_BY_DIRECTION
ponruslan Dec 3, 2020
baeab24
ci: add versioning
ponruslan Dec 6, 2020
71187a2
Update issue templates
VitaliiKulinskyi Dec 7, 2020
a392f12
Update task.md
VitaliiKulinskyi Dec 7, 2020
6e26c60
feature: add color field to DirectionEntity and DTO (#113)
ponruslan Dec 9, 2020
3abcdb7
feature: add endpoint to search for all types of posts (#111)
ponruslan Dec 9, 2020
d8411e8
Create LICENSE
VitaliiKulinskyi Dec 11, 2020
8a017d6
Merge pull request #115 from ita-social-projects/add-license-1
VitaliiKulinskyi Dec 11, 2020
2f7198a
Update README.md
VitaliiKulinskyi Dec 11, 2020
6dc86ba
Update README.md
VitaliiKulinskyi Dec 11, 2020
f9d703c
Update README.md
VitaliiKulinskyi Dec 11, 2020
a7e0fbb
refactor: optimization for sonar
ponruslan Dec 14, 2020
98e2447
feature: add more demo data in migrations (#120)
ponruslan Dec 15, 2020
c345d6b
Update task.md
VitaliiKulinskyi Dec 18, 2020
3c09a08
added migration basis (#131)
AntonMishyn Dec 21, 2020
eefb60c
feature: add field to DirectionEntity and dto
ponruslan Dec 22, 2020
b96a002
feature: remove unnecessary directions from posts (#136)
ponruslan Dec 23, 2020
e70dc62
Feature/user sorting by relevance (#139)
AntonMishyn Jan 6, 2021
4bdfb86
API Post save and update (#138)
brmdm Jan 11, 2021
db02d6b
feat: add validation of dto for post request
brmdm Jan 13, 2021
fe2ca2f
docs: change README.md
ponruslan Jan 13, 2021
3a4bfb2
Merge branch 'develop' into feature/validation_of_post_request
brmdm Jan 14, 2021
b4a245b
Merge pull request #149 from ita-social-projects/feature/validation_o…
brmdm Jan 14, 2021
5d53d57
feat: add "get_post_by_id" Endpoint
brmdm Jan 15, 2021
a497986
fix: codeStyle fix
brmdm Jan 15, 2021
28028b3
Merge pull request #150 from ita-social-projects/feature/get_post_by_id
brmdm Jan 15, 2021
55f5d99
Feature/authorization (#118)
andrewtyshkovets Jan 21, 2021
21b0626
Feature/users refactoring (#154)
AntonMishyn Jan 25, 2021
61e3455
feature: new role implementation (#153)
ponruslan Jan 26, 2021
962f8d8
fix: edit PostSaveFromUserDTO
brmdm Jan 26, 2021
368fa52
fix: delete unused import
brmdm Jan 26, 2021
249b6dd
fix: delete validation of "Title" field
brmdm Jan 26, 2021
bbaa912
Merge pull request #156 from ita-social-projects/feature/delete-valid…
brmdm Jan 27, 2021
3cf573d
refactor: payload moved to dto (#160)
andrewtyshkovets Jan 27, 2021
f5ebca3
Assign roles to users (#162)
ponruslan Jan 29, 2021
9c14385
feat: add more Demo posts for QC (#164)
brmdm Jan 29, 2021
37f85c0
fix: fix migration name (#166)
ponruslan Jan 30, 2021
a4c97ee
fix: enabled http when adding cookies (#188)
andrewtyshkovets Feb 26, 2021
b9a630e
Refactor cors (#191)
alexandr-bielan Mar 5, 2021
99e6fed
Restrict endpoint access (#195)
lizozavr Mar 5, 2021
ee0863d
Collapse migrations (#194)
invzbl3 Mar 5, 2021
6786614
Changed method names in UserRepo, UserServiceImpl, UserServiceImplTes…
alexandr-bielan Mar 11, 2021
537ce8b
BE: Add field "videoUrl" and "previewImageUrl" to Post table (#206)
alexandr-bielan Mar 15, 2021
1fd55f9
deleted Source table and classes; refactored related classes (#221)
alexandr-bielan Mar 16, 2021
89dfdc2
feature: create origin entity #199 (#217)
lizozavr Mar 16, 2021
2e07072
Rename migration files (#223)
alexandr-bielan Mar 18, 2021
831c8cf
refactor: owners deleted (#231)
andrewtyshkovets Mar 18, 2021
b3c858e
owner deleted (#234)
andrewtyshkovets Mar 18, 2021
46a9f5c
refactor: Deleted id from Entity migration script (#242)
andrewtyshkovets Mar 23, 2021
9adb36a
Implement API for Post deleting (#225)
invzbl3 Mar 24, 2021
27f42f8
feature: create an endpoint for all posts (#245)
lizozavr Mar 24, 2021
5923498
refactor: refactored user providers, added DELETE_POST permision (#248)
andrewtyshkovets Mar 25, 2021
03e845f
Refactor/ add tests for all posts endpoint (#251)
lizozavr Mar 26, 2021
bb188cb
created endpoint all experts by name (#253)
alexandr-bielan Apr 1, 2021
fdc6cbf
Feature/add region status (#266)
alexandr-bielan Apr 12, 2021
722faf6
Implement update post API with permissions depends on role (#256)
invzbl3 Apr 14, 2021
7a1332a
Feature/add direction status (#267)
lizozavr Apr 16, 2021
ca10c0f
Feature/get all directions by user (#272)
alexandr-bielan Apr 19, 2021
654609d
Extend post with published date column (#273)
invzbl3 Apr 19, 2021
d26f622
Feature/get types of materials by user (#274)
lizozavr Apr 19, 2021
6a6df8c
create api get post by userid and directions (#277)
alexandr-bielan Apr 21, 2021
d28d346
Feature/post-save (#276)
andrewtyshkovets Apr 22, 2021
0103407
Fix: Update post by id Endpoint (#286)
lizozavr Apr 28, 2021
59eb054
Implement origin endpoint (#287)
invzbl3 Apr 30, 2021
92449e9
Write JavaDocs for Controllers (#292)
lizozavr May 2, 2021
68cde80
Create javadoc for User (#294)
alexandr-bielan May 5, 2021
fe06ac8
Create javadoc for Origin (#298)
invzbl3 May 12, 2021
a01a668
Create javadoc for Directions and Regions (#300)
alexandr-bielan May 12, 2021
30f8082
Improve handling of token (#302)
invzbl3 May 14, 2021
a0827f7
deleted saveUser (#304)
alexandr-bielan May 18, 2021
92547ed
Latest posts by post types and origins (#305)
lizozavr May 19, 2021
b392e64
Refactoring of update post method (#303)
invzbl3 May 23, 2021
c8b716b
Delete registerNewUser (#309)
alexandr-bielan May 25, 2021
891b1bc
Added directions parameter (#321)
lizozavr Jun 1, 2021
52f705d
delete existingByEmail (#310)
alexandr-bielan Jun 1, 2021
c5cb236
social network field (#325)
lizozavr Jun 1, 2021
26d4eb1
add bio field to postdto (#324)
alexandr-bielan Jun 1, 2021
a81a512
Create endpoint to set posts as Important (#328)
lizozavr Jun 3, 2021
a9b7aba
change-poststatus-to-published (#330)
alexandr-bielan Jun 3, 2021
27c4358
fixed query (#335)
lizozavr Jun 4, 2021
e2e2638
Set posts unimportant (#342)
lizozavr Jun 8, 2021
b845134
Create an endpoint for getting the Post Views Count (#343)
alexandr-bielan Jun 12, 2021
11bbd73
refact migr (#348)
alexandr-bielan Jun 12, 2021
63e11fa
sql script for trim (#350)
lizozavr Jun 14, 2021
748d11b
refact gradle (#352)
alexandr-bielan Jun 14, 2021
adee15c
Correct creds transport (#354)
alexandr-bielan Jun 18, 2021
f4ffc64
Merge pull request #358 from ita-social-projects/develop
alexandr-bielan Jun 18, 2021
d301233
Feature/set posts as Important/Unimportant with importance order (#361)
lizozavr Jun 24, 2021
d5f9c45
Merge pull request #366 from ita-social-projects/develop
lizozavr Jun 26, 2021
c81347f
Added permission (#368)
lizozavr Jun 30, 2021
6763eba
new heroku app
VitaliiKulinskyi Jun 30, 2021
6f2abaf
Merge pull request #369 from ita-social-projects/develop
VitaliiKulinskyi Jun 30, 2021
950a140
new environment
VitaliiKulinskyi Jul 2, 2021
a79a16c
master.yml
VitaliiKulinskyi Jul 2, 2021
7e98a8f
update yml
VitaliiKulinskyi Jul 2, 2021
5e70220
Merge pull request #372 from ita-social-projects/develop
VitaliiKulinskyi Jul 2, 2021
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
6 changes: 6 additions & 0 deletions .docker/docker-compose.heroku.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: '3'

services:
api:
image: dokazovi
container_name: dokazovi
4 changes: 4 additions & 0 deletions .docker/dokazovi.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM openjdk:13-jdk-alpine
ARG WAR_FILE=build/libs/*.war
COPY ${WAR_FILE} dokazovi.war
ENTRYPOINT ["java","-jar", "-Xmx128M","/dokazovi.war"]
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve
title: '[Affected functionality] Clear and concise summary, e.g. "[Create news] ''Publish''
button is not displayed on the ''Preview'' page"'
button is not displayed on the ''Preview'' page"'
labels: bug
assignees: ''

Expand Down
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/task.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Task
about: Describe task
title: ''
labels: ''
assignees: ''

---

**Story link**
[#100 Story](https://jira.softserve.academy/browse/100)

### Task description
Show priority posts by api request

### To do
1. - [ ] Implement api endpoint contorller for getting posts.
2. - [ ] Implement service for getting all priority posts.
3. - [ ] Implement repository for getting all priority posts.


### [Estimating](https://docs.google.com/spreadsheets/d/1RAvIdPidr9LfnJMXSpfFeylnlB2aTgO3D5Q7IRYhgp4/edit#gid=2007564499)
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/user-story.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: User story
about: Describe story goal
title: ''
labels: User story
labels: ''
assignees: ''

---
Expand Down
33 changes: 13 additions & 20 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,26 @@
dev
## JIRA
develop

* [Main JIRA ticket](https://jira.softserve.academy/secure/RapidBoard.jspa?rapidView=id)
## GitHub Board

**Issue link**

## Code reviewers
[#11 Issue name ]( )

- [ ] @github_username
**Story link**

### Second Level Review
[#11 Story]( )


## Code reviewers
- [ ] @github_username

## Summary of issue

ToDo
- [ ] Summary of issue
- [ ] Summary of issue

## Summary of change

ToDo

## Testing approach

ToDo
## Summary of change

## CHECK LIST
- [ ] СI passed
- [ ] Сode coverage >=95%
- [ ] PR is reviewed manually again (to make sure you have 100% ready code)
- [ ] All reviewers agreed to merge the PR
- [ ] I've checked new feature as logged in and logged out user if needed
- [ ] PR meets all conventions
- [ ] Summary of change
- [ ] Summary of change
39 changes: 39 additions & 0 deletions .github/workflows/Build_and_Test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Build & Test

on:
push:
branches:
- develop
pull_request:
types: [opened, synchronize, reopened, edited]

jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache SonarCloud packages
uses: actions/cache@v1
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Gradle packages
uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: ${{ runner.os }}-gradle
- name: Build and test
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
run: ./gradlew build sonarqube --info
33 changes: 0 additions & 33 deletions .github/workflows/blank.yml

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Bump version, build and push to heroku

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
environment: master
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Bump version and push tag
id: tag_version
uses: mathieudutour/github-tag-action@v5
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: master
pre_release_branches: release
append_to_pre_release_tag: 'Stable'

- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.11

- name: Change wrapper permissions
run: chmod +x ./gradlew

- name: Run build with Gradle(check styles, run tests)
env:
GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
run: ./gradlew build -Pversion=${{ steps.tag_version.outputs.new_tag }}

- name: Build the tagged Docker image
run: docker build -f .docker/dokazovi.Dockerfile -t dokazovi .

- name: Build, Push and Deploy to Heroku
id: heroku
uses: snithyanantham/docker-compose-multiple-apps-heroku-deploy@v1.0
with:
email: ${{ secrets.HEROKU_EMAIL }}
api_key: ${{ secrets.HEROKU_API_KEY }}
docker_compose_file: '.docker/docker-compose.heroku.yml'
heroku_apps: '[{"imagename":"dokazovi","appname":"dokazovi-backend","apptype":"web"}]'
48 changes: 48 additions & 0 deletions .github/workflows/rc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Bump version, build and push to heroku

on:
push:
branches:
- release

jobs:
build:
runs-on: ubuntu-latest
environment: release
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Bump version and push tag
id: tag_version
uses: mathieudutour/github-tag-action@v5
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: master
pre_release_branches: release
append_to_pre_release_tag: 'RC'

- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.11

- name: Change wrapper permissions
run: chmod +x ./gradlew

- name: Run build with Gradle(check styles, run tests)
env:
GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
run: ./gradlew build -Pversion=${{ steps.tag_version.outputs.new_tag }}

- name: Build the tagged Docker image
run: docker build -f .docker/dokazovi.Dockerfile -t dokazovi-dev .

- name: Build, Push and Deploy to Heroku
id: heroku
uses: snithyanantham/docker-compose-multiple-apps-heroku-deploy@v1.0
with:
email: ${{ secrets.HEROKU_EMAIL }}
api_key: ${{ secrets.HEROKU_API_KEY }}
docker_compose_file: '.docker/docker-compose.heroku.yml'
heroku_apps: '[{"imagename":"dokazovi-dev","appname":"dokazovi-be","apptype":"web"}]'
32 changes: 32 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Bump version and release

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Bump version and push tag
id: tag_version
uses: mathieudutour/github-tag-action@v5
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
release_branches: master
pre_release_branches: release

- name: Create a GitHub release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GOOGLE_CREDENTIALS: ${{ secrets.GOOGLE_CREDENTIALS }}
with:
tag_name: ${{ steps.tag_version.outputs.new_tag }}
release_name: Release ${{ steps.tag_version.outputs.new_tag }}
body: ${{ steps.tag_version.outputs.changelog }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Default ignored files
/shelf/
/workspace.xml
/logs/*

### Gradle ###
.gradle
Expand Down
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020 SoftServe IT Academy

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading