Skip to content

Commit df3a3da

Browse files
posixpascalposixpascal
committed
disable cache to build
1 parent 95031a3 commit df3a3da

File tree

12 files changed

+16500
-23457
lines changed

12 files changed

+16500
-23457
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
"jest": "^24.9.0",
3333
"lerna": "^4.0.0",
3434
"ts-jest": "^24.1.0",
35-
"typescript": "3.4.3"
35+
"typescript": "^3.5.3"
3636
}
3737
}

‎packages/web/.env.example‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
COLYSEUS_URL=ws://localhost:3001
22
BORDERED_TILE_SERVER=
33
BORDERLESS_TILE_SERVER=
4-
FIREBASE_PROJECT_ID=
5-
FIREBASE_API_KEY=
6-
FIREBASE_AUTH_DOMAIN=
7-
FIREBASE_STORAGE_BUCKET=
8-
FIREBASE_MESSAGING_SENDER_ID=
9-
FIREBASE_APP_ID=
10-
FIREBASE_MEASUREMENT_ID=
114

‎packages/web/components/dialogs/multiplayer-score-board-dialog.vue‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ import Pin from '~/components/pin.vue'
149149
import ICountUp from 'vue-countup-v2'
150150
import Button from '~/components/button.vue'
151151
import {Room} from '~/models'
152-
import {addDoc, collection, getDocs} from 'firebase/firestore'
153152
154153
@Component({components: {Button, Dialog, Pin, ICountUp}})
155154
export default class MultiplayerScoreBoardDialog extends Vue {
@@ -193,27 +192,6 @@ export default class MultiplayerScoreBoardDialog extends Vue {
193192
return
194193
}
195194
196-
const $firestore = (window.$nuxt as any).$firestore
197-
const path = `users/${(this.$store.state.auth.user as any).uid}/countries`
198-
199-
const querySnapshot = await getDocs(collection($firestore, path))
200-
let hasSeenCountry = false
201-
querySnapshot.forEach((doc) => {
202-
const {code} = doc.data()
203-
if (code && code === vote.country.alpha2code) {
204-
hasSeenCountry = true
205-
}
206-
})
207-
208-
if (hasSeenCountry) {
209-
return
210-
}
211-
212-
const docRef = await addDoc(collection($firestore, path), {
213-
latlng: [vote.country.lat, vote.country.lng],
214-
code: vote.country.alpha2code,
215-
createdAt: +new Date(),
216-
})
217195
}
218196
219197
get maxPoints() {

‎packages/web/nuxt.config.js‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,5 @@ export default {
149149
colyseusUrl: process.env.COLYSEUS_URL,
150150
borderedTileServer: process.env.BORDERED_TILE_SERVER,
151151
borderlessTileServer: process.env.BORDERLESS_TILE_SERVER,
152-
firebase: {
153-
projectId: process.env.FIREBASE_PROJECT_ID,
154-
apiKey: process.env.FIREBASE_API_KEY,
155-
authDomain: process.env.FIREBASE_AUTH_DOMAIN,
156-
storageBucket: process.env.FIREBASE_STORAGE_BUCKET,
157-
messagingSenderId: process.env.FIREBASE_MESSAGING_SENDER_ID,
158-
appId: process.env.FIREBASE_APP_ID,
159-
measurementId: process.env.FIREBASE_MEASUREMENT_ID,
160-
},
161152
},
162153
}

