diff --git a/gui/css/colorchanger.css b/gui/css/colorchanger.css index 82bcbdc..ad0e15a 100644 --- a/gui/css/colorchanger.css +++ b/gui/css/colorchanger.css @@ -4,6 +4,10 @@ padding-top: 5px; } +.list-group-item.active, .list-group-item.selected{ + background-color: rgb(255, 127, 0); +} + .color-block{ width: 40px; height: 40px; @@ -15,6 +19,12 @@ margin-right: 1px; } +.buttons{ + display: flex; + justify-content: center; + padding-top: 25px; +} + .color-1{ background-color: #0084FF; } diff --git a/gui/css/login.css b/gui/css/login.css index 739f63c..0791bab 100644 --- a/gui/css/login.css +++ b/gui/css/login.css @@ -6,6 +6,10 @@ height: 100vh; } +h1{ + color: rgb(255, 127, 0); +} + .grey-text{ color: lightgrey; } \ No newline at end of file diff --git a/img/default.jpg b/gui/img/default.jpg similarity index 100% rename from img/default.jpg rename to gui/img/default.jpg diff --git a/gui/img/facebook-messenger.svg b/gui/img/facebook-messenger.svg new file mode 100644 index 0000000..bb6be73 --- /dev/null +++ b/gui/img/facebook-messenger.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gui/index.html b/gui/index.html index c61517a..f5cfba9 100755 --- a/gui/index.html +++ b/gui/index.html @@ -1,7 +1,7 @@ - Messenger Color Changer + Phoenix: Messenger Color Changer @@ -19,6 +19,7 @@
+ +
+
- -
diff --git a/gui/js/colorchanger.js b/gui/js/colorchanger.js index ca05e3c..e7f7a62 100644 --- a/gui/js/colorchanger.js +++ b/gui/js/colorchanger.js @@ -11,7 +11,7 @@ var colorpicker = new ColorPicker({ el: document.getElementById("colorpicker"), height: 250, width: 249, - background: '#F5F5F4' + background: '#FFFFFF' }); waff.qq(".color-block").forEach(function (el) { @@ -41,42 +41,20 @@ function login_to_messenger() { return console.error(err); } - /*api.getUserInfo([100012621480066], function(err, ret) { - if(err) return console.error(err); - - for(var prop in ret) { - if(ret.hasOwnProperty(prop)) { - console.log(ret[prop]) - } - } - });*/ - api.getThreadList(0, 50, function (err, arr) { - /* - conversations: - - image: imageSrc - - name: name - - users: - - image: thumbSrc - - name: name - */ if(err){ return console.error(err); } for(prot in arr){ (function(){ - //console.log(arr[prot]); var conversationName; var conversationImage; var conversatonID; if(arr[prot]["isCanonicalUser"]){ //is user - //console.log([arr[prot]["participantIDs"][0]].toString()); api.getUserInfo([arr[prot]["participantIDs"][0]], function(err, res){ if(err) return console.error(err); for(var prop in res) { conversationName = res[prop].name; - console.log(conversationName); conversationImage = res[prop].thumbSrc; conversatonID = prop; addConversation(conversatonID, conversationName, conversationImage); @@ -121,7 +99,6 @@ function login_to_messenger() { function changeColor(){ var id = waff.q(".conversation.active").id; - //colorpicker.getColor() api.changeThreadColor(colorpicker.getHexString().toString(), id.toString(), function callback(err){ if(err) return console.error(err); }); diff --git a/gui/js/colorpicker.js b/gui/js/colorpicker.js deleted file mode 100644 index 4b3b012..0000000 --- a/gui/js/colorpicker.js +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Created by artur9010 on 19.07.2016. - */ -const ColorPicker = require("simple-color-picker"); - -var colorpicker = new ColorPicker({ - color: '#FF0000', - el: document.getElementById("colorpicker"), - height: 250, - width: 249, - background: '#F5F5F4' -}); - -waff.qq(".color-block").forEach(function (el) { - el.on("click", function(e){ - console.log(this.css("background-color")); - console.log(this); - colorpicker.setColor(this.css("background-color")); - }); -}); \ No newline at end of file diff --git a/gui/login.html b/gui/login.html index 277a31e..c0b75d9 100644 --- a/gui/login.html +++ b/gui/login.html @@ -1,23 +1,24 @@ - Log-in to Facebook Messenger + Phoenix: Log-in to Facebook Messenger
-

electron-colorchanger

+ +

Phoenix


- +
- +
- +

Use at your own risk, we are not responsible for the account lockout.

We do not send your data to the NSA ;) (facebook does)

diff --git a/main.js b/main.js index 80c3c40..5f4ff9b 100644 --- a/main.js +++ b/main.js @@ -10,7 +10,7 @@ let mainWindow function createWindow () { // Create the browser window. - mainWindow = new BrowserWindow({width: 470, height: 700}) + mainWindow = new BrowserWindow({width: 470, height: 600}) // and load the index.html of the app. mainWindow.loadURL(`file://${__dirname}/gui/login.html`)