From 12e55fb487e60ae353f5089cac7ed238f2e0623b Mon Sep 17 00:00:00 2001 From: James Allen Date: Fri, 26 Jan 2018 16:44:14 +0000 Subject: [PATCH] Show v2 message if awareOfV2 flag set --- .../app/coffee/Features/Project/ProjectController.coffee | 2 +- services/web/app/coffee/models/User.coffee | 1 + services/web/app/views/project/list/notifications.pug | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index f715031419..8583514149 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -157,7 +157,7 @@ module.exports = ProjectController = hasSubscription: (cb)-> LimitationsManager.userHasSubscriptionOrIsGroupMember currentUser, cb user: (cb) -> - User.findById user_id, "featureSwitches overleaf", cb + User.findById user_id, "featureSwitches overleaf awareOfV2", cb }, (err, results)-> if err? logger.err err:err, "error getting data for project list page" diff --git a/services/web/app/coffee/models/User.coffee b/services/web/app/coffee/models/User.coffee index 7689856ad3..2a48105e9b 100644 --- a/services/web/app/coffee/models/User.coffee +++ b/services/web/app/coffee/models/User.coffee @@ -63,6 +63,7 @@ UserSchema = new Schema id: { type: Number } accessToken: { type: String } refreshToken: { type: String } + awareOfV2: { type:Boolean, default: false } conn = mongoose.createConnection(Settings.mongo.url, { server: {poolSize: Settings.mongo.poolSize || 10}, diff --git a/services/web/app/views/project/list/notifications.pug b/services/web/app/views/project/list/notifications.pug index f4be585f7b..69fc1806a0 100644 --- a/services/web/app/views/project/list/notifications.pug +++ b/services/web/app/views/project/list/notifications.pug @@ -1,3 +1,11 @@ +if (user.awareOfV2 && !settings.overleaf) + .alert.alert-info.small + a.pull-right.btn.btn-info.btn-sm(href="/user/login_to_ol_v2" style="margin-left: 12px") Click here to try Overleaf v2 + p + | ShareLaTeX is joining Overleaf and will become Overleaf v2 in late 2018 (read more). +
+ | We’re beta testing Overleaf v2 now and you can try it out with your ShareLaTeX account. + span(ng-controller="NotificationsController").userNotifications ul.list-unstyled.notifications-list( ng-if="notifications.length > 0",