From c7d72be2d1eed9b7fbfe719752ff800653d8c089 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Sun, 2 Aug 2020 00:04:06 +0200 Subject: change db, set cookie --- src/browser/package.json | 1 - src/browser/src/assets/bootstrap-icons.svg | 1 + src/browser/src/router.js | 3 +- src/browser/src/store.js | 20 ++- src/browser/src/validators.js | 4 + src/browser/src/views/Login.vue | 64 ++++++--- src/server-secrets.json | 7 + src/server/.idea/.idea.Dough.dir/.idea/.gitignore | 13 ++ .../.idea.Dough.dir/.idea/.idea.Dough.dir.iml | 8 ++ src/server/.idea/.idea.Dough.dir/.idea/.name | 1 + .../.idea/.idea.Dough.dir/.idea/encodings.xml | 4 + .../.idea/.idea.Dough.dir/.idea/indexLayout.xml | 8 ++ src/server/.idea/.idea.Dough.dir/.idea/misc.xml | 6 + src/server/.idea/.idea.Dough.dir/.idea/vcs.xml | 6 + src/server/.idea/.idea.Dough.dir/riderModule.iml | 7 + src/server/Controllers/AccountController.cs | 16 ++- src/server/Controllers/BaseController.cs | 1 - src/server/Dough.csproj | 30 ++--- .../Migrations/20200729090558_Initial.Designer.cs | 143 -------------------- src/server/Migrations/20200729090558_Initial.cs | 97 -------------- .../20200801205356_INITIAL_MIGRATION.Designer.cs | 144 +++++++++++++++++++++ .../Migrations/20200801205356_INITIAL_MIGRATION.cs | 97 ++++++++++++++ .../Migrations/MainDbContextModelSnapshot.cs | 71 +++++----- src/server/Models/Constants.cs | 7 + src/server/Models/DbSetOverrides.cs | 5 +- src/server/Models/Payloads/LoginPayload.cs | 8 ++ src/server/Startup.cs | 25 +++- src/set-server-secrets.sh | 4 + 28 files changed, 470 insertions(+), 331 deletions(-) create mode 100644 src/browser/src/assets/bootstrap-icons.svg create mode 100644 src/browser/src/validators.js create mode 100644 src/server-secrets.json create mode 100644 src/server/.idea/.idea.Dough.dir/.idea/.gitignore create mode 100644 src/server/.idea/.idea.Dough.dir/.idea/.idea.Dough.dir.iml create mode 100644 src/server/.idea/.idea.Dough.dir/.idea/.name create mode 100644 src/server/.idea/.idea.Dough.dir/.idea/encodings.xml create mode 100644 src/server/.idea/.idea.Dough.dir/.idea/indexLayout.xml create mode 100644 src/server/.idea/.idea.Dough.dir/.idea/misc.xml create mode 100644 src/server/.idea/.idea.Dough.dir/.idea/vcs.xml create mode 100644 src/server/.idea/.idea.Dough.dir/riderModule.iml delete mode 100644 src/server/Migrations/20200729090558_Initial.Designer.cs delete mode 100644 src/server/Migrations/20200729090558_Initial.cs create mode 100644 src/server/Migrations/20200801205356_INITIAL_MIGRATION.Designer.cs create mode 100644 src/server/Migrations/20200801205356_INITIAL_MIGRATION.cs create mode 100644 src/server/Models/Constants.cs create mode 100644 src/server/Models/Payloads/LoginPayload.cs create mode 100755 src/set-server-secrets.sh (limited to 'src') diff --git a/src/browser/package.json b/src/browser/package.json index ac95ccb..6903285 100644 --- a/src/browser/package.json +++ b/src/browser/package.json @@ -13,7 +13,6 @@ }, "devDependencies": { "@vue/cli-plugin-babel": "~4.5.0", - "@vue/cli-plugin-pwa": "~4.5.0", "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-service": "~4.5.0", diff --git a/src/browser/src/assets/bootstrap-icons.svg b/src/browser/src/assets/bootstrap-icons.svg new file mode 100644 index 0000000..466fc57 --- /dev/null +++ b/src/browser/src/assets/bootstrap-icons.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/browser/src/router.js b/src/browser/src/router.js index 0122f66..611b97f 100644 --- a/src/browser/src/router.js +++ b/src/browser/src/router.js @@ -37,8 +37,7 @@ const router = createRouter({ }); router.beforeEach((to, from, next) => { - console.log(to); - console.log("store.state.isLoggedIn: " + store.state.isLoggedIn); + console.log("store.state.profile: " + store.state.profile); if (to.path !== "/login" && !store.state.isLoggedIn) next("/login"); else next(); }); diff --git a/src/browser/src/store.js b/src/browser/src/store.js index a3a0465..87f7b9d 100644 --- a/src/browser/src/store.js +++ b/src/browser/src/store.js @@ -3,13 +3,25 @@ import { createStore } from "vuex"; export default createStore({ strict: true, state: { - isLoggedIn: false, + profile: { + id: "", + username: "", + sessionStart: "", + isAuthenticated: false, + }, }, mutations: { - setLoggedInState(state, isLoggedIn) { - state.isLoggedIn = isLoggedIn; + setProfileData(state, profile) { + state.profile = { + id: profile.id, + username: profile.username, + sessionStart: profile.sessionStart, + isAuthenticated: profile.id !== "", + }; }, }, - actions: {}, + actions: { + + }, modules: {}, }); diff --git a/src/browser/src/validators.js b/src/browser/src/validators.js new file mode 100644 index 0000000..ac9d23a --- /dev/null +++ b/src/browser/src/validators.js @@ -0,0 +1,4 @@ +const isEmail = () => { + const re = /\S+@\S+\.\S+/; + return (input) => (re.test(input) ? null : "Must be a valid email address"); +}; diff --git a/src/browser/src/views/Login.vue b/src/browser/src/views/Login.vue index ec48878..9beca02 100644 --- a/src/browser/src/views/Login.vue +++ b/src/browser/src/views/Login.vue @@ -7,18 +7,17 @@

Logger inn...

-
+
-

money-manager

+

dough

@@ -34,13 +33,12 @@ class="form-control width-100%" name="password" id="password" - v-model.lazy="this.input.password" - placeholder="Password" + v-model.trim="input.password" />
- +