Beer Tuesday -> Beer Thirstday

Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>

client/src/App.js

@@ -32,6 +32,7 @@ const App = () => {
 
   useEffect(() => {
     console.log(`app - path - `, location.pathname);
+    setError(undefined);
   }, [location]);
 
   useEffect(() => {

client/src/Event.js

@@ -1,5 +1,4 @@
 import React, { useState, useEffect, useContext } from "react";
-import Paper from '@mui/material/Paper';
 import MomentUtils from '@date-io/moment'
 import { Calendar, MuiPickersUtilsProvider } from '@material-ui/pickers';
 import Moment from 'react-moment';

client/src/GoodTimesBar.js

@@ -11,10 +11,7 @@ import Container from '@mui/material/Container';
 import Button from '@mui/material/Button';
 import Tooltip from '@mui/material/Tooltip';
 import MenuItem from '@mui/material/MenuItem';
-import Popper from '@mui/material/Popper';
-import Grow from '@mui/material/Grow';
-import Paper from '@mui/material/Paper';
-import ClickAwayListener from '@mui/material/ClickAwayListener';
+
 import {
   useNavigate,
 } from "react-router-dom";

client/src/Location.js

@@ -1,9 +1,6 @@
 import React, { useState, useEffect, useContext } from "react";
 import Paper from '@mui/material/Paper';
-import {
-  useParams,
-  useNavigate
-} from "react-router-dom";
+
 
 import './Location.css';
 import { GlobalContext } from "./GlobalContext.js";
@@ -57,6 +54,7 @@ function Location(props) {
       if (!data) {
         return;
       }
+      
       setLocation(data);
     }
     effect();

client/src/SignIn.js

@@ -68,11 +68,40 @@ export default function SignIn() {
 
   return (
     <ThemeProvider theme={theme}>
+      <div style={{
+        width: '100%', 
+        display: 'flex', 
+        flexDirection: 'column',
+        alignItems: 'center'
+      }}>
+        <div
+          style={{
+            marginTop: 8,
+            display: 'flex',
+            width: '40rem',
+            flexDirection: 'column',
+            alignItems: 'left',
+            textAlign: 'left'
+          }}
+        >
+          <Typography>
+            <p>While those familiar with the original Beer App may recall
+              an account was not needed to particpate, now that
+              the audience is larger, events and contact information for
+              those participating are now restricted to only those that
+              have verified an email address and created an account
+              on Goodtimes.</p>
+
+            <p>Contact information is only shared with those that are in
+              groups that you join.</p>
+          </Typography>
+        </div>
+      </div>
       <Container component="main" maxWidth="xs">
         <CssBaseline />
+       
         <Box
           sx={{
-            marginTop: 8,
             display: 'flex',
             flexDirection: 'column',
             alignItems: 'center',

server/event-data.js

@@ -1,10 +1,10 @@
 const originalEvents = [ {
   groupId: 1,
-  name: 'Tuesday',
-  event: 'tuesday',
+  name: 'Thursday Happy Hour',
+  event: 'thursday',
   votingBegins: 'day-of',
   votingCloses: '3:00 PM',
-  description: 'Get together every Tuesday with friends for happy hour!',
+  description: 'Get together every Thursday with friends for happy hour!',
   date: Date.now() + 86400 * 14 * 1000 /* 2 weeks from now */
 } ];
 originalEvents.forEach((item, index) => item.id = index + 1);

server/group-data.js

@@ -1,8 +1,8 @@
 const originalEvents = require('./event-data.js');
 const originalGroups = [ {
   ownerId: 1,
-  name: 'Beer Tuesday',
-  group: 'beer-tuesday',
+  name: 'Beer Thirstday',
+  group: 'beer-thirstday',
 } ];
 
 originalGroups[0].nextEvent = originalEvents[0];

server/location-data.js

@@ -1,4 +1,5 @@
-const originalLocations = [{'id':1,'name':'CPR','location':'Cornelius Pass & Imbrie Dr ','map':'http://goo.gl/maps/ANsh2','url':'','note':'Cornelius Pass Roadhouse; standard McMenamin food and drinks. The Rubinator (Ruby + Terminator) is a common favorite, as are the rotating nitro offerings.\n\nHappy hour foods aren\'t that thrilling; tots, fries, etc.','disabled':0,'beerlist':''},
+const originalLocations = [
+  {'id':1,'name':'CPR','location':'Cornelius Pass & Imbrie Dr ','map':'http://goo.gl/maps/ANsh2','url':'','note':'Cornelius Pass Roadhouse; standard McMenamin food and drinks. The Rubinator (Ruby + Terminator) is a common favorite, as are the rotating nitro offerings.\n\nHappy hour foods aren\'t that thrilling; tots, fries, etc.','disabled':0,'beerlist':''},
   {'id':2,'name':'Orenco Taphouse','location':'Couple blocks off Cornell in Orenco Station area.','map':'http://goo.gl/maps/qoOxl','url':'http://orencotaphouse.com','note':'A wide variety of frequently changing taps; a good place to have a beer or two. \n\nNo food or appetizers, or happy hour pricing. If its crowded, or the TVs are all on, it can be a little loud...','disabled':0,'beerlist':'http://orencotaphouse.com/?page_id=5'},
   {'id':3,'name':'Dugout','location':'Just down the street from Jones Farm, across Cornell in the strip mall near the Dollar Store','map':'https://goo.gl/HXc5oq','url':'https://www.facebook.com/TheDugoutGourmetDeliBeerBarInc','note':'','disabled':0,'beerlist':''},
   {'id':4,'name':'Raccoon Lodge','location':'Beaverton Hillsdale Hwy a couple miles east of 217.','map':'http://goo.gl/maps/fbFAa','url':'http://www.raclodge.com','note':'OMG! The fruit beers! This is the west-side spot to drink Cascade Brewing\'s various beers. In addition to the sours, they have a wide variety of other beer types.\n\nHappy hour prices aren\'t that great, and only apply to the "standard" Cascade Brewing beers--not the sours :(','disabled':0,'beerlist':'http://www.raclodge.com/PDFs/cascade_brewing_ales_new.do.do.do.doc_oct_20.3.1.docuse.doc.docx'},
@@ -7,16 +8,16 @@ const originalLocations = [{'id':1,'name':'CPR','location':'Cornelius Pass & Imb
   {'id':7,'name':'Monteaux\'s Public House','location':'A quarter mile west of the 158th and Walker Rd intersection in Beaverton (across Walker from Fred Meyer.)','map':'http://goo.gl/maps/Oubb0','url':'http://www.monteauxs.com','note':'With good food, and happy hour running from 3-6, Monteaux\'s is a good place to kick back and have a pint with some friends (or co-workers; whichever you have available.)','disabled':1,'beerlist':'http://www.taplister.com/bars/410c3280f964a520ad0b1fe3'},
   {'id':8,'name':'Coyote\'s','location':'','map':'','url':'','note':'','disabled':0,'beerlist':''},
   {'id':9,'name':'Bugatti\'s','location':'','map':'','url':'','note':'','disabled':0,'beerlist':''},
-{'id':10,'name':'BJ\'s','location':'Cornell Rd near the intersection with Cornelius Pass Rd.','map':'http://goo.gl/maps/o5wJc','url':'','note':'A few really good beers (Tatonka Stout) and some tasty appetizers. Plus Tuesday gets you half off wine. What\'s not to like?\n\nReasonably located for most of the world, BJ\'s has climbed the ladder as a frequent Beer Tuesday target.','disabled':0,'beerlist':''},
+  {'id':10,'name':'BJ\'s','location':'Cornell Rd near the intersection with Cornelius Pass Rd.','map':'http://goo.gl/maps/o5wJc','url':'','note':'A few really good beers (Tatonka Stout) and some tasty appetizers. What\'s not to like?\n\nReasonably located for most of the world, BJ\'s has climbed the ladder as a frequent target.','disabled':0,'beerlist':''},
   {'id':11,'name':'Oregon Brewer\'s Festival','location':'Downtown Portland (waterfront)','map':'http://goo.gl/maps/jb622','url':'http://oregonbrewfest.com','note':'Instead of the July 23rd (or in addition to), add a Beer Thursday for the 25th.\n\nWe\'ll head down *early* afternoon to beat the crowds.','disabled':1,'beerlist':''},
   {'id':12,'name':'Tug Boat','location':'Downtown, a block from Burnside on Ankeny (just off of Broadway)','map':'http://goo.gl/maps/I83Oj','url':'http://www.d2m.com/tugwebsite/','note':'A "quaint" location, Tug Boat offers a reasonable set of beers in a unique setting. Its a great spot to finish a downtown hack session at the Collective Agency.','disabled':0,'beerlist':'http://www.taplister.com/bars/40b13b00f964a5200df61ee3'},
   {'id':13,'name':'Deschutes Brewery','location':'Downtown Bend. And more conveniently located on 11th a block off Burnside next to Powell\'s Books.','map':'http://goo.gl/maps/2r2Eh','url':'http://www.deschutesbrewery.com/locations/portland','note':'Beer. Good, wholesome, beer. Obsidian Stout on Nitro. Can\'t go wrong there, unless you don\'t like stout... if that be the case, mayhaps you\'d prefer the Chainbreaker or Mirror Pond. Or even one of the seasonals on tap. A good location after a day at the Collective Agency, or any other reason to be downtown.','disabled':0,'beerlist':'http://www.deschutesbrewery.com/on-tap/portland'},
   {'id':14,'name':'Ridge Pub','location':'Progress Ridge, between Ava Roasteria and Cinetopia.','map':'http://goo.gl/maps/Uckva','url':'http://www.theridgepub.com/','note':'A good location if you\'ll be catching an evening show at Cinetopia, or if you happen to be heading toward Tigard for any reason.','disabled':0,'beerlist':''},
   {'id':15,'name':'Stanford\'s','location':'Off of 185th and Cornell, walking distance from the Evergreen theater.','map':'http://goo.gl/maps/NKLOI','url':'http://www.stanfords.com','note':'Tasty appetizers with happy hour running to 6pm. The Wood-Fire Grilled Portobello\nMushroom is awesome.','disabled':0,'beerlist':'http://www.stanfords.com/menu.php?c=tanasbourne&id=Bar%20Menu'},
   {'id':16,'name':'Old Chicago','location':'Along Evergreen Parkway, between 185th and Cornell.','map':'http://goo.gl/maps/Blj9U','url':'http://oldchicago.com/locations/beaverton-tanasbourne?action=view','note':'A reasonable establishment to share a pint or two with your fellow coworker. Old Chicago has some tasty food, and a wide variety of beers, some ciders, and other beverages.','disabled':0,'beerlist':'http://oldchicago.com/beverages/hand-crafted-beers'},
-{'id':17,'name':'Rock Creek','location':'A couple minutes north of highway 26 on Cornelius Pass Rd','map':'http://goo.gl/maps/NwYhC','url':'http://www.mcmenamins.com/RockCreek','note':'McMenamin Ales. Good friends. Nice building. A win all around, especially if you hang round until the Blue Grass kicks in at 7PM on Tuesdays.','disabled':0,'beerlist':'http://www.mcmenamins.com/532-rock-creek-tavern-ales'},
+  {'id':17,'name':'Rock Creek','location':'A couple minutes north of highway 26 on Cornelius Pass Rd','map':'http://goo.gl/maps/NwYhC','url':'http://www.mcmenamins.com/RockCreek','note':'McMenamin Ales. Good friends. Nice building. A win all around, especially if you hang round until the Blue Grass kicks.','disabled':0,'beerlist':'http://www.mcmenamins.com/532-rock-creek-tavern-ales'},
   {'id':18,'name':'Thirsty Lion - Tanasbourne','location':'In the Streets of Tanasbourne, just minutes from shopping, beer, and food.','map':'https://maps.google.com/maps?q=2290+NW+Allie+Avenue,+Hillsboro,+Oregon+97124&hl=en&sll=37.6,-95.665&sspn=60.181414,50.185547&hnear=2290+NW+Allie+Ave,+Hillsboro,+Oregon+97124&t=m&z=16','url':'https://www.facebook.com/thirstyliontanasbourne','note':'A gastropub. Reasonable food. Good beers. Fun times.','disabled':0,'beerlist':'http://thirstylionpub.com/tanasbourne/menu'},
-{'id':19,'name':'Metropolitan Bistro & Bar','location':'In the small commercial complex where Baseline turns into Jenkins, just east of 170th you will find the Metropolitan Bistro & Bar, previously known as Mireille\'s Bistro. It\'s quaint, quiet, and the service is friendly. Worth hanging out on an afternoon.','map':'https://maps.google.com/maps?q=16755+SW+Baseline+Rd.,+Beaverton,+Oregon+97006&hl=en&ll=45.512106,-122.849207&spn=0.0103,0.022123&sll=45.512001,-122.849596&sspn=0.001295,0.002765&hnear=16755+SW+Baseline+Rd,+Beaverton,+Oregon+97006&t=m&z=16','url':'https://www.facebook.com/mireillesbistro','note':'It isn\'t a brewery or pub, and doesn\'t have the largest beer selection. However it is nice and quiet, and the staff is very friendly.\n\nThe food is pretty good too.\n\n*AND* Tuesday night is Trivia night (6:30-8:00)!','disabled':1,'beerlist':'http://www.beermenus.com/places/10862-mireille-s-bistro'},
+  {'id':19,'name':'Metropolitan Bistro & Bar','location':'In the small commercial complex where Baseline turns into Jenkins, just east of 170th you will find the Metropolitan Bistro & Bar, previously known as Mireille\'s Bistro. It\'s quaint, quiet, and the service is friendly. Worth hanging out on an afternoon.','map':'https://maps.google.com/maps?q=16755+SW+Baseline+Rd.,+Beaverton,+Oregon+97006&hl=en&ll=45.512106,-122.849207&spn=0.0103,0.022123&sll=45.512001,-122.849596&sspn=0.001295,0.002765&hnear=16755+SW+Baseline+Rd,+Beaverton,+Oregon+97006&t=m&z=16','url':'https://www.facebook.com/mireillesbistro','note':'It isn\'t a brewery or pub, and doesn\'t have the largest beer selection. However it is nice and quiet, and the staff is very friendly.\n\nThe food is pretty good too.','disabled':1,'beerlist':'http://www.beermenus.com/places/10862-mireille-s-bistro'},
   {'id':20,'name':'ABV Public House','location':'Conveniently located just a rock\'s throw from the corner of Brookwood and Hwy 26. ','map':'http://goo.gl/maps/WwjDT','url':'http://www.abvpub.com/','note':'Fantabulous! Recently opened, this brew pub / tap house is sure to become the next  big thing for Beer Tuesday. Check out the chicken fried portobello mushroom sandwich. ','disabled':0,'beerlist':'http://www.abvpub.com/taps/'},
   {'id':21,'name':'Three Mugs Brewing Company','location':'Right behind Brew Brothers just off Cornelius Pass Road, south of Hwy 26 and kitty corner from Kohls.','map':'https://maps.google.com/maps?q=2020+NW+Aloclek+Dr+Ste+108,+Hillsboro,+Oregon&hl=en&sll=45.532072,-122.935317&sspn=0.165705,0.306931&hnear=2020+NW+Aloclek+Dr+%23108,+Hillsboro,+Oregon+97124&t=m&z=16','url':'http://www.threemugsbrewing.com/','note':'Beers, Ciders, however no food...','disabled':0,'beerlist':'http://www.threemugsbrewingco.com/#!about2/c166u'},
   {'id':22,'name':'APEX','location':'Just 30 minutes from the farm (without traffic) and you\'re there! -- 1216 SE Division St.','map':'http://tinyurl.com/koldwj5','url':'http://www.apexbar.com/','note':'If it\'s beer you want, it\'s beer they have! A bit of a jug from the farm, however they have the juice that will cure what ales you once you land at their bar.\n\nSee what I did there? Punny, eh?','disabled':0,'beerlist':'http://www.apexbar.com/menu'},
@@ -33,4 +34,4 @@ const originalLocations = [{'id':1,'name':'CPR','location':'Cornelius Pass & Imb
 
 originalLocations.forEach((item, index) => item.id = index + 1);
 
-module.exports = originalLocations;
+module.exports = originalLocations.filter(item => !item.disabled);