Merge pull request #11 from yutingwu4/ui_final_update

UI Left Panel and Light/Dark Mode Updates

Author: aw2934

README.md

@@ -5,53 +5,54 @@
 
 [![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)
-![Release: 4.0](https://img.shields.io/badge/Release-4.0-white)
+// ADD RELEASE ICON HERE
 
-**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** 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 the user to _visualize_ their application architecture dynamically, employing a _drag-and-drop canvas display_ and a _real-time component code preview_. The user 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.
+**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 4.0:**
 
-- View dynamically created components/HTML elements in the component tree
-- View Typescript syntax for React
-- Code preview is fully editable (make changes before exporting project)
-- Create custom HTML elements
-- Improved UI experience
-- Implemented a comprehensive tutorial page with images
+**New with version 5.0:**
+
+- Elements may be added to components in any location, rather than only at the bottom
+- Compatability 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 4.0.0.exe.
+- **Windows users**: Install the application by running ReacType Setup 5.0.0.exe.
 
 - **Linux users**: Run the application as a super user in order to read and write files.
 
 ![Gif of adding](https://i.imgur.com/Ioqkr00.gif)
 
 ### How to use
 
-- **Sign-in page**: Sign up for an account, authenticate via Github/Facebook, or just continue as a guest.
-- **Tutorial**: Click ‘Tutorial’ from the help tab’s drop-down menu of the help tab at the top left of the application to view a tutorial page.
-- **Start a project (only after authenticating)**: After you authenticate via Github/Facebook, create a new project, and select whether you want your project to be a Next.js or a classic React project. Also, save your project so that you can return to it at a later time.
-- **Add Components**: Create components on the left panel. Components can be associated with a route, or they can be used within other components.
-- **Delete Components**: Delete components after focusing on them from the right panel. Be careful when deleting components because all instances of the component will be deleted within the application/project.
-- **Add Custom Elements**: Create custom elements or add HTML elements that you are more familiar with into the application. Once the project is exported, the HTML tags generated in the code preview will function the way the label is supposed to work. You can create functionality for custom elements in a new file. The tutorial on HTML Elements explains more on how to do this.
-- **Delete Elements**: Delete elements by clicking on the ‘X’ button next to the element. Be careful when deleting elements because all elements will be deleted within the application/project.
-- **Create instances on the canvas**: Each component has its canvas. Create an example of an element or HTML element by dragging it onto the canvas. Div components are arbitrarily nestable and useful for complex layouts. Next.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**: Click on an element on the canvas to update basic styling using the right functions. As you create new instances and add styling, watch as your code dynamically generates in the bottom panel.
-- **User preference features**: Select a theme for the code preview to your liking and change the application’s lighting.
-- **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’s mocked on the canvas.
+- **Sign-in page**: Sign up for an account, or just continue as a guest. Registered users enjoy additional project-saving functionality.
+- **Tutorial**: Click ‘Tutorial’ from the Help tab’s dropdown menu (at the top left of the application) to view a tutorial.
+- **Start a project (only after registration)**: Registered users can create a new project and select whether they want their project to be a Next.js, Gatsby.js, or classic React project. Also, registered users can save projects to return to them at a later time.
+- **Add Components**: Create components on the right panel. Components can be associated with a route, or they can be used within other components.
+- **Delete Components**: Delete components after focusing on them in the right panel. Be careful when deleting components: Upon deletion, all instances of the component will be removed within the application/project.
+- **Add Custom Elements**: Create custom elements or add provided HTML elements into the application. Once the project is exported, the HTML tags generated in the code preview will function as expected. You can specify functionality for custom elements in the code preview. The tutorial on HTML Elements explains more on how to do this.
+- **Delete Custom HTML Elements**: Delete custom HTML elements by clicking on the ‘X’ button adjacent to the element. Be careful when deleting custom elements: All instances of the element will be deleted within the application/project.
+- **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.
+- **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.
 
 #### Contributors
 
 [Aaron Bumanglag](https://www.linkedin.com/in/akbuma) [@akbuma](https://github.com/akbuma)
 
 [Adam Singer](https://linkedin.com/in/adsing) [@spincycle01](https://github.com/spincycle01)
 
+[Alex Wolinsky](https://www.linkedin.com/in/alex-wolinsky-80ab591b2/) [@aw2934](https://github.com/aw2934/)
+
 [Andrew Cho](https://www.linkedin.com/in/andrewjcho84/) [@andrewjcho84](https://github.com/andrewjcho84)
 
 [Brian Han](https://www.linkedin.com/in/brianjisoohan/) [@brianjshan](https://github.com/brianjshan)

app/src/components/bottom/BottomTabs.tsx

@@ -87,9 +87,9 @@ const BottomTabs = () => {
 const useStyles = makeStyles(theme => ({
   root: {
     flexGrow: 1,
-    backgroundColor: '#3ea3d6',
+    backgroundColor: '#186BB4',
     height: '100%',
-    color: '#091921',
+    color: '#E8E8E8',
     boxShadow: '0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23)',
 
   },
@@ -104,7 +104,7 @@ const useStyles = makeStyles(theme => ({
     minHeight: '50%'
   },
   tabsIndicator: {
-    backgroundColor: '#545E75'
+    backgroundColor: 'white',
   },
   tabRoot: {
     textTransform: 'initial',
@@ -133,7 +133,7 @@ const useStyles = makeStyles(theme => ({
       fontWeight: theme.typography.fontWeightMedium
     },
     '&:focus': {
-      color: 'white'
+      color: 'white',
     }
   },
   tabSelected: {},
@@ -157,7 +157,7 @@ const useStyles = makeStyles(theme => ({
     backgroundColor: 'rgba(255,255,255,0.15)',
     // width: '300px',
     // width: '100%',
-    color: '#fff'
+    color: 'white'
   }
 }));
 

app/src/components/left/HTMLItem.tsx

@@ -13,7 +13,7 @@ const buttonClasses =
 
 const useStyles = makeStyles({
   HTMLPanelItem: {
-    color: '#77b6ed',
+    color: '#186BB4',
     height: '35px',
     width: '90px',
     fontSize: '80%',
@@ -23,22 +23,31 @@ const useStyles = makeStyles({
     textAlign: 'center',
     margin: '7px auto',
     marginLeft: '30px',
-    // border: '2px solid rgba(225, 225, 225, 1.0)',
     borderRadius: '25px',
     cursor: 'grab',
     '& > h3': {
       display: 'inline-block',
     }
+  },
+  lightThemeFontColor: {
+    color: '#186BB4'
+  },
+  darkThemeFontColor: {
+    color: '#fff'
   }
+  
 });
 
-const HTMLItem: React.FC<{
+const HTMLItem : React.FC<{
   name: string;
   id: number;
   Icon: any;
   handleDelete: (id: number) => void;
-}> = ({ name, id, Icon, handleDelete }) => {
+  isThemeLight: boolean;
+}> = ({ name, id, Icon, handleDelete, isThemeLight }) => {
+  
   const classes = useStyles();
+  
   const [modal, setModal] = useState(null);
   const [{ isDragging }, drag] = useDrag({
     item: {
@@ -113,20 +122,18 @@ const HTMLItem: React.FC<{
 
   return (
     <Grid item xs={5} key={`html-g${name}`}>
-      <div ref={drag} className={classes.HTMLPanelItem} id="HTMLItem">
+      { id <= 11 &&
+      <div ref={drag} className={isThemeLight ? `${classes.HTMLPanelItem} ${classes.lightThemeFontColor}` : `${classes.HTMLPanelItem} ${classes.darkThemeFontColor}`} id="HTMLItem">
+        <h3>{name}</h3>
+        </div>}
+      {id > 11 &&
+      <span id="customHTMLElement">
+      <div ref={drag} className={isThemeLight ? `${classes.HTMLPanelItem} ${classes.lightThemeFontColor}` : `${classes.HTMLPanelItem} ${classes.darkThemeFontColor}`} id="HTMLItem">
         <h3>{name}</h3>
-        {/* <span
-          style={{
-            verticalAlign: 'middle',
-            display: 'inline-block',
-            // marginLeft: '5px'
-          }}
-        >
-          {Icon && <Icon />}
-        </span> */}
-        {id > 11 &&
-        <button className={buttonClasses} id="newElement" onClick={() => deleteAllInstances(id)} > X </button> }
       </div>
+        <button id="newElement" style={{color: isThemeLight ? '#186BB4' : 'white' }} onClick={() => deleteAllInstances(id)} >X</button>
+     </span>
+      }
       {modal}
     </Grid>
   );