‎packages/web/package.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"fmt": "prettier --write ."
1414
},
1515
"dependencies": {
16+
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
1617
"@heroicons/vue": "^1.0.5",
1718
"@nuxtjs/auth-next": "^5.0.0-1624817847.21691f1",
1819
"@nuxtjs/axios": "^5.13.6",
@@ -25,13 +26,11 @@
2526
"consola": "*",
2627
"core-js": "^3.9.1",
2728
"countup.js": "latest",
28-
"firebase": "^9.6.4",
2929
"global": "^4.4.0",
3030
"leaflet": "^1.7.1",
3131
"lodash": "^4.17.21",
32-
"mapbox-gl": "^2.6.1",
3332
"numeral": "^2.0.6",
34-
"nuxt": "^2.15.3",
33+
"nuxt": "2.15.8",
3534
"nuxt-i18n": "^6.22.3",
3635
"swiper": "^5.3.7",
3736
"ts-loader": "^8.1.0",

‎packages/web/pages/achievements.vue‎

Lines changed: 0 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +0,0 @@
1-
<template>
2-
<div class="main-menu pt-10 gray-map">
3-
<l-map
4-
:center="[32, -5]"
5-
:zoom="3"
6-
:max-zoom="8"
7-
:options="mapOptions"
8-
:class="`game-map`"
9-
ref="map"
10-
>
11-
<l-tile-layer
12-
:url="tileserver"
13-
:attribution="`&copy; <a href='https://mapbox.com'>MapBox</a>. Geofind.io`"
14-
/>
15-
<l-marker
16-
v-for="country in countries"
17-
:lat-lng="[country.latlng[1], country.latlng[0]]"
18-
:key="country.code"
19-
>
20-
<l-tooltip :options="{ permanent: false, interactive: false }">
21-
<Flag
22-
:hasDropShadow="true"
23-
:hasBorder="true"
24-
:hasBorderRadius="true"
25-
size="l"
26-
gradient="real-linear"
27-
:code="country.code"
28-
/>
29-
</l-tooltip>
30-
</l-marker>
31-
</l-map>
32-
33-
<Overlay :interactive="true" position="topleft">
34-
<div class="flex flex-col text-left justify-start">
35-
<h1 class="text-left m-0 p-0">{{ $t('achievements.title') }}</h1>
36-
<h1 class="text-lg sm:text-xl text-left m-0 p-0">
37-
{{ $t('achievements.description') }}
38-
</h1>
39-
</div>
40-
</Overlay>
41-
<Overlay :interactive="true" position="topright">
42-
<Button variant="red" xx-small :to="localePath('/')" class="ml-10">
43-
<span class="px-3 text-xl">X</span>
44-
</Button>
45-
</Overlay>
46-
</div>
47-
</template>
48-
49-
<script lang="ts">
50-
import Vue from 'vue'
51-
import Component from 'vue-class-component'
52-
import Box from '~/components/box.vue'
53-
import PinSelection from '~/components/pin-selection.vue'
54-
import Panel from '~/components/panel.vue'
55-
import Button from '~/components/button.vue'
56-
import Input from '~/components/input.vue'
57-
import { LGeoJson, LMap, LTileLayer, LTooltip } from 'vue2-leaflet'
58-
import Overlay from '~/components/overlay.vue'
59-
import { collection, getDocs } from 'firebase/firestore'
60-
import { Watch } from 'vue-property-decorator'
61-
62-
@Component({
63-
layout: 'play',
64-
components: {
65-
Overlay,
66-
LMap,
67-
LGeoJson,
68-
LTooltip,
69-
LTileLayer,
70-
Box,
71-
PinSelection,
72-
Input,
73-
Panel,
74-
Button,
75-
},
76-
})
77-
export default class SettingsPage extends Vue {
78-
get tileserver() {
79-
return this.$config.borderedTileServer
80-
}
81-
82-
countries = []
83-
84-
@Watch('$store.state.auth.user.uid', { immediate: true })
85-
async fetchShapes() {
86-
if (!this.$store.state.auth.user.uid) {
87-
return
88-
}
89-
90-
const $firestore = (window.$nuxt as any).$firestore
91-
const path = `users/${(this.$store.state.auth.user as any).uid}/countries`
92-
const querySnapshot = await getDocs(collection($firestore, path))
93-
querySnapshot.forEach((doc) => {
94-
const country = doc.data()
95-
this.countries.push(country)
96-
})
97-
}
98-
99-
get user() {
100-
return this.$store.state.auth.user
101-
}
102-
103-
get mapOptions() {
104-
return {
105-
zoomControl: false,
106-
scrollWheelZoom: false, // disable original zoom function
107-
smoothWheelZoom: true, // enable smooth zoom
108-
smoothSensitivity: 1, // zoom speed. default is 1
109-
}
110-
}
111-
}
112-
</script>
113-
<style lang="postcss">
114-
body {
115-
min-height: 100vh;
116-
/* mobile viewport bug fix */
117-
min-height: -webkit-fill-available;
118-
}
119-
120-
html {
121-
height: -webkit-fill-available;
122-
}
123-
124-
.map-wrapper .leaflet-layer > .leaflet-tile-container {
125-
transition: filter ease-in-out 0.3s;
126-
}
127-
128-
.gray-map .leaflet-layer > .leaflet-tile-container {
129-
filter: grayscale(100%);
130-
}
131-
</style>

0 commit comments

Comments
 (0)