From a88e0c72d89ff9028922e78e2a27db156fcfd6ce Mon Sep 17 00:00:00 2001 From: Ralph Tolipas Date: Mon, 6 Apr 2020 18:25:34 +0800 Subject: [PATCH 01/25] update router structure & clean up project --- app/assets/images/NativeScript-Vue.png | Bin 8414 -> 0 bytes app/components/Selection/Title.vue | 25 ---------- app/router/chart/index.ts | 11 +++++ app/router/index.ts | 27 ++++++----- app/router/social/index.ts | 11 +++++ app/views/Categories.vue | 61 ------------------------- app/views/Home.vue | 36 +++++++++------ app/views/chart/Chart.vue | 43 +++++++++++++++++ app/views/social/Social.vue | 43 +++++++++++++++++ 9 files changed, 144 insertions(+), 113 deletions(-) delete mode 100644 app/assets/images/NativeScript-Vue.png delete mode 100644 app/components/Selection/Title.vue create mode 100644 app/router/chart/index.ts create mode 100644 app/router/social/index.ts delete mode 100644 app/views/Categories.vue create mode 100644 app/views/chart/Chart.vue create mode 100644 app/views/social/Social.vue diff --git a/app/assets/images/NativeScript-Vue.png b/app/assets/images/NativeScript-Vue.png deleted file mode 100644 index 2ad8ed20d1818884bdcdad3d4d9e31c44fd535b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8414 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 - - - - - - - - diff --git a/app/router/chart/index.ts b/app/router/chart/index.ts new file mode 100644 index 0000000..ff8e9ea --- /dev/null +++ b/app/router/chart/index.ts @@ -0,0 +1,11 @@ +import Chart from "@/views/chart/Chart.vue"; + +export const chartRoutes:any = { + '/chart': { + component: Chart, + meta: { + title: "chart" + } + } +}; + \ No newline at end of file diff --git a/app/router/index.ts b/app/router/index.ts index fbc0f74..96e5835 100644 --- a/app/router/index.ts +++ b/app/router/index.ts @@ -1,17 +1,16 @@ import Home from "@/views/Home.vue"; -import Categories from "@/views/Categories.vue"; +import { socialRoutes } from "./social"; +import { chartRoutes } from "./chart"; -export const routes = { - '/home': { - component: Home, - meta: { - title: "Home" +const baseRoutes = { + '/home': { + component: Home, + meta: { + title: "Home" + } } - }, - '/categories': { - component: Categories, - meta: { - title: "Categories" - } - }, -} \ No newline at end of file +}; + +const allRountes = Object.assign(baseRoutes, socialRoutes, chartRoutes); + +export const routes = allRountes; \ No newline at end of file diff --git a/app/router/social/index.ts b/app/router/social/index.ts new file mode 100644 index 0000000..4cc7dcf --- /dev/null +++ b/app/router/social/index.ts @@ -0,0 +1,11 @@ +import Social from "@/views/social/Social.vue"; + +export const socialRoutes:any = { + '/social': { + component: Social, + meta: { + title: "social" + } + } +}; + \ No newline at end of file diff --git a/app/views/Categories.vue b/app/views/Categories.vue deleted file mode 100644 index 3b4a806..0000000 --- a/app/views/Categories.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - - - diff --git a/app/views/Home.vue b/app/views/Home.vue index b645221..97df317 100644 --- a/app/views/Home.vue +++ b/app/views/Home.vue @@ -1,7 +1,7 @@ @@ -28,14 +25,27 @@ const JSON_HELPER = namespace("json_helper"); export default class Home extends Vue { @JSON_HELPER.Action("setLoggedUsername") actionSetLoggedUsername?: any; - onPlay(event: any): void { + goTo(route: string): void { //store in state this.actionSetLoggedUsername("I am Karl Anthony Baluyot"); - // @ts-ignore - this.$navigator.navigate('/categories') - - console.log("HOME", "I GOT HERE"); + this.$navigator.navigate(`/${route}`) } } + + diff --git a/app/views/chart/Chart.vue b/app/views/chart/Chart.vue new file mode 100644 index 0000000..b871903 --- /dev/null +++ b/app/views/chart/Chart.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/app/views/social/Social.vue b/app/views/social/Social.vue new file mode 100644 index 0000000..9344a42 --- /dev/null +++ b/app/views/social/Social.vue @@ -0,0 +1,43 @@ + + + + + From 2556797f2e4e417e81c73a7ba04b31d71310fd3c Mon Sep 17 00:00:00 2001 From: Ralph Tolipas Date: Mon, 6 Apr 2020 18:26:11 +0800 Subject: [PATCH 02/25] add .env --- .env.example | 4 ++++ .gitignore | 3 +++ app/.DS_Store | Bin 0 -> 6148 bytes app/router/.DS_Store | Bin 0 -> 6148 bytes 4 files changed, 7 insertions(+) create mode 100644 .env.example create mode 100644 app/.DS_Store create mode 100644 app/router/.DS_Store diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..b8bee57 --- /dev/null +++ b/.env.example @@ -0,0 +1,4 @@ +APP_TITLE='Lyduz | Free Stock Trading Platform' +APP_URL=http://localhost:6969 +API_URL=https://dev-api.lyduz.com/api +API_URL_BROWSER=https://dev-api.lyduz.com/api \ No newline at end of file diff --git a/.gitignore b/.gitignore index 2c14639..f2c8fa1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ node_modules # NativeScript application hooks platforms + + +.env \ No newline at end of file diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..cafa105c50cecc704933ed057de24a0d7abb1e67 GIT binary patch literal 6148 zcmeHKO^ee&7=CBB-6riS6$DrC5b&UfQYuyV;3d{wK@gPf;vW2{$u?}GF;kMXMM|Lv zUOkIm{lLGW{s52u5zqR}N2O_Z4_-vvdCSZ*oq67wyw96tGDO5$gYG4wDiK*I0t;nS zhnN@_Wyw}_&pMFFIfgW#;8w)<{b-48I*bBFfqzW_@$8o9I`#3Z)7#Uf9ig zyFt7i1;Ze|lic>QAh|EdyPQWLsJ7?d3xiRodin;BGcSyTM9!z?c(517T|R2@LEKFx zUr#REcfG8Kd93qp@(m#q*_Pd@Zj8sx=9QY$Y&Iq}XS})Ds5zILS0@wOvd&((x$|i7 z;?P z929}B#;HR2>Odur0KfverJ*f88ibFd(bYIrh!Gf5u0Z9=^bvz8cl0}&=W3iPRPMy| z;e+XwnLeQ~xjN=|B%PS6(9}i&qd;DPRrR+j_W$jp&;NNR^Uo+?6!@%%#vDZ2%k5PmP-c+GY5PhRj4s6nCxuun0ZF7WJSo;SwiD2OHz(lazzvHjeHy=uJUaN@Az|Py- z`PkhDx4Q#CW-qHtU<#mNQxxrthz^gM4#N46D3)V;)Ah?m*DprW{LLX<`w^CS#66y| zyM9t4r?j5Go7nOjtnq{u9`K3_Y_ZwduTpq5@IS@|J+rTwy&L$x4Sa2aRLMXxkPIXP z$-s{@z&l%|IdM##3?u`|z!w90J`^^^Hn2L{(LrS;0CB=$6ZZ8XtT8394Xlo|P{c!t z9x72{h=+5$gkKw29X%Wp#fQYqpT&#V?95-x9nw0cP6m>JeFn7lrA+nyzveG9TI8Ec zs$?J;_^%AeWPUrJad&aIe%q(swT11DO-22xb|~!cJp%Zl=g65E-Cnd$zc#QsY8D;0 QaAH0LjF42xz%MZH0ZuP6!2kdN literal 0 HcmV?d00001 From 530803984d4030206d54805386fe6cd706acd688 Mon Sep 17 00:00:00 2001 From: Ralph Tolipas Date: Tue, 7 Apr 2020 09:40:21 +0800 Subject: [PATCH 03/25] remove routes folder based --- app/router/{chart/index.ts => chart.router.ts} | 0 app/router/index.ts | 4 ++-- app/router/{social/index.ts => social.router.ts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename app/router/{chart/index.ts => chart.router.ts} (100%) rename app/router/{social/index.ts => social.router.ts} (100%) diff --git a/app/router/chart/index.ts b/app/router/chart.router.ts similarity index 100% rename from app/router/chart/index.ts rename to app/router/chart.router.ts diff --git a/app/router/index.ts b/app/router/index.ts index 96e5835..0e86e1c 100644 --- a/app/router/index.ts +++ b/app/router/index.ts @@ -1,6 +1,6 @@ import Home from "@/views/Home.vue"; -import { socialRoutes } from "./social"; -import { chartRoutes } from "./chart"; +import { socialRoutes } from "./social.router"; +import { chartRoutes } from "./chart.router"; const baseRoutes = { '/home': { diff --git a/app/router/social/index.ts b/app/router/social.router.ts similarity index 100% rename from app/router/social/index.ts rename to app/router/social.router.ts From d8d47d6fe91fa13a9a6828726c072a8c4b73c455 Mon Sep 17 00:00:00 2001 From: Ralph Tolipas Date: Tue, 7 Apr 2020 09:44:26 +0800 Subject: [PATCH 04/25] update name from router to routes --- app/router/{chart.router.ts => chart.routes.ts} | 0 app/router/index.ts | 4 ++-- app/router/{social.router.ts => social.routes.ts} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename app/router/{chart.router.ts => chart.routes.ts} (100%) rename app/router/{social.router.ts => social.routes.ts} (100%) diff --git a/app/router/chart.router.ts b/app/router/chart.routes.ts similarity index 100% rename from app/router/chart.router.ts rename to app/router/chart.routes.ts diff --git a/app/router/index.ts b/app/router/index.ts index 0e86e1c..5c2e23d 100644 --- a/app/router/index.ts +++ b/app/router/index.ts @@ -1,6 +1,6 @@ import Home from "@/views/Home.vue"; -import { socialRoutes } from "./social.router"; -import { chartRoutes } from "./chart.router"; +import { socialRoutes } from "./social.routes"; +import { chartRoutes } from "./chart.routes"; const baseRoutes = { '/home': { diff --git a/app/router/social.router.ts b/app/router/social.routes.ts similarity index 100% rename from app/router/social.router.ts rename to app/router/social.routes.ts From 5334479ea90c5b262e0d4539a2c0132b8cb7a214 Mon Sep 17 00:00:00 2001 From: Ralph Tolipas Date: Tue, 7 Apr 2020 12:40:16 +0800 Subject: [PATCH 05/25] Remove .DS_Store from everywhere --- .gitignore | 4 +++- app/.DS_Store | Bin 6148 -> 0 bytes app/router/.DS_Store | Bin 6148 -> 0 bytes 3 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 app/.DS_Store delete mode 100644 app/router/.DS_Store diff --git a/.gitignore b/.gitignore index f2c8fa1..eed33c2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ hooks platforms -.env \ No newline at end of file +.env + +**/.DS_Store \ No newline at end of file diff --git a/app/.DS_Store b/app/.DS_Store deleted file mode 100644 index cafa105c50cecc704933ed057de24a0d7abb1e67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKO^ee&7=CBB-6riS6$DrC5b&UfQYuyV;3d{wK@gPf;vW2{$u?}GF;kMXMM|Lv zUOkIm{lLGW{s52u5zqR}N2O_Z4_-vvdCSZ*oq67wyw96tGDO5$gYG4wDiK*I0t;nS zhnN@_Wyw}_&pMFFIfgW#;8w)<{b-48I*bBFfqzW_@$8o9I`#3Z)7#Uf9ig zyFt7i1;Ze|lic>QAh|EdyPQWLsJ7?d3xiRodin;BGcSyTM9!z?c(517T|R2@LEKFx zUr#REcfG8Kd93qp@(m#q*_Pd@Zj8sx=9QY$Y&Iq}XS})Ds5zILS0@wOvd&((x$|i7 z;?P z929}B#;HR2>Odur0KfverJ*f88ibFd(bYIrh!Gf5u0Z9=^bvz8cl0}&=W3iPRPMy| z;e+XwnLeQ~xjN=|B%PS6(9}i&qd;DPRrR+j_W$jp&;NNR^Uo+?6!@%%#vDZ2%k5PmP-c+GY5PhRj4s6nCxuun0ZF7WJSo;SwiD2OHz(lazzvHjeHy=uJUaN@Az|Py- z`PkhDx4Q#CW-qHtU<#mNQxxrthz^gM4#N46D3)V;)Ah?m*DprW{LLX<`w^CS#66y| zyM9t4r?j5Go7nOjtnq{u9`K3_Y_ZwduTpq5@IS@|J+rTwy&L$x4Sa2aRLMXxkPIXP z$-s{@z&l%|IdM##3?u`|z!w90J`^^^Hn2L{(LrS;0CB=$6ZZ8XtT8394Xlo|P{c!t z9x72{h=+5$gkKw29X%Wp#fQYqpT&#V?95-x9nw0cP6m>JeFn7lrA+nyzveG9TI8Ec zs$?J;_^%AeWPUrJad&aIe%q(swT11DO-22xb|~!cJp%Zl=g65E-Cnd$zc#QsY8D;0 QaAH0LjF42xz%MZH0ZuP6!2kdN From 8008e3262de046192dec7a6499833df1b2eb4b0f Mon Sep 17 00:00:00 2001 From: Ralph Tolipas Date: Tue, 7 Apr 2020 12:40:57 +0800 Subject: [PATCH 06/25] added module based vuex store --- app/store/index.ts | 9 +++++--- app/store/modules/auth/actions.ts | 5 +++++ app/store/modules/auth/getters.ts | 5 +++++ app/store/modules/auth/index.ts | 17 ++++++++++++++ app/store/modules/auth/mutations.ts | 5 +++++ app/store/modules/auth/state.ts | 3 +++ app/store/modules/chart/actions.ts | 5 +++++ app/store/modules/chart/getters.ts | 5 +++++ app/store/modules/chart/index.ts | 17 ++++++++++++++ app/store/modules/chart/mutations.ts | 5 +++++ app/store/modules/chart/state.ts | 3 +++ app/store/modules/json_helper.ts | 32 --------------------------- app/store/modules/social/actions.ts | 5 +++++ app/store/modules/social/getters.ts | 5 +++++ app/store/modules/social/index.ts | 17 ++++++++++++++ app/store/modules/social/mutations.ts | 5 +++++ app/store/modules/social/state.ts | 3 +++ app/views/Home.vue | 18 +++++++++++---- app/views/chart/Chart.vue | 12 ++++++++++ app/views/social/Social.vue | 14 ++++++++---- 20 files changed, 147 insertions(+), 43 deletions(-) create mode 100644 app/store/modules/auth/actions.ts create mode 100644 app/store/modules/auth/getters.ts create mode 100644 app/store/modules/auth/index.ts create mode 100644 app/store/modules/auth/mutations.ts create mode 100644 app/store/modules/auth/state.ts create mode 100644 app/store/modules/chart/actions.ts create mode 100644 app/store/modules/chart/getters.ts create mode 100644 app/store/modules/chart/index.ts create mode 100644 app/store/modules/chart/mutations.ts create mode 100644 app/store/modules/chart/state.ts delete mode 100644 app/store/modules/json_helper.ts create mode 100644 app/store/modules/social/actions.ts create mode 100644 app/store/modules/social/getters.ts create mode 100644 app/store/modules/social/index.ts create mode 100644 app/store/modules/social/mutations.ts create mode 100644 app/store/modules/social/state.ts diff --git a/app/store/index.ts b/app/store/index.ts index 06cfb45..cd29cfa 100644 --- a/app/store/index.ts +++ b/app/store/index.ts @@ -1,14 +1,17 @@ import Vue from 'nativescript-vue'; import Vuex from 'vuex'; -//import vuex modules -import json_helper from './modules/json_helper' +import auth from './modules/auth'; +import chart from './modules/chart'; +import social from './modules/social'; Vue.use(Vuex); const store = new Vuex.Store({ modules: { - json_helper + auth, + social, + chart }, strict: true, }); diff --git a/app/store/modules/auth/actions.ts b/app/store/modules/auth/actions.ts new file mode 100644 index 0000000..b241be6 --- /dev/null +++ b/app/store/modules/auth/actions.ts @@ -0,0 +1,5 @@ +export default { + setTitle(context:any, data:any) { + context.commit("SET_TITLE", data); + } + }; \ No newline at end of file diff --git a/app/store/modules/auth/getters.ts b/app/store/modules/auth/getters.ts new file mode 100644 index 0000000..9dce4f1 --- /dev/null +++ b/app/store/modules/auth/getters.ts @@ -0,0 +1,5 @@ +export default { + title: (state:any) => { + return state.title; + }, +} \ No newline at end of file diff --git a/app/store/modules/auth/index.ts b/app/store/modules/auth/index.ts new file mode 100644 index 0000000..9611fb0 --- /dev/null +++ b/app/store/modules/auth/index.ts @@ -0,0 +1,17 @@ +import { MutationTree, ActionTree, GetterTree } from 'vuex' +import storeState from './state'; +import storeActions from './actions'; +import storeGetters from './getters'; +import storeMutations from './mutations'; + +const state = storeState; +const actions = >storeActions; +const mutations = >storeMutations; +const getters = >storeGetters; +export default { + namespaced: true, + state, + actions, + mutations, + getters +}; \ No newline at end of file diff --git a/app/store/modules/auth/mutations.ts b/app/store/modules/auth/mutations.ts new file mode 100644 index 0000000..9587048 --- /dev/null +++ b/app/store/modules/auth/mutations.ts @@ -0,0 +1,5 @@ +export default { + SET_TITLE(state:any, data:any) { + state.title = data; + }, + }; \ No newline at end of file diff --git a/app/store/modules/auth/state.ts b/app/store/modules/auth/state.ts new file mode 100644 index 0000000..f9d5bb4 --- /dev/null +++ b/app/store/modules/auth/state.ts @@ -0,0 +1,3 @@ +export default { + title: "" +} \ No newline at end of file diff --git a/app/store/modules/chart/actions.ts b/app/store/modules/chart/actions.ts new file mode 100644 index 0000000..b241be6 --- /dev/null +++ b/app/store/modules/chart/actions.ts @@ -0,0 +1,5 @@ +export default { + setTitle(context:any, data:any) { + context.commit("SET_TITLE", data); + } + }; \ No newline at end of file diff --git a/app/store/modules/chart/getters.ts b/app/store/modules/chart/getters.ts new file mode 100644 index 0000000..9dce4f1 --- /dev/null +++ b/app/store/modules/chart/getters.ts @@ -0,0 +1,5 @@ +export default { + title: (state:any) => { + return state.title; + }, +} \ No newline at end of file diff --git a/app/store/modules/chart/index.ts b/app/store/modules/chart/index.ts new file mode 100644 index 0000000..9611fb0 --- /dev/null +++ b/app/store/modules/chart/index.ts @@ -0,0 +1,17 @@ +import { MutationTree, ActionTree, GetterTree } from 'vuex' +import storeState from './state'; +import storeActions from './actions'; +import storeGetters from './getters'; +import storeMutations from './mutations'; + +const state = storeState; +const actions = >storeActions; +const mutations = >storeMutations; +const getters = >storeGetters; +export default { + namespaced: true, + state, + actions, + mutations, + getters +}; \ No newline at end of file diff --git a/app/store/modules/chart/mutations.ts b/app/store/modules/chart/mutations.ts new file mode 100644 index 0000000..9587048 --- /dev/null +++ b/app/store/modules/chart/mutations.ts @@ -0,0 +1,5 @@ +export default { + SET_TITLE(state:any, data:any) { + state.title = data; + }, + }; \ No newline at end of file diff --git a/app/store/modules/chart/state.ts b/app/store/modules/chart/state.ts new file mode 100644 index 0000000..f9d5bb4 --- /dev/null +++ b/app/store/modules/chart/state.ts @@ -0,0 +1,3 @@ +export default { + title: "" +} \ No newline at end of file diff --git a/app/store/modules/json_helper.ts b/app/store/modules/json_helper.ts deleted file mode 100644 index 0c3775a..0000000 --- a/app/store/modules/json_helper.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { MutationTree, ActionTree, GetterTree } from 'vuex' - -const state = { - loggedUsername: '', -} - -const getters = >{ - // getLevelState(state) { must make use of mapState - // return state.levelState - // } -} - -const mutations = >{ - SET_LOGGED_USERNAME(state, payload) { - state.loggedUsername = payload - }, - -} - -const actions = >{ - setLoggedUsername(context, data) { - context.commit("SET_LOGGED_USERNAME", data) - } -} - -export default { - namespaced: true, - state, - getters, - mutations, - actions, -} diff --git a/app/store/modules/social/actions.ts b/app/store/modules/social/actions.ts new file mode 100644 index 0000000..b241be6 --- /dev/null +++ b/app/store/modules/social/actions.ts @@ -0,0 +1,5 @@ +export default { + setTitle(context:any, data:any) { + context.commit("SET_TITLE", data); + } + }; \ No newline at end of file diff --git a/app/store/modules/social/getters.ts b/app/store/modules/social/getters.ts new file mode 100644 index 0000000..9dce4f1 --- /dev/null +++ b/app/store/modules/social/getters.ts @@ -0,0 +1,5 @@ +export default { + title: (state:any) => { + return state.title; + }, +} \ No newline at end of file diff --git a/app/store/modules/social/index.ts b/app/store/modules/social/index.ts new file mode 100644 index 0000000..9611fb0 --- /dev/null +++ b/app/store/modules/social/index.ts @@ -0,0 +1,17 @@ +import { MutationTree, ActionTree, GetterTree } from 'vuex' +import storeState from './state'; +import storeActions from './actions'; +import storeGetters from './getters'; +import storeMutations from './mutations'; + +const state = storeState; +const actions = >storeActions; +const mutations = >storeMutations; +const getters = >storeGetters; +export default { + namespaced: true, + state, + actions, + mutations, + getters +}; \ No newline at end of file diff --git a/app/store/modules/social/mutations.ts b/app/store/modules/social/mutations.ts new file mode 100644 index 0000000..9587048 --- /dev/null +++ b/app/store/modules/social/mutations.ts @@ -0,0 +1,5 @@ +export default { + SET_TITLE(state:any, data:any) { + state.title = data; + }, + }; \ No newline at end of file diff --git a/app/store/modules/social/state.ts b/app/store/modules/social/state.ts new file mode 100644 index 0000000..f9d5bb4 --- /dev/null +++ b/app/store/modules/social/state.ts @@ -0,0 +1,3 @@ +export default { + title: "" +} \ No newline at end of file diff --git a/app/views/Home.vue b/app/views/Home.vue index 97df317..605183e 100644 --- a/app/views/Home.vue +++ b/app/views/Home.vue @@ -17,20 +17,30 @@ diff --git a/app/views/chart/Chart.vue b/app/views/chart/Chart.vue index b871903..d5b2724 100644 --- a/app/views/chart/Chart.vue +++ b/app/views/chart/Chart.vue @@ -21,11 +21,23 @@ diff --git a/app/views/social/Social.vue b/app/views/social/Social.vue index 9344a42..affcaed 100644 --- a/app/views/social/Social.vue +++ b/app/views/social/Social.vue @@ -6,7 +6,7 @@ android.systemIcon="ic_menu_back" @tap="$navigator.navigate('/home')" /> -