Skip to content

ReacType V21.0 #261

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

Merged
merged 74 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
e4e6446
first commit; initial setup minor changes to server to prep development
sfryan95 Apr 19, 2024
025bee3
Sean 4/19 created MUIType interface in Interfaces.ts
sfryan95 Apr 19, 2024
baef808
Merge pull request #1 from oslabs-beta/feature/MUIInterface
HM-Pfeiffer Apr 22, 2024
e92beed
fixed forgot password component; updated syntax for signup and login …
sfryan95 Apr 22, 2024
f6c017f
Merge branch 'dev' into feature/ForgottenPW
sfryan95 Apr 22, 2024
5a79ce7
edit to signup endpoint resposne message
sfryan95 Apr 22, 2024
1605e74
edit to signup endpoint resposne message
sfryan95 Apr 22, 2024
2c887b6
Merge pull request #2 from oslabs-beta/feature/ForgottenPW
JesseWowczuk Apr 22, 2024
500275c
MUITypes added
Apr 22, 2024
9e48c8a
Merge branch 'dev' into feature/MUI-Components-Data
Apr 22, 2024
19ffb0b
updating local dev
InvectivusTaco Apr 23, 2024
7a369cf
Merge branch 'dev' of https://github.com/oslabs-beta/ReacType into dev
InvectivusTaco Apr 23, 2024
a6d9610
added MUITypes Props and added props to interface
HM-Pfeiffer Apr 23, 2024
7fb671d
Merge pull request #3 from oslabs-beta/feature/MUI-Components-Data
ZackVandiver Apr 23, 2024
3bf7ddb
Jesse 4/22, reworked the DragDropPanel to add arrodions for Root Comp…
JesseWowczuk Apr 23, 2024
8d50e18
Co-authored-by: ZackVandiver <[email protected]>
JesseWowczuk Apr 23, 2024
bc63540
Merge pull request #4 from oslabs-beta/feature/accordions
ZackVandiver Apr 23, 2024
bf1e05f
Sean 4/22 Fixed render overlap of buttons and input fields in the Cus…
sfryan95 Apr 23, 2024
d5f634e
Merge branch 'dev' into feature/CustomPanelButtons
sfryan95 Apr 23, 2024
10573b4
Merge pull request #5 from oslabs-beta/feature/CustomPanelButtons
JesseWowczuk Apr 23, 2024
866d831
Added MUI_Item folder
Apr 23, 2024
ca3da69
Co-authored-by: sfryan95 <[email protected]>
ZackVandiver Apr 23, 2024
5523ba9
Integrated MUI component into more files
ZackVandiver Apr 23, 2024
62d1b49
Sean 4/23 integrated MUITypes into redux and appStateSlice; created D…
sfryan95 Apr 24, 2024
aaf7b18
Merge pull request #6 from oslabs-beta/feature/MUI_item_component_state
HM-Pfeiffer Apr 24, 2024
cd95e83
merge
InvectivusTaco Apr 24, 2024
dc55e3f
stashed changes to new branch
HM-Pfeiffer Apr 24, 2024
1da9056
Jesse 4/25, MUI Props Tab added in file BottomTabs.tsx,re-adjust the …
JesseWowczuk Apr 25, 2024
2768316
Merge pull request #7 from oslabs-beta/feature/MUItab
sfryan95 Apr 25, 2024
db0e1d3
Sean 4/25 updated MUIType interface and MUITypes to include default p…
sfryan95 Apr 25, 2024
1053804
Merge branch 'dev' into feature/MUI_Code_Preview
sfryan95 Apr 25, 2024
2e4028a
Merge pull request #8 from oslabs-beta/feature/MUI_Code_Preview
HM-Pfeiffer Apr 25, 2024
2afa4d9
research demoRender
HM-Pfeiffer Apr 25, 2024
7904b11
Merge branch 'dev' into feature/MUI-demoRender
HM-Pfeiffer Apr 25, 2024
01330c6
iframe preview updates and logs
HM-Pfeiffer Apr 27, 2024
814b205
reworked iframe render logic to properly clearelements in the DemoRen…
sfryan95 Apr 29, 2024
8324c0a
added addtional material ui input components
sfryan95 Apr 29, 2024
853cb6a
added more components and now MUI components nest one level with othe…
sfryan95 Apr 30, 2024
0ac829c
tutorial and electron updated
InvectivusTaco Apr 30, 2024
fb59853
Zack 4/30 created MUITab in MUIDragDrop.ts
ZackVandiver Apr 30, 2024
f19643c
Merged with demo feature branch
ZackVandiver May 1, 2024
61a16b4
continuing to add more MUI components and associated data
sfryan95 May 1, 2024
f4dbc82
debugged MUItypes mismatch
JesseWowczuk May 1, 2024
86ae5fb
Sean 5/1 imported additional mui components
sfryan95 May 1, 2024
6083c10
updated file structure to exlcude unneccessary
sfryan95 May 1, 2024
325e004
updated file structure to exlcude unneccessary files
sfryan95 May 1, 2024
3f77a2a
Merge pull request #9 from oslabs-beta/feature/moreComps
HM-Pfeiffer May 1, 2024
7c0038e
Jesse 5/1, removed material UI components from canvas, re-created mat…
JesseWowczuk May 1, 2024
1d3fccc
Merge branch 'dev' into feature/MUI-tab
JesseWowczuk May 1, 2024
f413aa1
Merge pull request #10 from oslabs-beta/feature/MUI-tab
ZackVandiver May 1, 2024
c0f5172
fix for MUI nesting
sfryan95 May 1, 2024
6143f67
mui nesting fix
sfryan95 May 1, 2024
77f9dbf
btn text overflow - no wrap
sfryan95 May 1, 2024
e175cb4
Merge pull request #11 from oslabs-beta/feature/MUI-nesting-fix
JesseWowczuk May 2, 2024
5767d4e
added state to iframe; fixed rendering for Modal, Popover, Popper, Tr…
sfryan95 May 3, 2024
902905e
Merge pull request #12 from oslabs-beta/feature/MUI-comps-state
HM-Pfeiffer May 3, 2024
ab07a9e
Austin 5/3 updated Tutorial, Refactored Electron
InvectivusTaco May 3, 2024
26f8c39
Merge pull request #13 from oslabs-beta/feature/tutorial
InvectivusTaco May 3, 2024
6a6226d
Sean 5/9 Fixed render issues with more MUI Components; added JSDoc co…
sfryan95 May 9, 2024
1c3c6ca
Sean 5/9 Fixed render issues with more MUI Components; added JSDoc co…
sfryan95 May 9, 2024
637049d
Merge pull request #14 from oslabs-beta/feature/MUI-comps-state
InvectivusTaco May 11, 2024
d3cdb8d
“Austin 5/11 updated testing suite to Vitest for compatibility
InvectivusTaco May 11, 2024
b1f61d6
merge resolved
InvectivusTaco May 11, 2024
7c82050
Merge pull request #15 from oslabs-beta/feature/testing
JesseWowczuk May 11, 2024
8b6f185
updated generateCode; fixed remaining component rendering issues; upd…
sfryan95 May 11, 2024
fb7ccb3
Merge branch 'dev' into feature/drawer
sfryan95 May 11, 2024
0086c29
add names to contributers, update ReadMe, add 30 tests for new featur…
sfryan95 May 13, 2024
2410297
edited contributor list
sfryan95 May 13, 2024
1cf7e43
Merge pull request #16 from oslabs-beta/feature/drawer
HM-Pfeiffer May 13, 2024
4177a7d
finished JSDoc comments, removed MUIProp tab for future feature branch
sfryan95 May 13, 2024
ac190b9
Merge pull request #17 from oslabs-beta/feature/lastComments
InvectivusTaco May 13, 2024
4cb7c59
Updated final README
InvectivusTaco May 13, 2024
f4cf29c
Merge branch 'dev' into feature/finalReadme
InvectivusTaco May 13, 2024
20f5407
Merge pull request #18 from oslabs-beta/feature/finalReadme
sfryan95 May 13, 2024
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
40 changes: 20 additions & 20 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"plugins": [
[
"module-resolver",
{
"cwd": "babelrc",
"alias": {
"Components": "./app/src/components",
"Containers": "./app/src/containers"
}
}
]
],
// presets are a set of of plug-ins
"presets": [
["@babel/preset-env", { "targets": { "node": "current" } }],
"@babel/preset-typescript",
"@babel/preset-react"
]
}
{
"plugins": [
[
"module-resolver",
{
"cwd": "babelrc",
"alias": {
"Components": "./app/src/components",
"Containers": "./app/src/containers"
}
}
]
],
// presets are a set of of plug-ins
"presets": [
["@babel/preset-env", { "targets": { "node": "current" } }],
"@babel/preset-typescript",
"@babel/preset-react"
]
}
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
node_modules
app/electron
44 changes: 22 additions & 22 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"extends": ["plugin:react/recommended", "plugin:@typescript-eslint/recommended", "airbnb-base"],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": ["import", "react", "jest", "jsx-a11y", "babel"],
"parser": "@babel/eslint-parser",
"env": {
"browser": true,
"node": true,
"es6": true,
"jest": true
},
"rules": {
"class-methods-use-this": "off",
"linebreak-style": 0
}
}
{
"extends": ["plugin:react/recommended", "plugin:@typescript-eslint/recommended", "airbnb-base"],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"sourceType": "module"
},
"plugins": ["import", "react", "jest", "jsx-a11y", "babel"],
"parser": "@babel/eslint-parser",
"env": {
"browser": true,
"node": true,
"es6": true,
"jest": true
},
"rules": {
"class-methods-use-this": "off",
"linebreak-style": 0
}
}
76 changes: 38 additions & 38 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# Description

