Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into CU-86a1be24d_Update…
Browse files Browse the repository at this point in the history
…-title-of-Mint-Song-toggle-to-read-as-Distribute--Mint-Song_David-Kirshon
  • Loading branch information
dmkirshon committed Dec 4, 2023
2 parents 3865eda + 7e075ac commit a7023ac
Show file tree
Hide file tree
Showing 429 changed files with 23,943 additions and 45,854 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 http://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
8 changes: 4 additions & 4 deletions .env.template
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
REACT_APP_FACEBOOK_CLIENT_ID=
REACT_APP_GOOGLE_CLIENT_ID=
REACT_APP_LINKEDIN_CLIENT_ID=
SENTRY_AUTH_TOKEN=
VITE_FACEBOOK_CLIENT_ID=
VITE_GOOGLE_CLIENT_ID=
VITE_LINKEDIN_CLIENT_ID=
NX_CLOUD_ACCESS_TOKEN=
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
116 changes: 0 additions & 116 deletions .eslintrc.js

This file was deleted.

35 changes: 35 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
}
]
}
13 changes: 13 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"projects": {},
"targets": {
"newm-artist-portal": {
"hosting": {
"newm-artist-portal": [
"newm-artist-portal"
]
}
}
},
"etags": {}
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
name: Deploy to Firebase Hosting on merge
name: Deploy NEWM Studio to Firebase Hosting on merge
"on":
push:
branches:
- master
paths:
- apps/studio/**
- packages/**
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: npm install
- run: npm run build
- run: npx nx build-with-sentry studio
env:
REACT_APP_FACEBOOK_CLIENT_ID: ${{ secrets.FACEBOOK_CLIENT_ID }}
REACT_APP_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
REACT_APP_LINKEDIN_CLIENT_ID: ${{ secrets.LINKEDIN_CLIENT_ID }}
REACT_APP_ENV: ${{ secrets.REACT_APP_ENV }}
VITE_FACEBOOK_CLIENT_ID: ${{ secrets.FACEBOOK_CLIENT_ID }}
VITE_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
VITE_LINKEDIN_CLIENT_ID: ${{ secrets.LINKEDIN_CLIENT_ID }}
VITE_ENV: ${{ secrets.REACT_APP_ENV }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

- uses: FirebaseExtended/action-hosting-deploy@v0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
name: Deploy to Firebase Hosting on PR
name: Deploy NEWM Studio to Firebase Hosting on PR
on:
pull_request:
paths:
- .github/workflows/firebase-hosting-pull-request.yml
- "public/**"
- "src/**"
- "**.json"
- ".**.js"
- "**.js"
- apps/studio/**
- packages/**
jobs:
build_and_preview:
if: "${{ github.event.pull_request.head.repo.full_name == github.repository }}"
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- run: npm install
- run: npm run build
- run: npx nx build studio
env:
REACT_APP_FACEBOOK_CLIENT_ID: ${{ secrets.FACEBOOK_CLIENT_ID }}
REACT_APP_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
REACT_APP_LINKEDIN_CLIENT_ID: ${{ secrets.LINKEDIN_CLIENT_ID }}
VITE_FACEBOOK_CLIENT_ID: ${{ secrets.FACEBOOK_CLIENT_ID }}
VITE_GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
VITE_LINKEDIN_CLIENT_ID: ${{ secrets.LINKEDIN_CLIENT_ID }}
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}

- uses: FirebaseExtended/action-hosting-deploy@v0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-master-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
steps:
- uses: actions/checkout@v3
- run: npm install
- run: npm run test:ci
- run: npx nx run-many -t test

- uses: codecov/codecov-action@v1
with:
token: ${{ secrets.CODECOV_TOKEN }}
file: ./coverage/lcov.info
file: ./coverage/lcov.info
11 changes: 4 additions & 7 deletions .github/workflows/test-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,15 @@ on:
pull_request:
paths:
- .github/workflows/test-pull-request.yml
- "public/**"
- "src/**"
- "**.json"
- ".**.js"
- "**.js"
- apps/**
- packages/**
jobs:
build_and_test:
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- run: npm install
- run: npm run test:ci
- run: npx nx run-many -t test

- uses: codecov/codecov-action@v1
with:
Expand All @@ -24,4 +21,4 @@ jobs:
- uses: vebr/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
lcov-file: ./coverage/lcov.info
lcov-file: ./coverage/lcov.info
Loading

0 comments on commit a7023ac

Please sign in to comment.