Skip to content

Merge Reactype 11.0 into master branch #181

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 100 commits into from
Mar 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
0ae9508
able to render Next.js & Gatsby selection
calvincao Feb 17, 2022
f7246a6
Merge pull request #1 from oslabs-beta/renderNextjs
kchender Feb 17, 2022
3de23bc
calvin, yuanji, katrina, evan, miko - fixed bug where clear canvas do…
calvincao Feb 17, 2022
934c76a
Merge pull request #2 from oslabs-beta/renderNextjs
kchender Feb 17, 2022
f31e4b8
added drop down menu to Next.js Link component - Calvin, Katrina, Yua…
calvincao Feb 18, 2022
fa121e6
Merge pull request #3 from oslabs-beta/renderNextjs
Evan-Crews Feb 19, 2022
5f0e3ce
changed some of the ids to name for more declarative code
calvincao Feb 19, 2022
836ea4f
Merge pull request #4 from oslabs-beta/renderNextjs
kr1spybacon Feb 19, 2022
cedb714
linked pages to the link component dropdown menu
calvincao Feb 19, 2022
08e5ada
Merge pull request #5 from oslabs-beta/renderNextjs
kchender Feb 19, 2022
c62ac58
fixed bug that forces relogin after signing out
calvincao Feb 20, 2022
ef3034b
fixed bug in main.js where error message pops up when user clicks on …
calvincao Feb 22, 2022
c1a919b
fixed bug where error message pops up when user closes out of app thr…
calvincao Feb 22, 2022
b2660f3
working on adding oauth
calvincao Feb 22, 2022
e7e6ae0
fixed log out bug where user would automatically log back in after 2 …
calvincao Feb 22, 2022
c1f34e3
FIXED GITHUB OAUTH!
calvincao Feb 22, 2022
3110550
Merge pull request #6 from oslabs-beta/renderNextjs
kr1spybacon Feb 22, 2022
80f6d4f
replaced all static port names with variables to easily switch ports …
calvincao Feb 23, 2022
3ba584d
Merge pull request #7 from oslabs-beta/renderNextjs
kchender Feb 23, 2022
91ccda4
changed DB string to be personal DB and moved it into .env
calvincao Feb 23, 2022
7e7d6b7
Merge pull request #8 from oslabs-beta/renderNextjs
kchender Feb 23, 2022
990ea00
darkmode on canvas, DirectChildComponent & DirectChildHTMLNestable
Evan-Crews Feb 24, 2022
3fb7b72
Merge pull request #9 from oslabs-beta/darkmode
kchender Feb 24, 2022
e77ac62
trying to get render to work
kchender Feb 24, 2022
c83efba
Merge branch 'dev' into liveCodeRender
kchender Feb 24, 2022
4826f30
changes in DemoRender added
kchender Feb 24, 2022
18612de
bandaid fix to live rendering
MikoGome Feb 24, 2022
a7d25d3
it renders huzzah
kchender Feb 24, 2022
a5f1d7b
Merge pull request #10 from oslabs-beta/Miko
Evan-Crews Feb 24, 2022
180848f
renders HTML elements only, drag and drop Next.js components doesn't …
kchender Feb 24, 2022
031d042
miko
MikoGome Feb 24, 2022
5b56ec2
Merge pull request #11 from oslabs-beta/Miko
kchender Feb 24, 2022
b8dfeee
linkto bandaid
MikoGome Feb 24, 2022
7c54d1d
Merge pull request #12 from oslabs-beta/Miko
Evan-Crews Feb 25, 2022
72e88f6
multiple pages done
MikoGome Feb 26, 2022
3abdbdf
dark mode only missing dropdown menu on Link component
kchender Feb 26, 2022
38528a6
Merge pull request #13 from oslabs-beta/darkModeUpdates
kr1spybacon Feb 26, 2022
5956eb8
Merge pull request #14 from oslabs-beta/Miko
kchender Feb 26, 2022
889bba7
Merge pull request #15 from oslabs-beta/darkModeUpdates
kr1spybacon Feb 26, 2022
464e04e
demorender link click disabled
MikoGome Feb 26, 2022
b5d098b
export fixed and live rendering
MikoGome Mar 1, 2022
22b5887
update code preview when switching components
MikoGome Mar 1, 2022
2b03071
next dropdown pages working and updating
MikoGome Mar 1, 2022
9a48bc9
added light mode to redux
calvincao Mar 3, 2022
68494f3
commit
MikoGome Mar 3, 2022
217e147
dark mode works on sign in and sign up pages and syncs with dashboard
calvincao Mar 4, 2022
3db4d99
fixed drop down and focus select
MikoGome Mar 4, 2022
9362366
Merge branch 'Miko' of https://github.com/oslabs-beta/ReacType into a…
calvincao Mar 4, 2022
124ff14
merged redux and miko branch
calvincao Mar 4, 2022
05d3187
fixed some visual bugs
calvincao Mar 4, 2022
3621590
Merge pull request #17 from oslabs-beta/addReduxAndMikos
kr1spybacon Mar 4, 2022
6798dee
link href tweak
MikoGome Mar 4, 2022
f061059
tweaked deepIterate
MikoGome Mar 4, 2022
ac4a40c
added the code preview store to the redux store, created CHANGE_LOG.m…
calvincao Mar 4, 2022
fddf6fb
Merge pull request #18 from oslabs-beta/combineReduxStores
kchender Mar 4, 2022
a4cb3d7
Merge branch 'dev' of https://github.com/oslabs-beta/ReacType into Miko
MikoGome Mar 4, 2022
72b241d
updated readme and package.json
kchender Mar 4, 2022
f33b338
Merge pull request #19 from oslabs-beta/katrina1
kr1spybacon Mar 4, 2022
dc57bd6
fixed a few more visual bugs where text is white in light mode
calvincao Mar 4, 2022
cdf5d94
Merge branch 'Miko' of https://github.com/oslabs-beta/ReacType into c…
calvincao Mar 4, 2022
b9748cf
updated readme
calvincao Mar 4, 2022
6d3fbd5
Merge pull request #20 from oslabs-beta/calvinYuanji/CSSFixes
kr1spybacon Mar 4, 2022
5d08e1a
unionize react link and next link
MikoGome Mar 4, 2022
efa22da
Merge branch 'dev' of https://github.com/oslabs-beta/ReacType into Miko
MikoGome Mar 4, 2022
d932e0c
testing drop-down options
kchender Mar 4, 2022
0a54c4a
pulled changes from dev branch
kchender Mar 4, 2022
c91c3d4
fixed visual bugs where text is white while in light mode
calvincao Mar 5, 2022
5802ef0
switch and route no longer appearing in Next.js
MikoGome Mar 5, 2022
a25a997
not perfect but good enough
kchender Mar 5, 2022
ff530a2
Merge branch 'calvinYuanji/CSSFixes' of https://github.com/oslabs-bet…
kchender Mar 5, 2022
6b9c518
changed div className to a fragment
MikoGome Mar 5, 2022
07a3924
improved spacing unfinished
MikoGome Mar 5, 2022
cd94deb
tree chart adjusted for next
MikoGome Mar 5, 2022
00cb776
Merge pull request #21 from oslabs-beta/katrina1
calvincao Mar 7, 2022
3d6066f
Merge branch 'dev' of https://github.com/oslabs-beta/ReacType into Miko
MikoGome Mar 7, 2022
94be6f2
live rendering redirect
MikoGome Mar 7, 2022
ae54bdf
fixed the link href drop down persistence
Evan-Crews Mar 7, 2022
59dfd36
Merge branch 'Miko' of https://github.com/oslabs-beta/ReacType into d…
Evan-Crews Mar 7, 2022
0e40b82
fixed more linkHREF dropdown focus
Evan-Crews Mar 7, 2022
3e92088
Merge pull request #22 from oslabs-beta/darkmode
kr1spybacon Mar 7, 2022
cb15009
modals text now black
kchender Mar 8, 2022
480d8e1
adjusted drop down href update to customization
MikoGome Mar 8, 2022
b9f7f24
index routing bug fixed, save project button color corrected
kchender Mar 8, 2022
3ae3817
Merge pull request #23 from oslabs-beta/katrina1
MikoGome Mar 8, 2022
bdcf7ae
nested links working
MikoGome Mar 8, 2022
a2e3b98
Merge branch 'dev' of https://github.com/oslabs-beta/ReacType into Miko
MikoGome Mar 8, 2022
c3608fb
fixed drop down text color
kchender Mar 8, 2022
57ad211
Merge pull request #24 from oslabs-beta/katrina1
calvincao Mar 8, 2022
e928fe8
image shows up inside Link, no functionality yet
MikoGome Mar 8, 2022
00ac6ed
Merge branch 'dev' of https://github.com/oslabs-beta/ReacType into Miko
MikoGome Mar 9, 2022
f87e2ef
electron tweak
MikoGome Mar 9, 2022
091b6b9
fixed build version connecting to heroku server
calvincao Mar 9, 2022
be010fb
Merge pull request #25 from oslabs-beta/calvin
kr1spybacon Mar 9, 2022
629815c
11.0
kchender Mar 9, 2022
6084168
Merge pull request #26 from oslabs-beta/kat2
kr1spybacon Mar 9, 2022
2e96471
removed console logs from server files
calvincao Mar 9, 2022
ef072b4
image redirect working
MikoGome Mar 9, 2022
4a85c2c
Merge branch 'dev' of https://github.com/oslabs-beta/ReacType into Miko
MikoGome Mar 9, 2022
b24ebd6
Merge branch 'Miko' of https://github.com/oslabs-beta/ReacType into c…
calvincao Mar 9, 2022
1285511
Merge pull request #27 from oslabs-beta/calvin
calvincao Mar 9, 2022
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
32 changes: 32 additions & 0 deletions CHANGE_LOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<p align="center">
<img width="100" src="https://i.imgur.com/Yn70tqI.png">
<h1 align="center">ReacType Change Log</h1>
</p>

