Skip to content

Commit 2fd7ed6

Browse files
authored
Merge pull request #44 from oslabs-beta/Hernan/alerts
Hernan/alerts
2 parents ca73494 + 1f919ca commit 2fd7ed6

File tree

8 files changed

+15
-120
lines changed

8 files changed

+15
-120
lines changed

CHANGE_LOG.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,16 @@ Changes:<br>
1717
- Cleaned up hundreds of lines of outdated code and archived multiple unused and duplicate files
1818
- User Features:
1919
- UI updated with a modern style for a better developer experience
20-
- Added many user feedback alerts for better experience including alerts for when projects are published, cloned, deleted, context created, or custom component created.
20+
- Added many user feedback alerts for better experience including alerts for when projects are published, cloned, deleted, HTML custom tags are created, context created, or custom component created.
21+
- Built a specific buttons menu that individually display the HTML elements, reusable components created, and join room option.
22+
- Redesigned the state manager panel option to be readable and functional.
2123
- Drop down menu now closes only when the user clicks outside of the menu
2224
- Marketplace:
2325
- Implemented a dedicated area for developers to share their projects
2426
- Routing handled by React Router
25-
- Projects can also be cloned to the user's account to be used and edited
27+
- Projects can also be cloned to the user's account to be used and edited with the addition of a button
2628
- Added search functionality to search by username and project name
27-
- Separate section in the Saved Projects and Delete Projects modal in the Manage Project menu for Downloaded Projects from the Marketplace
29+
- Included a separate section in the Saved Projects and Delete Projects modal in the Manage Project menu for cloned projects from the Marketplace
2830
- Publish/Unpublish Button:
2931
- Publish feature on the web app allows users to publish their saved project files into the Marketplace from the main app page
3032
- Dynamically switches between publish/unpublish depending on whether the loaded project is in the Marketplace
@@ -40,6 +42,7 @@ Recommendations for Future Enhancements:<br>
4042
- Continue quality Typescript conversion. Continue to fix type errors within component files.
4143
- Modularize appStateSlice file. Further modularization is needed for readability and maintainability.
4244
- Solve residual bugs. Undo & Redo buttons on customization page not functioning as expected. Backend bugs persist as seen in the console when running the dev environment. Resolve electron app functionality to coincide with web app functionality.
45+
- Take a look at the join room functionality using web sockets in order to allow users to collaborate on the same project at the same time.
4346
- Continue code cleanup. Continue cleanup of outdated and unused code and files
4447

4548
**Version 16.0.0 Changes**

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ If you want to read about using ReacType, the [User Manual](https://reactype-1.h
6666
- **Improved Testing Coverage**: Testing coverage now sits at XX%.
6767
- **Typescript Conversion**: Typescript coverage now sits at XX%.
6868
- **UI Overhaul**: Upgraded the UI of the application with a more modern style and better developer experience
69-
- **Marketplace Feature**: Implemented a dedicated area for developers to share their projects
69+
- **Marketplace Feature**: Implemented a dedicated area for developers to share their projects,
7070
- **And more:** See [change log](https://github.com/open-source-labs/ReacType/blob/master/CHANGE_LOG.md) for more details on what was changed from the previous versions as well as plans for upcoming features!
7171

7272
## Changes with version 16.0.0

app/src/components/StateManagement/CreateTab/components/TableParentProps.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const useStyles = makeStyles({
128128
color: 'white'
129129
},
130130
'& .MuiTablePagination-root': {
131-
color: 'rbga(0,0,0,0.54)'
131+
color: 'white'
132132
}
133133
},
134134
themeDark: {

app/src/components/StateManagement/DisplayTab/DataTable.tsx

Lines changed: 0 additions & 111 deletions
This file was deleted.

app/src/components/StateManagement/DisplayTab/DisplayContainer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ function DisplayContainer({ data, props }) { // "data" is referring to component
3737
<Divider orientation="vertical" variant="middle" flexItem />
3838
<Grid item>
3939
<Typography
40-
style={{ color: 'black' }}
40+
style={{ color: 'white' }}
4141
variant="subtitle2"
4242
gutterBottom
4343
align="center"
4444
>
4545
Click on a component in the graph to see its state!
4646
</Typography>
4747
<Typography
48-
style={{ color: 'black' }}
48+
style={{ color: 'white' }}
4949
variant="h6"
5050
gutterBottom
5151
align="center"

app/src/components/right/DeleteProjects.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
7878
</ListItem>
7979
))}
8080
</List>
81-
<DialogTitle style={{ color: "#000" }} id="project-dialog-title"> MP Projects</DialogTitle>
81+
<DialogTitle style={{ color: "#000" }} id="project-dialog-title"> Marketplace Projects</DialogTitle>
8282
<List style={{ color: "#000" }}>
8383
{projects.filter((project: any) => project.forked === true).map((project: any, index: number) => (
8484
<ListItem

app/src/components/right/OpenProjects.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function ProjectsDialog(props: ProjectDialogProps) {
6969
)}
7070
</List>
7171
{/* this section handles the projects cloned from the marketplace */}
72-
<DialogTitle style={{ color: "#000" }} id="project-dialog-title">MP Projects</DialogTitle>
72+
<DialogTitle style={{ color: "#000" }} id="project-dialog-title">Marketplace Projects</DialogTitle>
7373
<List style={{ color: "#000" }}>
7474
{projects.filter((project: any) => project.forked === true).map((project: any, index: number) => (
7575
<ListItem

app/src/public/styles/style.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ body {
2626
overflow: hidden;
2727
height: 100vh;
2828
width: 100vw;
29+
background-color:white
2930
}
3031

3132
h4 {
@@ -692,6 +693,8 @@ NAVBAR
692693
width: 16%;
693694
}
694695

696+
697+
695698
/*
696699
/////////////////////////////////////////////////
697700
CANVAS WINDOW

0 commit comments

Comments
 (0)