From 89ba802b23bf1fd22afbc5e9a4b3b732264e3c18 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Tue, 4 Nov 2014 15:57:23 +0000 Subject: Move webclient to a python module so that it can be installed --- webclient/settings/settings-controller.js | 221 ------------------------------ webclient/settings/settings.html | 106 -------------- 2 files changed, 327 deletions(-) delete mode 100644 webclient/settings/settings-controller.js delete mode 100644 webclient/settings/settings.html (limited to 'webclient/settings') diff --git a/webclient/settings/settings-controller.js b/webclient/settings/settings-controller.js deleted file mode 100644 index 9cdace704a..0000000000 --- a/webclient/settings/settings-controller.js +++ /dev/null @@ -1,221 +0,0 @@ -/* -Copyright 2014 OpenMarket Ltd - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -'use strict'; - -angular.module('SettingsController', ['matrixService', 'mFileUpload', 'mFileInput']) -.controller('SettingsController', ['$scope', 'matrixService', 'mFileUpload', - function($scope, matrixService, mFileUpload) { - // XXX: duplicated from register - var generateClientSecret = function() { - var ret = ""; - var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - - for (var i = 0; i < 32; i++) { - ret += chars.charAt(Math.floor(Math.random() * chars.length)); - } - - return ret; - }; - $scope.config = matrixService.config(); - - $scope.profile = { - displayName: "", - avatarUrl: "" - }; - - // The profile as stored on the server - $scope.profileOnServer = { - displayName: "", - avatarUrl: "" - }; - - $scope.onInit = function() { - // Load profile data - // Display name - matrixService.getDisplayName($scope.config.user_id).then( - function(response) { - $scope.profile.displayName = response.data.displayname; - $scope.profileOnServer.displayName = response.data.displayname; - }, - function(error) { - $scope.feedback = "Can't load display name"; - } - ); - // Avatar - matrixService.getProfilePictureUrl($scope.config.user_id).then( - function(response) { - $scope.profile.avatarUrl = response.data.avatar_url; - $scope.profileOnServer.avatarUrl = response.data.avatar_url; - }, - function(error) { - $scope.feedback = "Can't load avatar URL"; - } - ); - }; - - $scope.$watch("profile.avatarFile", function(newValue, oldValue) { - if ($scope.profile.avatarFile) { - console.log("Uploading new avatar file..."); - mFileUpload.uploadFile($scope.profile.avatarFile).then( - function(url) { - $scope.profile.avatarUrl = url; - }, - function(error) { - $scope.feedback = "Can't upload image"; - } - ); - } - }); - - $scope.saveProfile = function() { - if ($scope.profile.displayName !== $scope.profileOnServer.displayName) { - setDisplayName($scope.profile.displayName); - } - if ($scope.profile.avatarUrl !== $scope.profileOnServer.avatarUrl) { - setAvatar($scope.profile.avatarUrl); - } - }; - - var setDisplayName = function(displayName) { - matrixService.setDisplayName(displayName).then( - function(response) { - $scope.feedback = "Updated display name."; - }, - function(error) { - $scope.feedback = "Can't update display name: " + error.data; - } - ); - }; - - var setAvatar = function(avatarURL) { - console.log("Updating avatar to " + avatarURL); - matrixService.setProfilePictureUrl(avatarURL).then( - function(response) { - console.log("Updated avatar"); - $scope.feedback = "Updated avatar."; - }, - function(error) { - $scope.feedback = "Can't update avatar: " + error.data; - } - ); - }; - - $scope.linkedEmails = { - linkNewEmail: "", // the email entry box - emailBeingAuthed: undefined, // to populate verification text - authSid: undefined, // the token id from the IS - emailCode: "", // the code entry box - linkedEmailList: matrixService.config().emailList // linked email list - }; - - $scope.linkEmail = function(email) { - if (email != $scope.linkedEmails.emailBeingAuthed) { - $scope.linkedEmails.emailBeingAuthed = email; - $scope.clientSecret = generateClientSecret(); - $scope.sendAttempt = 0; - } - $scope.sendAttempt++; - matrixService.linkEmail(email, $scope.clientSecret, $scope.sendAttempt).then( - function(response) { - if (response.data.success === true) { - $scope.linkedEmails.authSid = response.data.sid; - $scope.emailFeedback = "You have been sent an email."; - $scope.linkedEmails.emailBeingAuthed = email; - } - else { - $scope.emailFeedback = "Failed to send email."; - } - }, - function(error) { - $scope.emailFeedback = "Can't send email: " + error.data; - } - ); - }; - - $scope.submitEmailCode = function() { - var tokenId = $scope.linkedEmails.authSid; - if (tokenId === undefined) { - $scope.emailFeedback = "You have not requested a code with this email."; - return; - } - matrixService.authEmail($scope.clientSecret, $scope.linkedEmails.authSid, $scope.linkedEmails.emailCode).then( - function(response) { - if ("errcode" in response.data) { - $scope.emailFeedback = "Failed to authenticate email."; - return; - } - matrixService.bindEmail(matrixService.config().user_id, tokenId, $scope.clientSecret).then( - function(response) { - if ('errcode' in response.data) { - $scope.emailFeedback = "Failed to link email."; - return; - } - var config = matrixService.config(); - var emailList = {}; - if ("emailList" in config) { - emailList = config.emailList; - } - emailList[$scope.linkedEmails.emailBeingAuthed] = response; - // save the new email list - config.emailList = emailList; - matrixService.setConfig(config); - matrixService.saveConfig(); - // invalidate the email being authed and update UI. - $scope.linkedEmails.emailBeingAuthed = undefined; - $scope.emailFeedback = ""; - $scope.linkedEmails.linkedEmailList = emailList; - $scope.linkedEmails.linkNewEmail = ""; - $scope.linkedEmails.emailCode = ""; - }, function(reason) { - $scope.emailFeedback = "Failed to link email: " + reason; - } - ); - }, - function(reason) { - $scope.emailFeedback = "Failed to auth email: " + reason; - } - ); - }; - - - /*** Desktop notifications section ***/ - $scope.settings = { - notifications: undefined, - bingWords: matrixService.config().bingWords - }; - - $scope.saveBingWords = function() { - console.log("Saving words: "+JSON.stringify($scope.settings.bingWords)); - var config = matrixService.config(); - config.bingWords = $scope.settings.bingWords; - matrixService.setConfig(config); - matrixService.saveConfig(); - }; - - // If the browser supports it, check the desktop notification state - if ("Notification" in window) { - $scope.settings.notifications = window.Notification.permission; - } - - $scope.requestNotifications = function() { - console.log("requestNotifications"); - window.Notification.requestPermission(function (permission) { - console.log(" -> User decision: " + permission); - $scope.settings.notifications = permission; - }); - }; -}]); diff --git a/webclient/settings/settings.html b/webclient/settings/settings.html deleted file mode 100644 index 094c846f8b..0000000000 --- a/webclient/settings/settings.html +++ /dev/null @@ -1,106 +0,0 @@ -
- -
- -
- [matrix] -
- -

