+
+
+
+
+
+
+
diff --git a/thanasoft-front/src/components/Organism/LoginPresentation.vue b/thanasoft-front/src/components/Organism/LoginPresentation.vue
new file mode 100644
index 0000000..81835f7
--- /dev/null
+++ b/thanasoft-front/src/components/Organism/LoginPresentation.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/thanasoft-front/src/components/molecules/auth/SocialMedia.buttons.vue b/thanasoft-front/src/components/molecules/auth/SocialMedia.buttons.vue
new file mode 100644
index 0000000..946cac9
--- /dev/null
+++ b/thanasoft-front/src/components/molecules/auth/SocialMedia.buttons.vue
@@ -0,0 +1,67 @@
+
+
+
diff --git a/thanasoft-front/src/components/templates/LoginTemplate.vue b/thanasoft-front/src/components/templates/LoginTemplate.vue
new file mode 100644
index 0000000..4f4b2bb
--- /dev/null
+++ b/thanasoft-front/src/components/templates/LoginTemplate.vue
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+ Bonjour !
++ Veuillez entrer vos identifiants pour vous connecter +
+
+
+
diff --git a/thanasoft-front/src/examples/Navbars/Navbar.vue b/thanasoft-front/src/examples/Navbars/Navbar.vue
index ba63587..a1a6e51 100644
--- a/thanasoft-front/src/examples/Navbars/Navbar.vue
+++ b/thanasoft-front/src/examples/Navbars/Navbar.vue
@@ -55,16 +55,16 @@
+
+
+
+
+
+
+
+ Connectez-vous
+-
import Breadcrumbs from "../Breadcrumbs.vue";
import { mapMutations, mapActions, mapState } from "vuex";
+import { useAuthStore } from "@/stores/auth";
export default {
name: "Navbar",
@@ -265,6 +266,19 @@ export default {
this.toggleSidebarColor("bg-white");
this.navbarMinimize();
},
+
+ async handleLogout() {
+ try {
+ const authStore = useAuthStore();
+ await authStore.logout();
+ // Redirect to login page
+ this.$router.push("/login");
+ } catch (error) {
+ console.error("Logout error:", error);
+ // Still redirect to login even if logout API fails
+ this.$router.push("/login");
+ }
+ },
},
};
diff --git a/thanasoft-front/src/examples/PageLayout/Navbar.vue b/thanasoft-front/src/examples/PageLayout/Navbar.vue
index 7385ca3..5be2672 100644
--- a/thanasoft-front/src/examples/PageLayout/Navbar.vue
+++ b/thanasoft-front/src/examples/PageLayout/Navbar.vue
@@ -9,7 +9,8 @@
class="navbar-brand font-weight-bolder ms-lg-0 ms-3"
:class="darkMode ? 'text-black' : 'text-white'"
to="/"
- >Soft UI Dashboard PRO
+ >Soft UI Dashboard PRO
@@ -160,12 +160,12 @@ title="Refferals" :chart="{ labels: ['Adobe', 'Atlassian', 'Slack', 'Spotify', 'Jira'], - datasets: [{ label: 'Referrals', data: [25, 3, 12, 7, 10] }] + datasets: [{ label: 'Referrals', data: [25, 3, 12, 7, 10] }], }" :actions="{ route: 'https://creative-tim.com', label: 'See all referrals', - color: 'secondary' + color: 'secondary', }" /> @@ -177,28 +177,28 @@ { label: 'Facebook', icon: 'facebook', - progress: 80 + progress: 80, }, { label: 'Twitter', icon: 'twitter', - progress: 40 + progress: 40, }, { label: 'Reddit', icon: 'reddit', - progress: 30 + progress: 30, }, { label: 'Youtube', icon: 'youtube', - progress: 25 + progress: 25, }, { label: 'Slack', icon: 'slack', - progress: 15 - } + progress: 15, + }, ]" /> @@ -209,44 +209,44 @@ url: '/bits', views: 345, time: '00:17:07', - rate: '40.91%' + rate: '40.91%', }, { url: '/pages/argon-dashboard', views: 520, time: '00:23:13', - rate: '30.14%' + rate: '30.14%', }, { url: '/pages/soft-ui-dashboard', views: 122, time: '00:3:10', - rate: '54.10%' + rate: '54.10%', }, { url: '/bootstrap-themes', views: '1,900', time: '00:30:42', - rate: '20.93%' + rate: '20.93%', }, { url: '/react-themes', views: '1,442', time: '00:31:50', - rate: '34.98%' + rate: '34.98%', }, { url: '/product/argon-dashboard-angular', views: 201, time: '00:12:42', - rate: '21.4%' + rate: '21.4%', }, { url: '/product/material-dashboard-pro', views: '2,115', time: '00:50:11', - rate: '34.98%' - } + rate: '34.98%', + }, ]" /> @@ -274,7 +274,7 @@ export default { DefaultLineChart, DefaultDoughnutChart, SocialCard, - PagesCard + PagesCard, }, data() { return { @@ -282,11 +282,11 @@ export default { logoAtlassian, logoSlack, logoSpotify, - logoJira + logoJira, }; }, mounted() { setTooltip(this.$store.state.bootstrap); - } + }, }; diff --git a/thanasoft-front/src/views/auth/signin/Basic.vue b/thanasoft-front/src/views/auth/signin/Basic.vue index 7f8806e..fec739e 100644 --- a/thanasoft-front/src/views/auth/signin/Basic.vue +++ b/thanasoft-front/src/views/auth/signin/Basic.vue @@ -1,5 +1,4 @@ -
@@ -32,16 +30,16 @@ export default { props: { collapseRef: { type: String, - required: true + required: true, }, navText: { type: String, - required: true + required: true, }, collapse: { type: Boolean, - default: true - } + default: true, + }, }, computed: { ...mapState(["isRTL"]), diff --git a/thanasoft-front/src/examples/Sidenav/SidenavCollapseItem.vue b/thanasoft-front/src/examples/Sidenav/SidenavCollapseItem.vue index 06b4828..3ad36d9 100644 --- a/thanasoft-front/src/examples/Sidenav/SidenavCollapseItem.vue +++ b/thanasoft-front/src/examples/Sidenav/SidenavCollapseItem.vue @@ -24,16 +24,16 @@ export default { props: { refer: { type: String, - required: true + required: true, }, miniIcon: { type: String, - required: true + required: true, }, text: { type: String, - required: true - } - } + required: true, + }, + }, }; diff --git a/thanasoft-front/src/examples/Sidenav/SidenavList.vue b/thanasoft-front/src/examples/Sidenav/SidenavList.vue index ad771a9..686d9bc 100644 --- a/thanasoft-front/src/examples/Sidenav/SidenavList.vue +++ b/thanasoft-front/src/examples/Sidenav/SidenavList.vue @@ -844,9 +844,9 @@ export default { default: "", }, }, - computed: { - ...mapState(["isRTL"]), - }, + computed: { + ...mapState(["isRTL"]), + }, methods: { getRoute() { const routeArr = this.$route.path.split("/"); diff --git a/thanasoft-front/src/main.ts b/thanasoft-front/src/main.ts index 39f0323..e6a4159 100644 --- a/thanasoft-front/src/main.ts +++ b/thanasoft-front/src/main.ts @@ -18,8 +18,10 @@ import "./assets/css/nucleo-svg.css"; import VueTilt from "vue-tilt.js"; import VueSweetalert2 from "vue-sweetalert2"; import SoftUIDashboard from "./soft-ui-dashboard"; +import pinia from "./plugins/pinia"; const appInstance = createApp(App); +appInstance.use(pinia); appInstance.use(store); appInstance.use(router); appInstance.use(VueTilt); diff --git a/thanasoft-front/src/plugins/pinia.ts b/thanasoft-front/src/plugins/pinia.ts new file mode 100644 index 0000000..dd43c30 --- /dev/null +++ b/thanasoft-front/src/plugins/pinia.ts @@ -0,0 +1,5 @@ +import { createPinia } from 'pinia' + +// Single shared Pinia instance so router guards and app use the same store +export const pinia = createPinia() +export default pinia diff --git a/thanasoft-front/src/router/index.js b/thanasoft-front/src/router/index.js index cdcb8fb..e1fb11c 100644 --- a/thanasoft-front/src/router/index.js +++ b/thanasoft-front/src/router/index.js @@ -54,12 +54,30 @@ import lockBasic from "../views/auth/lock/Basic.vue"; import lockCover from "../views/auth/lock/Cover.vue"; import lockIllustration from "../views/auth/lock/Illustration.vue"; +//ROUTE SHOULD USED + const routes = [ { path: "/", name: "/", redirect: "/dashboards/dashboard-default", }, + { + path: "/dashboard", + redirect: "/dashboards/dashboard-default", + }, + { + path: "/login", + name: "Login", + component: () => import("@/views/pages/Login.vue"), + meta: { public: true, guestOnly: true, guestLayout: true }, + }, + { + path: "/register", + name: "Register", + component: () => import("@/views/pages/Register.vue"), + meta: { public: true, guestOnly: true, guestLayout: true }, + }, { path: "/dashboards/dashboard-default", name: "Default", @@ -249,94 +267,158 @@ const routes = [ path: "/authentication/signin/basic", name: "Signin Basic", component: Basic, + meta: { guestLayout: true }, }, { path: "/authentication/signin/cover", name: "Signin Cover", component: Cover, + meta: { guestLayout: true }, }, { path: "/authentication/signin/illustration", name: "Signin Illustration", component: Illustration, + meta: { guestLayout: true }, }, { path: "/authentication/reset/basic", name: "Reset Basic", component: ResetBasic, + meta: { guestLayout: true }, }, { path: "/authentication/reset/cover", name: "Reset Cover", component: ResetCover, + meta: { guestLayout: true }, }, { path: "/authentication/reset/illustration", name: "Reset Illustration", component: ResetIllustration, + meta: { guestLayout: true }, }, { path: "/authentication/lock/basic", name: "Lock Basic", component: lockBasic, + meta: { guestLayout: true }, }, { path: "/authentication/lock/cover", name: "Lock Cover", component: lockCover, + meta: { guestLayout: true }, }, { path: "/authentication/lock/illustration", name: "Lock Illustration", component: lockIllustration, + meta: { guestLayout: true }, }, { path: "/authentication/verification/basic", name: "Verification Basic", component: VerificationBasic, + meta: { guestLayout: true }, }, { path: "/authentication/verification/cover", name: "Verification Cover", component: VerificationCover, + meta: { guestLayout: true }, }, { path: "/authentication/verification/illustration", name: "Verification Illustration", component: VerificationIllustration, + meta: { guestLayout: true }, }, { path: "/authentication/signup/basic", name: "Signup Basic", component: SignupBasic, + meta: { guestLayout: true }, }, { path: "/authentication/signup/cover", name: "Signup Cover", component: SignupCover, + meta: { guestLayout: true }, }, { path: "/authentication/signup/illustration", name: "Signup Illustration", component: SignupIllustration, + meta: { guestLayout: true }, }, { path: "/authentication/error/error404", name: "Error Error404", component: Error404, + meta: { guestLayout: true }, }, { path: "/authentication/error/error500", name: "Error Error500", component: Error500, + meta: { guestLayout: true }, }, ]; const router = createRouter({ - // Use root base so the app works whether served at / or via /build/index.html - history: createWebHistory("/"), + history: createWebHistory(process.env.BASE_URL), routes, linkActiveClass: "active", }); +// Auth guard using Pinia store and Laravel Sanctum session +import { useAuthStore } from "@/stores/auth"; +import pinia from "@/plugins/pinia"; + +const DASHBOARD = "/dashboards/dashboard-default"; +const LOGIN = "/login"; // canonical login path without redirect query + +router.beforeEach(async (to, from, next) => { + const auth = useAuthStore(pinia); + const isPublic = to.matched.some((r) => r.meta && r.meta.public === true); + const isGuestOnly = to.matched.some( + (r) => r.meta && r.meta.guestOnly === true + ); + const isLoginRoute = to.name === "Login" || to.name === "Signin"; + + // Initialize auth from localStorage token if not already done + if (!auth.checked) { + const token = localStorage.getItem("auth_token"); + if (token) { + // Token exists, set it and try to fetch user + auth.token = token; + try { + await auth.fetchMe(); + } catch (error) { + // If token is invalid, clear it and continue as unauthenticated + console.warn("Invalid token, clearing auth"); + localStorage.removeItem("auth_token"); + auth.token = null; + auth.user = null; + auth.checked = true; + } + } else { + // No token, mark as checked + auth.checked = true; + } + } + + if (auth.isAuthenticated) { + // Prevent authenticated users from visiting guest-only routes (like sign-in) + if (isGuestOnly || isLoginRoute) return next(DASHBOARD); + return next(); + } + + // Not authenticated: allow public/guest routes (like sign-in), otherwise send to login (no redirect param) + if (isPublic || isGuestOnly || isLoginRoute) return next(); + return next({ path: LOGIN, replace: true }); +}); + export default router; diff --git a/thanasoft-front/src/services/auth.ts b/thanasoft-front/src/services/auth.ts new file mode 100644 index 0000000..f7ddbfd --- /dev/null +++ b/thanasoft-front/src/services/auth.ts @@ -0,0 +1,92 @@ +import { request, http } from "./http"; + +export interface LoginPayload { + email: string; + password: string; + remember?: boolean; +} + +export interface RegisterPayload { + name: string; + email: string; + password: string; +} + +export interface User { + id: number; + name: string; + email: string; + email_verified_at: string | null; + created_at: string; + updated_at: string; +} + +export interface LoginResponse { + success: boolean; + data: { + user: User; + token: string; + }; + message: string; +} + +export const AuthService = { + async login(payload: LoginPayload): Promise { + const response = await request ({ + url: "/api/auth/login", + method: "post", + data: payload, + }); + + // Save token to localStorage + if (response.success && response.data.token) { + localStorage.setItem("auth_token", response.data.token); + } + + return response; + }, + + async register(payload: RegisterPayload): Promise { + const response = await request ({ + url: "/api/auth/register", + method: "post", + data: payload, + }); + + // Save token to localStorage (user is automatically logged in after registration) + if (response.success && response.data.token) { + localStorage.setItem("auth_token", response.data.token); + } + + return response; + }, + + async logout() { + try { + await request ({ url: "/api/auth/logout", method: "post" }); + } finally { + // Always remove token from localStorage on logout + localStorage.removeItem("auth_token"); + } + }, + + async me() { + // Fetch current user from API + const response = await request ({ url: "/api/auth/user", method: "get" }); + // Handle both direct user response and wrapped response + if (response.success && response.data) { + return response.data; + } + return response; + }, + + getToken(): string | null { + return localStorage.getItem("auth_token"); + }, + + hasToken(): boolean { + return !!this.getToken(); + }, +}; + +export default AuthService; diff --git a/thanasoft-front/src/services/http.ts b/thanasoft-front/src/services/http.ts new file mode 100644 index 0000000..72527c4 --- /dev/null +++ b/thanasoft-front/src/services/http.ts @@ -0,0 +1,66 @@ +import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from "axios"; + +// Read base URL from Vue CLI env (must start with VUE_APP_) +const baseURL = process.env.VUE_APP_API_BASE_URL || ""; + +// Laravel Sanctum defaults +// - xsrfCookieName: 'XSRF-TOKEN' +// - xsrfHeaderName: 'X-XSRF-TOKEN' +// - withCredentials: true (needed for cookie-based session) + +let csrfInitPromise: Promise | null = null; + +async function ensureCSRF(client: AxiosInstance) { + if (!csrfInitPromise) { + // Hitting /sanctum/csrf-cookie sets the XSRF-TOKEN cookie used by Axios + csrfInitPromise = client + .get("/sanctum/csrf-cookie", { withCredentials: true }) + .then(() => void 0); + } + return csrfInitPromise; +} + +export const http: AxiosInstance = axios.create({ + baseURL, + withCredentials: true, + // These match Laravel’s defaults and Axios defaults; set explicitly for clarity + xsrfCookieName: "XSRF-TOKEN", + xsrfHeaderName: "X-XSRF-TOKEN", + headers: { + "X-Requested-With": "XMLHttpRequest", + Accept: "application/json", + }, + timeout: 30000, +}); + +// Optionally attach a request interceptor to ensure CSRF for state-changing requests +http.interceptors.request.use(async (config) => { + // Add Bearer token if available + const token = localStorage.getItem("auth_token"); + if (token) { + config.headers.Authorization = `Bearer ${token}`; + } + + // Only ensure CSRF for unsafe methods (POST, PUT, PATCH, DELETE) + // Skip CSRF if using token-based auth + const method = (config.method || "get").toLowerCase(); + if (!token && method !== "get" && method !== "head" && method !== "options") { + await ensureCSRF(http); + } + return config; +}); + +// Basic response error normalization (optional) +http.interceptors.response.use( + (r) => r, + (error: AxiosError) => { + // You can add global error handling, e.g., redirect on 401, etc. + return Promise.reject(error); + } +); + +// Helper to build typed requests if needed +export async function request (config: AxiosRequestConfig) { + const response = await http.request (config); + return response.data; +} diff --git a/thanasoft-front/src/services/index.ts b/thanasoft-front/src/services/index.ts new file mode 100644 index 0000000..8dc4fd7 --- /dev/null +++ b/thanasoft-front/src/services/index.ts @@ -0,0 +1,2 @@ +export * from './http' +export { default as AuthService } from './auth' diff --git a/thanasoft-front/src/shims-vue.d.ts b/thanasoft-front/src/shims-vue.d.ts index 77b16fd..ecaaa94 100644 --- a/thanasoft-front/src/shims-vue.d.ts +++ b/thanasoft-front/src/shims-vue.d.ts @@ -1,35 +1,13 @@ -declare module "*.vue" { - import type { DefineComponent } from "vue"; - const component: DefineComponent<{}, {}, any>; - export default component; +/* eslint-disable */ +declare module '*.vue' { + import type { DefineComponent } from 'vue' + const component: DefineComponent<{}, {}, any> + export default component } -declare module "*.png" { - const src: string; - export default src; -} - -declare module "*.jpg" { - const src: string; - export default src; -} - -declare module "*.jpeg" { - const src: string; - export default src; -} - -declare module "*.gif" { - const src: string; - export default src; -} - -declare module "*.webp" { - const src: string; - export default src; -} - -declare module "*.svg" { - const src: string; - export default src; +// Type shim for packages without TypeScript declarations +declare module 'vue-tilt.js' { + import type { Plugin } from 'vue' + const VueTilt: Plugin + export default VueTilt } diff --git a/thanasoft-front/src/store/index.js b/thanasoft-front/src/store/index.js index 561aa76..d6d8349 100644 --- a/thanasoft-front/src/store/index.js +++ b/thanasoft-front/src/store/index.js @@ -19,7 +19,7 @@ export default createStore({ navbarFixed: "position-sticky blur shadow-blur left-auto top-1 z-index-sticky px-0 mx-4", absolute: "position-absolute px-4 mx-0 w-100 z-index-2", - bootstrap + bootstrap, }, mutations: { toggleConfigurator(state) { @@ -57,7 +57,7 @@ export default createStore({ }, toggleHideConfig(state) { state.hideConfigButton = !state.hideConfigButton; - } + }, }, actions: { toggleSidebarColor({ commit }, payload) { @@ -67,5 +67,5 @@ export default createStore({ commit("cardBackground", payload); }, }, - getters: {} + getters: {}, }); diff --git a/thanasoft-front/src/stores/auth.ts b/thanasoft-front/src/stores/auth.ts new file mode 100644 index 0000000..4375a3c --- /dev/null +++ b/thanasoft-front/src/stores/auth.ts @@ -0,0 +1,86 @@ +import { defineStore } from "pinia"; +import type { User, LoginPayload, RegisterPayload } from "@/services/auth"; +import AuthService from "@/services/auth"; + +export const useAuthStore = defineStore("auth", { + state: () => ({ + user: null as User | null, + token: null as string | null, + checked: false as boolean, // whether we've attempted to fetch current user + }), + getters: { + isAuthenticated: (state) => !!state.user && !!state.token, + }, + actions: { + async fetchMe() { + try { + const userData = await AuthService.me(); + // Validate that we actually received a user object, not HTML or other invalid data + if (userData && typeof userData === 'object' && 'id' in userData && 'email' in userData) { + this.user = userData; + } else { + // If backend returned invalid data (like HTML), treat as unauthenticated + console.warn('Invalid user data received from /api/user:', userData); + this.user = null; + } + } catch (e) { + console.error('Error fetching user:', e); + this.user = null; + this.token = null; + } finally { + this.checked = true; + } + return this.user; + }, + async login(payload: LoginPayload) { + const response = await AuthService.login(payload); + + if (response.success && response.data.user && response.data.token) { + this.user = response.data.user; + this.token = response.data.token; + this.checked = true; + return this.user; + } else { + throw new Error(response.message || "Login failed"); + } + }, + async register(payload: RegisterPayload) { + const response = await AuthService.register(payload); + + if (response.success && response.data.user && response.data.token) { + this.user = response.data.user; + this.token = response.data.token; + this.checked = true; + return this.user; + } else { + throw new Error(response.message || "Registration failed"); + } + }, + async logout() { + try { + await AuthService.logout(); + } finally { + this.user = null; + this.token = null; + this.checked = true; + } + }, + // Initialize auth state from localStorage token on app load + initializeAuth() { + const token = AuthService.getToken(); + if (token) { + this.token = token; + // Optionally fetch user data if token exists + this.fetchMe().catch(() => { + // If fetching user fails, clear invalid token + this.token = null; + AuthService.logout(); + }); + } else { + this.checked = true; + } + }, + }, +}); + +export default useAuthStore; diff --git a/thanasoft-front/src/types/user.ts b/thanasoft-front/src/types/user.ts deleted file mode 100644 index 80debdd..0000000 --- a/thanasoft-front/src/types/user.ts +++ /dev/null @@ -1,8 +0,0 @@ -export interface User { - id: number; - name: string; - email: string; - email_verified_at?: string | null; - created_at?: string; - updated_at?: string; -} diff --git a/thanasoft-front/src/views/Home.vue b/thanasoft-front/src/views/Home.vue index 8e1801a..60d05c0 100644 --- a/thanasoft-front/src/views/Home.vue +++ b/thanasoft-front/src/views/Home.vue @@ -1,7 +1,18 @@ - + +- diff --git a/thanasoft-front/src/views/applications/analytics/Analytics.vue b/thanasoft-front/src/views/applications/analytics/Analytics.vue index 5b61ca9..a4ff428 100644 --- a/thanasoft-front/src/views/applications/analytics/Analytics.vue +++ b/thanasoft-front/src/views/applications/analytics/Analytics.vue @@ -40,11 +40,11 @@ value="930" :percentage="{ value: '+55%', - color: 'text-success' + color: 'text-success', }" :icon="{ component: 'ni ni-circle-08', - background: 'bg-gradient-dark' + background: 'bg-gradient-dark', }" class="ms-1" direction-reverse @@ -56,11 +56,11 @@ value="744" :percentage="{ value: '+3%', - color: 'text-success' + color: 'text-success', }" :icon="{ component: 'ni ni-world', - background: 'bg-gradient-dark' + background: 'bg-gradient-dark', }" class="ms-1" direction-reverse @@ -72,11 +72,11 @@ value="1,414" :percentage="{ value: '-2%', - color: 'text-danger' + color: 'text-danger', }" :icon="{ component: 'ni ni-watch-time', - background: 'bg-gradient-dark' + background: 'bg-gradient-dark', }" class="ms-1" direction-reverse @@ -88,11 +88,11 @@ value="1.76" :percentage="{ value: '+5%', - color: 'text-success' + color: 'text-success', }" :icon="{ component: 'ni ni-image', - background: 'bg-gradient-dark' + background: 'bg-gradient-dark', }" class="ms-1" direction-reverse @@ -133,22 +133,22 @@ 'Sep', 'Oct', 'Nov', - 'Dec' + 'Dec', ], datasets: [ { label: 'Organic Search', - data: [50, 40, 300, 220, 500, 250, 400, 230, 500] + data: [50, 40, 300, 220, 500, 250, 400, 230, 500], }, { label: 'Referral', - data: [30, 90, 40, 140, 290, 290, 340, 230, 400] + data: [30, 90, 40, 140, 290, 290, 340, 230, 400], }, { label: 'Direct', - data: [40, 80, 70, 90, 30, 90, 140, 130, 200] - } - ] + data: [40, 80, 70, 90, 30, 90, 140, 130, 200], + }, + ], }" />
+ + @@ -25,7 +23,7 @@-Welcome!
+Bonjour !
- Use these awesome forms to login or create new account in your - project for free. + Veuillez entrer vos identifiants pour vous connecter
--Sign in
+Connectez-vous
@@ -143,11 +141,11 @@ id="password" name="password" type="password" - placeholder="Password" + placeholder="Mot de passe" />- Remember me + Souvenez de moi Sign in + >Se connecter - or + ou
@@ -171,7 +169,7 @@ variant="gradient" color="dark" full-width - >Sign up + >creer un compte@@ -180,37 +178,29 @@- diff --git a/thanasoft-front/src/views/auth/signin/Cover.vue b/thanasoft-front/src/views/auth/signin/Cover.vue index 97755fc..65bc4ae 100644 --- a/thanasoft-front/src/views/auth/signin/Cover.vue +++ b/thanasoft-front/src/views/auth/signin/Cover.vue @@ -24,13 +24,19 @@ Enter your email and password to sign in
-@@ -94,6 +100,7 @@ import AppFooter from "@/examples/PageLayout/Footer.vue"; import SoftInput from "@/components/SoftInput.vue"; import SoftSwitch from "@/components/SoftSwitch.vue"; import SoftButton from "@/components/SoftButton.vue"; +import { useAuthStore } from "@/stores/auth"; const body = document.getElementsByTagName("body")[0]; import { mapMutations } from "vuex"; @@ -116,8 +123,39 @@ export default { this.toggleHideConfig(); body.classList.add("bg-gray-100"); }, + data() { + return { + email: "", + password: "", + remember: true, + }; + }, methods: { ...mapMutations(["toggleEveryDisplay", "toggleHideConfig"]), + onEmailInput(e) { + this.email = e.target.value; + }, + onPasswordInput(e) { + this.password = e.target.value; + }, + onRememberChange(e) { + this.remember = e.target.checked; + }, + async onSubmit() { + try { + const auth = useAuthStore(); + await auth.login({ + email: this.email, + password: this.password, + remember: this.remember, + }); + const redirect = this.$route.query.redirect || "/dashboard"; + this.$router.push(redirect); + } catch (e) { + // Optionally show a message to the user + console.error("Login failed", e); + } + }, }, }; diff --git a/thanasoft-front/src/views/dashboards/Automotive.vue b/thanasoft-front/src/views/dashboards/Automotive.vue index 7573b7c..161e133 100644 --- a/thanasoft-front/src/views/dashboards/Automotive.vue +++ b/thanasoft-front/src/views/dashboards/Automotive.vue @@ -11,15 +11,15 @@ class="bg-gradient-secondary" :title="{ text: 'Today\'s Trip', - color: 'opacity-7 text-white' + color: 'opacity-7 text-white', }" :value="{ text: '145 Km', - color: 'text-white' + color: 'text-white', }" :icon="{ component: 'text-dark ni ni-money-coins', - background: 'bg-white' + background: 'bg-white', }" direction-reverse /> @@ -29,15 +29,15 @@ class="bg-gradient-secondary" :title="{ text: 'Battery Health', - color: 'opacity-7 text-white' + color: 'opacity-7 text-white', }" :value="{ text: '99 %', - color: 'text-white' + color: 'text-white', }" :icon="{ component: 'text-dark ni ni-controller', - background: 'bg-white' + background: 'bg-white', }" direction-reverse /> @@ -47,15 +47,15 @@ class="bg-gradient-secondary" :title="{ text: 'Average Speed', - color: 'opacity-7 text-white' + color: 'opacity-7 text-white', }" :value="{ text: '56 Km/h', - color: 'text-white' + color: 'text-white', }" :icon="{ component: 'text-dark ni ni-delivery-fast', - background: 'bg-white' + background: 'bg-white', }" direction-reverse /> @@ -65,15 +65,15 @@ class="bg-gradient-secondary" :title="{ text: 'Music Volume', - color: 'opacity-7 text-white' + color: 'opacity-7 text-white', }" :value="{ text: '15/100', - color: 'text-white' + color: 'text-white', }" :icon="{ component: 'text-dark ni ni-note-03', - background: 'bg-white' + background: 'bg-white', }" direction-reverse /> @@ -98,10 +98,10 @@ export default { components: { MiniStatisticsCard, PlayerCard, - CardDetail + CardDetail, }, mounted() { setTooltip(this.$store.state.bootstrap); - } + }, }; diff --git a/thanasoft-front/src/views/dashboards/Default.vue b/thanasoft-front/src/views/dashboards/Default.vue index 81d49c9..1b9366b 100644 --- a/thanasoft-front/src/views/dashboards/Default.vue +++ b/thanasoft-front/src/views/dashboards/Default.vue @@ -203,7 +203,7 @@ - diff --git a/thanasoft-front/src/views/dashboards/vr/VRInfo.vue b/thanasoft-front/src/views/dashboards/vr/VRInfo.vue index 9c05f4a..8f1c7a1 100644 --- a/thanasoft-front/src/views/dashboards/vr/VRInfo.vue +++ b/thanasoft-front/src/views/dashboards/vr/VRInfo.vue @@ -10,7 +10,7 @@ class="mx-3 mt-3 border-radius-xl position-relative" :style="{ backgroundImage: 'url(' + require('../../../assets/img/vr-bg.jpg') + ')', - backgroundSize: 'cover' + backgroundSize: 'cover', }" >@@ -110,23 +110,23 @@ { route: '/', tooltip: '2 New Messages', - image: { url: image1, alt: 'Image Placeholder' } + image: { url: image1, alt: 'Image Placeholder' }, }, { route: '/', tooltip: '1 New Messages', - image: { url: image2, alt: 'Image Placeholder' } + image: { url: image2, alt: 'Image Placeholder' }, }, { route: '/', tooltip: '13 New Messages', - image: { url: image3, alt: 'Image Placeholder' } + image: { url: image3, alt: 'Image Placeholder' }, }, { route: '/', tooltip: '7 New Messages', - image: { url: image4, alt: 'Image Placeholder' } - } + image: { url: image4, alt: 'Image Placeholder' }, + }, ]" /> @@ -170,18 +170,18 @@ export default { EmailCard, TodoCard, MiniPlayerCard, - MessageCard + MessageCard, }, data() { return { image1, image2, image3, - image4 + image4, }; }, computed: { - ...mapState(["isTransparent", "isNavFixed", "navbarFixed", "mcolor"]) + ...mapState(["isTransparent", "isNavFixed", "navbarFixed", "mcolor"]), }, mounted() { setTooltip(this.$store.state.bootstrap); @@ -208,7 +208,7 @@ export default { this.$store.state.isTransparent = "bg-transparent"; }, methods: { - ...mapMutations(["navbarMinimize", "toggleConfigurator"]) - } + ...mapMutations(["navbarMinimize", "toggleConfigurator"]), + }, }; diff --git a/thanasoft-front/src/views/ecommerce/ProductPage.vue b/thanasoft-front/src/views/ecommerce/ProductPage.vue index 7a89e08..211be00 100644 --- a/thanasoft-front/src/views/ecommerce/ProductPage.vue +++ b/thanasoft-front/src/views/ecommerce/ProductPage.vue @@ -306,7 +306,7 @@ export default { item = { src: linkEl.getAttribute("href"), w: parseInt(size[0], 10), - h: parseInt(size[1], 10) + h: parseInt(size[1], 10), }; if (figureEl.children.length > 1) { @@ -430,9 +430,9 @@ export default { return { x: rect.left, y: rect.top + pageYScroll, - w: rect.width + w: rect.width, }; - } + }, }; // PhotoSwipe opened from URL @@ -502,10 +502,10 @@ export default { var element = document.getElementById(id); return new Choices(element, { searchEnabled: false, - itemSelectText: "" + itemSelectText: "", }); } - } - } + }, + }, }; diff --git a/thanasoft-front/src/views/ecommerce/ProductsList.vue b/thanasoft-front/src/views/ecommerce/ProductsList.vue index f3aaf0c..9450fd5 100644 --- a/thanasoft-front/src/views/ecommerce/ProductsList.vue +++ b/thanasoft-front/src/views/ecommerce/ProductsList.vue @@ -916,7 +916,7 @@ export default { const dataTableSearch = new DataTable("#products-list", { searchable: true, fixedHeight: false, - perPage: 7 + perPage: 7, }); document.querySelectorAll(".export").forEach(function (el) { @@ -925,7 +925,7 @@ export default { var data = { type: type, - filename: "soft-ui-" + type + filename: "soft-ui-" + type, }; if (type === "csv") { @@ -937,6 +937,6 @@ export default { }); } setTooltip(this.$store.state.bootstrap); - } + }, }; diff --git a/thanasoft-front/src/views/ecommerce/overview/Overview.vue b/thanasoft-front/src/views/ecommerce/overview/Overview.vue index 9733c2c..6bdea70 100644 --- a/thanasoft-front/src/views/ecommerce/overview/Overview.vue +++ b/thanasoft-front/src/views/ecommerce/overview/Overview.vue @@ -7,22 +7,22 @@ :percentage="{ color: 'success', value: '+55%', - label: 'since last month' + label: 'since last month', }" menu="6 May - 7 May" :dropdown="[ { label: 'Last 7 days', - route: 'https://creative-tim.com/' + route: 'https://creative-tim.com/', }, { label: 'Last week', - route: '/pages/widgets' + route: '/pages/widgets', }, { label: 'Last 30 days', - route: '/' - } + route: '/', + }, ]" /> @@ -97,9 +97,9 @@ datasets: [ { label: 'Sales by age', - data: [15, 20, 12, 60, 20, 15] - } - ] + data: [15, 20, 12, 60, 20, 15], + }, + ], }" /> @@ -180,7 +180,7 @@ export default { RevenueChartCard, HorizontalBarChart, OrdersListCard, - DefaultStatisticsCard + DefaultStatisticsCard, }, data() { return { @@ -192,7 +192,7 @@ export default { info: "Refund rate is lower with 97% than other products", img: "https://raw.githubusercontent.com/creativetimofficial/public-assets/master/soft-ui-design-system/assets/img/ecommerce/blue-shoe.jpg", - icon: "bold-down text-success" + icon: "bold-down text-success", }, { title: "Business Kit (Mug + Notebook)", @@ -200,7 +200,7 @@ export default { values: ["$80.250", "$4.200", "40"], img: "https://raw.githubusercontent.com/creativetimofficial/public-assets/master/soft-ui-design-system/assets/img/ecommerce/black-mug.jpg", - icon: "bold-down text-success" + icon: "bold-down text-success", }, { title: "Black Chair", @@ -208,7 +208,7 @@ export default { values: ["$40.600", "$9.430", "54"], img: "https://raw.githubusercontent.com/creativetimofficial/public-assets/master/soft-ui-design-system/assets/img/ecommerce/black-chair.jpg", - icon: "bold-up text-danger" + icon: "bold-up text-danger", }, { title: "Wireless Charger", @@ -216,7 +216,7 @@ export default { values: ["$91.300", "$7.364", "5"], img: "https://raw.githubusercontent.com/creativetimofficial/public-assets/master/soft-ui-design-system/assets/img/ecommerce/bang-sound.jpg", - icon: "bold-down text-success" + icon: "bold-down text-success", }, { title: "Mountain Trip Kit (Camera + Backpack)", @@ -225,45 +225,45 @@ export default { info: "Refund rate is higher with 70% than other products", img: "https://raw.githubusercontent.com/creativetimofficial/public-assets/master/soft-ui-design-system/assets/img/ecommerce/photo-tools.jpg", - icon: "bold-up text-danger" - } + icon: "bold-up text-danger", + }, ], sales: [ { country: "United States", sales: 2500, bounce: "29.9%", - flag: US + flag: US, }, { country: "Germany", sales: "3.900", bounce: "40.22%", - flag: DE + flag: DE, }, { country: "Great Britain", sales: "1.400", bounce: "23.44%", - flag: GB + flag: GB, }, { country: "Brasil", sales: "562", bounce: "32.14%", - flag: BR + flag: BR, }, { country: "Australia", sales: "400", bounce: "56.83%", - flag: AU - } - ] + flag: AU, + }, + ], }; }, mounted() { setTooltip(this.$store.state.bootstrap); - } + }, }; diff --git a/thanasoft-front/src/views/pages/Login.vue b/thanasoft-front/src/views/pages/Login.vue new file mode 100644 index 0000000..ed61661 --- /dev/null +++ b/thanasoft-front/src/views/pages/Login.vue @@ -0,0 +1,149 @@ + + + ++++++++Bonjour !
++ Veuillez entrer vos identifiants pour vous connecter +
+++ + diff --git a/thanasoft-front/src/views/pages/Register.vue b/thanasoft-front/src/views/pages/Register.vue new file mode 100644 index 0000000..a9a896f --- /dev/null +++ b/thanasoft-front/src/views/pages/Register.vue @@ -0,0 +1,153 @@ + +++++++++Connectez-vous
++ +++ ++++++++Bienvenue !
+Créez votre compte pour commencer
+++ + diff --git a/thanasoft-front/src/views/pages/profile/Overview.vue b/thanasoft-front/src/views/pages/profile/Overview.vue index e93557c..c4f8a22 100644 --- a/thanasoft-front/src/views/pages/profile/Overview.vue +++ b/thanasoft-front/src/views/pages/profile/Overview.vue @@ -5,7 +5,7 @@ :style="{ backgroundImage: 'url(' + require('@/assets/img/curved-images/curved14.jpg') + ')', - backgroundPositionY: '50%' + backgroundPositionY: '50%', }" > @@ -283,25 +283,25 @@ fullName: 'Alec M. Thompson', mobile: '(44) 123 1234 123', email: 'alecthompson@mail.com', - location: 'USA' + location: 'USA', }" :social="[ { link: 'https://www.facebook.com/CreativeTim/', - icon: faFacebook + icon: faFacebook, }, { link: 'https://twitter.com/creativetim', - icon: faTwitter + icon: faTwitter, }, { link: 'https://www.instagram.com/creativetimofficial/', - icon: faInstagram - } + icon: faInstagram, + }, ]" :action="{ route: 'javascript:;', - tooltip: 'Edit Profile' + tooltip: 'Edit Profile', }" /> @@ -445,24 +445,24 @@ :authors="[ { image: team1, - name: 'Elena Morison' + name: 'Elena Morison', }, { image: team2, - name: 'Ryan Milly' + name: 'Ryan Milly', }, { image: team3, - name: 'Nick Daniel' + name: 'Nick Daniel', }, { image: team4, - name: 'Peterson' - } + name: 'Peterson', + }, ]" :action="{ color: 'success', - label: 'View Project' + label: 'View Project', }" /> @@ -475,24 +475,24 @@ :authors="[ { image: team3, - name: 'Nick Daniel' + name: 'Nick Daniel', }, { image: team4, - name: 'Peterson' + name: 'Peterson', }, { image: team1, - name: 'Elena Morison' + name: 'Elena Morison', }, { image: team2, - name: 'Ryan Milly' - } + name: 'Ryan Milly', + }, ]" :action="{ color: 'success', - label: 'View Project' + label: 'View Project', }" /> @@ -505,24 +505,24 @@ :authors="[ { image: team4, - name: 'Peterson' + name: 'Peterson', }, { image: team3, - name: 'Nick Daniel' + name: 'Nick Daniel', }, { image: team1, - name: 'Elena Morison' + name: 'Elena Morison', }, { image: team2, - name: 'Ryan Milly' - } + name: 'Ryan Milly', + }, ]" :action="{ color: 'success', - label: 'View Project' + label: 'View Project', }" /> @@ -558,7 +558,7 @@ import team4 from "@/assets/img/team-4.jpg"; import { faFacebook, faTwitter, - faInstagram + faInstagram, } from "@fortawesome/free-brands-svg-icons"; import DefaultProjectCard from "./components/DefaultProjectCard.vue"; import PlaceHolderCard from "@/examples/Cards/PlaceHolderCard.vue"; @@ -572,7 +572,7 @@ export default { ProfileInfoCard, SoftAvatar, DefaultProjectCard, - PlaceHolderCard + PlaceHolderCard, }, data() { return { @@ -591,7 +591,7 @@ export default { img3, faFacebook, faTwitter, - faInstagram + faInstagram, }; }, @@ -602,6 +602,6 @@ export default { }, beforeUnmount() { this.$store.state.isAbsolute = false; - } + }, }; diff --git a/thanasoft-front/src/views/pages/profile/Teams.vue b/thanasoft-front/src/views/pages/profile/Teams.vue index 8233b7a..575748d 100644 --- a/thanasoft-front/src/views/pages/profile/Teams.vue +++ b/thanasoft-front/src/views/pages/profile/Teams.vue @@ -5,7 +5,7 @@ :style="{ backgroundImage: 'url(' + require('@/assets/img/curved-images/curved14.jpg') + ')', - backgroundPositionY: '50%' + backgroundPositionY: '50%', }" > @@ -232,34 +232,34 @@ :members="[ { name: 'Alexa Tompson', - image: team1 + image: team1, }, { name: 'Romina Hadid', - image: team2 + image: team2, }, { name: 'Alexander Smith', - image: team3 + image: team3, }, { name: 'Martin Doe', - image: team4 - } + image: team4, + }, ]" :dropdown="[ { label: 'Action', - route: 'javascript:;' + route: 'javascript:;', }, { label: 'Another action', - route: 'javascript:;' + route: 'javascript:;', }, { label: 'Something else here', - route: 'javascript:;' - } + route: 'javascript:;', + }, ]" />++++++++Créer un compte
++ ++@@ -372,7 +372,7 @@ export default { TeamProfileCard, PostCard, StoryAvatar, - EventCard + EventCard, }, data() { return { @@ -380,49 +380,49 @@ export default { stories: [ { name: "Abbie W", - image: team1 + image: team1, }, { name: "Boris U", - image: team2 + image: team2, }, { name: "Kay R", - image: team3 + image: team3, }, { name: "Tom M", - image: team4 + image: team4, }, { name: "Nicole N", - image: team5 + image: team5, }, { name: "Marie P", - image: marie + image: marie, }, { name: "Bruce M", - image: bruce + image: bruce, }, { name: "Sandra A", - image: ivana + image: ivana, }, { name: "Katty L", - image: kal + image: kal, }, { name: "Emma O", - image: emma + image: emma, }, { name: "Tao G", image: - "https://raw.githubusercontent.com/creativetimofficial/public-assets/master/soft-ui-design-system/assets/img/team-9.jpg" - } + "https://raw.githubusercontent.com/creativetimofficial/public-assets/master/soft-ui-design-system/assets/img/team-9.jpg", + }, ], nick, slackLogo, @@ -436,7 +436,7 @@ export default { team2, team3, team4, - team5 + team5, }; }, @@ -447,6 +447,6 @@ export default { }, beforeUnmount() { this.$store.state.isAbsolute = false; - } + }, }; diff --git a/thanasoft-front/tsconfig.json b/thanasoft-front/tsconfig.json index 468c781..65434ae 100644 --- a/thanasoft-front/tsconfig.json +++ b/thanasoft-front/tsconfig.json @@ -1,30 +1,40 @@ { "compilerOptions": { - "target": "ES2018", - "module": "ESNext", - "moduleResolution": "Node", - "lib": ["ES2020", "DOM", "DOM.Iterable"], + "target": "esnext", + "module": "esnext", + "strict": true, "jsx": "preserve", + "importHelpers": true, + "moduleResolution": "node", "allowJs": true, - "checkJs": false, - "noEmit": true, - "strict": false, "skipLibCheck": true, "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "resolveJsonModule": true, - "isolatedModules": true, + "allowSyntheticDefaultImports": true, + "sourceMap": true, "baseUrl": ".", + "types": [ + "webpack-env" + ], "paths": { - "@/*": ["src/*"] + "@/*": [ + "src/*" + ] }, - "types": ["node"] + "lib": [ + "esnext", + "dom", + "dom.iterable", + "scripthost" + ] }, "include": [ "src/**/*.ts", "src/**/*.tsx", "src/**/*.vue", - "src/shims-vue.d.ts" + "tests/**/*.ts", + "tests/**/*.tsx" ], - "exclude": ["node_modules", "dist"] + "exclude": [ + "node_modules" + ] } diff --git a/thanasoft-front/vue.config.js b/thanasoft-front/vue.config.js deleted file mode 100644 index 548e3ea..0000000 --- a/thanasoft-front/vue.config.js +++ /dev/null @@ -1,24 +0,0 @@ -const path = require("path"); - -module.exports = { - // Dossier de sortie du build - outputDir: path.resolve(__dirname, "../thanasoft-back/public/build"), - - // Le index.html généré - indexPath: "index.html", - - // En prod on sert les assets depuis /build/, en dev on reste sur la racine - publicPath: process.env.NODE_ENV === "production" ? "/build/" : "/", - - // Dev server config to work locally alongside Laravel backend - devServer: { - historyApiFallback: true, - // proxy API calls to Laravel (adjust if your API prefix differs) - proxy: { - "^/api": { - target: "http://127.0.0.1:8000", - changeOrigin: true, - }, - }, - }, -}; -- 2.47.2