-
Sign Out
@@ -19,10 +19,23 @@
Side Nav
diff --git a/src/main.scss b/src/main.scss index 3b320d3b..10e81f92 100644 --- a/src/main.scss +++ b/src/main.scss @@ -46,3 +46,9 @@ label{ overflow-x: hidden; overflow-y: auto; } + +.inline-form-control{ + @extend .form-control; + width: auto; + display: inline-block; +} diff --git a/src/modals/new-snippet-editor.scss b/src/modals/new-snippet-editor.scss new file mode 100644 index 00000000..4faa7b04 --- /dev/null +++ b/src/modals/new-snippet-editor.scss @@ -0,0 +1,12 @@ +@import "../variables"; + +$editor-border-color: $border-color; + +.new-snippet-modal{ + + .ace_editor { + height: 200px; + border: solid 1px $editor-border-color; + border-radius: 5px; + } +} diff --git a/src/modals/new-snippet-modal.js b/src/modals/new-snippet-modal.js new file mode 100644 index 00000000..11ce9465 --- /dev/null +++ b/src/modals/new-snippet-modal.js @@ -0,0 +1,38 @@ +angular.module('codexen.modals') + .factory('newSnippetModal', function ($modal) { + var open = function () { + return $modal.open({ + templateUrl:'modals/new-snippet-modal.tpl.html', + controller:'NewSnippetModalController as vm' + }) + } + + return { + open: open + } + }) + .controller('NewSnippetModalController', function ($modalInstance, aceModes, $log, Snippet, $rootScope){ + var vm = this + + vm.aceModes = aceModes + + vm.submit = function () { + var params = { + title: vm.title, + description: vm.description, + prefix: vm.prefix, + mode: vm.mode==null?null:vm.mode.name.toLowerCase(), + content: vm.content + } + + Snippet.create(params) + .success(function(data){ + $modalInstance.close(data.snippet) + console.log('snippet created!', data) + }) + } + + vm.cancel = function () { + $modalInstance.dismiss() + } + }) diff --git a/src/modals/new-snippet-modal.tpl.html b/src/modals/new-snippet-modal.tpl.html new file mode 100644 index 00000000..5ab107a6 --- /dev/null +++ b/src/modals/new-snippet-modal.tpl.html @@ -0,0 +1,34 @@ ++diff --git a/src/services/snippet.js b/src/services/snippet.js index e9d594d7..6468262a 100644 --- a/src/services/snippet.js +++ b/src/services/snippet.js @@ -1,16 +1,23 @@ angular.module('codexen.services') .factory('Snippet', function ($http, $auth, apiUrl) { - var findByUserId = function (userId) { + var findByUser = function (user) { var url = apiUrl + 'snippets' return $http.get(url, { params: { - userId: userId + user: user } }) } + var create = function (params) { + var url = apiUrl + 'snippets' + + return $http.post(url, params) + } + return { - findByUserId: findByUserId + findByUser: findByUser, + create: create } }) diff --git a/src/states/home/home.js b/src/states/home/home.js index bbfe1976..45f42e64 100644 --- a/src/states/home/home.js +++ b/src/states/home/home.js @@ -1,36 +1,6 @@ /* global angular */ angular.module('codexen.states') .controller('HomeController', function ($auth, Snippet, $scope) { - var vm = this - - vm.isLoaded = false - - var laodSnippets = function () { - if ($auth.isAuthenticated) { - console.log($auth.getPayload()) - var userId = $auth.getPayload().sub - Snippet.findByUserId(userId) - .success(function (data) { - console.log('snippets fetched', data.snippets) - vm.isLoaded = true - vm.snippets = data.snippets - vm.isGuest = false - }) - }else { - vm.isLoaded = true - vm.isGuest = true - vm.snippets = void 0 - } - } - - laodSnippets() - - $scope.$on('userSignIn', function () { - laodSnippets() - }) - - $scope.$on('userSignOut', function () { - laodSnippets() - }) + }) diff --git a/src/states/home/home.scss b/src/states/home/home.scss index c5cf7a09..17a788d0 100644 --- a/src/states/home/home.scss +++ b/src/states/home/home.scss @@ -1,51 +1,6 @@ @import "../../variables"; @import "../../mixins"; -$left-pane-width: 275px; - - -$pane-border-color: #ddd; -$snippet-list-border-color: #ddd; -$snippet-list-item-hover-bg: #EEE; - .home-state{ - position: absolute; - top:0; - left:0; - right:0; - bottom:0; - .left-pane{ - position: absolute; - top: 0; - bottom: 0; - left: 0; - width: $left-pane-width; - overflow-x: hidden; - overflow-y: auto; - border-right: solid 1px $pane-border-color; - .snippet-list{ - list-style: none; - padding: 0; - li{ - padding: 5px; - border-bottom: solid 1px $snippet-list-border-color; - h4{ - margin: 0; - } - &:hover{ - background-color: $snippet-list-item-hover-bg; - } - p{ - margin:0; - } - } - } - } - .right-pane{ - position: absolute; - top: 0; - bottom: 0; - left: $left-pane-width; - right: 0; - } + padding: 10px; } diff --git a/src/states/home/home.tpl.html b/src/states/home/home.tpl.html index f951962f..a22d1c45 100644 --- a/src/states/home/home.tpl.html +++ b/src/states/home/home.tpl.html @@ -1,51 +1,10 @@+ ++ +++ + ++ +++ + ++ + ++ +{{$select.selected.name}} ++ + ++diff --git a/src/states/snippets/list.js b/src/states/snippets/list.js new file mode 100644 index 00000000..79c40dbe --- /dev/null +++ b/src/states/snippets/list.js @@ -0,0 +1,40 @@ +/* global angular */ +angular.module('codexen.states') + .controller('SnippetsListController', function ($auth, Snippet, $scope) { + var vm = this + + vm.isLoaded = false + + var laodSnippets = function () { + if ($auth.isAuthenticated) { + console.log($auth.getPayload()) + var userId = $auth.getPayload().sub + Snippet.findByUser(userId) + .success(function (data) { + console.log('snippets fetched', data.snippets) + vm.isLoaded = true + vm.snippets = data.snippets + vm.isGuest = false + }) + }else { + vm.isLoaded = true + vm.isGuest = true + vm.snippets = void 0 + } + } + + laodSnippets() + + $scope.$on('userSignIn', function () { + laodSnippets() + }) + + $scope.$on('userSignOut', function () { + laodSnippets() + }) + + $scope.$on('snippetUpdated', function () { + laodSnippets() + }) + + }) diff --git a/src/states/snippets/list.tpl.html b/src/states/snippets/list.tpl.html new file mode 100644 index 00000000..05c5cf5f --- /dev/null +++ b/src/states/snippets/list.tpl.html @@ -0,0 +1,51 @@ + diff --git a/src/states/snippets/snippets.scss b/src/states/snippets/snippets.scss new file mode 100644 index 00000000..ec41c0ca --- /dev/null +++ b/src/states/snippets/snippets.scss @@ -0,0 +1,51 @@ +@import "../../variables"; +@import "../../mixins"; + +$left-pane-width: 275px; + + +$pane-border-color: $border-color; +$snippet-list-border-color: $border-color; +$snippet-list-item-hover-bg: #EEE; + +.snippets-list-state{ + position: absolute; + top:0; + left:0; + right:0; + bottom:0; + .left-pane{ + position: absolute; + top: 0; + bottom: 0; + left: 0; + width: $left-pane-width; + overflow-x: hidden; + overflow-y: auto; + border-right: solid 1px $pane-border-color; + .snippet-list{ + list-style: none; + padding: 0; + li{ + padding: 5px; + border-bottom: solid 1px $snippet-list-border-color; + h4{ + margin: 0; + } + &:hover{ + background-color: $snippet-list-item-hover-bg; + } + p{ + margin:0; + } + } + } + } + .right-pane{ + position: absolute; + top: 0; + bottom: 0; + left: $left-pane-width; + right: 0; + } +} diff --git a/src/states/states.js b/src/states/states.js index 704e50ee..43819466 100644 --- a/src/states/states.js +++ b/src/states/states.js @@ -4,6 +4,7 @@ angular.module('codexen.states') $urlRouterProvider .when('/auth', '/auth/register') .when('/auth/', '/auth/register') + .otherwise('/') $stateProvider /* Auth */ @@ -26,10 +27,26 @@ angular.module('codexen.states') controller: 'AuthSignInController as vm' }) + /* Snippets */ + .state('snippets', { + url: '/snippets', + views:{ + 'main-view': { + templateUrl: 'states/snippets/list.tpl.html', + controller: 'SnippetsListController as vm' + } + } + }) + .state('snippets.detail', { + url: '/:id', + templateUrl: 'states/snippets/detail.tpl.html', + controller: 'SnippetsDetailController as vm' + }) + /* Home */ .state('home', { url: '/', - views:{ + views: { 'main-view': { templateUrl: 'states/home/home.tpl.html', controller: 'HomeController as vm' diff --git a/test.js b/test.js new file mode 100644 index 00000000..94dacead --- /dev/null +++ b/test.js @@ -0,0 +1,132 @@ +var data = { + ABAP: ["abap"], + ABC: ["abc"], + ActionScript:["as"], + ADA: ["ada|adb"], + Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"], + AsciiDoc: ["asciidoc|adoc"], + Assembly_x86:["asm"], + AutoHotKey: ["ahk"], + BatchFile: ["bat|cmd"], + C9Search: ["c9search_results"], + C_Cpp: ["cpp|c|cc|cxx|h|hh|hpp"], + Cirru: ["cirru|cr"], + Clojure: ["clj|cljs"], + Cobol: ["CBL|COB"], + coffee: ["coffee|cf|cson|^Cakefile"], + ColdFusion: ["cfm"], + CSharp: ["cs"], + CSS: ["css"], + Curly: ["curly"], + D: ["d|di"], + Dart: ["dart"], + Diff: ["diff|patch"], + Dockerfile: ["^Dockerfile"], + Dot: ["dot"], + Dummy: ["dummy"], + DummySyntax: ["dummy"], + Eiffel: ["e"], + EJS: ["ejs"], + Elixir: ["ex|exs"], + Elm: ["elm"], + Erlang: ["erl|hrl"], + Forth: ["frt|fs|ldr"], + FTL: ["ftl"], + Gcode: ["gcode"], + Gherkin: ["feature"], + Gitignore: ["^.gitignore"], + Glsl: ["glsl|frag|vert"], + golang: ["go"], + Groovy: ["groovy"], + HAML: ["haml"], + Handlebars: ["hbs|handlebars|tpl|mustache"], + Haskell: ["hs"], + haXe: ["hx"], + HTML: ["html|htm|xhtml"], + HTML_Ruby: ["erb|rhtml|html.erb"], + INI: ["ini|conf|cfg|prefs"], + Io: ["io"], + Jack: ["jack"], + Jade: ["jade"], + Java: ["java"], + JavaScript: ["js|jsm"], + JSON: ["json"], + JSONiq: ["jq"], + JSP: ["jsp"], + JSX: ["jsx"], + Julia: ["jl"], + LaTeX: ["tex|latex|ltx|bib"], + Lean: ["lean|hlean"], + LESS: ["less"], + Liquid: ["liquid"], + Lisp: ["lisp"], + LiveScript: ["ls"], + LogiQL: ["logic|lql"], + LSL: ["lsl"], + Lua: ["lua"], + LuaPage: ["lp"], + Lucene: ["lucene"], + Makefile: ["^Makefile|^GNUmakefile|^makefile|^OCamlMakefile|make"], + Markdown: ["md|markdown"], + Mask: ["mask"], + MATLAB: ["matlab"], + MEL: ["mel"], + MUSHCode: ["mc|mush"], + MySQL: ["mysql"], + Nix: ["nix"], + ObjectiveC: ["m|mm"], + OCaml: ["ml|mli"], + Pascal: ["pas|p"], + Perl: ["pl|pm"], + pgSQL: ["pgsql"], + PHP: ["php|phtml"], + Powershell: ["ps1"], + Praat: ["praat|praatscript|psc|proc"], + Prolog: ["plg|prolog"], + Properties: ["properties"], + Protobuf: ["proto"], + Python: ["py"], + R: ["r"], + RDoc: ["Rd"], + RHTML: ["Rhtml"], + Ruby: ["rb|ru|gemspec|rake|^Guardfile|^Rakefile|^Gemfile"], + Rust: ["rs"], + SASS: ["sass"], + SCAD: ["scad"], + Scala: ["scala"], + Scheme: ["scm|rkt"], + SCSS: ["scss"], + SH: ["sh|bash|^.bashrc"], + SJS: ["sjs"], + Smarty: ["smarty|tpl"], + snippets: ["snippets"], + Soy_Template:["soy"], + Space: ["space"], + SQL: ["sql"], + SQLServer: ["sqlserver"], + Stylus: ["styl|stylus"], + SVG: ["svg"], + Tcl: ["tcl"], + Tex: ["tex"], + Text: ["txt"], + Textile: ["textile"], + Toml: ["toml"], + Twig: ["twig"], + Typescript: ["ts|typescript|str"], + Vala: ["vala"], + VBScript: ["vbs|vb"], + Velocity: ["vm"], + Verilog: ["v|vh|sv|svh"], + VHDL: ["vhd|vhdl"], + XML: ["xml|rdf|rss|wsdl|xslt|atom|mathml|mml|xul|xbl|xaml"], + XQuery: ["xq"], + YAML: ["yaml|yml"], + Django: ["html"] +} +var arr = [] + +for(var key in data){ + arr.push({name:key, mode:data[key]}) +} + +console.log(JSON.stringify(arr, null, ' '))Codexen App, v0.1 (breakthru)
++ App for Code snippets
- -
--- + App: Rokt33r/codexen-app- --
+ Server: Rokt33r/codexen-server +
-