Skip to content

Commit 2c18bdf

Browse files
committed
Remove Bower
1 parent 24dcd13 commit 2c18bdf

16 files changed

+2506
-3653
lines changed

.bowerrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"directory": "app/bower_components"
2+
"directory": "app/bower_components",
3+
"registry": "https://registry.bower.io"
34
}

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ test/temp
44
.sass-cache
55
app/bower_components
66
.tmp
7-
test/bower_components/
7+
test/bower_components
88
*.sw?
99
docs
1010
notes

.travis.yml

+7-40
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,17 @@
11
language: node_js
22

33
node_js:
4-
- 0.12.10
5-
- 4.3.0
6-
7-
# Travis supports running a real browser (Firefox) with a virtual screen. Just update your .travis.yml to set up the virtual screen like this:
8-
# before_script:
9-
# - export DISPLAY=:99.0
10-
# - sh -e /etc/init.d/xvfb start
11-
12-
# whitelist
13-
# branches:
14-
# only:
15-
# - master
16-
bundler_args: --retry 3
17-
18-
notifications:
19-
email:
20-
recipients:
21-
22-
on_success: change
23-
on_failure: always
24-
25-
# env:
26-
# matrix:
27-
# see set_up_new_machine.sh
4+
- 8.9.1
285

296
before_install:
30-
# Download and configure deps
31-
- export TZ=Canada/Eastern # http://stackoverflow.com/questions/23371542/how-do-i-configure-travis-ci-to-use-the-correct-time-zone-for-a-rails-app
32-
# - sudo apt-get install ncftp
7+
- export TZ=Canada/Eastern
338
- npm install -g grunt-cli
34-
- npm install -g bower
359

36-
script: grunt deploy
10+
install:
11+
- yarn
3712

38-
env:
39-
global:
40-
- FIELDDB_HOME=$HOME
41-
- secure: MFLi2VIIEDtmYXUwHYTdMelUVTiILNi2d66dqp7amyLIjSfsgypnmmtbH6NBnNEmZ9srpgrvJVym9tR+0JDvtmC1F/qhZyrLTF2K8schfe3M6+dHlMJDpiFgt4vmWkxnYTinRUXh5nb/Tvhtx8RydDW4JDeTZNyurfE6e7FqZ70=
42-
- secure: FQG2Ix+HjfFe2s7KT8RDkb8vhXugWSVOBw/fcbkfSLRLMd9+13mQ/mQooo0HC+L9u9ZtfqVeqkEn0dJExej7heSkWFkUg2vKfyR3Mceyou5JdzXWUX3BUrbLAfAvkN4S6IGtO8Nxnbu88ghqw20uUHGeiKUDfjc9tuSPFxtqQBQ=
43-
- secure: hE2iibDhUs1CwWVPkfvNz1l9chaZLF4dRJy4xJ+wejdvVCTgWgg2qTSllwYjRXZ8zwSEi9v5MVHng9z2+AGikuMl8i7yYzxFrBbzM5qIRqRonXlfNrJXx9ruMGKKBhffNtIwZAp1b7IxQaapQ3BXsoXbOp/z8wp3u0aX7DJa1Ck=
13+
script: grunt deploy
4414

4515
after_success:
46-
# on:
47-
# branch: master
48-
# condition: $TRAVIS_REPO_SLUG = FieldDB/dative
49-
- touch "dist/deployed at `date`"
50-
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_REPO_SLUG}" = "FieldDB/dative" ] && ncftpput -R -v -u $USERNAME -p $PASSWORD $SERVER /beta dist/*'
16+
- touch "dist/deployed at `date`"
17+
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_REPO_SLUG}" = "FieldDB/dative" ] && ncftpput -R -v -u $USERNAME -p $PASSWORD $SERVER /beta dist/*'

Dockerfile

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
FROM node:8
22

3-
# Install Bower & Grunt
4-
RUN npm install -g bower grunt-cli && \
3+
RUN npm install -g grunt-cli && \
54
echo '{ "allow_root": true }' > /root/.bowerrc
65

76
COPY . /usr/src/dative
87
ENV GIT_DIR=/usr/src/dative
98

