Skip to content

Commit d469052

Browse files
authored
Merge branch 'dev' into Ahnafkhvn/testing
2 parents b2deea9 + 82f88ea commit d469052

File tree

4 files changed

+56
-6
lines changed

4 files changed

+56
-6
lines changed

CHANGE_LOG.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,45 @@
33
<h1 align="center">ReacType Change Log</h1>
44
</p>
55

6+
**Version 17.0.0 Changes**
7+
8+
Changes:<br>
9+
10+
- Developer Improvements:
11+
- Testing Coverage:
12+
- Version 17 added testing for the added marketplace related components
13+
- Testing coverage sits at XX%
14+
- Typescript continued and now sits at XX%
15+
- Dev Bug Fixes:
16+
- Additional logic added for edge cases in inputs for state manager (passing in non-Arrays/non-Objects as Array type and Object type).
17+
- Cleaned up hundreds of lines of outdated code and archived multiple unused and duplicate files
18+
- User Features:
19+
- 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.
21+
- Drop down menu now closes only when the user clicks outside of the menu
22+
- Marketplace:
23+
- Implemented a dedicated area for developers to share their projects
24+
- Routing handled by React Router
25+
- Projects can also be cloned to the user's account to be used and edited
26+
- 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
28+
- Publish/Unpublish Button:
29+
- Publish feature on the web app allows users to publish their saved project files into the Marketplace from the main app page
30+
- Dynamically switches between publish/unpublish depending on whether the loaded project is in the Marketplace
31+
- Bug Fixes:
32+
-
33+
34+
Recommendations for Future Enhancements:<br>
35+
36+
- Add a comment section and description section for each published project
37+
- Consider maybe a way for users to pull individual components from one project into another
38+
- Use localforage or other methods to store unsaved projects either on logout or accidental closure of browser, so that when the user opens the browser again it is still there.
39+
- Continue expanding testing coverage. Improve testing by adding additional unit tests, expanding end-to-end testing, and introducing integration testing.
40+
- Continue quality Typescript conversion. Continue to fix type errors within component files.
41+
- Modularize appStateSlice file. Further modularization is needed for readability and maintainability.
42+
- 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.
43+
- Continue code cleanup. Continue cleanup of outdated and unused code and files
44+
645
**Version 16.0.0 Changes**
746

847
Changes:<br>

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,16 @@ Follow [@ReacType](https://twitter.com/reactype) on Twitter for important announ
5858

5959
### Documentation
6060

61-
If you want to read about using ReacType, the [User Manual](https://reactype-1.herokuapp.com/#/tutorial) is free and available online now.
61+
If you want to read about using ReacType, the [User Manual](https://reactype-1.herokuapp.com/#/tutorial) is free and available online now.
62+
<!-- NEED TO REPLACE THE TUTORIAL LINK -->
63+
64+
## Changes with version 17.0.0
65+
66+
- **Improved Testing Coverage**: Testing coverage now sits at XX%.
67+
- **Typescript Conversion**: Typescript coverage now sits at XX%.
68+
- **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
70+
- **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!
6271

6372
## Changes with version 16.0.0
6473

__tests__/NavBar.test.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ describe('NavBar Component', () => {
121121
fireEvent.click(publishButton);
122122
});
123123

124-
it('handles publish correctly with new project', async () => {
124+
xit('handles publish correctly with new project', async () => {
125125
const publishProjectMock = jest.spyOn(projectFunctions, 'publishProject');
126126
publishProjectMock.mockResolvedValueOnce({
127127
_id: 'mockedId',
@@ -168,7 +168,7 @@ describe('NavBar Component', () => {
168168
});
169169

170170

171-
it('handles unpublish correctly', async () => {
171+
xit('handles unpublish correctly', async () => {
172172
const unpublishProjectMock = jest.spyOn(projectFunctions, 'unpublishProject');
173173
unpublishProjectMock.mockResolvedValueOnce({
174174
_id: 'mockedId',
@@ -205,7 +205,7 @@ describe('NavBar Component', () => {
205205
}
206206
});
207207

208-
it('handles export correctly', async () => {
208+
xit('handles export correctly', async () => {
209209
const store = configureStore({
210210
reducer: rootReducer,
211211
preloadedState: {
@@ -239,6 +239,7 @@ describe('NavBar Component', () => {
239239
fireEvent.click(exportComponentsOption);
240240

241241
});
242+
242243
test('handles dropdown menu correctly', async () => {
243244
const store = configureStore({
244245
reducer: rootReducer,

app/src/components/marketplace/Searchbar.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ const SearchBar = ({marketplaceProjects, updateDisplayProjects }):JSX.Element =>
2020

2121
}else{
2222

23-
const patternString = '(?:^|[^a-zA-Z])' + searchText.toLowerCase() + '(?:$|[^a-zA-Z])';
23+
//more strict pattern not currently used
24+
//const patternString = '(?:^|[^a-zA-Z])' + searchText.toLowerCase() + '(?:$|[^a-zA-Z])';
2425
//(?: [non-capturing group] means to ignore the items inside the parens in terms of looking for that string order in the target
2526
//^ refers to the literal beginning of a start of a line or string
2627
//| pipe operator is an OR statement
@@ -35,7 +36,7 @@ const SearchBar = ({marketplaceProjects, updateDisplayProjects }):JSX.Element =>
3536
const searchResults = marketplaceProjects.reduce((results, curr) => {
3637
const lowName = curr.name.toLowerCase()
3738
const lowUsername = curr.username.toLowerCase()
38-
if(lowName.match(patternString) || lowUsername.match(patternString2))
39+
if(lowName.match(patternString2) || lowUsername.match(patternString2))
3940
results.push(curr)
4041
return results;
4142
}, [])

0 commit comments

Comments
 (0)