Skip to content

ReacType 6.0 Released #167

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 161 commits into from
Mar 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
aa4af0a
working on GraphQl
khuongdn16 Mar 1, 2021
51ac9af
updated eslint
slhoehn Mar 1, 2021
a61da80
test for graphQL
slhoehn Mar 2, 2021
7b4e424
modfied package.json
slhoehn Mar 2, 2021
37c22b1
commit
khuongdn16 Mar 2, 2021
7bf7788
commit
khuongdn16 Mar 2, 2021
be2afe0
working
khuongdn16 Mar 2, 2021
e842314
added form nesting, renamed index to app when exporting
eddypjr Mar 3, 2021
e33110a
Merge pull request #1 from eddypjr/master
Anthonytorrero Mar 3, 2021
b6d6cf7
Added Route for Dashboard
khuongdn16 Mar 3, 2021
2659dac
clean graphql file structure
slhoehn Mar 3, 2021
8c7840a
Merge branch 'test_shana_graphql' of https://github.com/khuongdn16/Re…
slhoehn Mar 3, 2021
b275f17
pull from Shana Router branch
khuongdn16 Mar 4, 2021
a636ae0
react router skeleton
slhoehn Mar 4, 2021
77f59ad
Merge branch 'router' of https://github.com/slhoehn/ReacType into fea…
khuongdn16 Mar 4, 2021
444d7ad
update export file name from index to App
Mar 4, 2021
23f7c9d
resolved merge conflicts
Mar 4, 2021
fe610f1
impliment Apollo Client
slhoehn Mar 4, 2021
40686a1
Merge branch 'router' of https://github.com/slhoehn/ReacType into fea…
khuongdn16 Mar 4, 2021
057324b
test useQuery
slhoehn Mar 4, 2021
20f00af
add psuedo-code
slhoehn Mar 4, 2021
4fa387c
add comments for Apollo Server and Apollo Client>
slhoehn Mar 4, 2021
5bb9a2e
add comments for Apollo Server and Apollo Client
slhoehn Mar 4, 2021
32e6b53
prepare to pull from Shana branch router
khuongdn16 Mar 4, 2021
18a4b55
Merge pull request #2 from slhoehn/router
Anthonytorrero Mar 5, 2021
d941fd1
Merge pull request #3 from oslabs-beta/frontEnd
slhoehn Mar 5, 2021
21cdd77
add likes button
slhoehn Mar 5, 2021
4aa6cb0
prepare pull upstream master
khuongdn16 Mar 5, 2021
832567e
implement mutation with variables
khuongdn16 Mar 5, 2021
e4d37c6
implement variable validation with propType in Form.jsx
khuongdn16 Mar 5, 2021
6b26b1b
implement schema and resolvers for Projects (query & mutation)
khuongdn16 Mar 6, 2021
859bfc2
implement projects sync between Dashboard and main App. Dashboard act…
khuongdn16 Mar 6, 2021
99b701b
implement project download feature for each user
khuongdn16 Mar 6, 2021
602ebe8
add field: username to projectSchema
khuongdn16 Mar 6, 2021
2a6051c
add field:username to return Project type
khuongdn16 Mar 6, 2021
9f2a207
for sharing with Shana
khuongdn16 Mar 6, 2021
cdbc499
changes from khuong
slhoehn Mar 6, 2021
615d291
nested undo not working
eddypjr Mar 7, 2021
adb9603
add delete button and functionality
slhoehn Mar 7, 2021
0d44638
disable minimize feature for projectSchema to prevent Mongoose from d…
khuongdn16 Mar 7, 2021
ccfcf4d
Merge branch 'router' of https://github.com/slhoehn/ReacType into test
khuongdn16 Mar 8, 2021
3891010
merge to recieve from khuong
slhoehn Mar 8, 2021
ab95470
Implement public dashboard and user dashboard with in seprate view
khuongdn16 Mar 8, 2021
c8dfb63
undo button for nested has bugs
eddypjr Mar 8, 2021
494b939
before pulling eddy's code
Mar 8, 2021
b4ce4c9
Merge pull request #4 from khuongdn16/feature/client/graphQL
khuongdn16 Mar 8, 2021
ec0fb18
switching branch
khuongdn16 Mar 8, 2021
a563a13
undo functional, but undo for nested elements require double clicks >…
eddypjr Mar 8, 2021
b1b9cab
preapre to pull from Shana
khuongdn16 Mar 8, 2021
1f01772
Merge branch 'router' of https://github.com/slhoehn/ReacType into typ…
khuongdn16 Mar 8, 2021
04e6c14
migrate React component to Typescript
khuongdn16 Mar 8, 2021
8a76f14
add navbar for dashboard
slhoehn Mar 8, 2021
7d71f26
prepare to merge typescript branch
khuongdn16 Mar 9, 2021
bf5434a
resolve merge conflict
khuongdn16 Mar 9, 2021
5b8789e
Implement graphQL error handling
khuongdn16 Mar 9, 2021
5211416
implmenet resolver and schema for publishProject
khuongdn16 Mar 9, 2021
cc6dff5
implement toggle publish state
khuongdn16 Mar 9, 2021
d32ce0d
add sortmenu to navbar
slhoehn Mar 9, 2021
fc801e2
Merge branch 'feature/server/graphQL' of https://github.com/khuongdn1…
slhoehn Mar 9, 2021
65f7f72
Working Undo Functionality.
elenaconn Mar 9, 2021
77c6d95
Finished Undo/Redo Functionality.
elenaconn Mar 10, 2021
88c3014
Cleaned up comments and unused code and deleted customHooks.ts file
elenaconn Mar 10, 2021
50c2a72
Merge pull request #5 from elenaconn/UndoButton
khuongdn16 Mar 10, 2021
80fd9d3
Merge branch 'master' into feature/server/graphQL
khuongdn16 Mar 10, 2021
1e0cc09
switching branches
eddypjr Mar 10, 2021
3f9ceab
cleaned up an extra console log and completed Form Nesting
eddypjr Mar 10, 2021
d99e010
commit to switch branch
eddypjr Mar 11, 2021
6c73cf1
in progress navbar
slhoehn Mar 11, 2021
30efd8f
test
khuongdn16 Mar 11, 2021
bd0dbfa
fixed saveProject duplicate
khuongdn16 Mar 11, 2021
15d6a3f
added keybindings for undo and redo
eddypjr Mar 11, 2021
a03422b
modified server.js and projects.test.js to test projects routes. Thes…
khuongdn16 Mar 11, 2021
a232510
add conditional logic to start server based on dev, test or productio…
khuongdn16 Mar 11, 2021
05c3b8d
validate user.test.js is functional
khuongdn16 Mar 11, 2021
fa5b72f
checked
khuongdn16 Mar 11, 2021
5a69f47
working on test
khuongdn16 Mar 12, 2021
d1c5a2c
removed event listener and isObjectType
eddypjr Mar 13, 2021
228360e
deleted value from DirectChildHTML
eddypjr Mar 13, 2021
8400b4a
cleaned up unused code
eddypjr Mar 13, 2021
1deb1b2
Merge pull request #6 from eddypjr/mobileViewport
khuongdn16 Mar 13, 2021
873cea9
add sorting menu in nav bar
slhoehn Mar 13, 2021
7a299b7
navbar
slhoehn Mar 13, 2021
9de0063
removed console.logs and added comments to navbar
slhoehn Mar 13, 2021
47ee144
removed comments in projects.test
slhoehn Mar 13, 2021
d8bda37
Merge pull request #7 from slhoehn/navbar
eddypjr Mar 13, 2021
600e80c
pull from master 3/13. going to work comments for dashboard
Mar 13, 2021
42976eb
clean up .test files
khuongdn16 Mar 13, 2021
69b3416
Fix userAuth.test.ts by reqiring app from server.js. Install identity…
khuongdn16 Mar 14, 2021
62f1f0d
add mockData.js for endpoint tests
khuongdn16 Mar 14, 2021
85a2423
fix bug in enzyme.test.tsx for Test Navbar
khuongdn16 Mar 14, 2021
9d539d7
added dark mode button to user dashboard
eddypjr Mar 14, 2021
bdddb26
added keybindings for login and delete
eddypjr Mar 14, 2021
47fa14c
added keybinding for save project
eddypjr Mar 14, 2021
fa9980c
cleaned up console logs and Capitalized dashboard sort methods
eddypjr Mar 14, 2021
d187d10
added keybindings for saving, deleting, and opening prjects. and for…
eddypjr Mar 14, 2021
6cc85ab
complete graphql test for query
khuongdn16 Mar 14, 2021
f3721e3
fixed undo button for multiple components
eddypjr Mar 16, 2021
f0224ad
removed delete component keybind
eddypjr Mar 16, 2021
61fb94b
added keybinding support for Windows
eddypjr Mar 16, 2021
ef97344
added keyboard shortcuts to Tutorial under CANVAS
eddypjr Mar 16, 2021
1d3dcef
added removeEventListeners for useEffect
eddypjr Mar 17, 2021
393c8fb
added keybind for export
eddypjr Mar 17, 2021
e359e75
keybinding instructions added to tutorial
eddypjr Mar 17, 2021
efa645c
refactored keybindings for shorter code and cleaned up console log
eddypjr Mar 17, 2021
48cee38
edited comments for undo and redo
eddypjr Mar 17, 2021
7dc986b
Merge pull request #8 from eddypjr/comments
khuongdn16 Mar 17, 2021
f47cfd3
requested changes made
eddypjr Mar 17, 2021
d93eb6b
commentsSection branch, editing comments query
eddypjr Mar 18, 2021
a0c5baf
switching branch
khuongdn16 Mar 18, 2021
13e0e80
added comments for Eddie
khuongdn16 Mar 18, 2021
9200d7e
complete graphql test for all query and mutation
khuongdn16 Mar 18, 2021
5f711a8
merged master to supertest
khuongdn16 Mar 18, 2021
b5fd265
merged master to supertest again
khuongdn16 Mar 18, 2021
225440f
resolved merge conflict for NavBar.tsx
khuongdn16 Mar 18, 2021
ae804fe
backend graphQL logic for addComment
eddypjr Mar 18, 2021
c80b293
work on comment front-end
Mar 18, 2021
7ab57ce
merged backend but working on getting comments to publish
Mar 18, 2021
ee99e0e
comments working on both frontend and backend
Mar 18, 2021
cb0568b
styling for Project.tsx and styles.css
eddypjr Mar 18, 2021
0d9f09e
done with comment feature on both frontend and backend. Needs styling
Mar 18, 2021
22811a9
added responsive design
eddypjr Mar 19, 2021
26b2cb7
added styling for responsiveDesign
eddypjr Mar 19, 2021
6227cd5
fix mockData import
khuongdn16 Mar 19, 2021
0f57dd1
remove React Mobile tab from Bottom Tab and fixed script
khuongdn16 Mar 19, 2021
a3b29f9
Merge pull request #9 from khuongdn16/supertest
slhoehn Mar 19, 2021
53b12dd
added comments icon
Mar 20, 2021
10056f3
after merge from master org (key-bindings && superTes)
Mar 20, 2021
5801026
before merging with master local
Mar 20, 2021
69fa165
branch up to date. before pulling from eddy's code w/ comments styling
Mar 20, 2021
88cc3e5
icons added for every button and added modal on delete in dashboard
eddypjr Mar 20, 2021
2682a69
Editing Jest Undo Reducer Test
elenaconn Mar 20, 2021
39415ca
added scrolling for user dashboard
eddypjr Mar 21, 2021
8c12033
In Progress Testing UNDO Functionality
elenaconn Mar 22, 2021
b674e66
added color to header for each individual project
Mar 22, 2021
b6e74a5
add some color to header
Mar 22, 2021
98fbbbd
Finalized Undo, Redo, and Root Component unit tests.
elenaconn Mar 22, 2021
1140ac6
Cleaned up ReacType files and console.logs
elenaconn Mar 22, 2021
654d5d8
commit to prepare deployment
khuongdn16 Mar 23, 2021
77630da
Removed React Native dependency for exported files
elenaconn Mar 23, 2021
849a027
Merge branch 'commentsMerge' of https://github.com/Anthonytorrero/Rea…
khuongdn16 Mar 23, 2021
fce1af9
make projectContainer scrollable
khuongdn16 Mar 23, 2021
b4e439b
before merging Elena's testing code
Mar 23, 2021
55665d8
Additional comments to componentReducer.test.ts and deleted FormsCont…
elenaconn Mar 23, 2021
d8208ae
Cleaned up Canvas.tsx
elenaconn Mar 23, 2021
0ca1b0c
Merge pull request #10 from elenaconn/UndoRedoTests
eddypjr Mar 23, 2021
370d542
after merging khuong's code
Mar 23, 2021
b73a0e4
comments done with styling. Before pushing to master
Mar 23, 2021
4d1f714
tutorial for undo and redo added
eddypjr Mar 23, 2021
9084bc7
comments and styling done
Mar 23, 2021
656e2fb
merged eddy's tutorial code
Mar 23, 2021
251938c
Fixing bug for download and upload projects
Mar 23, 2021
dc7f0a7
updated tutorial
eddypjr Mar 23, 2021
22fdf52
commit to switch branch
eddypjr Mar 23, 2021
db392a7
updated README and changed like feature back to the way it was
Mar 23, 2021
7a1099d
final push for comments and refactored ProjectContainer file
Mar 23, 2021
4375c56
commit to pull commentsMerge branch
eddypjr Mar 24, 2021
6178476
cleaned up some code on server.js and updated README
Mar 24, 2021
0701c10
Merge pull request #11 from Anthonytorrero/commentsMerge
khuongdn16 Mar 24, 2021
c0468e2
changed version number of package.json to 6.0.0
eddypjr Mar 24, 2021
f53b5b2
made final changes to merge to OS Labs
eddypjr Mar 24, 2021
e8715ad
Merge pull request #12 from eddypjr/finalTest
khuongdn16 Mar 24, 2021
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
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM node:10.1
WORKDIR /usr/src/app
COPY . /usr/src/app
RUN npm install
RUN npm run prod-build
EXPOSE 5000
CMD npm run server
62 changes: 52 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,18 @@

