diff --git a/site/client/app/modules/landing/components/landing.js b/site/client/app/modules/landing/components/landing.js index 05e1f86..0c457d6 100644 --- a/site/client/app/modules/landing/components/landing.js +++ b/site/client/app/modules/landing/components/landing.js @@ -11,7 +11,8 @@ module.exports = { }, components: { - login: require('./login') + login: require('./../../session/components/login'), + register: require('./../../session/components/register') }, ready: function() { diff --git a/site/client/app/modules/landing/views/landing.html b/site/client/app/modules/landing/views/landing.html index a9c2e41..da4bc29 100644 --- a/site/client/app/modules/landing/views/landing.html +++ b/site/client/app/modules/landing/views/landing.html @@ -11,16 +11,7 @@
-
- - - - -
- - -
-
+ or diff --git a/site/client/app/modules/landing/components/login.js b/site/client/app/modules/session/components/login.js similarity index 99% rename from site/client/app/modules/landing/components/login.js rename to site/client/app/modules/session/components/login.js index 8fd91a6..776012c 100644 --- a/site/client/app/modules/landing/components/login.js +++ b/site/client/app/modules/session/components/login.js @@ -7,5 +7,4 @@ module.exports = { methods: { } - }; \ No newline at end of file diff --git a/site/client/app/modules/session/components/register.js b/site/client/app/modules/session/components/register.js new file mode 100644 index 0000000..81c9ea0 --- /dev/null +++ b/site/client/app/modules/session/components/register.js @@ -0,0 +1,16 @@ +module.exports = { + + template: require('./../views/register.html'), + + inherit: true, + + methods: { + register: function(e) { + e.preventDefault(); + + console.log("bal"); + + return false; + } + } +}; \ No newline at end of file diff --git a/site/client/app/modules/landing/views/login.html b/site/client/app/modules/session/views/login.html similarity index 100% rename from site/client/app/modules/landing/views/login.html rename to site/client/app/modules/session/views/login.html diff --git a/site/client/app/modules/session/views/register.html b/site/client/app/modules/session/views/register.html new file mode 100644 index 0000000..133c112 --- /dev/null +++ b/site/client/app/modules/session/views/register.html @@ -0,0 +1,10 @@ +
+ + + + +
+ + +
+
\ No newline at end of file