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

Release 3 #41

Merged
merged 187 commits into from
Nov 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
187 commits
Select commit Hold shift + click to select a range
5004627
#73 Add userupdate view
LeoSilvaGomes Oct 18, 2019
fe9093d
#73 Create photoupload component
LeoSilvaGomes Oct 18, 2019
6a8da02
#73 Update TextField
LeoSilvaGomes Oct 18, 2019
57c410c
#73 Add Datepicker library
jps12 Oct 18, 2019
b83c00f
Merge branch 'feature/73-update-user' of https://github.com/fga-eps-m…
jps12 Oct 18, 2019
52b6f18
#73 Update components color settings
LeoSilvaGomes Oct 18, 2019
a2d5632
Merge branch 'feature/73-update-user' of https://github.com/fga-eps-m…
jps12 Oct 18, 2019
19f7ad1
#73 Add datetime library
jps12 Oct 18, 2019
66184b1
#73 Create Get and patch method
LeoSilvaGomes Oct 19, 2019
8349b14
#73 Create birthdate input
jps12 Oct 19, 2019
cb0461f
#73 Update textfield view on userupdate
LeoSilvaGomes Oct 19, 2019
d474c31
Merge branch 'feature/73-update-user' of https://github.com/fga-eps-m…
LeoSilvaGomes Oct 19, 2019
f083c25
#73 Remove borders from datefield
jps12 Oct 19, 2019
0e135af
Merge branch 'feature/73-update-user' of https://github.com/fga-eps-m…
jps12 Oct 19, 2019
8099c34
#73 Merge with develop for update
jps12 Oct 23, 2019
9c48271
#73 Adjust title
jps12 Oct 24, 2019
a48165c
#73 Add new fields and i18n
jps12 Oct 25, 2019
8c2cbf3
#73 Upload informations about user profile
jps12 Oct 25, 2019
c37bf7c
Fix undefined component import
Oct 26, 2019
381017b
#129 Limit birthdate on datetime
jps12 Oct 26, 2019
3ce453f
#73 Get and set date on datetime
jps12 Oct 26, 2019
13db4cb
#73 Save birthdate from datepicker
jps12 Oct 26, 2019
d5f5f41
#73 Show birthdate user
jps12 Oct 26, 2019
91ec82f
#73 Adjust merge for develop
LeoSilvaGomes Nov 8, 2019
1c770a0
#73 Adjust merge to develop
LeoSilvaGomes Nov 8, 2019
2f17d22
Merge branch 'feature/73-update-user' of https://github.com/fga-eps-m…
LeoSilvaGomes Nov 9, 2019
894b9aa
#167 Create modal card
LeoSilvaGomes Nov 11, 2019
bc47ad7
#120 create initial structure of property view
KiSobral Nov 12, 2019
84caf93
#167 Adjust modal card style
LeoSilvaGomes Nov 12, 2019
d48f609
#167 Remove open data route
LeoSilvaGomes Nov 12, 2019
cc15a91
#69 Add view and basic harvest GET
RenatoBrittoAraujo Nov 12, 2019
084fcd6
#167 Adjust modal card access
LeoSilvaGomes Nov 12, 2019
85ba055
#120 add the initial styling to property page view
KiSobral Nov 12, 2019
ad7cb7f
#69 Add page layout
RenatoBrittoAraujo Nov 12, 2019
f9f4847
#167 Adjust route after harvest registration
LeoSilvaGomes Nov 13, 2019
709ce2d
#69 Add remaining layout to harvest view
RenatoBrittoAraujo Nov 13, 2019
27bdef4
#73 Adjust color calendar options
LeoSilvaGomes Nov 13, 2019
0b8c1a9
#69 Fix rule visualization
RenatoBrittoAraujo Nov 13, 2019
f6291b5
#120 add TreeCard component and finish property view
KiSobral Nov 13, 2019
3d2c4d7
#153 install and import library vuelidate
Nov 7, 2019
f2aa3f7
#153 replace toasted to vuelidate
Nov 7, 2019
b82cb8a
#153 add validation on harvest form
Nov 8, 2019
6edfd6c
#153 add vuelidate in signin and signup
Nov 9, 2019
954903b
Change toasted for vuelidate, it doesnt save if there're invalid fields
mardntas Nov 9, 2019
39fea0b
Validated all fields of property registration
mardntas Nov 9, 2019
11eeb7c
Fix select of state and type of address
mardntas Nov 9, 2019
ddb7670
#153 add validation signin and property form
Nov 9, 2019
f3fceac
#153 add snackbar to show mensagens
Nov 14, 2019
d12f43d
#120 update harvest list padding and treecard style
KiSobral Nov 14, 2019
b02d689
#153 add vuelidate/show messages to treeRegistration and adjustment o…
Nov 14, 2019
0bea8f7
#69 Fix interaction with backend API
RenatoBrittoAraujo Nov 15, 2019
3558bf1
#73 Adjust branch to develop and adjust some indentation erro
LeoSilvaGomes Nov 15, 2019
3a09105
#177 Create docker-compose deploy and adjust docker-compose to create…
shayanealcantara Nov 15, 2019
fcb627e
#120 fix communication between the front and the API
KiSobral Nov 15, 2019
6515ead
#177 Adjust .env.stagind
shayanealcantara Nov 15, 2019
6c7fcd5
#120 add support to properties with no tree or harvests
KiSobral Nov 15, 2019
7c207b5
#153 ESLint adjustment
Nov 15, 2019
46d3987
#69 Fixed faulty back-end interaction
RenatoBrittoAraujo Nov 15, 2019
708b102
Merge branch 'develop' into feature/69-harvest-view
RenatoBrittoAraujo Nov 15, 2019
95009da
#120 make communication between API and property view
KiSobral Nov 15, 2019
bada105
#120 add internationalization support
KiSobral Nov 16, 2019
4268039
#120 fix lint errors
KiSobral Nov 16, 2019
baea103
#120 merge branch devel and solve conflicts
KiSobral Nov 16, 2019
4d6e5d8
#178 Adjust env vars and package.lock builds
vitorcx Nov 16, 2019
6ad6882
#178 Remove compose volumes and add logs
vitorcx Nov 16, 2019
5a9a6b1
#153 update test unit
flaviovl Nov 16, 2019
218dc44
#153 adjust details
flaviovl Nov 16, 2019
a957344
#153 Remove console logs and commented sections of code
RenatoBrittoAraujo Nov 17, 2019
71b14e3
#192 create initial structure to rearrange slides
KiSobral Nov 18, 2019
5bff38f
#167 Adjust style sheets
LeoSilvaGomes Nov 18, 2019
2ead7f8
#73 Adjust style button of registration pages
LeoSilvaGomes Nov 18, 2019
f0c1f5c
#153 update review pr
flaviovl Nov 18, 2019
84f1186
Merge pull request #32 from fga-eps-mds/feature/177-config-stagin-doc…
fabiola-m Nov 18, 2019
818d638
Merge branch 'develop' into feature/153-replace-vue-toasted
fabiola-m Nov 18, 2019
737e991
Merge branch 'develop' into feature/120-properties-visualization
fabiola-m Nov 18, 2019
c659183
Merge branch 'develop' into feature/73-update-user
fabiola-m Nov 18, 2019
81b0007
#153 Remove coverage files
fabiola-m Nov 18, 2019
f02d33c
Merge branch 'feature/153-replace-vue-toasted' of https://github.com/…
fabiola-m Nov 18, 2019
271aac4
#153 Fix property page style
fabiola-m Nov 18, 2019
8dcc141
#153 Update property validation while creating tree
fabiola-m Nov 18, 2019
0b3374a
#153 Fix router redirect issue in harvest form
fabiola-m Nov 18, 2019
a194481
#73 Adjust fields request and validate
LeoSilvaGomes Nov 18, 2019
6383d73
Merge branch 'feature/73-update-user' of https://github.com/fga-eps-m…
LeoSilvaGomes Nov 18, 2019
fdee2c6
Merge branch 'develop' of https://github.com/fga-eps-mds/2019.2-Acaci…
LeoSilvaGomes Nov 18, 2019
c5d05a2
#73 Delete component unused
LeoSilvaGomes Nov 18, 2019
90006ab
#167 Adjust modal component to be universal
LeoSilvaGomes Nov 18, 2019
1c87691
Merge pull request #27 from fga-eps-mds/feature/153-replace-vue-toasted
fabiola-m Nov 18, 2019
e11ae3c
Merge branch 'develop' of https://github.com/fga-eps-mds/2019.2-Acaci…
KiSobral Nov 18, 2019
218de2a
Merge branch 'feature/73-update-user' of https://github.com/fga-eps-m…
KiSobral Nov 18, 2019
1b4f72c
#69 Remove chat icon and add spinner for loading
RenatoBrittoAraujo Nov 18, 2019
72a31d8
#73 Adjust text field with validate logic
LeoSilvaGomes Nov 18, 2019
c80912f
#69 Merged with develop
RenatoBrittoAraujo Nov 18, 2019
603f970
#69 Merge with current change
RenatoBrittoAraujo Nov 18, 2019
751025e
#69 Merge with current branch
RenatoBrittoAraujo Nov 18, 2019
7aa5350
#73 Remove components test
fabiola-m Nov 18, 2019
0b99dc9
Merge pull request #12 from fga-eps-mds/feature/73-update-user
fabiola-m Nov 18, 2019
523600d
#192 update harvest digest and reorder slides content
KiSobral Nov 18, 2019
837e2e6
#69 Merge with develop
RenatoBrittoAraujo Nov 18, 2019
af2766a
#178 Remove console logs
shayanealcantara Nov 19, 2019
766d9a5
#120 Adjust merge conflict to devel
LeoSilvaGomes Nov 19, 2019
35f23cd
Merge branch 'develop' into feature/178-config-prod-docker-compose
shayanealcantara Nov 19, 2019
a6ee3c4
Fix test script
vitorcx Nov 19, 2019
1f5fd84
Fix test script
vitorcx Nov 19, 2019
6fe14cc
Merge branch 'develop' of https://github.com/fga-eps-mds/2019.2-Acaci…
vitorcx Nov 19, 2019
5b0ade1
Merge branch 'develop' into feature/178-config-prod-docker-compose
shayanealcantara Nov 19, 2019
98211b1
Merge branch 'develop' into feature/69-harvest-view
shayanealcantara Nov 19, 2019
1b28660
Merge branch 'develop' into feature/120-properties-visualization
shayanealcantara Nov 19, 2019
825b453
#192 fix layout errors
KiSobral Nov 19, 2019
2e7ccd5
#120 Change tree months route
Nov 19, 2019
22488f3
#69 Fix calendar min and max validation for harvest and user profile
fabiola-m Nov 19, 2019
c6d5bef
Merge pull request #31 from fga-eps-mds/feature/69-harvest-view
fabiola-m Nov 19, 2019
615116f
#192 merge branch develop to get updated API routes
KiSobral Nov 19, 2019
6798085
#120 Adjust conflict with develop
LeoSilvaGomes Nov 19, 2019
fbd884b
#192 get user's harvest from backend
KiSobral Nov 19, 2019
e0b9ea7
#188 Add logic of current data
LeoSilvaGomes Nov 19, 2019
e934e03
#188 Add request harvest informations from back
LeoSilvaGomes Nov 19, 2019
320f9b3
Merge branch 'develop' into feature/178-config-prod-docker-compose
mardntas Nov 19, 2019
4254b01
#120 Fix view name mispelling
Nov 19, 2019
815b319
#188 Adjust logic to dynamic data when select date
LeoSilvaGomes Nov 20, 2019
b1383d6
#190 Add dashboard property visualization
RenatoBrittoAraujo Nov 20, 2019
15780fa
#188 Adjust calendar informations title
LeoSilvaGomes Nov 20, 2019
687caa8
#190 Fix flux propery-harvest registration
RenatoBrittoAraujo Nov 20, 2019
0e98c39
#188 Add harvest informations in calendar
LeoSilvaGomes Nov 20, 2019
14cb58c
#188 Adjust button style of calendar
LeoSilvaGomes Nov 20, 2019
716e6cd
Merge pull request #34 from fga-eps-mds/feature/178-config-prod-docke…
shayanealcantara Nov 20, 2019
26eb56b
#179 Add watchtower labels in docker-compose.deploy
vitorcx Nov 20, 2019
26529a0
#120 fix harvest routing error and make harvests list dynamic
KiSobral Nov 20, 2019
0747de9
Merge branch 'develop' into feature/120-properties-visualization
vitorcx Nov 20, 2019
c1e03c5
Merge pull request #30 from fga-eps-mds/feature/120-properties-visual…
vitorcx Nov 21, 2019
51ae44c
#188 adjust harvests list visualization
KiSobral Nov 21, 2019
51d536f
#188 add internationalization and fix lint errors
KiSobral Nov 21, 2019
1793f94
#188 merge branch develop and solve merge conflicts
KiSobral Nov 21, 2019
3211d3b
Merge branch 'develop' into feature/190-fix-property-harvest-dinamic
RenatoBrittoAraujo Nov 21, 2019
b26e1da
#188 update sidebar user settings
KiSobral Nov 21, 2019
903a089
Merge pull request #37 from fga-eps-mds/feature/190-fix-property-harv…
vitorcx Nov 21, 2019
823d1cf
Merge branch 'develop' of https://github.com/fga-eps-mds/2019.2-Acaci…
LeoSilvaGomes Nov 22, 2019
cf5d711
Merge branch 'develop' of https://github.com/fga-eps-mds/2019.2-Acaci…
LeoSilvaGomes Nov 22, 2019
a560e39
Merge pull request #33 from fga-eps-mds/feature/167-flow-check
fabiola-m Nov 22, 2019
39f7e74
Merge branch 'develop' into feature/188-dynamic-data-calendar
LeoSilvaGomes Nov 22, 2019
f3d94ff
#192 fix harvest digest image
KiSobral Nov 22, 2019
ed8a693
#192 update web browser icon and title
KiSobral Nov 22, 2019
8b4c1ea
Merge branch 'develop' of https://github.com/fga-eps-mds/2019.2-Acaci…
LeoSilvaGomes Nov 22, 2019
a008a8b
Merge branch 'feature/188-dynamic-data-calendar' of https://github.co…
LeoSilvaGomes Nov 22, 2019
78c821e
#192 add internationalization
KiSobral Nov 22, 2019
9709678
#192 fix lint errors
KiSobral Nov 22, 2019
a5864af
#192 merge branch devel and fix some errors
KiSobral Nov 22, 2019
9c78b17
#188 Adjust calendar circle style
LeoSilvaGomes Nov 22, 2019
62ec233
Fix layout of propertyDigest
mardntas Nov 22, 2019
a52507e
#179 Add deploy staging script
shayanealcantara Nov 22, 2019
dc24877
#179 Change login method
shayanealcantara Nov 22, 2019
6eb9312
#191 update slidebar
flaviovl Nov 23, 2019
ed0b6ff
#192 add no harvest error message and update property digest color
KiSobral Nov 23, 2019
4b2d10b
#192 Increase color contrast to better visualization
shayanealcantara Nov 23, 2019
680c6f2
#192 Correct colors and property title position
shayanealcantara Nov 23, 2019
919760a
#191 add button new harvest and adjust router
flaviovl Nov 23, 2019
50c285d
#179 Add production deploy script
shayanealcantara Nov 23, 2019
43971f9
Merge branch 'develop' into feature/179-continuous-deploy
shayanealcantara Nov 23, 2019
4a4cf1f
Add alert of no harvests has been found
mardntas Nov 23, 2019
9c3371c
Merge branch 'feature/192-dashboard-slides' of https://github.com/fga…
mardntas Nov 23, 2019
8a8e042
Add title of component when harvest is not found
mardntas Nov 23, 2019
8afef1e
#188 Adjust close harvest visualization
LeoSilvaGomes Nov 23, 2019
93578f0
#179 Use specific version for vuetify-loader
vitorcx Nov 23, 2019
4d50a60
#188 Adjust calendar circle color
LeoSilvaGomes Nov 23, 2019
c74fcaf
#179 Remove branch tests
shayanealcantara Nov 23, 2019
c3fb8aa
#191 add username sliderbar and add button add tree
flaviovl Nov 23, 2019
0728cdf
Merge pull request #38 from fga-eps-mds/feature/179-continuous-deploy
fabiola-m Nov 23, 2019
2acf422
Merge branch 'develop' into feature/188-dynamic-data-calendar
fabiola-m Nov 23, 2019
e65e31d
Merge branch 'develop' into feature/192-dashboard-slides
fabiola-m Nov 23, 2019
fad576c
#192 fix windows titles bugs
KiSobral Nov 23, 2019
5ec9c1b
#188 Add package.lock
shayanealcantara Nov 23, 2019
28c2dc4
#188 Fix property translations
fabiola-m Nov 23, 2019
f95524b
Merge branch 'feature/188-dynamic-data-calendar' of https://github.co…
fabiola-m Nov 23, 2019
8af56e1
Merge branch 'develop' into feature/191-update-slidebar
fabiola-m Nov 23, 2019
f3b4d75
Merge pull request #36 from fga-eps-mds/feature/188-dynamic-data-cale…
fabiola-m Nov 23, 2019
11571bf
Merge branch 'develop' into feature/192-dashboard-slides
shayanealcantara Nov 23, 2019
6a1471c
Merge pull request #35 from fga-eps-mds/feature/192-dashboard-slides
fabiola-m Nov 23, 2019
a9e085c
#191 Adjust to develop
LeoSilvaGomes Nov 23, 2019
7f4c305
#191 fix button bug
KiSobral Nov 23, 2019
6b1eeee
#191 remove add button from property view
KiSobral Nov 23, 2019
9212661
#191 adjust sidebar logged items
KiSobral Nov 23, 2019
26d3a3b
#191 fix lint errors
KiSobral Nov 23, 2019
d49db20
#191 adjust router add harvest and add tree
flaviovl Nov 24, 2019
aadc823
#191 adjust style
flaviovl Nov 24, 2019
905127d
#191 fix week's harvests bug
KiSobral Nov 25, 2019
76bc7c6
Merge pull request #39 from fga-eps-mds/feature/191-update-slidebar
shayanealcantara Nov 25, 2019
64ae391
#205 fix routing params
KiSobral Nov 25, 2019
16de90d
Merge pull request #40 from fga-eps-mds/bugfix/205-week-harvests
shayanealcantara Nov 25, 2019
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
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VUE_APP_MODE=development
VUE_APP_API_URL=http://0.0.0.0:8000/
2 changes: 2 additions & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VUE_APP_MODE=production
VUE_APP_API_URL=http://45.55.46.19:8001/
3 changes: 2 additions & 1 deletion .env.staging
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
VUE_APP_API_URL=https://acacia-backend-staging.herokuapp.com
VUE_APP_MODE=staging
VUE_APP_API_URL=http://45.55.46.19:8000/
25 changes: 0 additions & 25 deletions .github/workflows/cd.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: deploy-production