[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/team-reactype/ReacType/pulls)
![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)
![Version 5.0](https://img.shields.io/badge/Release-5.0-lightgrey.svg)
![Version 6.0](https://img.shields.io/badge/Release-6.0-lightgrey.svg)

**ReacType** is a visual prototyping tool for developers employing **React** component architecture alongside the comprehensive type-checking of **TypeScript**.
In other words, **you can draw prototypes and export React / TypeScript code!**

**ReacType** allows users to _visualize_ their application architecture dynamically, employing a _drag-and-drop canvas display_ and a _real-time component code preview_. Users can create components and drag _instances_ of these components, as well as HTML elements, onto the canvas. This architecture can then be _exported_ as TypeScript application files to be used as a starter template for any repository.


**New with version 5.0:**

- Elements may be added to components in any location, rather than only at the bottom
- Compatibility with Gatsby.js
- Modernized and cleaner UI, including enhanced dark mode
- Tutorial has been updated to reflect other modifications

Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windows](https://github.com/team-reactype/ReacType/releases/), [Linux](https://github.com/team-reactype/ReacType/releases/).

- **Mac users**: After opening the dmg and dragging ReacType into your Applications folder, ctrl+click the icon and select 'Open' from the context menu to run the app. This extra step is necessary since we don't have an Apple developer license yet.

- **Windows users**: Install the application by running ReacType Setup 5.0.0.exe.
- **Windows users**: Install the application by running ReacType Setup 6.0.0.exe.

- **Linux users**: Run the application as a super user in order to read and write files.

Expand All @@ -45,6 +37,46 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo
- **User Preference Features**: With the click of a button, toggle between light mode and dark mode, depending on your preference.
- **Export project**: Click the “Export Project’ button to export the project’s application files into a TypeScript file. The exported project is fully functional with Webpack, Express server, routing, etc., and will match what is mocked on the canvas.

- Elements may be added to components in any location, rather than only at the bottom
- Compatibility with Gatsby.js
- Modernized and cleaner UI, including enhanced dark mode
- Tutorial has been updated to reflect other modifications

**New with version 6.0:**

### Features

- **Dashboard**: Click the 'Dashboard' button to view the Public Dashboard and User Dashboard.
- **Like**: Like other people's templates by clicking on the star icon.
- **Comment**: Comment on other templates by typing in the input field and clicking the comment icon.
- **Download**: Save any public template by clicking the download icon to save a copy as your own.
- **Publish**: Publish any template to the Public Dashboard for other users to download, like, or comment on. Click again to unpublish projects.
- **Sort By**: Click the 'Sort By' button to choose different metrics to sort the Public Dashboard by.
- **Form Nesting**: Nesting within form tags is now fully functional
- **Added Undo and Redo functionality**

### Keyboard Shortcuts

**Mac**:
- Export Project: Command + e
- Undo: Command + z
- Redo: Command + Shift + z
- Save Project As: Command + s
- Save Project: Command + shift + s
- Delete HTML Tag on Canvas: Backspace
- Delete Project: Command + Backspace
- Open Project: Command + o

**Windows**:
- Export Project: Control + e
- Undo: Control + z
- Redo: Control + Shift + z
- Save Project As: Control + s
- Save Project: Control + shift + s
- Delete HTML Tag on Canvas: Backspace
- Delete Project: Control + Backspace
- Open Project: Control + o

#### Contributors

[Aaron Bumanglag](https://www.linkedin.com/in/akbuma) [@akbuma](https://github.com/akbuma)
Expand All @@ -55,6 +87,8 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo

[Andrew Cho](https://www.linkedin.com/in/andrewjcho84/) [@andrewjcho84](https://github.com/andrewjcho84)

[Anthony Torrero](https://www.linkedin.com/in/anthony-torrero-4b8798159/) [@Anthonytorrero](https://github.com/Anthonytorrero)

[Brian Han](https://www.linkedin.com/in/brianjisoohan/) [@brianjshan](https://github.com/brianjshan)

[Charles Finocchiaro](https://www.linkedin.com/in/charles-finocchiaro-62440040/) [@null267](https://github.com/null267)
Expand All @@ -65,6 +99,10 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo

[Diego Vazquez](https://www.linkedin.com/in/diegovazquezny/) [@diegovazquezny](https://github.com/diegovazquezny)

[Edward Park](https://www.linkedin.com/in/edwardparkwork/) [@eddypjr](https://github.com/eddypjr)

[Elena Conn](https://www.linkedin.com/in/elena-conn-366346123/) [@elenaconn](https://github.com/elenaconn)

[Eliot Nguyen](https://linkedin.com/in/ibeeliot) [@ibeeliot](https://github.com/ibeeliot)

[Fredo Chen](https://www.linkedin.com/in/fredochen/) [@fredosauce](https://github.com/fredosauce)
Expand All @@ -75,6 +113,8 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo

[Julie Wu](https://www.linkedin.com/in/jwuarchitect/) [@yutingwu4](https://github.com/yutingwu4)

[Khuong Nguyen](https://www.linkedin.com/in/khuong-nguyen/) [@khuongdn16](https://github.com/khuongdn16)

[Linh Tran](https://www.linkedin.com/in/linhtran51/) [@Linhatran](https://github.com/Linhatran)

[Luke Madden](https://www.linkedin.com/in/lukemadden/) [@lukemadden](https://github.com/lukemadden)
Expand All @@ -87,6 +127,8 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo

[Sean Sadykoff](https://www.linkedin.com/in/sean-sadykoff/) [@sean1292](https://github.com/sean1292)

[Shana Hoehn](https://www.linkedin.com/in/shana-hoehn-70297b169/) [@slhoehn](https://github.com/slhoehn)

[Shlomo Porges](https://linkedin.com/shlomoporges) [@shlomoporges](https://github.com/ShlomoPorges)

[Sophia Huttner](https://www.linkedin.com/in/sophia-huttner-68315975/) [@sophjean](https://github.com/sophjean)
Expand Down
Empty file.
Loading