Merge pull request #39 from js-suck/develop

QuizzBattle/.gitignore

@@ -1,3 +1,16 @@
 uploads/
 coverage/
 !/uploads/defaultUser.png
+!/uploads/arts_and_literature.jpeg
+!/uploads/film_and_tv.jpeg
+!/uploads/food_and_drink.jpeg
+!/uploads/general_knowledge.jpeg
+!/uploads/geography.jpeg
+!/uploads/history.png
+!/uploads/history.jpeg
+!/uploads/music.jpeg
+!/uploads/science.jpeg
+!/uploads/society_and_culture.jpeg
+!/uploads/sport_and_leisure.jpeg
+!/uploads/sport.avif
+

QuizzBattle/back/src/app.ts

@@ -70,11 +70,10 @@ const quizzBattleSocket = new QuizzBattleSocket(server)
 
 const multer = require('multer');
 const upload = multer({ dest: __dirname + '/uploads/' });
-
+console.log(upload, 'updza', __dirname, 'tototot')
 
 app.use(express.urlencoded({ extended: false }));
-app.use('/uploads', express.static(path.join(__dirname, './uploads')));
-
+app.use('/uploads', express.static(path.join(__dirname, 'uploads')));
 
 app.post('/upload', upload.single('profileImage'), (req, res) => {
   if (!req['file']) {
@@ -85,8 +84,6 @@ app.post('/upload', upload.single('profileImage'), (req, res) => {
   }
 });
 
-
-
 initMongo()
 app.use(express.json())
 

QuizzBattle/back/src/routers/categoryRouter.ts

@@ -5,7 +5,7 @@ const multer = require('multer');
 import path from 'path';
 import usersRouter from "./userRouter";
 const storage = multer.diskStorage({
-    destination: 'src/uploads/',
+    destination: 'dist/uploads/',
     filename: function (req, file, cb) {
         const uniqueSuffix = Date.now() + '-' + Math.round(Math.random() * 1E9);
         const fileExtension = path.extname(file.originalname);

QuizzBattle/back/src/routers/userRouter.ts

@@ -16,7 +16,7 @@ const usersRouter = express.Router();
 const destinationFolder = path.join(__dirname, 'uploads/');
 
 const storage = multer.diskStorage({
-    destination: 'src/uploads/',
+    destination: 'dist/uploads/',
     filename: function (req, file, cb) {
         const uniqueSuffix = Date.now() + '-' + Math.round(Math.random() * 1E9);
         const fileExtension = path.extname(file.originalname);

QuizzBattle/front/src/components/EditSurvey.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="p-4 sm:ml-64 flex flex-col">
-        <h2 class="text-2xl font-semibold mb-4">User Sheet</h2>
+        <h2 class="text-2xl font-semibold mb-4">Edit Survey</h2>
         <div class="container flex">
             <div class="card flex mr-4">
                 <form class="my-4 w-full" @submit.prevent="submitForm" enctype="multipart/form-data">

QuizzBattle/front/src/components/RankingTable.vue

@@ -27,7 +27,7 @@
         <img
           @click="openModal(userData.userId)"
           class="rounded-full h-full object-cover w-full"
-          :src="`${API_URL}/uploads/${userData.image}`"
+          :src="`${API_URL}/uploads/${userData.userProfilePicture}`"
           alt=""
         />
       </div>
@@ -85,6 +85,7 @@ const openModal = (user) => {
 onMounted(async () => {
   const response = await client.get(url)
   items.value = response.data
+  console.log(items)
 })
 </script>
 

QuizzBattle/front/src/components/Register.vue

@@ -89,7 +89,7 @@
                 type="submit"
                 class="px-4 py-2 bg-blue-500 text-white rounded-lg hover:bg-blue-600 focus:outline-none focus:bg-blue-600"
               >
-                Register
+                Enregistré
               </button>
             </div>
             <div class="mt-6">
@@ -114,21 +114,18 @@
           </div>
         </form>
       </div>
-      <div class="card flex mr-4">
-        <span>Match History In Coming</span>
-      </div>
     </div>
   </div>
 </template>
 
 <script setup>
 import { defineProps, onMounted, ref } from 'vue'
 
-
 import { API_URL } from '@/constants'
 
 import client from '../helpers/client'
 
+const stats = ref({})
 const responseUser = ref({})
 const fileInputRef = ref(null)
 const profilePicture = ref(null)

QuizzBattle/front/src/components/Sidebar.vue

@@ -13,15 +13,6 @@
                 <img src="@/assets/images/LogoQuizzBattleWithoutBG.png">
 
             </li>
-            <li>
-                <router-link :to="{ name: 'admin_dashboard' }" class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 group">
-                    <svg class="w-8 h-8 text-gray-500 transition duration-75 group-hover:text-gray-900" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 22 21">
-                        <path d="M16.975 11H10V4.025a1 1 0 0 0-1.066-.998 8.5 8.5 0 1 0 9.039 9.039.999.999 0 0 0-1-1.066h.002Z"/>
-                        <path d="M12.5 0c-.157 0-.311.01-.565.027A1 1 0 0 0 11 1.02V10h8.975a1 1 0 0 0 1-.935c.013-.188.028-.374.028-.565A8.51 8.51 0 0 0 12.5 0Z"/>
-                    </svg>
-                    <h2 class="ml-3 text-gray-700">Dashboard</h2>
-                </router-link>
-            </li>
             <li>
                 <router-link :to="{ name: 'admin_users' }" class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 group">
                     <svg class="flex-shrink-0 w-8 h-8 text-gray-500 transition duration-75 group-hover:text-gray-900" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 20 18">

QuizzBattle/front/src/components/SurveyModalForm.vue

@@ -96,8 +96,6 @@
 <script>
 import { onMounted, ref } from 'vue'
 
-import axios from 'axios'
-
 import { API_URL } from '@/constants'
 
 import client from '../helpers/client'

QuizzBattle/front/src/components/Surveys.vue

@@ -31,11 +31,11 @@ import {onMounted, reactive} from 'vue';
 import axios from 'axios';
 import {API_URL} from "@/constants";
 const surveys = reactive([]);
-import { RouterLink } from 'vue-router';
 import SurveyModalForm from "@/components/SurveyModalForm.vue";
+import client from '../helpers/client'
 
 onMounted(() => {
-    axios.get(`${API_URL}/api/category/`, {
+    client.get(`${API_URL}/api/category/`, {
             headers: {
                 Authorization: `Bearer ${localStorage.getItem('token')}`
             },

QuizzBattle/front/src/components/UserStats.vue

@@ -26,7 +26,7 @@
             :key="stats.id"
             :style="{ display: stats.userObtain ? 'initial' : 'hidden' }"
           >
-            <img :src="`/src/assets/badges/${stats.image}`" class="w-24" />
+            <img :src="`/assets/badges/${stats.image}`" class="w-24" />
           </div>
         </div>
       </div>

QuizzBattle/front/src/constants/files.ts

@@ -1,7 +1,7 @@
 export const FILE_PATHS  = {
     profilePictures : "/src/assets/uploads/profile/",
     categoryPictures: "/src/assets/images/categories/",
-    emotes: '/src/assets/images/emotes/'
+    emotes: '/assets/images/emotes/'
 }
 
 export default FILE_PATHS

QuizzBattle/front/src/router/index.ts

@@ -85,15 +85,6 @@ const router = createRouter({
       component: () => import('../views/ScoreboardView.vue')
     },
     //BackOffice / Admin
-    {
-      path: '/admin/dashboard',
-      name: 'admin_dashboard',
-      // route level code-splitting
-      // this generates a separate chunk (About.[hash].js) for this route
-      // which is lazy-loaded when the route is visited.
-      component: () => import('../views/admin/HomeView.vue')
-      //      beforeEnter: roleCheckMiddleware // Appliquer le middleware seulement pour la route admin
-    },
     {
       path: '/admin/users',
       name: 'admin_users',

QuizzBattle/front/src/views/Badges.vue

@@ -19,7 +19,7 @@
   :key="stats.label"
   :style="{ backgroundColor: stats.userObtain ? 'violet' : '#71717154' }"
 >
-         <img :src='`/src/assets/badges/${stats.image}`'>
+         <img :src='`/assets/badges/${stats.image}`'>
           <h2>{{stats.label}}</h2>
             <v-progress-linear v-if="stats.gamesNeeds"
        :model-value="`${gameStats.totalGamesPlayed / stats.gamesNeeds * 100}`"

QuizzBattle/front/src/views/StartQuizz.vue

@@ -50,7 +50,7 @@
             <v-slide-group>
               <v-slide-group-item v-for="(category, key) in categories" :key="category">
                 <QuizzCard @click="startGameWithCategory(category.name)" class="ma-2" :title="category.name"
-                  :text="category.description" :image="`${FILE_PATHS.categoryPictures}${category.image_url}`" :categoryId="category.id" />
+                  :text="category.description" :image="`${API_URL}/uploads/${category.image_url}`" :categoryId="category.id" />
               </v-slide-group-item>
             </v-slide-group>
           </v-sheet>

QuizzBattle/front/src/views/WaitingGameView.vue

@@ -9,7 +9,7 @@ arrow_back
   </div>
   <div class="flex flex-col mt-10">
 
-  <Card v-if="category" :name="category.name" :image="`${FILE_PATHS.categoryPictures}${category.image_url}`"/>
+  <Card v-if="category" :name="category.name" :image="`${API_URL}/uploads/${category.image_url}`"/>
   <v-progress-circular class="spinner"
       :size="70"
       :width="7"
@@ -25,14 +25,15 @@ import {
   onMounted,
   ref
 } from 'vue'
-import socket from "./../config/socket"
 
 import { useRoute } from 'vue-router'
-import client from './../helpers/client'
+
+import { userManagerKey } from '@/contexts/userManagerKeys'
+
 import Card from '../components/Card.vue'
+import socket from '../config/socket'
 import { API_URL } from '../constants/index'
-import { FILE_PATHS } from '../constants/files'
-import { userManagerKey } from '@/contexts/userManagerKeys';
+import client from '../helpers/client'
 
 const route = useRoute();
 const category = ref("")

QuizzBattle/front/src/views/admin/HomeView.vue

@@ -9,7 +9,7 @@ import Stats from "@/components/Stats.vue";
 <template>
   <main>
       <Sidebar />
-      <Stats />
+      <DataTable />
   </main>
 </template>