Skip to content

Commit 9e53bec

Browse files
Rokt33rRokt33r
committed
tag as v0.1
1 parent 4094fff commit 9e53bec

10 files changed

Lines changed: 105 additions & 36 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
/node_modules
33
/electron_build
44
.env
5+
dist/

‎Gulpfile.js‎

Lines changed: 48 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,56 @@ var ngAnnotate = require('gulp-ng-annotate')
2020
var uglify = require('gulp-uglify')
2121
var minifyCss = require('gulp-minify-css')
2222
var merge = require('merge-stream')
23+
var concat = require('gulp-concat')
24+
var streamqueue = require('streamqueue')
25+
var minifyHtml = require('gulp-minify-html')
2326

2427
var config = require('./build.config.js')
2528

26-
gulp.task('env', function () {
27-
return gulp.src('tpls/env.js')
28-
.pipe(template({
29-
apiUrl: env.BUILD_API_URL
30-
}))
31-
.pipe(gulp.dest('build/config'))
29+
gulp.task('js', function () {
30+
return streamqueue({objectMode: true},
31+
gulp.src('tpls/env.js')
32+
.pipe(template({
33+
apiUrl: env.BUILD_API_URL
34+
})),
35+
gulp.src(['src/**/*.js'])
36+
)
37+
.pipe(changed('build'))
38+
.pipe(gulp.dest('build'))
3239
})
3340

34-
gulp.task('js', function () {
35-
return gulp.src(['src/**/*.js'])
36-
.pipe(changed('build'))
37-
.pipe(gulp.dest('build'))
41+
gulp.task('dist', function () {
42+
var js = streamqueue({objectMode: true},
43+
gulp.src(['src/**/*.js']),
44+
gulp.src('tpls/env.js')
45+
.pipe(template({
46+
apiUrl: env.DIST_API_URL
47+
})),
48+
gulp.src('src/**/*.tpl.html')
49+
.pipe(templateCache())
50+
)
51+
.pipe(ngAnnotate())
52+
.pipe(uglify())
53+
.pipe(concat('app.js'))
54+
.pipe(gulp.dest('dist'))
55+
56+
var css = gulp.src('src/styles/main.styl')
57+
.pipe(plumber({errorHandler: notify.onError('Error: <%= error.message %>')}))
58+
.pipe(styl())
59+
.pipe(autoprefixer())
60+
.pipe(minifyCss())
61+
.pipe(gulp.dest('dist'))
62+
63+
var index = gulp.src('src/index.html')
64+
.pipe(template({
65+
scripts: ['app.js'],
66+
styles: ['main.css'],
67+
env: 'dist'
68+
}))
69+
.pipe(minifyHtml())
70+
.pipe(gulp.dest('dist'))
71+
72+
return merge(js, css, index)
3873
})
3974

4075
gulp.task('styl', function () {
@@ -72,7 +107,7 @@ gulp.task('index', function () {
72107
.pipe(template({
73108
scripts: scripts,
74109
styles: styles,
75-
env: env
110+
env: 'build'
76111
}))
77112
.pipe(gulp.dest('build'))
78113
.pipe(livereload())
@@ -100,13 +135,11 @@ gulp.task('resources', function () {
100135
})
101136

102137
gulp.task('build', function (cb) {
103-
runSequence(['env', 'js', 'styl', 'tpls', 'vendor', 'resources'], 'index', cb)
138+
runSequence(['js', 'styl', 'tpls', 'vendor', 'resources'], 'index', cb)
104139
})
105140

106141
gulp.task('watch', function (cb) {
107-
gulp.watch(['.env', 'tpls/env.js'], ['env'])
108-
109-
gulp.watch('src/**/*.js', ['js'])
142+
gulp.watch(['.env', 'tpls/env.js', 'src/**/*.js'], ['js'])
110143

111144
gulp.watch('src/styles/**/*.styl', ['styl'])
112145

‎electron_src/popup/services/snippet.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global angular */
22
angular.module('codexen.popup')
3-
.constant('apiUrl', 'http://localhost:8000/')
3+
.constant('apiUrl', 'http://codexen-server-dev.elasticbeanstalk.com/')
44
.config(function ($authProvider, $httpProvider, apiUrl) {
55
$authProvider.baseUrl = apiUrl
66

‎gulp-electron.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports = function (gulp) {
2121
gulp.task('elec-env', function () {
2222
return gulp.src('tpls/env.js')
2323
.pipe(template({
24-
apiUrl: env.BUILD_API_URL
24+
apiUrl: env.ELEC_API_URL
2525
}))
2626
.pipe(gulp.dest('electron_build/config'))
2727
})
@@ -78,7 +78,7 @@ module.exports = function (gulp) {
7878
.pipe(template({
7979
scripts: scripts,
8080
styles: styles,
81-
env: env
81+
env: 'build'
8282
}))
8383
.pipe(gulp.dest('electron_build'))
8484
.pipe(livereload())

‎package.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,9 @@
6868
"satellizer": "^0.10.1",
6969
"ui-select": "^0.11.2"
7070
},
71-
"devDependencies": {}
71+
"devDependencies": {
72+
"gulp-concat": "^2.5.2",
73+
"gulp-minify-html": "^1.0.3",
74+
"streamqueue": "^1.1.0"
75+
}
7276
}

‎src/controllers/states/SnippetsListController.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global angular */
22
angular.module('codexen')
3-
.controller('SnippetsListController', function ($auth, Snippet, $scope, $state, $scope, $filter, mySnippets) {
3+
.controller('SnippetsListController', function ($auth, Snippet, $scope, $state, $scope, $filter, mySnippets, User) {
44
var vm = this
55

66
vm.isLoading = false
@@ -12,6 +12,16 @@ angular.module('codexen')
1212
vm.searchSnippets = searchSnippets
1313
vm.searchSnippets()
1414

15+
vm.isAuthenticated = $auth.isAuthenticated()
16+
var reloadUser = function () {
17+
if (vm.isAuthenticated) {
18+
User.me().success(function (data) {
19+
vm.currentUser = data
20+
})
21+
}
22+
}
23+
reloadUser()
24+
1525
// TODO: add Navigation methods
1626
// vm.nextSnippet()
1727
// vm.priorSnippet()

‎src/index.html‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,16 @@
1111
<meta name="description" content="CodeXen - Short code storage service">
1212

1313
<title>Codexen!</title>
14-
<link rel="stylesheet" href="vendor/css/font-awesome.css" media="screen" title="no title" charset="utf-8">
14+
15+
16+
<% if(env === 'dist') { %>
17+
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
18+
<% } %>
19+
20+
<% if(env === 'build') { %>
21+
<link rel="stylesheet" href="vendor/css/font-awesome.css" media="screen" title="no title" charset="utf-8">
22+
<% } %>
23+
1524
<% styles.forEach(function(style){ %>
1625
<link rel="stylesheet" href="<%=style %>" media="screen" title="no title" charset="utf-8">
1726
<% }) %>
@@ -22,15 +31,30 @@
2231
<div side-nav id="side-view"></div>
2332
<div ui-view name="main-view" id="main-view"></div>
2433

25-
<script src="vendor/ace.js"></script>
26-
<script src="vendor/angular.js"></script>
27-
<script src="vendor/angular-sanitize.js"></script>
28-
<script src="vendor/angular-ui-router.js"></script>
29-
<script src="vendor/ui-bootstrap-tpls.js"></script>
30-
<script src="vendor/select.js"></script>
31-
<script src="vendor/satellizer.js"></script>
32-
<script src="vendor/angular-md5.js"></script>
33-
<script src="vendor/moment.js"></script>
34+
<% if(env === 'dist') { %>
35+
<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.9/ace.js" charset="utf-8"></script>
36+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js" charset="utf-8"></script>
37+
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular-sanitize.min.js" charset="utf-8"></script>
38+
<script src="https://cdn.rawgit.com/angular-ui/ui-router/0.2.15/release/angular-ui-router.min.js" charset="utf-8"></script>
39+
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.0/ui-bootstrap-tpls.min.js" charset="utf-8"></script>
40+
<script src="https://cdn.rawgit.com/angular-ui/ui-select/v0.12.0/dist/select.min.js" charset="utf-8"></script>
41+
<script src="https://cdn.jsdelivr.net/satellizer/0.11.2/satellizer.min.js"></script>
42+
<script src="https://cdn.rawgit.com/gdi2290/angular-md5/v0.1.7/angular-md5.min.js" charset="utf-8"></script>
43+
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.3/moment.min.js" charset="utf-8"></script>
44+
<% } %>
45+
46+
<% if(env === 'build') { %>
47+
<script src="vendor/ace.js"></script>
48+
<script src="vendor/angular.js"></script>
49+
<script src="vendor/angular-sanitize.js"></script>
50+
<script src="vendor/angular-ui-router.js"></script>
51+
<script src="vendor/ui-bootstrap-tpls.js"></script>
52+
<script src="vendor/select.js"></script>
53+
<script src="vendor/satellizer.js"></script>
54+
<script src="vendor/angular-md5.js"></script>
55+
<script src="vendor/moment.js"></script>
56+
<% } %>
57+
3458

3559
<% scripts.forEach(function(script){ %>
3660
<script src="<%=script %>"></script>

‎src/styles/_bootstrap.styl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
@import '../../node_modules/bootstrap-styl/bootstrap/navs'
2828
@import '../../node_modules/bootstrap-styl/bootstrap/navbar'
2929
// @import '../../node_modules/bootstrap-styl/bootstrap/breadcrumbs'
30-
@import '../../node_modules/bootstrap-styl/bootstrap/pagination'
31-
@import '../../node_modules/bootstrap-styl/bootstrap/pager'
30+
// @import '../../node_modules/bootstrap-styl/bootstrap/pagination'
31+
// @import '../../node_modules/bootstrap-styl/bootstrap/pager'
3232
@import '../../node_modules/bootstrap-styl/bootstrap/labels'
3333
@import '../../node_modules/bootstrap-styl/bootstrap/badges'
3434
@import '../../node_modules/bootstrap-styl/bootstrap/jumbotron'

‎src/tpls/states/home.tpl.html‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
<h1 class="jumbotron">Codexen App <small>v0.1</small></h1>
33
<p>
44
App for Code snippets<br>
5-
6-
App: <a href="https://github.com/Rokt33r/codexen-app">Rokt33r/codexen-app</a><br>
7-
Server: <a href="https://github.com/Rokt33r/codexen-server">Rokt33r/codexen-server</a>
85
</p>
96

107
<p>

‎src/tpls/states/snippets.list.tpl.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h4>
2929
<li snippet-item="snippet" ng-repeat="snippet in vm.filtered" ui-sref="snippets.detail({id:snippet.id})" ng-class="{active:vm.snippetId===snippet.id}">
3030
<div class="media">
3131
<div class="media-left">
32-
<img width="25" height="25" class="img-circle" src="http://www.gravatar.com/avatar/ea0b6ad1c11700120d1af08810caa19d" alt="" />
32+
<img width="25" height="25" class="img-circle" ng-src="http://www.gravatar.com/avatar/{{ vm.currentUser.email | gravatar }}" alt="" />
3333
</div>
3434
<div class="media-body">
3535
<p ng-bind="snippet.callSign" class="call-sign">

0 commit comments

Comments
 (0)