Merge from master and resolve conflicts

Author: matthargett

.githooks/pre-commit

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# Setup for the check for filenames with non-ASCII characters
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=$(git hash-object -t tree /dev/null)
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --type=bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff-index --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+This can cause problems if you want to work with people on other platforms.
+To be portable it is advisable to rename the file.
+If you know what you are doing you can disable this check using:
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# lints changed JavaScript and TypeScript
+changed_js=$(git diff-index --cached --name-only $against | grep -E "(.*\.(js|mjs|ts|mts)|scripts/.*\.(js|mjs|ts|mts)|src/.*\.(js|mjs|ts|mts)|test/.*\.(js|mjs|ts|mts)|admin/.*\.(js|mjs|ts|mts)|admin/src/.*\.(js|mjs|ts|mts))$")
+# /dev/null prevents eslint from checking everything
+./node_modules/.bin/eslint ${changed_js:-/dev/null}
+LINT_STATUS=$?
+if [ "$LINT_STATUS" != "0" ]; then
+  echo 'Fix the errors above, then use `git add` to restage all fixed files'
+  exit $LINT_STATUS
+fi
+
+# lints changed HTML
+changed_html=$(git diff-index --cached --name-only $against | grep -E "^src/.*\.html$")
+# src/tokens.html prevents htmlhint from checking everything
+node_modules/.bin/htmlhint ${changed_html:-src/tokens.html}
+LINT_STATUS=$?
+if [ "$LINT_STATUS" != "0" ]; then
+  echo 'Fix the errors above, then use `git add` to restage all fixed files'
+  exit $LINT_STATUS
+fi
+
+# runs all automated tests
+npm run test:unit
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

.gitignore

@@ -57,7 +57,9 @@ jspm_packages/
 # Ignore dist folder with webpack build output
 dist/
 dist-types/
+# local storybook files
 storybook-static/
+admin/storybook-static/
 webpack-stats.json
 spritesheet.json
 spritesheet.png
@@ -66,6 +68,13 @@ spritesheet.png
 # Generated type declarations from local builds (source types live under /types)
 src/**/*.d.ts
 
+# Admin
+admin/node_modules/
+admin/dist/
+admin/build_output.log
+
+# Reticulum
+reticulum/
 .DS_Store
 
 certs/

.vscode/settings.json

@@ -17,7 +17,5 @@
   },
   "[html]": {
     "editor.defaultFormatter": "vscode.html-language-features" // Set to esbenp.prettier-vscode when we are ready to reformat all HTML files
-  },
-  "i18n-ally.localesPaths": ["src/assets/locales"],
-  "i18n-ally.keystyle": "nested"
+  }
 }

README.md

@@ -45,6 +45,13 @@ Read our [contributor guide](./CONTRIBUTING.md) to learn how you can submit bug
 
 We're also looking for help with localization. The Hubs redesign has a lot of new text and we need help from people like you to translate it. Follow the [localization docs](./src/assets/locales/README.md) to get started.
 
+A Git hook will run before each commit, to lint and test the code.
+Fix the issues it complains about, then the hook will allow your commit.
+The checks are also run in Continuous Integration, so you'll be requested to fix a Pull Request that fails these checks — the Git hook just gives you faster feedback.
+In unusual situations, you can suppress the checks by adding the flag `-n` to your commit command.
+
+To run the checks *before* you commit, run `npm run test`.
+
 Contributors are expected to abide by the project's [Code of Conduct](./CODE_OF_CONDUCT.md) and to be respectful of the project and people working on it.
 
 ## Additional Resources

admin/.storybook/preview.js

@@ -1,46 +1,10 @@
 import React from "react";
 import { IntlProvider } from "react-intl";
-import { createTheme, ThemeProvider } from "@material-ui/core/styles";
+import { ThemeProvider } from "@material-ui/core/styles";
 import { Provider } from "react-redux";
 import mockStore from "./mocks/store.js";
 import "../src/styles/globals.scss";
-
-// Admin theme matching the one in admin.js
-const adminTheme = createTheme({
-  components: {
-    MuiDrawer: {
-      styleOverrides: {
-        paper: {
-          backgroundColor: "#222222",
-          minHeight: "100vh",
-          position: "sticky",
-          top: 0,
-          overflowX: "hidden"
-        }
-      }
-    },
-    MuiAppBar: {
-      styleOverrides: {
-        root: {
-          position: "sticky",
-          top: 0,
-          zIndex: 1100
-        }
-      }
-    }
-  },
-  palette: {
-    primary: {
-      main: "#1700c7"
-    },
-    secondary: {
-      main: "#000000"
-    }
-  },
-  typography: {
-    fontFamily: "Inter,Arial"
-  }
-});
+import { adminTheme } from "../src/admin-theme";
 
 // Simple messages for preview
 const messages = {
@@ -57,8 +21,8 @@ const AdminLayout = ({ children }) => {
     <Provider store={mockStore}>
       <IntlProvider locale="en" messages={messages}>
         <ThemeProvider theme={adminTheme}>
-          <div style={{ fontFamily: "Inter,Arial", margin: 0, padding: 0 }}>
-            {children}
+          <div className="global_background" style={{ fontFamily: "Inter,Arial", margin: 0, padding: 0 }}>
+            <main style={{ minHeight: "100vh" }}>{children}</main>
           </div>
         </ThemeProvider>
       </IntlProvider>