**Version 11.0.0 Changes:**

- Added Next.js functionality
- Next.js projects will generate the right code needed for exporting a Next.js application
- Link & Image elements have been added
- Link components are able to couple with a page to enable SSR
- Current canvas can be saved as a page to be coupled with a Next.js Link element
- Image element can accept special attribute that allow for it to optimize performance
- Added Redux and began migrating some state over for ease of development (debugging & readability)
- Fixed bug causing electron to crash when closing the window rather than going to file > exit
- Fixed bug causing app to crash when project was changed to either Next.js or Gatsby.js
- Fixed GitHub OAuth
- added Passport.js & Passport-Github libraries for strategies which takes care of all the credential exchanges and session information
- linked electron front end to talk to backend to exchange credentials
- Fixed code preview not displaying properly
- Fixed dark mode not syncing properly across pages

**Version 11.0.0 Stretch Features:**

- Move more state away from the react hook & context API and into the Redux store
- This will be very time consuming but will make implementing new features much easier
- Highly suggest you read Redux documentation on best practices before diving into this
- This will improve performance by reducing the amount of unneccessary re-render. The context API causes certain pieces of state to be needlessly coupled
- Debugging is much easier by the use of Redux dev tools which allow time travel debugging
- Code will be easier to read and thus data flow will be easier to visualize
- Tried to implement peer to peer communication via webRTC with redux swarmlog but was not successful. Look into websockets.
- Save project (state) onto local storage for guests
61 changes: 38 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<p align="center">
<img width="50" src="https://i.imgur.com/Yn70tqI.png">
<img width="100" src="https://i.imgur.com/Yn70tqI.png">
<h1 align="center">ReacType </h1>
</p>

