Merge branch 'master' of https://github.com/popcodeorg/popcode

Author: pwjablonski

locales/en/translation.json

@@ -1,21 +1,17 @@
 {
   "top-bar": {
     "create-snapshot": "Snapshot",
+    "export-gist": "Export Gist",
+    "export-repo": "Export Repo",
     "libraries": "Libraries",
     "load-project": "My Projects",
     "new-project": "New Project",
+    "send-feedback": "Send Feedback",
     "session": {
       "log-in-prompt": "Log in to save",
       "log-out-prompt": "Log out"
     }
   },
-  "dashboard": {
-    "menu": {
-      "export-gist": "Export Gist",
-      "send-feedback": "Send Feedback",
-      "export-repo": "Export Repo"
-    }
-  },
   "editors": {
     "help-text": "Type in your $t(languages.{{language}}) code here."
   },
@@ -51,7 +47,6 @@
   },
   "workspace": {
     "confirmations": {
-      "unload-unsaved": "If you leave the page, you will lose your work. To save your work, you must log in using your GitHub account.",
       "anonymous-gist-export": "Are you sure you want to export this gist anonymously? If you sign in before exporting, the gist will be added to your GitHub account."
     },
     "loading": "Loading…",

package.json

@@ -100,7 +100,6 @@
     "PrettyCSS": "^0.3.13",
     "ajv": "^5.2.2",
     "array-to-sentence": "^1.1.0",
-    "base64-js": "^1.0.2",
     "bowser": "^1.4.5",
     "brace": "^0.10.0",
     "bugsnag-js": "^3.0.1",
@@ -141,11 +140,12 @@
     "redux-logger": "^3.0.6",
     "redux-saga": "^0.15.3",
     "redux-saga-debounce-effect": "https://github.com/madewithlove/redux-saga-debounce-effect.git#v0.2.2",
+    "remark": "^8.0.0",
+    "remark-react": "^4.0.0",
     "reselect": "^3.0.1",
     "rxjs": "^5.0.2",
     "slowparse": "^1.1.4",
     "stylelint": "^8.0.0",
-    "text-encoding": "^0.6.0",
     "uuid": "^3.1.0",
     "void-elements": "^3.1.0"
   },

src/actions/clients.js

@@ -18,3 +18,5 @@ export const repoExportError = createAction('REPO_EXPORT_ERROR');
 export const repoExportDisplayed = createAction('REPO_EXPORT_DISPLAYED');
 export const repoExportNotDisplayed =
   createAction('REPO_EXPORT_NOT_DISPLAYED');
+export const projectRestoredFromLastSession =
+  createAction('PROJECT_RESTORED_FROM_LAST_SESSION');

src/actions/index.js

@@ -16,6 +16,7 @@ import {
   toggleLibrary,
   hideComponent,
   unhideComponent,
+  toggleComponent,
   updateProjectSource,
 } from './projects';
 
@@ -44,10 +45,6 @@ import {
   userLoggedOut,
 } from './user';
 
-function toggleDashboard() {
-  return {type: 'DASHBOARD_TOGGLED'};
-}
-
 export {
   createProject,
   createSnapshot,
@@ -59,7 +56,7 @@ export {
   addRuntimeError,
   hideComponent,
   unhideComponent,
-  toggleDashboard,
+  toggleComponent,
   focusLine,
   editorFocusedRequestedLine,
   dragRowDivider,

src/actions/projects.js

@@ -36,6 +36,12 @@ export const unhideComponent = createAction(
   (_projectKey, _componentName, timestamp = Date.now()) => ({timestamp}),
 );
 
+export const toggleComponent = createAction(
+  'TOGGLE_COMPONENT',
+  (projectKey, componentName) => ({projectKey, componentName}),
+  (_projectKey, _componentName, timestamp = Date.now()) => ({timestamp}),
+);
+
 export const gistImported = createAction(
   'GIST_IMPORTED',
   (projectKey, gistData) => ({projectKey, gistData}),

src/clients/github.js

@@ -108,6 +108,12 @@ function buildGistFromProject(project) {
       language: 'JavaScript',
     };
   }
+  if (trim(project.instructions)) {
+    files['README.md'] = {
+      content: project.instructions,
+      language: 'Markdown',
+    };
+  }
   if (project.enabledLibraries.length || project.hiddenUIComponents.length) {
     files['popcode.json'] = {
       content: createPopcodeJson(project),

src/clients/localStorage.js

@@ -0,0 +1,21 @@
+const PROJECT_STORAGE_KEY = 'last-closed-session-project-state';
+const GRACE_PERIOD = 5 * 60 * 1000;
+
+export function dehydrateProject(project) {
+  localStorage.setItem(PROJECT_STORAGE_KEY, JSON.stringify({
+    dehydratedAt: Date.now(),
+    project,
+  }));
+}
+
+export function rehydrateProject() {
+  const dehydrated = localStorage.getItem(PROJECT_STORAGE_KEY);
+  localStorage.removeItem(PROJECT_STORAGE_KEY);
+  if (dehydrated) {
+    const rehydrated = JSON.parse(dehydrated);
+    if (Date.now() - rehydrated.dehydratedAt <= GRACE_PERIOD) {
+      return rehydrated.project;
+    }
+  }
+  return null;
+}

src/components/Dashboard.jsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import remark from 'remark';
+import remarkReact from 'remark-react';
+import classnames from 'classnames';
+
+export default function Instructions({instructions, isOpen}) {
+  if (!instructions || !isOpen) {
+    return null;
+  }
+
+  return (
+    <div
+      className={classnames(
+        'layout__instructions',
+        'instructions',
+        'u__flex-container',
+        'u__flex-container_column',
+      )}
+    >
+      {remark().use(remarkReact).processSync(instructions).contents}
+    </div>
+  );
+}
+
+Instructions.propTypes = {
+  instructions: PropTypes.string.isRequired,
+  isOpen: PropTypes.bool.isRequired,
+};