Skip to content

Commit

Permalink
[enhancement][feature][bugfix] update reamde & bower.json; fix all &n…
Browse files Browse the repository at this point in the history
…bsp warning; add auto-complete (close #46) also close pannel tabs by gogson (close #20)
  • Loading branch information
SylTi committed Nov 23, 2014
1 parent fb9e191 commit 460b37b
Show file tree
Hide file tree
Showing 16 changed files with 119 additions and 92 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ Bitcoin Crowdfunding Platform
##### Client Configuration
You can configure:

* Google Analytics ID in the **/client/index.html**
* Addthis user ID in the **/client/index.html**
* Disquss App name in the **/client/app/app.js**
* Google Analytics ID in the **/client/index.html** file
* Addthis user ID in the **/client/index.html** file
* Disquss App name in the **/client/app/app.js** file
* $scope.fee Withdrawal fee in the **/client/app/account/settings/settings.controller.js** file

## Platform Workflow : User
1. A user create is account
Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
"angular-loading-bar": "~0.6.0",
"angular-disqus": "~1.1.0",
"angular-slugify": "~1.0.0",
"angular-utils-pagination": "~0.4.0"
"angular-utils-pagination": "~0.4.0",
"angucomplete-alt": "~0.0.31"
},
"devDependencies": {
"angular-mocks": ">=1.2.*",
Expand Down
4 changes: 2 additions & 2 deletions client/app/account/dashboard/dashboard.jade
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ div(ng-include='"components/navbar/navbar.html"')
tr(ng-repeat="proj in projects")
td
i.fa.fa-book.text-muted
  
|   
a(ng-href="/projects/{{proj.slug}}") {{proj.name}}
td
span.label.label-success(ng-show="proj.amountRaised >= proj.amountToRaise") Finished
span.label.label-warning(ng-show="proj.amountRaised !== 0 && proj.amountRaised < proj.amountToRaise") Ongoing
span.label.label-default(ng-show="proj.amountRaised === 0") Not started
td
{{proj.amountRaised | toBTC}} / {{proj.amountToRaise | toBTC}} BTC
span {{proj.amountRaised | toBTC}} / {{proj.amountToRaise | toBTC}} BTC
td.text-center
a(ng-href='/projects/{{proj.slug}}/edit')
span.glyphicon.glyphicon-pencil
Expand Down
6 changes: 3 additions & 3 deletions client/app/account/profile/profile.jade
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ div(ng-include='"components/navbar/navbar.html"')
div(ng-show="user.bitcointalkLogin != ''")
i.fa.fa-comment.text-muted.space-right
span {{user.bitcointalkLogin}} @
&nbsp;&nbsp;
| &nbsp;&nbsp;
a(href="https://bitcointalk.org") BitcoinTalk
div(ng-show="user.githubLogin != ''")
i.fa.fa-github-alt.text-muted.space-right
span {{user.githubLogin}} @
&nbsp;&nbsp;
| &nbsp;&nbsp;
a(href="https://github.com/{{user.githubLogin}}") GitHub
div(ng-show="user.stackexchangeLogin != ''")
i.fa.fa-stack-exchange.text-muted.space-right
span {{user.stackexchangeLogin}} @
&nbsp;&nbsp;
| &nbsp;&nbsp;
a(href="http://stackexchange.com/") StackExchange
.col-md-9
.col-md-6
Expand Down
14 changes: 7 additions & 7 deletions client/app/account/settings/settings.jade
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,25 @@ div(ng-include='"components/navbar/navbar.html"')
.form-group
label
span Your
&nbsp;
| &nbsp;
a(href="https://bitcointalk.org/", target="_blank") Bitcointalk
&nbsp;
| &nbsp;
span account name
input.form-control(type='text', name='bitcointalkLogin', ng-model='user.bitcointalkLogin', mongoose-error='', placeholder='')
.form-group
label
span Your
&nbsp;
| &nbsp;
a(href="https://github.com", target="_blank") Github
&nbsp;
| &nbsp;
span account name
input.form-control(type='text', name='githubLogin', ng-model='user.githubLogin', mongoose-error='', placeholder='')
.form-group
label
span Your
&nbsp;
| &nbsp;
a(href="https://stackexchange.com", target="_blank") StackExchange
&nbsp;
| &nbsp;
span login
input.form-control(type='text', name='stackexchangeLogin', ng-model='user.stackexchangeLogin', mongoose-error='', placeholder='')
hr
Expand All @@ -57,7 +57,7 @@ div(ng-include='"components/navbar/navbar.html"')
.form-group
label
input(type='checkbox', ng-model="user.privateContrib")
&nbsp;&nbsp;
| &nbsp;&nbsp;
b Anonymous contributions
br
span If you enable this option, your contributions won't be displayed with your name along.
Expand Down
72 changes: 36 additions & 36 deletions client/app/admin/admin.jade
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ div(ng-include='"components/navbar/navbar.html"')
tab
tab-heading
span.glyphicon.glyphicon-user.text-muted
&nbsp;
| &nbsp;
b Users Management
ul.list-group.well
li.list-group-item(ng-repeat='user in users | orderBy:"role"')
span.pull-left
a.text-muted(href="/profile/{{user.name}}")
img.avatar(gravatar-src="'{{user.email}}'", width=40)
&nbsp;&nbsp;&nbsp;
| &nbsp;&nbsp;&nbsp;
span
strong
a.text-muted(href="/profile/{{user.name}}") {{user.name}}
&nbsp;
| &nbsp;
span.label.label-danger(ng-show="user.role == 'admin'") Admin
span.label.label-info(ng-show="user.role == 'user'") User
br
small.text-warning {{user.balance | toBTC}} BTC
small.text-muted
&nbsp;&nbsp;
{{user.email}}
| &nbsp;&nbsp;
| {{user.email}}
div.pull-right
a.trash(ng-href='/admin/{{user._id}}/editUser')
span.glyphicon.glyphicon-edit &nbsp;
Expand All @@ -35,7 +35,7 @@ div(ng-include='"components/navbar/navbar.html"')
tab
tab-heading
span.fa.fa-book.text-muted
&nbsp;
| &nbsp;
b Projects Management
ul.list-group.well
tabset(justified='true', type="'pills'")
Expand All @@ -45,21 +45,21 @@ div(ng-include='"components/navbar/navbar.html"')
span.label.label-success(ng-show="project.amountRaised >= project.amountToRaise") Finished
span.label.label-warning(ng-show="project.amountRaised !== 0 && project.amountRaised < project.amountToRaise") Ongoing
span.label.label-default(ng-show="project.amountRaised === 0") Not started
&nbsp;&nbsp;
| &nbsp;&nbsp;
span {{project.name}} ({{project.amountRaised | toBTC}} / {{project.amountToRaise | toBTC}})
br
small.text-muted
span Project created
&nbsp;
| &nbsp;
b(am-time-ago="project.dateCreat")
&nbsp;
| &nbsp;
span and finishing
&nbsp;
| &nbsp;
b(am-time-ago="project.dateEndCampaign")
.pull-right
a(ng-href='/projects/{{project.slug}}/edit')
span.glyphicon.glyphicon-pencil
&nbsp;&nbsp;&nbsp;&nbsp;
| &nbsp;&nbsp;&nbsp;&nbsp;
a.trash(ng-click='deleteProject(project)')
span.glyphicon.glyphicon-trash
tab(heading='Not Started').label-default.tabText
Expand All @@ -68,21 +68,21 @@ div(ng-include='"components/navbar/navbar.html"')
span.label.label-success(ng-show="project.amountRaised >= project.amountToRaise") Finished
span.label.label-warning(ng-show="project.amountRaised !== 0 && project.amountRaised < project.amountToRaise") Ongoing
span.label.label-default(ng-show="project.amountRaised === 0") Not started
&nbsp;&nbsp;
| &nbsp;&nbsp;
span {{project.name}} ({{project.amountRaised | toBTC}} / {{project.amountToRaise | toBTC}})
br
small.text-muted
span Project created
&nbsp;
| &nbsp;
b(am-time-ago="project.dateCreat")
&nbsp;
| &nbsp;
span and finishing
&nbsp;
| &nbsp;
b(am-time-ago="project.dateEndCampaign")
.pull-right
a(ng-href='/projects/{{project.slug}}/edit')
span.glyphicon.glyphicon-pencil
&nbsp;&nbsp;&nbsp;&nbsp;
| &nbsp;&nbsp;&nbsp;&nbsp;
a.trash(ng-click='deleteProject(project)')
span.glyphicon.glyphicon-trash
tab(heading='Ongoing').label-warning.tabText
Expand All @@ -91,21 +91,21 @@ div(ng-include='"components/navbar/navbar.html"')
span.label.label-success(ng-show="project.amountRaised >= project.amountToRaise") Finished
span.label.label-warning(ng-show="project.amountRaised !== 0 && project.amountRaised < project.amountToRaise") Ongoing
span.label.label-default(ng-show="project.amountRaised === 0") Not started
&nbsp;&nbsp;
| &nbsp;&nbsp;
span {{project.name}} ({{project.amountRaised | toBTC}} / {{project.amountToRaise | toBTC}})
br
small.text-muted
span Project created
&nbsp;
| &nbsp;
b(am-time-ago="project.dateCreat")
&nbsp;
| &nbsp;
span and finishing
&nbsp;
| &nbsp;
b(am-time-ago="project.dateEndCampaign")
.pull-right
a(ng-href='/projects/{{project.slug}}/edit')
span.glyphicon.glyphicon-pencil
&nbsp;&nbsp;&nbsp;&nbsp;
| &nbsp;&nbsp;&nbsp;&nbsp;
a.trash(ng-click='deleteProject(project)')
span.glyphicon.glyphicon-trash
tab(heading='Expired').label-danger.tabText
Expand All @@ -115,21 +115,21 @@ div(ng-include='"components/navbar/navbar.html"')
span.label.label-success(ng-show="project.amountRaised >= project.amountToRaise") Finished
span.label.label-warning(ng-show="project.amountRaised !== 0 && project.amountRaised < project.amountToRaise") Ongoing
span.label.label-default(ng-show="project.amountRaised === 0") Not started
&nbsp;&nbsp;
| &nbsp;&nbsp;
span {{project.name}} ({{project.amountRaised | toBTC}} / {{project.amountToRaise | toBTC}})
br
small.text-muted
span Project created
&nbsp;
| &nbsp;
b(am-time-ago="project.dateCreat")
&nbsp;
| &nbsp;
span and finishing
&nbsp;
| &nbsp;
b(am-time-ago="project.dateEndCampaign")
.pull-right
a(ng-href='/projects/{{project.slug}}/edit')
span.glyphicon.glyphicon-pencil
&nbsp;&nbsp;&nbsp;&nbsp;
| &nbsp;&nbsp;&nbsp;&nbsp;
a.trash(ng-click='deleteProject(project)')
span.glyphicon.glyphicon-trash
tab(heading='Finished').label-success.tabText
Expand All @@ -138,21 +138,21 @@ div(ng-include='"components/navbar/navbar.html"')
span.label.label-success(ng-show="project.amountRaised >= project.amountToRaise") Finished
span.label.label-warning(ng-show="project.amountRaised !== 0 && project.amountRaised < project.amountToRaise") Ongoing
span.label.label-default(ng-show="project.amountRaised === 0") Not started
&nbsp;&nbsp;
| &nbsp;&nbsp;
span {{project.name}} ({{project.amountRaised | toBTC}} / {{project.amountToRaise | toBTC}})
br
small.text-muted
span Project created
&nbsp;
| &nbsp;
b(am-time-ago="project.dateCreat")
&nbsp;
| &nbsp;
span and finishing
&nbsp;
| &nbsp;
b(am-time-ago="project.dateEndCampaign")
.pull-right
a(ng-href='/projects/{{project.slug}}/edit')
span.glyphicon.glyphicon-pencil
&nbsp;&nbsp;&nbsp;&nbsp;
| &nbsp;&nbsp;&nbsp;&nbsp;
a.trash(ng-click='deleteProject(project)')
span.glyphicon.glyphicon-trash
tab(heading='Done').label-info.tabText
Expand All @@ -161,21 +161,21 @@ div(ng-include='"components/navbar/navbar.html"')
span.label.label-success(ng-show="project.amountRaised >= project.amountToRaise") Finished
span.label.label-warning(ng-show="project.amountRaised !== 0 && project.amountRaised < project.amountToRaise") Ongoing
span.label.label-default(ng-show="project.amountRaised === 0") Not started
&nbsp;&nbsp;
| &nbsp;&nbsp;
span {{project.name}} ({{project.amountRaised | toBTC}} / {{project.amountToRaise | toBTC}})
br
small.text-muted
span Project created
&nbsp;
| &nbsp;
b(am-time-ago="project.dateCreat")
&nbsp;
| &nbsp;
span and finishing
&nbsp;
| &nbsp;
b(am-time-ago="project.dateEndCampaign")
.pull-right
a(ng-href='/projects/{{project.slug}}/edit')
span.glyphicon.glyphicon-pencil
&nbsp;&nbsp;&nbsp;&nbsp;
| &nbsp;&nbsp;&nbsp;&nbsp;
a.trash(ng-click='deleteProject(project)')
span.glyphicon.glyphicon-trash

Expand Down
3 changes: 2 additions & 1 deletion client/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ angular.module('bitCrowdFundsApp', [
'angular-loading-bar',
'ngDisqus',
'slugifier',
'angularUtils.directives.dirPagination'
'angularUtils.directives.dirPagination',
'angucomplete-alt'
])
.config(['cfpLoadingBarProvider', function(cfpLoadingBarProvider) {
cfpLoadingBarProvider.includeSpinner = false;
Expand Down
16 changes: 8 additions & 8 deletions client/app/main/main.jade
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ header#banner.hero-unit
br
br
a.btn.btn-default.btn-lg(href='/addproject') Create a project
&nbsp;&nbsp;
| &nbsp;&nbsp;
a.btn.btn-success.btn-lg(href='/projects') Explore projects
br
br
Expand All @@ -29,12 +29,12 @@ header#banner.hero-unit
.panel-heading
h3.panel-title
i.fa.fa-book.text-muted
&nbsp;&nbsp;
| &nbsp;&nbsp;
a(ng-href="/projects/{{proj.slug}}") {{proj.name}}
&nbsp;
| &nbsp;
small.text-muted
span by
&nbsp;
| &nbsp;
a(href="/profile/{{proj.Owner}}") {{proj.Owner}}
span.pull-right
div.progress
Expand All @@ -43,17 +43,17 @@ header#banner.hero-unit
div.row
.col-lg-8
span {{proj.description | limitTo: 1000}}.
&nbsp;
| &nbsp;
a(ng-href="/projects/{{proj.slug}}") See project page.
br
br
span.text-muted
span Project started
&nbsp;
| &nbsp;
b(am-time-ago="proj.dateCreat")
&nbsp;
| &nbsp;
span and finishing
&nbsp;
| &nbsp;
b(am-time-ago="proj.dateEndCampaign")
.col-lg-3.text-right
div.project-state.well.text-center
Expand Down
14 changes: 7 additions & 7 deletions client/app/projects/list/projects.jade
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ div(ng-include='"components/navbar/navbar.html"')
.panel-heading
h3.panel-title
i.fa.fa-book.text-muted
&nbsp;&nbsp;
| &nbsp;&nbsp;
a(ng-href="/projects/{{proj.slug}}") {{proj.name}}
&nbsp;
| &nbsp;
small.text-muted
span by
&nbsp;
| &nbsp;
a(href="/profile/{{proj.Owner}}") {{proj.Owner}}
span.pull-right
div.progress
Expand All @@ -24,17 +24,17 @@ div(ng-include='"components/navbar/navbar.html"')
div.row
.col-lg-8
span {{proj.description | limitTo: 1000}}.
&nbsp;
| &nbsp;
a(ng-href="/projects/{{proj.slug}}") See project page.
br
br
span.text-muted
span Project started
&nbsp;
| &nbsp;
b(am-time-ago="proj.dateCreat")
&nbsp;
| &nbsp;
span and finishing
&nbsp;
| &nbsp;
b(am-time-ago="proj.dateEndCampaign")
.col-lg-3.text-right
div.project-state.well.text-center
Expand Down
Loading

0 comments on commit 460b37b

Please sign in to comment.