[![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 10.0.0]
![Version 11.0.0]

**ReacType** is a rapid 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!**
Expand All @@ -16,7 +16,7 @@ Download for [MacOS](https://github.com/team-reactype/ReacType/releases), [Windo

- **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 10.0.0.exe.
- **Windows users**: Install the application by running ReacType Setup 11.0.0.exe.

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

Expand All @@ -35,7 +35,7 @@ How to use
- **Create Instances on the Canvas**: Each component has its own canvas. Add an element to a component by dragging it onto the canvas. Div components are arbitrarily nestable and useful for complex layouts. Next.js and Gatsby.js projects have Link components to enable client-side navigation to other routes.
- **Component Tree**: Click on the Component Tree tab next to the Code Preview tab to view the component tree hierarchy.
- **Update Styling**: Select an element on the canvas to update its basic style attributes on the right panel. As you create new instances and add styling, watch as your code dynamically generates in the code preview in the bottom panel.
- **Using State in Elements**: As of 10.0.0, you can now select an HTML element on the canvas and then navigate to the customization panel to click a button to pass a variable from state into your element's text or link field.
- **Using State in Elements**: As of 11.0.0, you can now select an HTML element on the canvas and then navigate to the customization panel to click a button to pass a variable from state into your element's text or link field.
- **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.
- **Export project with Tests**: Click the "includes tests" checkbox while exporting to include pre-configured Webpack, Jest, and Typescript files along with tests for your project.
Expand All @@ -49,7 +49,7 @@ How to use
- **Like**: Like other people's templates by clicking on the thumbs up 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.
- **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**
Expand All @@ -60,31 +60,36 @@ How to use
- Modernized and cleaner UI, including enhanced dark mode
- Tutorial has been updated to reflect other modifications

**New with version 11.0.0:**

**New with version 10.0.0:**
- **Live Code Preview**: See your code preview update in real time as you build. React hooks are enabled for application lifecycle management. Dynamically render functional components using a live code editor. User's can hook event listeners to components and see them render in real time.
- **Enhanced Next.js Functionality**: Create a Next.js application in Reactype! Take advantage of server side rendering and static site generation by using the new improved Next.js link and image components. Simply drag and drop a Link element onto the canvas which can be coupled with a page to support SSR or optimize performance by using Next.js' Image component to enable on-demand image resizing. After you're done, export your project as a Next.js application written in Typescript!
- **More Dark Mode**: Cleaned up the dark mode UI and added it to all areas of the application including the sign in and sign up page.
- **Various Performance Enhancements**: Improved performance by reducing unnecessary re-rendering due to needlessly coupled state hooks
- **And more:** See CHANGE_LOG.md for more details on what was changed from the previous version as well as plans for upcoming features!

### 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

- 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

- 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

Expand All @@ -106,6 +111,8 @@ How to use

[Bryan Chau](https://www.linkedin.com/in/chaubryan1/) [@bchauu](https://github.com/bchauu)

[Calvin Cao](http://www.linkedin.com/in/calvincao9/) [@calvincao](https://github.com/calvincao)

[Charles Finocchiaro](https://www.linkedin.com/in/charles-finocchiaro-62440040/) [@null267](https://github.com/null267)

[Chelsey Fewer](https://www.linkedin.com/in/chelsey-fewer/) [@chelseyeslehc](https://github.com/chelseyeslehc)
Expand All @@ -128,6 +135,8 @@ How to use

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

[Evan Crews](https://www.linkedin.com/in/evan-crews/) [@Evan-Crews](https://github.com/Evan-Crews)

[Fredo Chen](https://www.linkedin.com/in/fredochen/) [@fredosauce](https://github.com/fredosauce)

[Jonathan Calvo Ramirez](https://www.linkedin.com/in/jonathan-calvo/) [@jonocr](https://github.com/jonocr)
Expand All @@ -138,6 +147,8 @@ How to use

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

[Katrina Henderson](https://www.linkedin.com/in/katrinahenderson/) [@kchender](https://github.com/kchender)

[Kevin Park](https://www.linkedin.com/in/xkevinpark/) [@xkevinpark](https://github.com/xkevinpark)

[Khuong Nguyen](https://www.linkedin.com/in/khuong-nguyen/) [@khuongdn16](https://github.com/khuongdn16)
Expand All @@ -146,6 +157,8 @@ How to use

[Luke Madden](https://www.linkedin.com/in/lukemadden/) [@lukemadden](https://github.com/lukemadden)

[Michael Ng](https://www.linkedin.com/in/<ADD_USERNAME>/) [@MikoGome](https://github.com/MikoGome)

[Miles Wright](https://www.linkedin.com/in/miles-m-wright) [@Miles818](https://github.com/Miles818)

[Mitchel Severe](https://www.linkedin.com/in/misevere/) [@mitchelsevere](https://github.com/mitchelsevere)
Expand Down Expand Up @@ -184,6 +197,8 @@ How to use

[William Yoon](https://www.linkedin.com/in/williamdyoon/) [@williamdyoon](https://github.com/williamdyoon)

[Yuanji Huang](https://www.linkedin.com/in/yuanjihuang/) [@kr1spybacon](https://github.com/kr1spybacon)

## To Run Your Own Version

- **Fork** and **Clone** Repository.
Expand Down
Loading