Browse Source

db, server and web applications

Maxim Sokhatsky 11 years ago
parent
commit
ad20c64a2c
42 changed files with 7 additions and 7 deletions
  1. 2 2
      Makefile
  2. 1 1
      apps/rebar.config
  3. 0 0
      apps/web/README.md
  4. 0 0
      apps/web/include/users.hrl
  5. 0 0
      apps/web/priv/ssl/cowboy-ca.crt
  6. 0 0
      apps/web/priv/ssl/server.crt
  7. 0 0
      apps/web/priv/ssl/server.key
  8. 0 0
      apps/web/priv/static/README.md
  9. 0 0
      apps/web/priv/static/doc/Kakaranet-Scene.sketch/Data
  10. 0 0
      apps/web/priv/static/doc/Kakaranet-Scene.sketch/metadata
  11. 0 0
      apps/web/priv/static/doc/Kakaranet-Scene.sketch/version
  12. 0 0
      apps/web/priv/static/doc/Kakaranet-Scene.svg
  13. 0 0
      apps/web/priv/static/doc/campaigns_mock.htm
  14. 0 0
      apps/web/priv/static/doc/contents.htm
  15. 0 0
      apps/web/priv/static/doc/game_server.htm
  16. 0 0
      apps/web/priv/static/doc/js_proto.htm
  17. 0 0
      apps/web/priv/static/doc/n2o_proto.htm
  18. 0 0
      apps/web/priv/static/doc/plans/april2014.htm
  19. 0 0
      apps/web/priv/static/doc/svg.htm
  20. 0 0
      apps/web/priv/static/doc/svg.js
  21. 0 0
      apps/web/priv/static/doc/svg_mock.htm
  22. 0 0
      apps/web/priv/static/doc/synrc.css
  23. 0 0
      apps/web/priv/static/doc/templates/ButtonAnimation.svg
  24. 0 0
      apps/web/priv/static/doc/templates/Card.svg
  25. 0 0
      apps/web/priv/static/doc/templates/Mustafa-Persona.svg
  26. 0 0
      apps/web/priv/static/doc/templates/Mustafa-Selection.svg
  27. 0 0
      apps/web/priv/static/google_sdk.js
  28. 0 0
      apps/web/priv/static/kakaranet.css
  29. 0 0
      apps/web/priv/static/react.htm
  30. 0 0
      apps/web/priv/static/spa/index.htm
  31. 0 0
      apps/web/priv/static/spa/spa.htm
  32. 0 0
      apps/web/priv/templates/index.html
  33. 0 0
      apps/web/rebar.config
  34. 0 0
      apps/web/src/logallow.erl
  35. 0 0
      apps/web/src/okey.erl
  36. 0 0
      apps/web/src/protocol.erl
  37. 0 0
      apps/web/src/routes.erl
  38. 0 0
      apps/web/src/users.erl
  39. 1 1
      apps/web/src/web.app.src
  40. 0 0
      apps/web/src/web_app.erl
  41. 2 2
      apps/web/src/web_sup.erl
  42. 1 1
      rels/web/reltool.config

+ 2 - 2
Makefile

@@ -1,6 +1,6 @@
 RELEASE := kakaranet
 COOKIE  := node_runner
-APPS    := kernel avz stdlib sasl gproc cowboy cowlib ranch erlydtl n2o face db sync server
+APPS    := kernel avz stdlib sasl gproc cowboy cowlib ranch erlydtl n2o db sync server web
 VER     := 1.0.0
 VM      := rels/web/files/vm.args
 SYS     := rels/web/files/sys.config
@@ -8,7 +8,7 @@ PLT_NAME := ~/.n2o_dialyzer.plt
 ERL_ARGS := -args_file $(VM) -config $(SYS)
 RUN_DIR ?= rels/web/devbox
 LOG_DIR ?= rels/web/devbox/logs
-APP     := apps/face/priv/static/nitrogen
+APP     := apps/web/priv/static/nitrogen
 
 default: get-deps compile static-link
 static-link:

+ 1 - 1
apps/rebar.config

@@ -1,3 +1,3 @@
-{sub_dirs, ["db","server","face"]}.
+{sub_dirs, ["db","server","web"]}.
 {lib_dirs, ["../apps"]}.
 {deps_dir, ["../deps"]}.

+ 0 - 0
apps/face/README.md → apps/web/README.md


+ 0 - 0
apps/face/include/users.hrl → apps/web/include/users.hrl


+ 0 - 0
apps/face/priv/ssl/cowboy-ca.crt → apps/web/priv/ssl/cowboy-ca.crt


+ 0 - 0
apps/face/priv/ssl/server.crt → apps/web/priv/ssl/server.crt


+ 0 - 0
apps/face/priv/ssl/server.key → apps/web/priv/ssl/server.key


+ 0 - 0
apps/face/priv/static/README.md → apps/web/priv/static/README.md


+ 0 - 0
apps/face/priv/static/doc/Kakaranet-Scene.sketch/Data → apps/web/priv/static/doc/Kakaranet-Scene.sketch/Data