Please describe the issue of the pull request and the changes

<!-- Please include the following information:
- A summary of the changes and the related issue.
- Relevant motivation and context.
- Any dependencies that are required for this change.
-->

## Type of Change

Please check the options that apply

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update

# How Has the Changes Been Tested?

<!--
Please describe the tests that you ran to verify your changes.
Provide instructions so we can reproduce.
Please also list any relevant details for your test configuration
-->

# Checklist:

- [ ] My code follows the style guidelines of this project
- [ ] Changes included in this pull request covers minimal topic
- [ ] I have performed a self-review of my code
- [ ] I have commented my code properly, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules
# Description
Please describe the issue of the pull request and the changes
<!-- Please include the following information:
- A summary of the changes and the related issue.
- Relevant motivation and context.
- Any dependencies that are required for this change.
-->
## Type of Change
Please check the options that apply
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update
# How Has the Changes Been Tested?
<!--
Please describe the tests that you ran to verify your changes.
Provide instructions so we can reproduce.
Please also list any relevant details for your test configuration
-->
# Checklist:
- [ ] My code follows the style guidelines of this project
- [ ] Changes included in this pull request covers minimal topic
- [ ] I have performed a self-review of my code
- [ ] I have commented my code properly, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
- [ ] Any dependent changes have been merged and published in downstream modules
80 changes: 40 additions & 40 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
# This is a basic workflow to help you get started with Actions

name: CI

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [dev]
pull_request:
branches: [dev]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
with:
node-version: 18.13.0

# Runs a single command using the runners shell
- name: Install dependencies
run: npm install
- name: Run all tests
run: npm run test --bail

# Runs a set of commands using the runners shell
- name: Run a multi-line script
run: |
echo Add other actions to build,
echo test, and deploy your project.
# This is a basic workflow to help you get started with Actions
name: CI
# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
branches: [dev]
pull_request:
branches: [dev]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
with:
node-version: 18.13.0
# Runs a single command using the runners shell
- name: Install dependencies
run: npm install
- name: Run all tests
run: npm run test --bail
# Runs a set of commands using the runners shell
- name: Run a multi-line script
run: |
echo Add other actions to build,
echo test, and deploy your project.
Loading