From 3ab423d695fde846e9106b76c4936f75fb2e6cd2 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Sun, 30 Aug 2015 05:30:54 +0900 Subject: [PATCH] =?UTF-8?q?-=20Stylus=E3=81=A7=E3=82=B3=E3=83=B3=E3=83=91?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=95=E3=82=8C=E3=81=9FCSS=E3=82=92Cachin?= =?UTF-8?q?g=E3=81=99=E3=82=8B(=E3=83=AD=E3=83=87=E3=82=A3=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=81=8C=E7=9F=AD=E3=81=8F=E3=81=AA=E3=82=8B)=20-=20P?= =?UTF-8?q?lanet=20name=20change=E3=81=AE=E3=81=A8=E3=81=8D=E3=81=AB?= =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA?= =?UTF-8?q?=E3=83=B3=E3=82=B0=E8=BF=BD=E5=8A=A0=20+=20Bug=20fix=20-=20Team?= =?UTF-8?q?=E3=81=AEMember=E3=82=92=E7=B7=A8=E9=9B=86=E3=81=99=E3=82=8B?= =?UTF-8?q?=E5=A0=B4=E5=90=88=E3=80=81=E8=87=AA=E5=88=86=E3=82=92=E7=B7=A8?= =?UTF-8?q?=E9=9B=86=E3=81=99=E3=82=8B=E3=81=93=E3=81=A8=E3=81=AF=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=84=20-=20Finder=E3=81=ABMarkdown?= =?UTF-8?q?=E3=81=AE=E3=83=AA=E3=83=B3=E3=82=AF=E3=81=8C=E3=81=A1=E3=82=83?= =?UTF-8?q?=E3=82=93=E3=81=A8=E5=A4=96=E9=83=A8=E3=81=AB=E9=A3=9B=E3=81=B6?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20-=20Tray=20icon=E3=81=8C=E3=81=A1?= =?UTF-8?q?=E3=82=83=E3=82=93=E3=81=A8=E8=A1=A8=E7=A4=BA=20-=20ArticleDeta?= =?UTF-8?q?il=E3=81=AECode=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=8C?= =?UTF-8?q?=E3=81=A1=E3=82=83=E3=82=93=E3=81=A8=E8=A1=A8=E7=A4=BA=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 ++ browser/electron-stylus | 1 + browser/finder/Components/FinderDetail.jsx | 5 +-- browser/finder/index.electron.html | 2 +- .../main/Components/PlanetArticleDetail.jsx | 2 +- browser/main/Components/PlanetCreateModal.jsx | 2 +- .../main/Components/PlanetSettingModal.jsx | 40 +++++++++++++++--- browser/main/Stores/PlanetStore.js | 8 ++++ browser/main/index.electron.html | 12 +++--- browser/styles/shared/modal.styl | 4 +- main.js | 20 ++++----- modules/menu-template.js | 2 +- package.json | 4 +- tray-icon.png | Bin 463 -> 959 bytes tray-icon@2x.png | Bin 924 -> 2277 bytes 15 files changed, 72 insertions(+), 33 deletions(-) create mode 160000 browser/electron-stylus diff --git a/.gitmodules b/.gitmodules index 548af57f..73ca057a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "browser/ace"] path = browser/ace url = https://github.com/ajaxorg/ace-builds.git +[submodule "browser/electron-stylus"] + path = browser/electron-stylus + url = https://github.com/Rokt33r/electron-stylus.git diff --git a/browser/electron-stylus b/browser/electron-stylus new file mode 160000 index 00000000..6d86de7c --- /dev/null +++ b/browser/electron-stylus @@ -0,0 +1 @@ +Subproject commit 6d86de7c6666363c6c62a1c4ef95a3c1204e10ec diff --git a/browser/finder/Components/FinderDetail.jsx b/browser/finder/Components/FinderDetail.jsx index 0f610d6c..afc29762 100644 --- a/browser/finder/Components/FinderDetail.jsx +++ b/browser/finder/Components/FinderDetail.jsx @@ -2,10 +2,9 @@ var React = require('react/addons') var CodeViewer = require('../../main/Components/CodeViewer') -var Markdown = require('../../main/Mixins/Markdown') +var MarkdownPreview = require('../../main/Components/MarkdownPreview') module.exports = React.createClass({ - mixins: [Markdown], propTypes: { currentArticle: React.PropTypes.object }, @@ -28,7 +27,7 @@ module.exports = React.createClass({
{article.title}
-
+
) diff --git a/browser/finder/index.electron.html b/browser/finder/index.electron.html index e69f70ce..9aa524c9 100644 --- a/browser/finder/index.electron.html +++ b/browser/finder/index.electron.html @@ -64,7 +64,7 @@
diff --git a/browser/main/Components/PlanetArticleDetail.jsx b/browser/main/Components/PlanetArticleDetail.jsx index 23ff9761..6bf1d1b5 100644 --- a/browser/main/Components/PlanetArticleDetail.jsx +++ b/browser/main/Components/PlanetArticleDetail.jsx @@ -66,7 +66,7 @@ module.exports = React.createClass({
- +
diff --git a/browser/main/Components/PlanetCreateModal.jsx b/browser/main/Components/PlanetCreateModal.jsx index c92f8fc7..3775ba58 100644 --- a/browser/main/Components/PlanetCreateModal.jsx +++ b/browser/main/Components/PlanetCreateModal.jsx @@ -72,7 +72,7 @@ module.exports = React.createClass({ this.setState({error: {message: 'The entered name already in use'}}) break default: - this.setState({error: {message: 'Undefined error please try again'}}) + this.setState({error: {message: 'Unexpected error occured! please try again'}}) } }.bind(this)) }) diff --git a/browser/main/Components/PlanetSettingModal.jsx b/browser/main/Components/PlanetSettingModal.jsx index 10432b2f..a592c945 100644 --- a/browser/main/Components/PlanetSettingModal.jsx +++ b/browser/main/Components/PlanetSettingModal.jsx @@ -58,18 +58,44 @@ module.exports = React.createClass({ handleSavePlanetProfile: function (e) { var planet = this.props.planet - this.setState({profileSubmitStatus: 'sending'}, function () { + this.setState({profileFormStatus: 'sending', profileFormError: null}, function () { Hq.updatePlanet(planet.userName, planet.name, this.state.planet) .then(function (res) { var planet = res.body - - this.setState({profileSubmitStatus: 'done'}) + console.log(planet) + this.setState({profileFormStatus: 'done'}) PlanetStore.Actions.update(planet) + this.props.close() }.bind(this)) .catch(function (err) { - this.setState({profileSubmitStatus: 'error'}) console.error(err) + var newState = { + profileFormStatus: 'error' + } + + if (err.status == null) { + newState.profileFormError = {message: 'Check your network connection'} + return this.setState(newState) + } + + switch (err.status) { + case 403: + newState.profileFormError = err.response.body + this.setState(newState) + break + case 422: + newState.profileFormError = {message: 'Planet name should be Alphanumeric with _, -'} + this.setState(newState) + break + case 409: + newState.profileFormError = {message: 'The entered name already in use'} + this.setState(newState) + break + default: + newState.profileFormError = {message: 'Undefined error please try again'} + this.setState(newState) + } }.bind(this)) }) }, @@ -130,11 +156,11 @@ module.exports = React.createClass({
-
on Sending...
+
on Sending...
-
Connection failed.. Try again.
+
{this.state.profileFormError != null ? this.state.profileFormError.message : 'Unexpected error occured! please try again'}
-
Successfully done!!
+
Successfully done!!
) diff --git a/browser/main/Stores/PlanetStore.js b/browser/main/Stores/PlanetStore.js index f7559876..a1232b6f 100644 --- a/browser/main/Stores/PlanetStore.js +++ b/browser/main/Stores/PlanetStore.js @@ -53,6 +53,14 @@ module.exports = Reflux.createStore({ localStorage.setItem('currentUser', JSON.stringify(currentUser)) UserStore.Actions.update(currentUser) + planet.Codes.forEach(function (code) { + code.type = 'code' + }) + + planet.Notes.forEach(function (note) { + note.type = 'note' + }) + // Update the planet localStorage.setItem('planet-' + planet.id, JSON.stringify(planet)) diff --git a/browser/main/index.electron.html b/browser/main/index.electron.html index 31eb98b8..ba9fe46d 100644 --- a/browser/main/index.electron.html +++ b/browser/main/index.electron.html @@ -29,14 +29,16 @@ } #loadingCover img{ display: block; - margin: 0 auto; + margin: 75px auto 5px; + width: 160px; + height: 160px; } #loadingCover .message{ - font-size: 45px; + font-size: 30px; text-align: center; line-height: 1.6; - font-weight: 200; - color: #404849; + font-weight: 100; + color: #888; } @@ -88,7 +90,7 @@ var version = require('remote').getGlobal('version') document.title = 'Boost ' + ((version == null || version.length === 0) ? 'DEV version' : 'v' + version) - require('electron-stylus')(__dirname + '/../styles/main/index.styl') + require('../electron-stylus')(__dirname + '/../styles/main/index.styl', 'mainCss') require('node-jsx').install({ harmony: true, extension: '.jsx' }) require('./index.jsx') diff --git a/browser/styles/shared/modal.styl b/browser/styles/shared/modal.styl index 250de965..736c9fb1 100644 --- a/browser/styles/shared/modal.styl +++ b/browser/styles/shared/modal.styl @@ -97,7 +97,7 @@ float right padding 12px 10px border-radius 5px - width 200px + width 320px font-size 1em overflow-x hidden white-space nowrap @@ -139,7 +139,7 @@ float right padding 12px 10px border-radius 5px - width 200px + width 320px font-size 1em overflow-x hidden white-space nowrap diff --git a/main.js b/main.js index d9fc9b29..9fb81ce9 100644 --- a/main.js +++ b/main.js @@ -27,6 +27,7 @@ var path = require('path') autoUpdater .on('error', function (err, message) { + console.error(message) nn.notify({ title: 'Error! ' + versionText, icon: path.join(__dirname, 'browser/main/resources/favicon-230x230.png'), @@ -34,11 +35,7 @@ autoUpdater }) }) .on('checking-for-update', function () { - nn.notify({ - title: 'Boost launched!! ' + versionText, - icon: path.join(__dirname, 'browser/main/resources/favicon-230x230.png'), - message: 'Checking update is available....' - }) + // Connecting }) .on('update-available', function () { nn.notify({ @@ -131,9 +128,10 @@ app.on('ready', function () { 'zoom-factor': 1.0, 'always-on-top': true, 'web-preferences': { - 'overlay-scrollbars': true, - 'skip-taskbar': true - } + 'overlay-scrollbars': true, + 'skip-taskbar': true + }, + 'standard-window': false }) popUpWindow.loadUrl('file://' + __dirname + '/browser/finder/index.electron.html') @@ -141,6 +139,7 @@ app.on('ready', function () { popUpWindow.on('blur', function () { popUpWindow.hide() }) + popUpWindow.setVisibleOnAllWorkspaces(true) var globalShortcut = require('global-shortcut') @@ -167,8 +166,9 @@ function makeNewMainWindow () { height: 720, 'zoom-factor': 1.0, 'web-preferences': { - 'overlay-scrollbars': true - } + 'overlay-scrollbars': true + }, + 'standard-window': false }) if (update != null) { mainWindow.webContents.on('did-finish-load', function () { diff --git a/modules/menu-template.js b/modules/menu-template.js index ad34ae62..9021cba0 100644 --- a/modules/menu-template.js +++ b/modules/menu-template.js @@ -5,7 +5,7 @@ module.exports = [ label: 'Electron', submenu: [ { - label: 'About Electron', + label: 'About Boost', selector: 'orderFrontStandardAboutPanel:' }, { diff --git a/package.json b/package.json index 97fb7a0b..9a7cd215 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "boost", - "version": "0.2.7", + "version": "0.2.8", "description": "Boost App", "main": "main.js", "scripts": { @@ -31,7 +31,6 @@ }, "homepage": "https://github.com/Rokt33r/codexen-app#readme", "dependencies": { - "electron-stylus": "^0.1.0", "font-awesome": "^4.3.0", "markdown-it": "^4.3.1", "md5": "^2.0.0", @@ -43,6 +42,7 @@ "react-router": "^0.13.3", "react-select": "^0.5.4", "reflux": "^0.2.8", + "stylus": "^0.52.0", "superagent": "^1.2.0", "superagent-promise": "^1.0.3" }, diff --git a/tray-icon.png b/tray-icon.png index aba8e7d5dc096ad74e761b59eb21528e0aef6221..c42383b3c4cc840b95df5c209fd6bf85504dbe71 100644 GIT binary patch literal 959 zcmV;w13>(VP)v)jzsUH2MPPy;i}nVIvQf4=YkzXSZE#{A|v7KW-^`2E1zQ?JRhk97av z0pHlE2FvKlOb3R^9bcD90fo{C!FL;GTOG z2xxb(JTAX}C~oA;nvJZ~$*4S92^G)aL)i(u%in=&MGno1SUR%Fm=fmLP?blJG0^kruU)XEf82-9H5 zUJH(u2P%G=G7<@B6Up>PfQACvrDNG!&(LuPBJf z8xxF(|Ft2RY-dn$eou(scoPzR`1wQ8P&5;k5%D;2ZEP%TIMJy!jQ6G*Y;UNI1WgP~ zg`_SuWnv@JR6b(%8u*0tC}7WMFD%1Nxb}22&fdRE)BaC?O-!)%Q&78Zu9*A>ufGjO h=MD+=U)xUs1^{l~JNm&fWlR77002ovPDHLkV1jKaz99er literal 463 zcmV;=0WkiFP)Px#pHNIxMNDaN0Gek2plblNeE_d@0J3=ioM-^AcK}g0 z0Geh1t8)OccK}*B0KS9(9})nOVgR~=0C`aWsBr+FY5=fz0K9_$v3CHtegLj?0J?zy zsBHtXd(q|Hmd3RI|NqC})?2ujBeaBW!>1~(e-@^6w&c|G`1TF6e(dt^vDC%8;nY*B zi2$*90GC^u-p5F{lPp(5OtmumFh$a940IW$wK~xyiZI9;;!Y~YkJCn9_0&z1h6~v*8wsgoOXy zr#ssxN&m)BbxL*B*tAKt9e{AC`O(KH0szKlYb6Ga&dt3GLxjqbQXTO~`=&l|0L??7 z3wG<1Y{(0=$OtGvHx5ahj?p`V0IDpG+X=T21UiE7nYQs%FtJ4T8UU}dJWopI2kY6z zQuAwh;ly1Zvu4H+a(=M4*L{INBlfqPCo4n_+@Hc*)fdm(4$b8QgA)J%002ovPDHLk FV1naS$Ls(A diff --git a/tray-icon@2x.png b/tray-icon@2x.png index eff01fc01d3a5f85b16146be519c6ce59e52f854..effa6bfa3cdc0e4c35da1efe3846d45c367080b3 100644 GIT binary patch literal 2277 zcmV}Q&12TB@hE9Bd=`A zBMQVkYC=MRguFu@GFnyw`DRbsd5l!> zl!P*TUe+W9G$#@43bN6|boHY<^ArWMWB0y+0l;DbnN}2Zp$}t0Vm*$PR0lEdeX zI2QGFcGC00y+?|n5~P}frOBE2^x~iBu4gD{?;1Y-m$Bfu!@S+G1zDqM%R=Ii95>l* zs5T@N$?=o%>q%)CcC!!qt~%J98aEh#_IANuS(K0hm`Pah9Qxz=sJPKQ)HIYnwl8}S zk=E10y@)m>1REEvLP^SR5Z7r28XE=8I!(ZAmS^{ie!P)EABxcva6z_CJi!JfIGEq+ z(p!xI*O@k9Dhd~8;sGv(bYpi9V{#-iWFb-~$FYOmKVUV_4RjuHlr*SszveM~`<^%O z=D~M)TXxF0F=LUt<^{~g@H+?1DZ`LHlR1pm^+fh&5(|8Jc}0{4m&z}=b$2VQD7;pV z^sO84(%#qIOyr}7|3J}1BYk=_DEC$Pl zCm?dbj&d70zfuB?QFGz=`22pR7w56<8P?3^cz;LiUPTKYzfgolv*+_&vG>H|ClN6) z4j7PMb{4M}=3wz83V%x<<$oVGViez|V-|n^Xn#LiKHY)i=%UrRKp`%gK0`#D7EhC4 z}~7%eZ>E5>v;F$Km1=J|Dp}{;Vc}%*+xv z2bmZh>l?5`B0r|BJRa1Iza87nYi!@LM2YYcotbitA+e&;|wOAk|H6zT>cvFiOu=MvcI(){9v6?q&}=UA^QH zOq-PGzIJC5OyLA_82OR8Us}F%vZ7gx5Dsr~*g;!RCmD2zme*3Ar2$u~D+3NMyi!I^ ztAd6t>m)_agUOkdIMXSfjw;&3=wS18a5!Lh6v-myq)l>GNyFF9U5tB-9KQbL^Y~=O z8fcUn;n-(Pjy;DpSHOMda%QO1tiAzTZAG$9BSwx$LABjCJ$_{7qQw5*sniLSAG5gKlecg z9m#pJv`kyMx$ZQ!9Ncxg>jnKMz*IViCXPWAZTbF%>!6Jqf%Em3@#3;4`7sQ%#z?zu zGzmw)t2B2NqpG1n)Ud-Jfp;KfQWb`W{Z=wymZMqBDC(+3No6@YZ#3ZTZc2coB4`IR z;Apw0#?8eO)92%fle;lN9gg+)twjD;XRy!S$dBPw#~jhgy>}k{Gp@H*x$+3#8OP^k zT}Yp$p|gCRtVA;=1~r@!pLJ7o3@1|w)$k<8q*CH&O$pXcNWto9X;@S655!tHWRMf? zzH|ZxomNP#oY_rP;{p6VKbM}$2)IdFW?&P`-QB$nnm62I& zh-&LY#xNrI4VO_7O7}fx)JKvHkD@4{7SFIg<8@>o{2l(=QbKnvLsKMwp<9VpA5X=& zsAIHngm;q72~NktTdx<#@h~0wBmE}kQ1mC&!tx4%Q1O4xYBykCQ5KGTd5XmdYDPJA z2?t+3Vig%yISZ0U3mZ_`F06(krsEO$*Pj#qCHV0JDnUvO#`ZqQKpKt@izt{|PVvg_IYv_b6)K00000NkvXXu0mjfyQNgq literal 924 zcmV;N17rM&P)Px$5l~E2MNDaN08};r1Ofo5asZ@m0H|>Quyz0*6aWqh z0IYNXsd4~{TL6z>0I+rdwR`}ucL1Pl0I_)hH6j3LLjbIE0IhTYxq$#P9{>OV0ESxt zrf&eRcK};D0FYn+wR-@aXaGel0I+xfv3dZWX#inA0Fq+>W<>zJg8(=r0HtdHv3LLf z{{X**0I+rdwR-@pa{#!00J3-hpl1N7Zvc~6=<@CWy@LRlUWdA+bi=65=ic)7^>nwL ze95k%*u_DxjQafhN}hh(>g2rJ&#TP8%HP(p;n0lIxtY$pF|LIowuVuzi{b9+_xbo^ z%c&u%e+!jhESq&Sl5JkRo1@>$KEIU-t$F~2OBtJK9ExCRsE=J(G(rFX04j7+PE!Cx z7P}KE(g6h7G&vgQqwjlPA5rb|*f$V~-?Uvu(6%ga8p$qmE^P|@A8kDE0005=NklfPL*ap4qzBcNzp_O(bR4U&MS z1NkgT2x)-!F9aNI|B(|KJkfvnGJ4oh1V>6-`2c((lD7~-`)-4=;hG_UPI_^Dbw#59 zgu&RgEF+STKSV%@*jDc#+-)b&zPBtFMG`k*%ftc!oUeU2n|d=!L^;3(8(KV9$-^VK z8_bv9(w>j}s2=%}79!-S-g*n?-Y;)SoJ@vcB~^w3nIio&U-}Dgx$yR0XOEPqRip#} zj6oj;gQ*SS;@Ln6AWT6TWD#OwPhkJ~yAh?J03Xl6_#Dt?%zplGG4ZX*4eCKEL;!Z@ zB)qfj>1v1_Qae`;$5Dy^ z0Mjzo22w{WKUia3Yq9abb6o5KVFb{(;duOr_3K9OFz>9q4{MGZdNEBCgLbER+!*mp z2D(OOde}R?-C>hECuTWKIRZMm?y#@VLoA=v9fdBVuA_FV(R_0ny^lAia