Skip to content

Commit

Permalink
Merge branch 'develop' into amp-react
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosapaduarte authored Jul 19, 2024
2 parents 1bb00f6 + d0d588f commit 7733706
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 8 deletions.
13 changes: 13 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Editor configuration, see https://editorconfig.org
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = off
trim_trailing_whitespace = false
3 changes: 1 addition & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ REACT_APP_AMP_DEV_SERVER=http://10.55.37.16:/api/amp
REACT_APP_AMP_PROD_SERVER=

REACT_APP_DEV_SERVER_URL="/amp/"
REACT_APP_PROD_SERVER_URL="/"

REACT_APP_PROD_SERVER_URL="/"
22 changes: 22 additions & 0 deletions .github/workflows/sync.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: sync

on:
- push
- delete

jobs:
sync:
runs-on: ubuntu-latest
name: Git Repo Sync
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
- uses: wangchucheng/[email protected]
with:
# Such as https://github.com/wangchucheng/git-repo-sync.git
target-url: https://appcontrol.ama.lan/acessibilidade/accessmonitor/accessmonitor
# Such as wangchucheng
target-username: antonio.estriga
# You can store token in your project's 'Setting > Secrets' and reference the name here. Such as ${{ secrets.ACCESS_TOKEN }}
target-token: ${{ secrets.ACCESS_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*

.env
.env
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"homepage": "amp",
"name": "acess-monitor-plus",
"version": "0.1.0",
"version": "1.1.0",
"private": true,
"dependencies": {
"ama-design-system": "^1.1.21",
Expand Down
5 changes: 3 additions & 2 deletions src/config/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
import axios from "axios";

const baseURLDEV = process.env.REACT_APP_AMP_DEV_SERVER;
const baseURLPROD = process.env.REACT_APP_AMP_PROD_SERVER;
const baseURLPPR = process.env.REACT_APP_AMP_PPR_SERVER;
const baseURLPRD = process.env.REACT_APP_AMP_PRD_SERVER;

export const api = axios.create({
baseURL: baseURLDEV,
baseURL: baseURLPPR,
});

0 comments on commit 7733706

Please sign in to comment.