Skip to content

Commit 059d78e

Browse files
authored
Merge pull request #221 from open-source-labs/master
Merging Master TO this development branch to act as new development branch
2 parents c05fcca + f389a4c commit 059d78e

File tree

526 files changed

+110371
-30837
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

526 files changed

+110371
-30837
lines changed

.babelrc

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
{
2-
"presets": [
2+
"plugins": [
33
[
4-
"env",
4+
"module-resolver",
55
{
6-
"modules": false
6+
"cwd": "babelrc",
7+
"alias": {
8+
"Components": "./app/src/components",
9+
"Containers": "./app/src/containers"
10+
}
711
}
8-
],
9-
"react",
10-
"stage-0"
11-
// "@babel/preset-typescript"
12+
]
1213
],
13-
"plugins": ["transform-es2015-modules-commonjs"]
14+
// presets are a set of of plug-ins
15+
"presets": [
16+
["@babel/preset-env", { "targets": { "node": "current" } }],
17+
"@babel/preset-typescript",
18+
"@babel/preset-react"
19+
]
1420
}

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node_modules
2+
app/electron

.eslintrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": ["plugin:react/recommended", "airbnb-base"],
2+
"extends": ["plugin:react/recommended", "plugin:@typescript-eslint/recommended", "airbnb-base"],
33
"parserOptions": {
44
"ecmaFeatures": {
55
"jsx": true
@@ -8,7 +8,7 @@
88
"sourceType": "module"
99
},
1010
"plugins": ["import", "react", "jest", "jsx-a11y", "babel"],
11-
"parser": "babel-eslint",
11+
"parser": "@babel/eslint-parser",
1212
"env": {
1313
"browser": true,
1414
"node": true,

.github/workflows/main.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# This is a basic workflow to help you get started with Actions
2+
3+
name: CI
4+
5+
# Controls when the workflow will run
6+
on:
7+
# Triggers the workflow on push or pull request events but only for the master branch
8+
push:
9+
branches: [dev]
10+
pull_request:
11+
branches: [dev]
12+
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
17+
jobs:
18+
# This workflow contains a single job called "build"
19+
build:
20+
# The type of runner that the job will run on
21+
runs-on: ubuntu-latest
22+
23+
# Steps represent a sequence of tasks that will be executed as part of the job
24+
steps:
25+
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
26+
- uses: actions/checkout@v3
27+
with:
28+
node-version: 18.13.0
29+
30+
# Runs a single command using the runners shell
31+
- name: Install dependencies
32+
run: npm install
33+
- name: Run all tests
34+
run: npm run test --bail
35+
36+
# Runs a set of commands using the runners shell
37+
- name: Run a multi-line script
38+
run: |
39+
echo Add other actions to build,
40+
echo test, and deploy your project.

.gitignore

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Created by https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn
2-
2+
yarn.lock
3+
.prettierrc.json
34
### Linux ###
45
*~
56

@@ -156,6 +157,7 @@ $RECYCLE.BIN/
156157

157158
#VSCode
158159
.vscode/
160+
reactype.code-workspace
159161

160162
# User-specific files
161163
*.suo
@@ -483,4 +485,43 @@ ASALocalRun/
483485
reactype.dmg
484486
installers/
485487

488+
# for server key and ssl certificate generation
489+
server/domains.ext
490+
server/localhost.crt
491+
server/localhost.csr
492+
server/localhost.key
493+
server/RootCA.crt
494+
server/rootCA.key
495+
server/rootCA.pem
496+
server/RootCA.srl
497+
498+
499+
486500
# End of https://www.gitignore.io/api/node,linux,macos,windows,visualstudio,yarn
501+
/test-results/
502+
/playwright-report/
503+
/playwright/.cache/
504+
505+
#amplify-do-not-edit-begin
506+
amplify/\#current-cloud-backend
507+
amplify/.config/local-*
508+
amplify/logs
509+
amplify/mock-data
510+
amplify/mock-api-resources
511+
amplify/backend/amplify-meta.json
512+
amplify/backend/.temp
513+
build/
514+
dist/
515+
node_modules/
516+
aws-exports.js
517+
awsconfiguration.json
518+
amplifyconfiguration.json
519+
amplifyconfiguration.dart
520+
amplify-build-config.json
521+
amplify-gradle-config.json
522+
amplifytools.xcconfig
523+
.secret-*
524+
**.sample
525+
#amplify-do-not-edit-end
526+
527+
/amplify/team-provider-info.json

.prettierrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"printWidth": 80,
3+
"singleQuote": true,
4+
"trailingComma": "none"
5+
}

.travis.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
language: node_js
2-
node_js:
3-
- "8"
4-
- "10"
1+
# language: node_js
2+
# node_js:
3+
# - "16"
4+
# dist: xenial
5+
# arch: amd64
6+
# script:
7+
# - python3 -VV
8+
# - pip install --upgrade pip
9+
# - pip -V
10+
# - npm run test
11+
# cache:
12+
# directories:
13+
# - node_modules
14+
# install:
15+
# - npm install --legacy-peer-deps
16+
# env:
17+
# global: PATH=/opt/python/3.7.1/bin:$PATH

0 commit comments

Comments
 (0)