Skip to content

Commit

Permalink
Merge pull request #35 from mikepence/remove-catalysis
Browse files Browse the repository at this point in the history
Removes all references to Catalysis except the one in the README
  • Loading branch information
metasoarous authored Jun 15, 2017
2 parents d27d59b + 41810b1 commit 67f5065
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ULog: Easy life management",
"description": "A barebones Reagent+Sente app deployable to Heroku. Uses Figwheel (for development build) and Component (lifecycle management).",
"keywords": ["catalysis", "clojure", "clojurescript", "react", "web socket", "reagent", "sente", "heroku", "figwheel", "component", "enterlab"],
"keywords": ["datsys", "clojure", "clojurescript", "react", "web socket", "reagent", "sente", "heroku", "figwheel", "component", "enterlab"],
"env": {
"LEIN_BUILD_TASK": "package"}
}
Binary file removed catalysis.jpg
Binary file not shown.
6 changes: 3 additions & 3 deletions config/example/env.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Note; these env variables will be read and parsed by the config component in catalysis.config
# Note; these env variables will be read and parsed by the config component in datsys.config
# Take a look there for further information about what's available.

# Copy this file over into config/local/env.sh; This dir is ingored by git, so you don't version credentials.
Expand All @@ -10,8 +10,8 @@ export DATOMIC_PASSWORD=

# Set your datomic url env var; this should match the url that prints out when your transactor starts.
# If you don't change much with the example/dev-transactor.properties, this should work fine.
export DATOMIC_URL="datomic:dev://localhost:4834/catalysis"
export DATOMIC_URL="datomic:dev://localhost:4834/datsys"
# If you'd like to switch to sql backend, you'll have something like this:
#export DATOMIC_URL="datomic:sql://catalysis?jdbc:mysql://localhost:3306/catalysis"
#export DATOMIC_URL="datomic:sql://datsys?jdbc:mysql://localhost:3306/datsys"


2 changes: 1 addition & 1 deletion resources/public/cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<script type="text/javascript" src="js/out/goog/base.js"></script>
<script type="text/javascript" src="js/app.js"></script>
<!--<script type="text/javascript">-->
<!--goog.require("catalysis.start");-->
<!--goog.require("datsys.start");-->
<!--</script>-->
<script src="/js/app.js" type="text/javascript"></script>
</body>
Expand Down
4 changes: 2 additions & 2 deletions resources/schema.edn
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
;; We'll be using conformity (https://github.com/rkneufeld/conformity) to define "norms" about
;; what we expect to see in the shape of the database.

{;; ## Catalysis Domain model
:catalysis/base-schema
{;; ## Datsys Domain model
:datsys/base-schema
;; This is how conformity does dependencies (:requires)
{:requires [:dat.view/base-schema]
:txes
Expand Down
2 changes: 1 addition & 1 deletion resources/test-data.edn
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
;; Other misc todos...
{:db/id #db/id[:db.part/user -120] :e/type :e.type/Todo :e/name "dinner at la escalera" :e/description "With the love of my life" :e/category #db/id[:db.part/user -2] :e/tags [#db/id[:db.part/user -20]]}
{:db/id #db/id[:db.part/user -130] :e/type :e.type/Todo :e/name "play piano" :e/description "Practice and work on tunes" :e/category #db/id[:db.part/user -3] :e/tags [#db/id[:db.part/user -30]]}
{:db/id #db/id[:db.part/user -140] :e/type :e.type/Todo :e/name "finish catalysis" :e/category #db/id[:db.part/user -3] :e/tags [#db/id[:db.part/user -10] #db/id[:db.part/user -40]]}
{:db/id #db/id[:db.part/user -140] :e/type :e.type/Todo :e/name "finish datsys" :e/category #db/id[:db.part/user -3] :e/tags [#db/id[:db.part/user -10] #db/id[:db.part/user -40]]}
;; Some more stuff to play with...
{:db/id #db/id[:db.part/user -150] :e/type :e.type/Todo :e/name "think about snails"}
{:db/id #db/id[:db.part/user -151] :e/type :e.type/Todo :e/name "play piano"}
Expand Down

0 comments on commit 67f5065

Please sign in to comment.