Settings

-
-
-
- -
-
- -
- -
-
-
-
- -

Linked emails

-
-
- - - {{ emailFeedback }} -
-
- Enter validation token for {{ linkedEmails.emailBeingAuthed }}: -
- - -
- - - - -
{{address}}
-
-
- -

Desktop notifications

-
-
- Notifications are enabled. -
-

Specific words to alert on:

-

Leave blank to alert on all messages. Your username & display name always alerts.

- -
    -
  • {{word}}
    • -
-
-
-
- You have denied permission for notifications.
- To enable it, reset the notification setting for this web site into your browser settings. -
-
- -
-
- Sorry, your browser does not support notifications. -
-
-
- -

Configuration

-
-
Home server: {{ config.homeserver }}
-
Identity server: {{ config.identityServer }}
-
User ID: {{ config.user_id }}
-
Access token: {{ config.access_token }}
-
-
- -

Commands

-
- The following commands are available in the room chat: -
    -
  • /nick <display_name>: change your display name
    • -
  • /me <action>: send the action you are doing. /me will be replaced by your display name
    • -
  • /join <room_alias>: join a room
    • -
  • /kick <user_id> [<reason>]: kick the user
    • -
  • /ban <user_id> [<reason>]: ban the user
    • -
  • /unban <user_id>: unban the user
    • -
  • /op <user_id> <power_level>: set user power level
    • -
  • /deop <user_id>: reset user power level to the room default value
    • -
-
-
- - {{ feedback }} - -
-
-- cgit 1.4.1