Merge branch 'develop' into develop-preferences-test

Author: catarak

.env.example

@@ -22,6 +22,9 @@ ML5_LIBRARY_PASS=helloml5
 MOBILE_ENABLED=true
 MONGO_URL=mongodb://localhost:27017/p5js-web-editor
 PORT=8000
+PREVIEW_PORT=8002
+EDITOR_URL=http://localhost:8000
+PREVIEW_URL=http://localhost:8002
 S3_BUCKET=<your-s3-bucket>
 S3_BUCKET_URL_BASE=<alt-for-s3-url>
 SESSION_SECRET=whatever_you_want_this_to_be_it_only_matters_for_production

.github/CODE_OF_CONDUCT.md

@@ -1,24 +1,51 @@
-# p5.js Code of Conduct
+## [p5.js community statement](http://p5js.org/community/)
+
+p5.js is a community interested in exploring the creation of art and design with technology.
+
+We are a community of, and in solidarity with, people from every gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, disability, class, religion, culture, subculture, political opinion, age, skill level, occupation, and background. We acknowledge that not everyone has the time, financial means, or capacity to actively participate, but we recognize and encourage involvement of all kinds. We facilitate and foster access and empowerment. We are all learners.
+
+We like these hashtags: #noCodeSnobs (because we value community over efficiency), #newKidLove (because we all started somewhere), #unassumeCore (because we don't assume knowledge), and #BlackLivesMatter (because of course).
+
+In practice:
+* We are not code snobs. We do not assume knowledge or imply there are things that somebody should know.
+* We insist on actively engaging with requests for feedback regardless of their complexity.
+* We welcome newcomers and prioritize the education of others. We strive to approach all tasks with the enthusiasm of a newcomer. Because we believe that newcomers are just as valuable in this effort as experts.
+* We consistently make the effort to actively recognize and validate multiple types of contributions.
+* We are always willing to offer help or guidance.
+
+In times of conflict:
+* We listen.
+* We clearly communicate while acknowledging other's feelings.
+* We admit when we're wrong, apologize, and accept responsibility for our actions.
+* We are continuously seeking to improve ourselves and our community.
+* We keep our community respectful and open.
+* We make everyone feel heard.
+* We are mindful and kind in our interactions.
+
+In the future:
+* The future is now.
+
+
+## p5.js Code of Conduct
 
 * **Be mindful of your language.** Any of the following behavior is unacceptable: 
   * Offensive comments related to gender identity and expression, sexual orientation, race, ethnicity, language, neuro-type, size, ability, class, religion, culture, subculture, political opinion, age, skill level, occupation, or background
   * Threats of violence
   * Deliberate intimidation
-  * Sexually explicit or violent material
+  * Sexually explicit or violent material that is not contextualized and preceded by a considerate warning 
   * Unwelcome sexual attention
   * Stalking or following
   * Or any other kinds of harassment
 
   Use your best judgement. If it will possibly make others uncomfortable, do not post it.
 
-* **Be respectful.** Disagreement is not an opportunity to attack someone else's thoughts or opinions. Although views may differ, remember to approach every situation with patience and care.
-* **Be considerate.** Think about how your contribution will affect others in the community.
+* **Be respectful.** Disagreement is not an opportunity to attack someone else's thoughts or opinions. Although views may differ, remember to approach every situation with patience and care. 
+* **Be considerate.** Think about how your contribution will affect others in the community. 
 * **Be open minded.** Embrace new people and new ideas. Our community is continually evolving and we welcome positive change.
 
 If you believe someone is violating the code of conduct, we ask that you report it by emailing [hello@p5js.org](mailto:hello@p5js.org). Please include your name and a description of the incident, and we will get back to you ASAP.
 
-Participants asked to stop any harassing behavior are expected to comply immediately. If a participant engages in harassing behavior, the p5.js Team may take any action they deem appropriate, up to and including expulsion from all p5.js spaces and identification of the participant as a harasser to other p5.js members or the general public.
-
-## Also
+Sometimes, participants violating the Code of Conduct are unaware that their behavior is harmful, and an open conversation clears things up to move forward. However, if a participant continues with the behavior, the p5.js team may take any action they deem appropriate, up to and including expulsion from all p5.js spaces and identification of the participant as a harasser to other p5.js members or the general public.
 