109
WORKDIR /usr/src/dative/
11-
RUN npm install
12-
RUN bower install
10+
RUN yarn
1311
WORKDIR /usr/src/dative/test/
14-
RUN bower install
12+
RUN yarn
1513

1614
WORKDIR /usr/src/dative/
1715
CMD grunt serve

Gruntfile.coffee

+1-29
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ module.exports = (grunt) ->
281281
spin: '../../<%= yeoman.app %>/bower_components/spin.js/spin'
282282
jqueryspin: '../../<%= yeoman.app %>/bower_components/spin.js/jquery.spin'
283283
perfectscrollbar: '../../<%= yeoman.app %>/bower_components/perfect-scrollbar/src/perfect-scrollbar'
284-
fielddb: '../../<%= yeoman.app %>/bower_components/fielddb/fielddb'
285284
backbonerelational: '../../<%= yeoman.app %>/bower_components/backbone-relational/backbone-relational'
286285
backbonelocalstorage: '../../<%= yeoman.app %>/bower_components/backbone.localStorage/backbone.localStorage'
287286

@@ -478,33 +477,6 @@ module.exports = (grunt) ->
478477
setContinuousDeploymentVersion:
479478
cmd: ->
480479
return 'bash scripts/set_ci_version.sh'
481-
symlinkFieldDBIfAvailable:
482-
cmd: ->
483-
return 'if [ -z ${FIELDDB_HOME} ]; ' +
484-
' then ' +
485-
' echo "Not using the most recent FieldDB, some functions might not work.";' +
486-
' else ' +
487-
' echo "Symlinking FieldDB to your local dev version in $FIELDDB_HOME/FieldDB/fielddb.js";' +
488-
' rm app/bower_components/fielddb/fielddb.js;' +
489-
' ln -s $FIELDDB_HOME/FieldDB/fielddb.js app/bower_components/fielddb/fielddb.js;' +
490-
' fi '
491-
updateFieldDB:
492-
cmd: ->
493-
return 'if [ -z ${FIELDDB_HOME} ]; ' +
494-
' then ' +
495-
' echo "Not using the most recent FieldDB, some functions might not work.";' +
496-
' else ' +
497-
' echo "Updating FieldDB in $FIELDDB_HOME/FieldDB/fielddb.js";' +
498-
' cd $FIELDDB_HOME;' +
499-
' git clone https://github.com/cesine/FieldDB.git;' +
500-
' cd $FIELDDB_HOME/FieldDB;' +
501-
' pwd; '+
502-
' git remote add cesine https://github.com/cesine/FieldDB.git;' +
503-
' git checkout master;' +
504-
' git pull cesine master;' +
505-
' npm install; ' +
506-
' grunt browserify:src; ' +
507-
' fi '
508480

509481
rev:
510482
dist:
@@ -688,7 +660,7 @@ module.exports = (grunt) ->
688660

689661
grunt.registerTask 'docs', ['clean:docs', 'clean:doctmp', 'copy:docco', 'docco', 'clean:doctmp']
690662

691-
grunt.registerTask 'deploy', ['exec:updateFieldDB', 'exec:symlinkFieldDBIfAvailable', 'jshint', 'build', 'exec:setContinuousDeploymentVersion']
663+
grunt.registerTask 'deploy', ['jshint', 'build', 'exec:setContinuousDeploymentVersion']
692664

693665
grunt.registerTask 'copydist', 'copy:dist'
694666
grunt.registerTask 'cleandist', 'clean:dist'

README.md

+4-5
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,14 @@ Then clone the dative repo and move into the clone:
5050
$ git clone https://github.com/jrwdunham/dative.git
5151
$ cd dative
5252

53-
Then install the Node dependencies:
53+
Then install the dependencies:
5454

55-
$ npm install
55+
$ yarn
5656

57-
Then install the Bower dependencies for the app and the tests:
57+
Then optionally install the test dependencies:
5858

59-
$ bower install
6059
$ cd test
61-
$ bower install
60+
$ yarn
6261
$ cd ..
6362

6463

app/help/html/help.html