on:
push:
branches:
- master

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: Docker login
run: docker login --username=${{secrets.DOCKER_USER}} --password=${{secrets.DOCKER_PASS}}
- name: Docker build
run: docker build -t acaciaelis/acacia:node-prod .
- name: Docker push
run: docker push acaciaelis/acacia:node-prod
22 changes: 22 additions & 0 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

name: deploy-staging

on:
push:
branches:
- develop
- release/*

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- name: Docker login
run: docker login --username=${{secrets.DOCKER_USER}} --password=${{secrets.DOCKER_PASS}}
- name: Docker build
run: docker build -t acaciaelis/acacia:node-staging .
- name: Docker push
run: docker push acaciaelis/acacia:node-staging
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,3 @@ RUN mkdir -p /app && cp -a /tmp/node_modules /app/

WORKDIR /app
ADD . /app

EXPOSE 8080

CMD npm run build:stage; npm start
19 changes: 19 additions & 0 deletions docker-compose.deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: '3'
services:
node-staging:
container_name: node-staging
image: acaciaelis/acacia:node-staging
command: sh -c "npm run build-stage && npm start"
ports:
- "8080:8080"
labels:
- "com.centurylinklabs.watchtower.enable=true"

node-production:
container_name: node-production
image: acaciaelis/acacia:node-prod
command: sh -c "npm run build-prod && npm start"
ports:
- "8081:8080"
labels:
- "com.centurylinklabs.watchtower.enable=true"
Loading