Merge branch 'master' into mod-queue-load-more

app.js

@@ -34,6 +34,7 @@ app.use(helmet({
 }));
 app.use(bodyParser.json());
 app.use('/client', express.static(path.join(__dirname, 'dist')));
+app.use('/public', express.static(path.join(__dirname, 'public')));
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'ejs');
 

public/img/logomark_512x512.svg

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+  <path fill="white" d="M16.7429696,289.934029 L16.7429696,458.867065 C16.7429696,481.160847 35.3814834,499.299461 58.2908753,499.299461 L169.597151,499.299461 C158.836328,474.699234 146.091015,460.197252 131.645088,456.148988 C126.701358,454.785444 121.474518,454.593973 115.421116,454.373782 C104.509342,453.975797 90.9286642,453.482077 76.2824173,444.961637 C62.747265,436.971845 52.4401198,424.838083 45.5544632,408.844822 C42.2496325,401.168221 46.043857,392.367414 54.029227,389.190371 C62.0160196,386.010592 71.1679678,389.662209 74.4742211,397.337442 C78.7820245,407.344514 84.8724162,414.724335 92.5732549,419.271761 C100.204384,423.709775 107.442859,423.97373 116.606188,424.307436 C123.672522,424.564554 131.682078,424.855863 140.341787,427.245141 C166.794658,434.659154 187.053285,457.505693 202.339727,497.107272 C202.619449,497.832288 202.837382,498.564799 202.996073,499.299461 L284.656131,499.299461 C286.965782,487.427519 286.935693,475.772879 284.558741,464.571863 C278.13945,434.869939 253.955243,407.184778 222.957351,394.096741 C199.121645,384.005953 178.839782,386.655918 159.224803,389.220805 C135.853764,392.279423 111.691069,395.43846 87.6674882,376.424263 C76.9156055,367.94577 67.9736302,356.324976 62.5094881,343.719511 C58.195844,333.771593 56.334782,323.968287 56.9590722,314.78635 C41.9611009,308.809842 28.4371262,300.451076 16.7429696,289.934029 Z M16.7429696,239.54762 L16.7429696,180.284334 C27.1524231,185.641291 38.480441,188.935397 49.6407882,189.598941 C66.7574642,190.61848 81.7759671,185.434312 93.0986447,174.588981 C103.850527,164.252723 106.599808,152.820216 109.782205,139.582944 C112.444002,128.517248 115.756907,114.744403 125.183628,95.8389951 C134.825472,76.3352527 141.01243,68.9097718 148.003951,68.438357 C158.159223,67.7284453 175.07942,80.5277763 177.655168,99.6493659 C179.539651,113.063768 174.352302,122.234041 168.346048,132.852033 C161.694423,144.609509 153.417897,159.2415 159.333799,177.9907 C165.62545,197.893332 182.836781,206.235143 196.666366,212.936765 C211.089694,219.927093 220.162177,224.805818 224.732839,236.475427 C228.668169,246.59411 229.234661,261.534333 224.078863,266.406085 C220.619674,269.689252 208.893998,266.979314 196.48136,264.111773 C175.227138,259.200969 146.116599,252.475637 111.924837,262.703107 C102.902286,265.361173 82.2939291,271.430924 68.9482506,286.448589 C57.42349,281.838466 47.0611385,275.406982 38.1547127,267.339738 C29.3172038,259.310683 22.1238233,249.971901 16.7429696,239.54762 Z M498.953781,114.591176 L498.953781,198.311405 C497.548158,199.463488 496.327786,200.875258 495.37497,202.524288 C486.842982,217.286951 473.462229,235.245568 458.304457,236.943114 C452.254267,237.571164 448.787788,235.603459 439.624226,229.842386 C430.529563,224.124482 418.07464,216.294046 398.310685,211.96593 C376.863012,207.281316 362.671261,210.117986 351.267047,212.39902 C341.457557,214.359763 334.978184,215.653463 324.560087,212.362814 C299.206704,204.251078 285.449877,179.826745 277.22937,165.232584 L277.002577,164.828738 C258.70129,132.009977 260.156781,100.287172 261.440024,72.2992459 L261.464426,71.7770312 C262.361113,53.226538 265.404036,34.6117671 270.525195,16.2935206 L330.612166,16.293521 C316.774675,31.9003135 304.026832,52.4264552 298.402056,78.2615335 C294.476492,95.6315177 286.306535,131.777011 310.890418,157.544973 C323.46845,170.626628 341.294327,177.852632 358.686086,177.852632 C365.872517,177.852632 372.98351,176.618752 379.620532,174.055322 C408.850188,162.729518 422.907068,135.065012 425.138861,123.424055 C428.130716,107.702995 429.777517,91.3094221 430.990201,77.3315514 C431.334648,74.1012352 433.187834,71.2128035 435.959071,69.5948316 C436.115639,69.503381 436.269359,69.4105235 436.423079,69.3134452 C440.230507,67.3578095 445.257734,67.9374655 448.734947,70.7808754 C467.056146,85.6591827 482.685813,99.3598878 496.512113,112.666652 C497.2744,113.400416 498.093011,114.041857 498.953781,114.591176 Z M498.953781,72.5695095 L498.953781,56.7259179 C498.953781,34.4321352 480.316701,16.293521 457.405876,16.293521 L376.020363,16.293521 C375.296977,17.1665224 374.465125,17.97437 373.527225,18.6976547 C357.010818,31.4360182 335.877105,53.2589426 328.989576,84.8924047 C326.001991,98.1091251 320.490828,122.492666 333.631079,136.266532 C341.301444,144.245244 356.3632,149.808253 368.208213,145.231503 C385.960077,138.354419 393.570662,120.885949 394.384811,117.599356 C397.116195,103.210661 398.656246,87.7752086 399.802033,74.5697436 C399.807726,74.5064317 399.813419,74.4445266 399.820536,74.3812147 C401.08446,61.6428512 408.31359,50.141181 419.224894,43.4287077 C420.17426,42.7787051 421.008336,42.3439631 421.574824,42.0611697 C436.54691,34.1626527 455.42748,36.0915567 468.64886,46.8939816 C479.591832,55.7802027 489.636475,64.2886721 498.953781,72.5695095 Z M498.953781,249.050956 L498.953781,289.945375 C484.010941,291.989684 469.210648,292.136094 454.887289,290.372058 C439.159833,288.416798 428.176638,284.799914 417.554668,281.304104 C402.650631,276.395774 388.56Line truncated
+</svg>

public/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/img\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/img\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/img\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/img\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/img\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/img\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

routes/admin/index.js

@@ -12,7 +12,7 @@ router.get('/password-reset', (req, res) => {
 
   // TODO: store the redirect uri in the token or something fancy.
   // admins and regular users should probably be redirected to different places.
-  res.render('password-reset', {redirectUri: process.env.TALK_ROOT_URL});
+  res.render('admin/password-reset', {redirectUri: process.env.TALK_ROOT_URL});
 });
 
 router.get('*', (req, res) => {

views/admin.ejs

@@ -5,6 +5,20 @@
     <meta name="viewport" content="initial-scale=1, maximum-scale=1">
     <meta property="csrf" content="<%= csrfToken %>">
     <title>Talk - Coral Admin</title>
+    <link rel="apple-touch-icon" sizes="57x57" href="/public/img/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/public/img/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/public/img/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/public/img/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/public/img/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/public/img/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/public/img/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/public/img/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/public/img/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/public/img/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/public/img/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/public/img/favicon-16x16.png">
+    <link rel="manifest" href="/public/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
     <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
     <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">