+21-21
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ <h2 id="about-dative-a-data-name-about-dative-a-">About Dative<a data-name="abou
8383
linguistic data to be stored and manipulated on web servers by multiple users
8484
at the same time.</p>
8585
<p>In order to log in to an OLD or {{FieldDB.FieldDBObject.application.brand}} web
86-
service, you must know the web services URL and you must create a Dative
86+
service, you must know the web service&#39;s URL and you must create a Dative
8787
“server” object for that web service in Dative’s
8888
<a href="#application-settings">application settings</a>.</p>
8989
<p>Dative is written in CoffeeScript (and HTML and CSS) using the Backbone
@@ -253,7 +253,7 @@ <h3 id="updating-an-existing-resource-a-data-name-update-resource-a-">Updating a
253253
the values that they had before you began making changes.</p>
254254
<h3 id="destroying-a-resource-a-data-name-destroy-resource-a-">Destroying a Resource<a data-name="destroy-resource"></a></h3>
255255
<p>To destroy (i.e., delete) a resource, click on the
256-
<i class="fa fa-trash fa-fw"></i> button at the top of the resources interface.
256+
<i class="fa fa-trash fa-fw"></i> button at the top of the resource&#39;s interface.
257257
Doing this will cause a confirm dialog to be displayed. You must click the
258258
“Ok” button in order to issue the destroy request. You may also click
259259
“Cancel” (or press Esc) in order to abort the destroy action.</p>
@@ -307,7 +307,7 @@ <h4 id="advanced-search-a-data-name-advanced-search-a-">Advanced Search<a data-n
307307
</li>
308308
</ol>
309309
<p>Searches of arbitrary structural complexity can be created by using the “and”,
310-
“not”, “or”, or “” buttons to create more boolean nodes or
310+
“not”, “or”, or “...” buttons to create more boolean nodes or
311311
change existing ones. By changing the select menus you can change the field
312312
that a given search condition is targeting or you can change the type of search
313313
from, say, a regular expression search (<em>regex</em>) to an exact match search (<em>=</em>).</p>
@@ -333,7 +333,7 @@ <h4 id="advanced-search-a-data-name-advanced-search-a-">Advanced Search<a data-n
333333
<h4 id="smart-search-a-data-name-smart-search-a-">Smart Search<a data-name="smart-search"></a></h4>
334334
<p>The smart search interface has a single search input. Dative tries to guess
335335
what you want to search for, given your input, and reports back on the type of
336-
searches it thinks youre after and how many results they would return. The
336+
searches it thinks you&#39;re after and how many results they would return. The
337337
screenshot below shows an example of a smart search for “dog” and the
338338
suggestions that Dative has returned.</p>
339339
<p><img src="/images/help/smart-search-500.png" alt="screenshot of an advanced search"></p>
@@ -370,7 +370,7 @@ <h3 id="exporting-resources-a-data-name-export-resources-a-">Exporting Resources
370370
OpenOffice or Google Sheets.</p>
371371
<p>JSON files can be parsed by most modern programming languages.</p>
372372
<h2 id="application-settings-a-data-name-application-settings-a-">Application Settings<a data-name="application-settings"></a></h2>
373-
<p>Datives application settings allows you to:</p>
373+
<p>Dative&#39;s application settings allows you to:</p>
374374
<ol>
375375
<li><p><i class="fa fa-fw fa-server"></i>
376376
<a href="#configuring-servers">Configure servers</a>, i.e., connections to
@@ -396,24 +396,24 @@ <h3 id="configuring-servers-a-data-name-configuring-servers-a-">Configuring Serv
396396
(“{{FieldDB.FieldDBObject.application.brand}}” or “OLD”), and
397397
potentially a server code.</p>
398398
<p>To change the active server, simply select one of the existing servers from
399-
the <em>Active Server</em> select menu, or click on that servers
399+
the <em>Active Server</em> select menu, or click on that server&#39;s
400400
<i class="fa fa-fw fa-toggle-off"></i> button. Note that you cannot change the
401401
active server while you are logged in to a server.</p>
402402
<p>To create a new server, click on the <i class="fa fa-fw fa-plus"></i> button to
403403
reveal the interface for creating a new one. In the new server form, enter a
404-
name, the servers URL, its type, and (if it’s a FieldDB-type server) its
404+
name, the server&#39;s URL, its type, and (if it’s a FieldDB-type server) its
405405
server code. If you do not know which server code value to choose, then choose
406406
“production.” If you do not know which values to enter to create a new
407407
server, please contact your {{FieldDB.FieldDBObject.application.brand}} or OLD
408408
server administrator. Note that there is no “Save” button for creating
409409
servers: Dative saves all of your application settings changes automatically to
410-
your browsers local storage.</p>
410+
your browser&#39;s local storage.</p>
411411
<p>To delete a server configuration, click its <i class="fa fa-fw fa-trash"></i>
412412
button. A confirm dialog will verify that you really want to proceed with the
413413
deletion.</p>
414414
<p>Note that you cannot delete or modify a server while it is the designated
415415
active one.</p>
416-
<h3 id="changing-dative-s-appearance-a-data-name-changing-appearance-a-">Changing Datives Appearance<a data-name="changing-appearance"></a></h3>
416+
<h3 id="changing-dative-s-appearance-a-data-name-changing-appearance-a-">Changing Dative&#39;s Appearance<a data-name="changing-appearance"></a></h3>
417417
<p>To change how Dative looks, simply click on one of the example form resources
418418
in the application settings appearance sub-section. The form examples
419419
illustrate how Dative will look using each of the possible visual themes.</p>
@@ -422,16 +422,16 @@ <h3 id="changing-dative-s-appearance-a-data-name-changing-appearance-a-">Changin
422422
Two themes that are known to work well with Dative are “Pepper Grinder” and
423423
“Cupertino”.</p>
424424
<h3 id="configuring-server-settings-a-data-name-configuring-server-settings-a-">Configuring Server Settings<a data-name="configuring-server-settings"></a></h3>
425-
<p>At present, Dative only allows for the configuration of an OLD web servers
425+
<p>At present, Dative only allows for the configuration of an OLD web server&#39;s
426426
application settings. Support for viewing and altering the settings of a
427427
{{FieldDB.FieldDBObject.application.brand}} web service will be available soon.</p>
428428
<p>The interface for configuring the settings of a server (i.e., a particular
429429
server-side web service) works very much like the standard
430430
<a href="#viewing-single-resource">resource interface described above</a>. Note that you
431-
must be an administrator in order to have permission to modify a web services
431+
must be an administrator in order to have permission to modify a web service&#39;s
432432
application settings.</p>
433433
<h4 id="configuring-old-server-settings-a-data-name-configuring-old-server-settings-a-">Configuring OLD Server Settings<a data-name="configuring-old-server-settings"></a></h4>
434-
<p>An OLD web services application-wide settings are used to identify the
434+
<p>An OLD web service&#39;s application-wide settings are used to identify the
435435
language being documented (the “object language”), the language used to
436436
document and analyze (the “metalanguage”), validation settings for various
437437
form transcription fields, and the set of users designated as “unrestricted”.</p>
@@ -442,7 +442,7 @@ <h5 id="object-language">Object Language</h5>
442442
latter must be an
443443
<a href="http://www-01.sil.org/iso639-3/codes.asp">ISO 639-3 three-letter language identifier code</a>.
444444
Luckily, the OLD and Dative contain a copy of the ISO 639-3 language database so
445-
that the application settings interfaces input fields will help you to find the
445+
that the application settings interface&#39;s input fields will help you to find the
446446
appropriate code for the language that you are documenting/analyzing. If the
447447
language categorization of ISO 639-3 standard is not suitable or appropriate for
448448
your language of documentation, then leave the object language id field blank.</p>
@@ -462,7 +462,7 @@ <h5 id="metalanguage">Metalanguage</h5>
462462
your Dative/OLD data.</p>
463463
<h5 id="form-field-validation">Form Field Validation</h5>
464464
<p><strong>Important Notice:</strong> form field validation is not yet implemented in Dative.
465-
That is, while you can specify inventories and validation settings via Datives
465+
That is, while you can specify inventories and validation settings via Dative&#39;s
466466
interface, they will have no effect at present.</p>
467467
<p>The following form fields can be configured to have validation:</p>
468468
<ul>
@@ -513,7 +513,7 @@ <h3 id="importing-forms-a-data-name-importing-forms-a-">Importing Forms<a data-n
513513
in these columns will not be imported.</p>
514514
<p>You can alter the values in the cells of the table by double-clicking them.</p>
515515
<p>Some form attributes are not simply strings but are resources in their own
516-
right. A forms “source” value and its “tags” value are examples of
516+
right. A form&#39;s “source” value and its “tags” value are examples of
517517
this. If Dative cannot identify an existing resource (or existing resources)
518518
that match(es) the string value in your CSV file, it will display a warning and
519519
will help you to create a corresponding resource (or resources), if you want
@@ -554,19 +554,19 @@ <h3 id="importing-forms-a-data-name-importing-forms-a-">Importing Forms<a data-n
554554
<h2 id="files-a-data-name-files-a-">Files<a data-name="files"></a></h2>
555555
<p>In Dative, a file resource represents a digital file, i.e., an audio or video
556556
recording, an image, or a textual file, such as a PDF.</p>
557-
<p></p>
557+
<p>...</p>
558558
<h2 id="texts-a-k-a-collections-a-data-name-texts-a-">Texts (a.k.a. Collections)<a data-name="texts"></a></h2>
559559
<p>A text resource reresents a text in the object language. A text may be a story
560560
or narrative or it may be a conversation, or even a record of an elicitation
561561
session. In Dative, a text is simply a sequence of forms and is specified as a
562562
sequence of references to forms.</p>
563-
<p></p>
563+
<p>...</p>
564564
<h2 id="corpora-a-data-name-corpora-a-">Corpora<a data-name="corpora"></a></h2>
565565
<p>A corpus is, like a text, also a sequence of forms. A corpus may be specified
566566
manually, i.e., by listing form references in the same way as a text is
567567
specified, or it may be specified by referencing a saved search.</p>
568568
<p>Corpora may be used in the construction of OLD morphologies and language models.</p>
569-
<p></p>
569+
<p>...</p>
570570
<h2 id="parsers-a-data-name-parsers-a-">Parsers<a data-name="parsers"></a></h2>
571571
<p>Dative provides an interface to the morphological parser creation tools of OLD
572572
web services. These tools allow users to construct morphological parsers using
@@ -578,7 +578,7 @@ <h2 id="parsers-a-data-name-parsers-a-">Parsers<a data-name="parsers"></a></h2>
578578
<li>morphologies</li>
579579
<li>phonologies</li>
580580
</ul>
581-
<p></p>
581+
<p>...</p>
582582
<h2 id="other-resources-a-data-name-other-resources-a-">Other Resources<a data-name="other-resources"></a></h2>
583583
<p>When logged in to an OLD web service, Dative provides standard resource-style
584584
interfaces to the following additional resources:</p>
@@ -702,7 +702,7 @@ <h2 id="frequently-asked-questions-a-data-name-frequently-asked-questions-a-">Fr
702702
<li><p>How can I request new features or report bugs?</p>
703703
<ul>
704704
<li>At present, the best way to do this is by creating an issue on
705-
<a href="https://github.com/jrwdunham/dative/issues">Datives GitHub issues page</a>.</li>
705+
<a href="https://github.com/jrwdunham/dative/issues">Dative&#39;s GitHub issues page</a>.</li>
706706
</ul>
707707
</li>
708708
<li><p>Can I import my existing data into an OLD or
@@ -728,7 +728,7 @@ <h2 id="frequently-asked-questions-a-data-name-frequently-asked-questions-a-">Fr
728728
</li>
729729
<li><p>Are there any video tutorials on how to use Dative?</p>
730730
<ul>
731-
<li>Not yet. Theyre a comin.</li>
731+
<li>Not yet. They&#39;re a comin&#39;.</li>
732732
</ul>
733733
</li>
734734
</ol>

bower.json

-36
This file was deleted.

0 commit comments

Comments
 (0)