+ 0 - 0
apps/face/priv/static/doc/Kakaranet-Scene.sketch/metadata → apps/web/priv/static/doc/Kakaranet-Scene.sketch/metadata


+ 0 - 0
apps/face/priv/static/doc/Kakaranet-Scene.sketch/version → apps/web/priv/static/doc/Kakaranet-Scene.sketch/version


+ 0 - 0
apps/face/priv/static/doc/Kakaranet-Scene.svg → apps/web/priv/static/doc/Kakaranet-Scene.svg


+ 0 - 0
apps/face/priv/static/doc/campaigns_mock.htm → apps/web/priv/static/doc/campaigns_mock.htm


+ 0 - 0
apps/face/priv/static/doc/contents.htm → apps/web/priv/static/doc/contents.htm


+ 0 - 0
apps/face/priv/static/doc/game_server.htm → apps/web/priv/static/doc/game_server.htm


+ 0 - 0
apps/face/priv/static/doc/js_proto.htm → apps/web/priv/static/doc/js_proto.htm


+ 0 - 0
apps/face/priv/static/doc/n2o_proto.htm → apps/web/priv/static/doc/n2o_proto.htm


+ 0 - 0
apps/face/priv/static/doc/plans/april2014.htm → apps/web/priv/static/doc/plans/april2014.htm


+ 0 - 0
apps/face/priv/static/doc/svg.htm → apps/web/priv/static/doc/svg.htm


+ 0 - 0
apps/face/priv/static/doc/svg.js → apps/web/priv/static/doc/svg.js


+ 0 - 0
apps/face/priv/static/doc/svg_mock.htm → apps/web/priv/static/doc/svg_mock.htm


+ 0 - 0
apps/face/priv/static/doc/synrc.css → apps/web/priv/static/doc/synrc.css


+ 0 - 0
apps/face/priv/static/doc/templates/ButtonAnimation.svg → apps/web/priv/static/doc/templates/ButtonAnimation.svg


+ 0 - 0
apps/face/priv/static/doc/templates/Card.svg → apps/web/priv/static/doc/templates/Card.svg


+ 0 - 0
apps/face/priv/static/doc/templates/Mustafa-Persona.svg → apps/web/priv/static/doc/templates/Mustafa-Persona.svg


+ 0 - 0
apps/face/priv/static/doc/templates/Mustafa-Selection.svg → apps/web/priv/static/doc/templates/Mustafa-Selection.svg


+ 0 - 0
apps/face/priv/static/google_sdk.js → apps/web/priv/static/google_sdk.js


+ 0 - 0
apps/face/priv/static/kakaranet.css → apps/web/priv/static/kakaranet.css


+ 0 - 0
apps/face/priv/static/react.htm → apps/web/priv/static/react.htm


+ 0 - 0
apps/face/priv/static/spa/index.htm → apps/web/priv/static/spa/index.htm


+ 0 - 0
apps/face/priv/static/spa/spa.htm → apps/web/priv/static/spa/spa.htm


+ 0 - 0
apps/face/priv/templates/index.html → apps/web/priv/templates/index.html


+ 0 - 0
apps/face/rebar.config → apps/web/rebar.config


+ 0 - 0
apps/face/src/logallow.erl → apps/web/src/logallow.erl


+ 0 - 0
apps/face/src/okey.erl → apps/web/src/okey.erl


+ 0 - 0
apps/face/src/protocol.erl → apps/web/src/protocol.erl


+ 0 - 0
apps/face/src/routes.erl → apps/web/src/routes.erl


+ 0 - 0
apps/face/src/users.erl → apps/web/src/users.erl


+ 1 - 1
apps/face/src/face.app.src → apps/web/src/web.app.src

@@ -1,4 +1,4 @@
-{application, face,
+{application, web,
  [
   {description, "KKN Web Site"},
   {vsn, "1"},

+ 0 - 0
apps/face/src/web_app.erl → apps/web/src/web_app.erl


+ 2 - 2
apps/face/src/web_sup.erl → apps/web/src/web_sup.erl

@@ -4,7 +4,7 @@
 -compile(export_all).
 -include_lib ("n2o/include/wf.hrl").
 -include("users.hrl").
--define(APP, face).
+-define(APP, web).
 
 start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
@@ -17,7 +17,7 @@ init([]) ->
     {ok, _} = cowboy:start_http(http, 100, [{port, wf:config(n2o,transition_port,8080)}],
                                            [{env, [{dispatch, dispatch_rules()}]}]),
 
-    PrivDir = code:priv_dir(face),
+    PrivDir = code:priv_dir(?APP),
 
     {ok, _} = cowboy:start_https(https, 100, [
         {port, wf:config(n2o,port,8443)},

+ 1 - 1
rels/web/reltool.config

@@ -17,7 +17,7 @@
          server,
          sync,
          kvs,
-         face
+         web
         ]},
        {rel, "start_clean", "",
         [