@@ -240,7 +240,13 @@ export default {
},
computed: {
...mapGetters(["isPremiumUser"]),
- ...mapState(["authUser", "events", "groupsEnabled", "folders"]),
+ ...mapState([
+ "authUser",
+ "events",
+ "groupsEnabled",
+ "folders",
+ "enablePaywall",
+ ]),
orderedFolders() {
return this.folders.sort((a, b) => {
return a.name.localeCompare(b.name)
diff --git a/frontend/src/components/schedule_overlap/ScheduleOverlap.vue b/frontend/src/components/schedule_overlap/ScheduleOverlap.vue
index 1e028082..eb523062 100644
--- a/frontend/src/components/schedule_overlap/ScheduleOverlap.vue
+++ b/frontend/src/components/schedule_overlap/ScheduleOverlap.vue
@@ -1250,11 +1250,7 @@ export default {
...mapState(["authUser", "overlayAvailabilitiesEnabled"]),
...mapGetters(["isPremiumUser"]),
showAds() {
- return (
- !this.ownerIsPremium &&
- !this.isPremiumUser &&
- this.state !== this.states.SET_SPECIFIC_TIMES
- )
+ return false
},
/** Returns the width of the right side of the calendar */
rightSideWidth() {
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 2d370f7a..9dfa971a 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -5,19 +5,12 @@ import router from "./router"
import store from "./store"
import vuetify from "./plugins/vuetify"
import posthogPlugin from "./plugins/posthog"
-import VueGtm from "@gtm-support/vue2-gtm"
import VueMeta from "vue-meta"
import "./index.css"
// Posthog
Vue.use(posthogPlugin)
-// Google Analytics
-Vue.use(VueGtm, {
- id: "GTM-M677X6V",
- vueRouter: router,
-})
-
// Site Metadata
Vue.use(VueMeta)
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index a0770841..b9460a8f 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -29,7 +29,7 @@ export default new Vuex.Store({
signUpFormEnabled: false,
daysOnlyEnabled: true,
overlayAvailabilitiesEnabled: true,
- enablePaywall: true,
+ enablePaywall: false,
// Experiments
pricingPageConversion: "control",
diff --git a/frontend/src/views/Event.vue b/frontend/src/views/Event.vue
index 81887280..79786ce3 100644
--- a/frontend/src/views/Event.vue
+++ b/frontend/src/views/Event.vue
@@ -638,11 +638,7 @@ export default {
...mapState(["authUser", "events"]),
...mapGetters(["isPremiumUser"]),
showAds() {
- return (
- !this.ownerIsPremium &&
- !this.isPremiumUser &&
- !this.isSettingSpecificTimes
- )
+ return false
},
allowScheduleEvent() {
return this.scheduleOverlapComponent?.allowScheduleEvent
diff --git a/frontend/src/views/Landing.vue b/frontend/src/views/Landing.vue
index b8a50d8f..41d7521c 100644
--- a/frontend/src/views/Landing.vue
+++ b/frontend/src/views/Landing.vue
@@ -31,13 +31,10 @@
class="tw-mb-4 tw-flex tw-select-none tw-items-center tw-rounded-full tw-border tw-border-light-gray-stroke tw-bg-white/70 tw-px-2.5 tw-py-1.5 tw-text-sm tw-text-dark-gray"
>
We're open source!
- StarSource
-
@@ -168,25 +151,6 @@
/>
-
-
@@ -299,11 +263,9 @@ import NewEvent from "@/components/NewEvent.vue"
import NewDialog from "@/components/NewDialog.vue"
import LandingPageHeader from "@/components/landing/LandingPageHeader.vue"
import Logo from "@/components/Logo.vue"
-import GithubButton from "vue-github-button"
import SignInDialog from "@/components/SignInDialog.vue"
import { calendarTypes } from "@/constants"
import HowItWorksDialog from "@/components/HowItWorksDialog.vue"
-import { vueVimeoPlayer } from "vue-vimeo-player"
import Footer from "@/components/Footer.vue"
import PronunciationMenu from "@/components/PronunciationMenu.vue"
import { mapState, mapMutations } from "vuex"
@@ -325,11 +287,9 @@ export default {
NewEvent,
NewDialog,
LandingPageHeader,
- GithubButton,
Logo,
SignInDialog,
HowItWorksDialog,
- vueVimeoPlayer,
Footer,
PronunciationMenu,
AuthUserMenu,
diff --git a/frontend/src/views/SignIn.vue b/frontend/src/views/SignIn.vue
index d667be55..6be32f29 100644
--- a/frontend/src/views/SignIn.vue
+++ b/frontend/src/views/SignIn.vue
@@ -32,70 +32,20 @@
-
+
-
+ mdi-github
- {{ isSignUp ? "Sign up with" : "Continue with" }} Google
+ {{ isSignUp ? "Sign up with" : "Continue with" }} GitHub
-
-
-
-
- {{ isSignUp ? "Sign up with" : "Continue with" }} Outlook
-
-
-
-
-
-
- or
-
-
-
-
-
- Email address
-
-
-
- {{ isSignUp ? "Sign up with" : "Continue with" }} Email
-
+ GitHub sign-in failed. Make sure your GitHub account has a
+ verified email address and try again.
@@ -251,7 +201,7 @@