Merge pull request #253 from KenEucker/develop

Adds Search

functions/achievements-background.ts

@@ -1,9 +1,9 @@
 import { Handler } from '@netlify/functions'
 import BikeTagClient from 'biketag'
 import { Achievement, Game, Player, Tag } from 'biketag/dist/common/schema'
-import { getSupportedGames } from '../src/common/utils'
+import { getSupportedGames } from '../src/common'
+import { getBikeTagClientOpts } from './common'
 import { HttpStatusCode } from './common/constants'
-import { getBikeTagClientOpts } from './common/methods'
 import { BackgroundProcessResults } from './common/types'
 
 export const assignAchievements = async (): Promise<BackgroundProcessResults> => {

functions/achievements.ts

@@ -3,7 +3,7 @@ import { BikeTagClient } from 'biketag'
 import { getAchievementsPayload } from 'biketag/dist/common/payloads'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 
 const achievementsHandler: Handler = async (event) => {
   const biketagOpts = getBikeTagClientOpts(

functions/ambassadors.ts

@@ -3,7 +3,7 @@ import { BikeTagClient } from 'biketag'
 import { getAmbassadorsPayload } from 'biketag/dist/common/payloads'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 
 const ambassadorsHandler: Handler = async (event) => {
   const biketagOpts = getBikeTagClientOpts(

functions/approve.ts

@@ -2,15 +2,15 @@ import { Handler } from '@netlify/functions'
 import { BikeTagClient } from 'biketag'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { HttpStatusCode } from './common/constants'
 import {
-    acceptCorsHeaders,
-    getActiveQueueForGame,
-    getBikeTagClientOpts,
-    getPayloadOpts,
-    getProfileAuthorization,
-    setNewBikeTagPost,
-} from './common/methods'
+  acceptCorsHeaders,
+  getActiveQueueForGame,
+  getBikeTagClientOpts,
+  getPayloadOpts,
+  getProfileAuthorization,
+  setNewBikeTagPost,
+} from './common'
+import { HttpStatusCode } from './common/constants'
 
 const approveHandler: Handler = async (event) => {
   /// Bailout on OPTIONS requests

functions/authorize.ts

@@ -1,8 +1,8 @@
 import { builder, Handler } from '@netlify/functions'
 import { BikeTagClient } from 'biketag'
 import request from 'request'
+import { getBikeTagClientOpts, getBikeTagHash, getPayloadOpts } from './common'
 import { HttpStatusCode } from './common/constants'
-import { getBikeTagClientOpts, getBikeTagHash, getPayloadOpts } from './common/methods'
 
 const authorizeHandler: Handler = async (event) => {
   const {

functions/autopost-background.ts

@@ -2,13 +2,13 @@ import { Handler } from '@netlify/functions'
 import BikeTagClient from 'biketag'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { HttpStatusCode } from './common/constants'
 import {
-    getActiveQueueForGame,
-    getBikeTagClientOpts,
-    getWinningTagForCurrentRound,
-    setNewBikeTagPost,
-} from './common/methods'
+  getActiveQueueForGame,
+  getBikeTagClientOpts,
+  getWinningTagForCurrentRound,
+  setNewBikeTagPost,
+} from './common'
+import { HttpStatusCode } from './common/constants'
 import { BackgroundProcessResults } from './common/types'
 
 export const autoPostNewBikeTags = async (): Promise<BackgroundProcessResults> => {

functions/autopost-clear.ts

@@ -1,13 +1,13 @@
 import { Handler } from '@netlify/functions'
 import BikeTagClient from 'biketag'
 import { Game } from 'biketag/dist/common/schema'
-import { HttpStatusCode } from './common/constants'
 import {
   archiveAndClearQueue,
   getActiveQueueForGame,
   getBikeTagClientOpts,
   isRequestAllowed,
-} from './common/methods'
+} from './common'
+import { HttpStatusCode } from './common/constants'
 import { BackgroundProcessResults } from './common/types'
 
 export const autoClearQueue = async (event): Promise<BackgroundProcessResults> => {

functions/autopost-notify.ts

@@ -1,12 +1,12 @@
 import { Handler } from '@netlify/functions'
 import BikeTagClient from 'biketag'
 import { Game } from 'biketag/dist/common/schema'
-import { HttpStatusCode } from './common/constants'
 import {
-    getBikeTagClientOpts,
-    isRequestAllowed,
-    sendNewBikeTagNotifications,
-} from './common/methods'
+  getBikeTagClientOpts,
+  isRequestAllowed,
+  sendNewBikeTagNotifications,
+} from './common'
+import { HttpStatusCode } from './common/constants'
 import { BackgroundProcessResults } from './common/types'
 
 export const autoNotifyNewBikeTagPosted = async (event): Promise<BackgroundProcessResults> => {

functions/common/index.ts

@@ -0,0 +1,4 @@
+export * from './constants'
+export * from './methods'
+export * from './types'
+

functions/common/methods.ts

@@ -14,13 +14,13 @@ import nodemailer from 'nodemailer'
 import { extname, join } from 'path'
 import qs from 'qs'
 import request from 'request'
-import { BikeTagProfile } from '../../src/common/types'
 import {
   getDomainInfo,
   getImgurImageSized,
   getTagDate,
   isAuthenticationEnabled,
-} from '../../src/common/utils'
+} from '../../src/common'
+import { BikeTagProfile } from '../../src/common/types'
 import { ErrorMessage, HttpStatusCode } from './constants'
 import { BackgroundProcessResults, activeQueue } from './types'
 

functions/current.ts

@@ -3,9 +3,9 @@ import axios from 'axios'
 import { BikeTagClient } from 'biketag'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { getDomainInfo, getImgurImageSized } from '../src/common/utils'
+import { getDomainInfo, getImgurImageSized } from '../src/common'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 import { HttpStatusCode } from './common/constants'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
 
 const currentTagHandler = async (event) => {
   const biketagOpts = getBikeTagClientOpts(

functions/game.ts

@@ -2,7 +2,7 @@ import { builder, Handler } from '@netlify/functions'
 import { BikeTagClient } from 'biketag'
 import { getGamePayload } from 'biketag/dist/common/payloads'
 import request from 'request'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 
 const gameHandler: Handler = async (event) => {
   const biketagOpts = getBikeTagClientOpts(

functions/players.ts

@@ -3,7 +3,7 @@ import { BikeTagClient } from 'biketag'
 import { getPlayersPayload } from 'biketag/dist/common/payloads'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 
 const playersHandler: Handler = async (event) => {
   const biketagOpts = getBikeTagClientOpts(

functions/profile.ts

@@ -1,13 +1,13 @@
 import { Handler } from '@netlify/functions'
-import { getDomainInfo } from '../src/common/utils'
-import { ErrorMessage, HttpStatusCode } from './common/constants'
+import { getDomainInfo } from '../src/common'
 import {
   acceptCorsHeaders,
   getBikeTagAuth0Profile,
   getBikeTagPlayerProfile,
   getProfileAuthorization,
   handleAuth0ProfileRequest,
-} from './common/methods'
+} from './common'
+import { ErrorMessage, HttpStatusCode } from './common/constants'
 
 const profileHandler: Handler = async (event) => {
   /// Bailout on OPTIONS requests

functions/queue.ts

@@ -3,7 +3,7 @@ import { BikeTagClient } from 'biketag'
 import { getQueuePayload } from 'biketag/dist/common/payloads'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 
 const queueHandler: Handler = async (event) => {
   const biketagOpts = getBikeTagClientOpts(

functions/recent.ts

@@ -3,7 +3,7 @@ import { BikeTagClient } from 'biketag'
 import { getTagsPayload } from 'biketag/dist/common/payloads'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 
 const recentHandler: Handler = async (event) => {
   const response = {

functions/settings.ts

@@ -3,7 +3,7 @@ import { BikeTagClient } from 'biketag'
 import { getSettingsPayload } from 'biketag/dist/common/payloads'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 
 const setttingsHandler: Handler = async (event) => {
   const biketagOpts = getBikeTagClientOpts(

functions/submission-created.ts

@@ -1,15 +1,15 @@
 import { BikeTagClient } from 'biketag'
 import { Ambassador, Game, Tag } from 'biketag/dist/common/schema'
 import request from 'request'
-import { stringifyNumber } from '../src/common/utils'
-import { HttpStatusCode } from './common/constants'
+import { stringifyNumber } from '../src/common'
 import {
-    defaultLogo,
-    getBikeTagClientOpts,
-    getEncodedExpiry,
-    getSanityImageUrl,
-    sendEmailsToAmbassadors,
-} from './common/methods'
+  defaultLogo,
+  getBikeTagClientOpts,
+  getEncodedExpiry,
+  getSanityImageUrl,
+  sendEmailsToAmbassadors,
+} from './common'
+import { HttpStatusCode } from './common/constants'
 
 export const handler = async (event) => {
   const body = JSON.parse(event.body)

functions/tags.ts

@@ -3,7 +3,7 @@ import { BikeTagClient } from 'biketag'
 import { getTagsPayload } from 'biketag/dist/common/payloads'
 import { Game } from 'biketag/dist/common/schema'
 import request from 'request'
-import { getBikeTagClientOpts, getPayloadOpts } from './common/methods'
+import { getBikeTagClientOpts, getPayloadOpts } from './common'
 
 const tagsHandler: Handler = async (event) => {
   const biketagOpts = getBikeTagClientOpts(

functions/token.ts

@@ -1,8 +1,8 @@
 import { Handler } from '@netlify/functions'
 import { BikeTagClient } from 'biketag'
 import request from 'request'
+import { acceptCorsHeaders, getBikeTagClientOpts, getPayloadAuthorization } from './common'
 import { HttpStatusCode } from './common/constants'
-import { acceptCorsHeaders, getBikeTagClientOpts, getPayloadAuthorization } from './common/methods'
 
 const tokenHandler: Handler = async (event) => {
   /// Bailout on OPTIONS requests

src/App.vue

@@ -10,8 +10,8 @@
     <meta property="og:image" :content="logo" />
   </Head>
   <div :class="isWhiteBackground">
-    <div :class="`spacer-top ${isWhiteBackground}`"></div>
-    <bike-tag-menu variant="top" />
+    <div :class="`${isNotLanding ? 'spacer-top' : 'spacer-less'} ${isWhiteBackground}`"></div>
+    <bike-tag-menu v-if="isNotLanding" variant="top" />
     <confetti-explosion v-if="showConfetti" />
     <service-worker />
     <router-view />
@@ -23,12 +23,12 @@
 </template>
 
 <script setup name="App">
-import { ref, inject, computed, onMounted, watch, nextTick } from 'vue'
-import { useRouter } from 'vue-router'
 import { useBikeTagStore } from '@/store/index'
 import { useAuth0 } from '@auth0/auth0-vue'
-import { debug, isAuthenticationEnabled } from './common/utils'
+import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
 import ConfettiExplosion from 'vue-confetti-explosion'
+import { useRouter } from 'vue-router'
+import { debug, isAuthenticationEnabled } from './common'
 
 // componets
 import BikeTagMenu from '@/components/BikeTagMenu.vue'
@@ -189,6 +189,9 @@ created()
 .spacer-bottom {
   margin-bottom: 50px;
 }
+.spacer-less {
+  height: 0;
+}
 
 .spacer-top {
   height: 85px;

src/app.ts

@@ -27,7 +27,7 @@ import 'bootstrap-vue-next/dist/bootstrap-vue-next.css'
 import 'bootstrap/dist/css/bootstrap.css'
 import 'highlight.js/styles/monokai.css'
 import 'vue-toast-notification/dist/theme-sugar.css'
-import { debug, isAuthenticationEnabled } from './common/utils'
+import { debug, isAuthenticationEnabled } from './common'
 
 class BikeTagApp {
   protected emitter

src/assets/styles/style.scss

@@ -42,6 +42,22 @@ body {
     color: black;
   }
 
+  .search-bar {
+    display: flex;
+    margin-bottom: 25px;
+
+    .biketag__button {
+      padding-inline: 15px;
+      min-height: auto;
+      background-size: contain;
+      color: $btn-primary-text-color;
+    }
+  }
+
+  .clear-search-button {
+    color: $btn-primary-text-color;
+  }
+
   @keyframes spin {
     from {
       transform: rotate(0deg);
@@ -182,7 +198,6 @@ body {
       font-weight: $tag-player-font-weight;
       font-size: $tag-player-font-size;
       line-height: $tag-player-line-height;
-      text-transform: uppercase;
     }
 
     .tag-date {

src/common/index.ts

@@ -1,4 +1,4 @@
 export * from './constants'
+export * from './methods'
 export * from './types'
-export * from './utils'
 export * from './uuid'

src/common/utils.ts → src/common/methods.ts

@@ -13,7 +13,7 @@ import {
   DomainInfo,
   deca,
   special,
-} from '../../src/common'
+} from '.'
 
 export const stringifyNumber = (n: number): string => {
   if (n < 20) return special[n]

src/components/BikeDex.vue

@@ -21,7 +21,7 @@
 </template>
 
 <script setup name="BikeDex">
-import { getTagDate } from '@/common/utils'
+import { getTagDate } from '@/common'
 
 // props
 const props = defineProps({

src/components/BikeTagCamera.vue

@@ -57,8 +57,8 @@
 </template>
 
 <script setup name="BikeTagCamera">
-import { ref, onMounted } from 'vue'
-import { exportHtmlToDownload } from '@/common/utils'
+import { exportHtmlToDownload } from '@/common'
+import { onMounted, ref } from 'vue'
 
 const props = defineProps({
   title: {

src/components/BikeTagFooter.vue

@@ -84,13 +84,13 @@
 </template>
 
 <script setup name="BikeTagFooter">
-import { ref, computed, onBeforeUnmount, nextTick } from 'vue'
-import { useRouter } from 'vue-router'
-import { useBikeTagStore } from '@/store/index'
-import HintIcon from '@/assets/images/hint-icon.svg'
 import CloseRounded from '@/assets/images/close-rounded.svg'
+import HintIcon from '@/assets/images/hint-icon.svg'
+import { exportHtmlToDownload } from '@/common'
+import { useBikeTagStore } from '@/store/index'
+import { computed, onBeforeUnmount, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
-import { exportHtmlToDownload } from '@/common/utils'
+import { useRouter } from 'vue-router'
 
 // componets
 import BikeTagButton from '@/components/BikeTagButton.vue'