-* You can read our [community statement](http://p5js.org/community/) on our website.
+---
+This statement is licensed under a [Creative Commons license](https://creativecommons.org/licenses/by-sa/4.0/). Please feel free to share and remix with attribution.

.github/workflows/deploy.yml

@@ -20,6 +20,8 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
+        with:
+          ref: release
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to Docker Hub

.gitignore

@@ -6,7 +6,6 @@
 node_modules/
 npm-debug.log
 dump.rdb
-public/*
 static/dist/
 static/css/app.min.css
 dist/

.prettierrc

@@ -14,5 +14,6 @@
   "tabWidth": 2,
   "trailingComma": "none",
   "useTabs": false,
-  "quoteProps": "as-needed"
+  "quoteProps": "as-needed",
+  "endOfLine":"auto"
 }

Dockerfile

@@ -4,6 +4,7 @@ ENV APP_HOME=/usr/src/app \
 RUN mkdir -p $APP_HOME
 WORKDIR $APP_HOME
 EXPOSE 8000
+EXPOSE 8002
 
 FROM base as development
 ENV NODE_ENV development
@@ -15,6 +16,7 @@ COPY ./webpack ./webpack
 COPY client ./client
 COPY server ./server
 COPY translations/locales ./translations/locales
+COPY public ./public
 CMD ["npm", "start"]
 
 FROM development as build

client/__test__/mocks/fileMock.js renamed to client/__mocks__/fileMock.js

@@ -0,0 +1,28 @@
+import { enUS, es, ja, hi } from 'date-fns/locale';
+import i18n from '../i18n-test';
+
+export function languageKeyToLabel(lang) {
+  const languageMap = {
+    'en-US': 'English',
+    'es-419': 'Español',
+    ja: '日本語',
+    hi: 'हिन्दी'
+  };
+  return languageMap[lang];
+}
+
+export function languageKeyToDateLocale(lang) {
+  const languageMap = {
+    'en-US': enUS,
+    'es-419': es,
+    ja,
+    hi
+  };
+  return languageMap[lang];
+}
+
+export function currentDateLocale() {
+  return languageKeyToDateLocale(i18n.language);
+}
+
+export default i18n;

client/__mocks__/i18n.js

@@ -0,0 +1 @@
+module.exports = {};

client/__mocks__/styleMock.js

@@ -6,8 +6,12 @@ import { Link } from 'react-router';
 import { remSize, prop } from '../theme';
 
 const kinds = {
+  primary: 'primary',
+  secondary: 'secondary'
+};
+
+const displays = {
   block: 'block',
-  icon: 'icon',
   inline: 'inline'
 };
 
@@ -16,52 +20,57 @@ const kinds = {
 // general global styles
 const StyledButton = styled.button`
   &&& {
+    font-weight: bold;
     display: flex;
     justify-content: center;
     align-items: center;
 
     width: max-content;
     text-decoration: none;
 
-    color: ${prop('Button.default.foreground')};
-    background-color: ${prop('Button.default.background')};
+    color: ${({ kind }) => prop(`Button.${kind}.default.foreground`)};
+    background-color: ${({ kind }) =>
+      prop(`Button.${kind}.default.background`)};
     cursor: pointer;
-    border: 2px solid ${prop('Button.default.border')};
+    border: 2px solid ${({ kind }) => prop(`Button.${kind}.default.border`)};
     border-radius: 2px;
     padding: ${remSize(8)} ${remSize(25)};
     line-height: 1;
 
     svg * {
-      fill: ${prop('Button.default.foreground')};
+      fill: ${({ kind }) => prop(`Button.${kind}.default.foreground`)};
     }
 
     &:hover:not(:disabled) {
-      color: ${prop('Button.hover.foreground')};
-      background-color: ${prop('Button.hover.background')};
-      border-color: ${prop('Button.hover.border')};
+      color: ${({ kind }) => prop(`Button.${kind}.hover.foreground`)};
+      background-color: ${({ kind }) =>
+        prop(`Button.${kind}.hover.background`)};
+      border-color: ${({ kind }) => prop(`Button.${kind}.hover.border`)};
 
       svg * {
-        fill: ${prop('Button.hover.foreground')};
+        fill: ${({ kind }) => prop(`Button.${kind}.hover.foreground`)};
       }
     }
 
     &:active:not(:disabled) {
-      color: ${prop('Button.active.foreground')};
-      background-color: ${prop('Button.active.background')};
+      color: ${({ kind }) => prop(`Button.${kind}.active.foreground`)};
+      background-color: ${({ kind }) =>
+        prop(`Button.${kind}.active.background`)};
 
       svg * {
-        fill: ${prop('Button.active.foreground')};
+        fill: ${({ kind }) => prop(`Button.${kind}.active.foreground`)};
       }
     }
 
     &:disabled {
-      color: ${prop('Button.disabled.foreground')};
-      background-color: ${prop('Button.disabled.background')};
-      border-color: ${prop('Button.disabled.border')};
+      color: ${({ kind }) => prop(`Button.${kind}.disabled.foreground`)};
+      background-color: ${({ kind }) =>
+        prop(`Button.${kind}.disabled.background`)};
+      border-color: ${({ kind }) => prop(`Button.${kind}.disabled.border`)};
       cursor: not-allowed;
 
       svg * {
-        fill: ${prop('Button.disabled.foreground')};
+        fill: ${({ kind }) => prop(`Button.${kind}.disabled.foreground`)};
       }
     }
 
@@ -108,35 +117,38 @@ const StyledIconButton = styled.button`
     height: ${remSize(32)}px;
     text-decoration: none;
 
-    color: ${prop('Button.default.foreground')};
-    background-color: ${prop('Button.hover.background')};
+    color: ${({ kind }) => prop(`Button.${kind}.default.foreground`)};
+    background-color: ${({ kind }) => prop(`Button.${kind}.hover.background`)};
     cursor: pointer;
     border: 1px solid transparent;
     border-radius: 50%;
     padding: ${remSize(8)} ${remSize(25)};
     line-height: 1;
 
     &:hover:not(:disabled) {
-      color: ${prop('Button.hover.foreground')};
-      background-color: ${prop('Button.hover.background')};
+      color: ${({ kind }) => prop(`Button.${kind}.hover.foreground`)};
+      background-color: ${({ kind }) =>
+        prop(`Button.${kind}.hover.background`)};
 
       svg * {
-        fill: ${prop('Button.hover.foreground')};
+        fill: ${({ kind }) => prop(`Button.${kind}.hover.foreground`)};
       }
     }
 
     &:active:not(:disabled) {
-      color: ${prop('Button.active.foreground')};
-      background-color: ${prop('Button.active.background')};
+      color: ${({ kind }) => prop(`Button.${kind}.active.foreground`)};
+      background-color: ${({ kind }) =>
+        prop(`Button.${kind}.active.background`)};
 
       svg * {
-        fill: ${prop('Button.active.foreground')};
+        fill: ${({ kind }) => prop(`Button.${kind}.active.foreground`)};
       }
     }
 
     &:disabled {
-      color: ${prop('Button.disabled.foreground')};
-      background-color: ${prop('Button.disabled.background')};
+      color: ${({ kind }) => prop(`Button.${kind}.disabled.foreground`)};
+      background-color: ${({ kind }) =>
+        prop(`Button.${kind}.disabled.background`)};
       cursor: not-allowed;
     }
 
@@ -151,10 +163,12 @@ const StyledIconButton = styled.button`
  */
 const Button = ({
   children,
+  display,
   href,
   kind,
   iconBefore,
   iconAfter,
+  iconOnly,
   'aria-label': ariaLabel,
   to,
   type,
@@ -170,16 +184,19 @@ const Button = ({
   );
   let StyledComponent = StyledButton;
 
-  if (kind === kinds.inline) {
+  if (display === displays.inline) {
     StyledComponent = StyledInlineButton;
-  } else if (kind === kinds.icon) {
+  }
+
+  if (iconOnly) {
     StyledComponent = StyledIconButton;
   }
 
   if (href) {
     return (
       <StyledComponent
         kind={kind}
+        display={display}
         as="a"
         aria-label={ariaLabel}
         href={href}
@@ -194,6 +211,7 @@ const Button = ({
     return (
       <StyledComponent
         kind={kind}
+        display={display}
         as={Link}
         aria-label={ariaLabel}
         to={to}
@@ -205,7 +223,13 @@ const Button = ({
   }
 
   return (
-    <StyledComponent kind={kind} aria-label={ariaLabel} type={type} {...props}>
+    <StyledComponent
+      kind={kind}
+      display={display}
+      aria-label={ariaLabel}
+      type={type}
+      {...props}
+    >
       {content}
     </StyledComponent>
   );
@@ -214,16 +238,19 @@ const Button = ({
 Button.defaultProps = {
   children: null,
   disabled: false,
+  display: displays.block,
   iconAfter: null,
   iconBefore: null,
-  kind: kinds.block,
+  iconOnly: false,
+  kind: kinds.primary,
   href: null,
   'aria-label': null,
   to: null,
   type: 'button'
 };
 
 Button.kinds = kinds;
+Button.displays = displays;
 
 Button.propTypes = {
   /**
@@ -235,6 +262,10 @@ Button.propTypes = {
     If the button can be activated or not
   */
   disabled: PropTypes.bool,
+  /**
+   * The display type of the button—inline or block
+   */
+  display: PropTypes.string,
   /**
    * SVG icon to place after child content
    */
@@ -243,6 +274,10 @@ Button.propTypes = {
    * SVG icon to place before child content
    */
   iconBefore: PropTypes.element,
+  /**
+   * If the button content is only an SVG icon
+   */
+  iconOnly: PropTypes.bool,
   /**
    * The kind of button - determines how it appears visually
    */

client/common/Button.jsx

@@ -59,7 +59,7 @@ export const ButtonWithIconAfter = () => (
 );
 
 export const InlineButtonWithIconAfter = () => (
-  <Button iconAfter={<DropdownArrowIcon />} kind={Button.kinds.inline}>
+  <Button iconAfter={<DropdownArrowIcon />} display={Button.displays.inline}>
     File name
   </Button>
 );
@@ -68,6 +68,6 @@ export const InlineIconOnlyButton = () => (
   <Button
     aria-label="Add to collection"
     iconBefore={<PlusIcon />}
-    kind={Button.kinds.inline}
+    display={Button.displays.inline}
   />
 );