Merge branch 'develop' into fix/keyword-syntax-highlighting-beginClip

Author: raclim

.storybook/main.js

@@ -4,7 +4,8 @@ const config = {
   addons: [
     '@storybook/addon-links',
     '@storybook/addon-essentials',
-    '@storybook/addon-interactions'
+    '@storybook/addon-interactions',
+    '@storybook/addon-mdx-gfm'
   ],
   framework: {
     name: '@storybook/react-webpack5',

README.md

@@ -22,8 +22,6 @@ Make your first sketch in the [p5.js Editor](https://editor.p5js.org/)! Learn mo
 If you have found a bug in the p5.js Web Editor, you can file it under the ["issues" tab](https://github.com/processing/p5.js-web-editor/issues). You can also request new features here. A set of templates for reporting issues and requesting features are provided to assist you (and us!). The p5.js Editor is maintained mostly by volunteers, so we thank you for your patience as we try to address your issues as soon as we can. Please post bugs and feature requests in the correct repository if you can:
 
 * p5.js library: [https://github.com/processing/p5.js/issues](https://github.com/processing/p5.js/issues)
-* p5.accessibility: [https://github.com/processing/p5.accessibility/issues](https://github.com/processing/p5.accessibility/issues)
-* p5.sound: [https://github.com/processing/p5.js-sound/issues](https://github.com/processing/p5.js-sound/issues)
 * p5.js website: [https://github.com/processing/p5.js-website/issues](https://github.com/processing/p5.js-website/issues)
 
 

client/components/createRedirectWithUsername.jsx

@@ -1,4 +1,4 @@
-import { Meta } from '@storybook/addon-docs/blocks';
+import { Meta } from '@storybook/blocks';
 
 <Meta title=" |Intro" />
 

client/index.stories.mdx

@@ -1,4 +1,4 @@
-import { React, useState } from 'react';
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Form, Field } from 'react-final-form';
 import { useDispatch } from 'react-redux';

client/modules/User/components/SignupForm.jsx

@@ -17,13 +17,7 @@ import NewPasswordView from './modules/User/pages/NewPasswordView';
 import AccountView from './modules/User/pages/AccountView';
 import CollectionView from './modules/User/pages/CollectionView';
 import DashboardView from './modules/User/pages/DashboardView';
-import RedirectToUser from './components/createRedirectWithUsername';
 import { getUser } from './modules/User/actions';
-import {
-  userIsAuthenticated,
-  userIsNotAuthenticated,
-  userIsAuthorized
-} from './utils/auth';
 
 /**
  *  `params` is no longer a top-level route component prop in v4.
@@ -51,25 +45,19 @@ Route.propTypes = {
 const routes = (
   <Switch>
     <Route exact path="/" component={IDEView} />
-    <Route path="/login" component={userIsNotAuthenticated(LoginView)} />
-    <Route path="/signup" component={userIsNotAuthenticated(SignupView)} />
+    <Route path="/login" component={LoginView} />
+    <Route path="/signup" component={SignupView} />
     <Route
       path="/reset-password/:reset_password_token"
       component={NewPasswordView}
     />
-    <Route
-      path="/reset-password"
-      component={userIsNotAuthenticated(ResetPasswordView)}
-    />
+    <Route path="/reset-password" component={ResetPasswordView} />
     <Route path="/verify" component={EmailVerificationView} />
     <Route path="/projects/:project_id" component={IDEView} />
     <Route path="/:username/full/:project_id" component={FullView} />
     <Route path="/full/:project_id" component={FullView} />
 
-    <Route
-      path="/:username/assets"
-      component={userIsAuthenticated(userIsAuthorized(DashboardView))}
-    />
+    <Route path="/:username/assets" component={DashboardView} />
     <Route
       path="/:username/sketches/:project_id/add-to-collection"
       component={IDEView}
@@ -81,18 +69,10 @@ const routes = (
       component={CollectionView}
     />
     <Route path="/:username/collections" component={DashboardView} />
-
-    <Route
-      path="/sketches"
-      component={() => <RedirectToUser url="/:username/sketches" />}
-    />
-    <Route
-      path="/assets"
-      component={() => <RedirectToUser url="/:username/assets" />}
-    />
-    <Route path="/account" component={userIsAuthenticated(AccountView)} />
+    <Route path="/sketches" />
+    <Route path="/assets" />
+    <Route path="/account" component={AccountView} />
     <Route path="/about" component={IDEView} />
-
     <Route path="/privacy-policy" component={PrivacyPolicy} />
     <Route path="/terms-of-use" component={TermsOfUse} />
     <Route path="/code-of-conduct" component={CodeOfConduct} />

client/routes.jsx

@@ -1,6 +1,6 @@
 {
   "name": "p5.js-web-editor",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "description": "The web editor for p5.js.",
   "scripts": {
     "clean": "rimraf dist",
@@ -96,16 +96,17 @@
     "@babel/plugin-transform-react-inline-elements": "^7.14.5",
     "@babel/preset-env": "^7.14.7",
     "@babel/preset-react": "^7.14.5",
-    "@storybook/addon-actions": "^7.0.24",
-    "@storybook/addon-docs": "^7.0.24",
-    "@storybook/addon-essentials": "^7.0.27",
-    "@storybook/addon-interactions": "^7.0.27",
-    "@storybook/addon-links": "^5.3.21",
-    "@storybook/addons": "^5.3.21",
-    "@storybook/blocks": "^7.0.27",
-    "@storybook/react": "^7.0.24",
-    "@storybook/react-webpack5": "^7.0.27",
-    "@storybook/testing-library": "^0.0.14-next.2",
+    "@storybook/addon-actions": "^7.6.8",
+    "@storybook/addon-docs": "^7.6.8",
+    "@storybook/addon-essentials": "^7.6.8",
+    "@storybook/addon-interactions": "^7.6.8",
+    "@storybook/addon-links": "^7.6.8",
+    "@storybook/addon-mdx-gfm": "^7.6.8",
+    "@storybook/addons": "^7.6.8",
+    "@storybook/blocks": "^7.6.8",
+    "@storybook/react": "^7.6.8",
+    "@storybook/react-webpack5": "^7.6.8",
+    "@storybook/testing-library": "^0.2.2",
     "@svgr/webpack": "^6.2.1",
     "@testing-library/jest-dom": "^5.15.0",
     "@testing-library/react": "^12.1.2",
@@ -121,7 +122,7 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-react": "^7.24.0",
-    "eslint-plugin-storybook": "^0.6.12",
+    "eslint-plugin-storybook": "^0.6.15",
     "file-loader": "^6.2.0",
     "husky": "^4.3.8",
     "jest": "^27.3.1",
@@ -140,8 +141,8 @@
     "rimraf": "^2.7.1",
     "sass": "^1.66.1",
     "sass-loader": "^12.6.0",
-    "storybook": "^7.0.27",
-    "storybook-addon-theme-playground": "^2.2.0",
+    "storybook": "^7.6.8",
+    "storybook-addon-theme-playground": "^3.1.0",
     "style-loader": "^3.3.1",
     "terser-webpack-plugin": "^5.3.1",
     "webpack-cli": "^4.9.2",

client/utils/auth.js

@@ -76,11 +76,17 @@ router.get('/login', (req, res) => {
 });
 
 router.get('/reset-password', (req, res) => {
-  res.send(renderIndex());
+  if (req.user) {
+    return res.redirect('/account');
+  }
+  return res.send(renderIndex());
 });
 
 router.get('/reset-password/:reset_password_token', (req, res) => {
-  res.send(renderIndex());
+  if (req.user) {
+    return res.redirect('/account');
+  }
+  return res.send(renderIndex());
 });
 
 router.get('/verify', (req, res) => {
@@ -89,18 +95,18 @@ router.get('/verify', (req, res) => {
 
 router.get('/sketches', (req, res) => {
   if (req.user) {
-    res.send(renderIndex());
-  } else {
-    res.redirect('/login');
+    const { username } = req.user;
+    return res.redirect(`/${username}/sketches`);
   }
+  return res.redirect('/login');
 });
 
 router.get('/assets', (req, res) => {
   if (req.user) {
-    res.send(renderIndex());
-  } else {
-    res.redirect('/login');
+    const { username } = req.user;
+    return res.redirect(`/${username}/assets`);
   }
+  return res.redirect('/login');
 });
 
 router.get('/:username/assets', async (req, res) => {