diff --git a/QuizzBattle/.gitignore b/QuizzBattle/.gitignore index df10bf9..4cf8485 100644 --- a/QuizzBattle/.gitignore +++ b/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 + diff --git a/QuizzBattle/back/src/app.ts b/QuizzBattle/back/src/app.ts index bc4b91b..74d0258 100644 --- a/QuizzBattle/back/src/app.ts +++ b/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()) diff --git a/QuizzBattle/back/src/routers/categoryRouter.ts b/QuizzBattle/back/src/routers/categoryRouter.ts index e0efedf..d4986a0 100644 --- a/QuizzBattle/back/src/routers/categoryRouter.ts +++ b/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); diff --git a/QuizzBattle/back/src/routers/userRouter.ts b/QuizzBattle/back/src/routers/userRouter.ts index 7635f20..bf191a9 100644 --- a/QuizzBattle/back/src/routers/userRouter.ts +++ b/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); diff --git a/QuizzBattle/back/src/uploads/arts_and_literature.jpeg b/QuizzBattle/back/src/uploads/arts_and_literature.jpeg new file mode 100644 index 0000000..3f8b250 Binary files /dev/null and b/QuizzBattle/back/src/uploads/arts_and_literature.jpeg differ diff --git a/QuizzBattle/back/src/uploads/film_and_tv.jpeg b/QuizzBattle/back/src/uploads/film_and_tv.jpeg new file mode 100644 index 0000000..91c5118 Binary files /dev/null and b/QuizzBattle/back/src/uploads/film_and_tv.jpeg differ diff --git a/QuizzBattle/back/src/uploads/food_and_drink.jpeg b/QuizzBattle/back/src/uploads/food_and_drink.jpeg new file mode 100644 index 0000000..f7a9218 Binary files /dev/null and b/QuizzBattle/back/src/uploads/food_and_drink.jpeg differ diff --git a/QuizzBattle/back/src/uploads/general_knowledge.jpeg b/QuizzBattle/back/src/uploads/general_knowledge.jpeg new file mode 100644 index 0000000..10bbefd Binary files /dev/null and b/QuizzBattle/back/src/uploads/general_knowledge.jpeg differ diff --git a/QuizzBattle/back/src/uploads/geography.jpeg b/QuizzBattle/back/src/uploads/geography.jpeg new file mode 100644 index 0000000..41900ce Binary files /dev/null and b/QuizzBattle/back/src/uploads/geography.jpeg differ diff --git a/QuizzBattle/back/src/uploads/history.jpeg b/QuizzBattle/back/src/uploads/history.jpeg new file mode 100644 index 0000000..414895f Binary files /dev/null and b/QuizzBattle/back/src/uploads/history.jpeg differ diff --git a/QuizzBattle/back/src/uploads/history.png b/QuizzBattle/back/src/uploads/history.png new file mode 100644 index 0000000..414895f Binary files /dev/null and b/QuizzBattle/back/src/uploads/history.png differ diff --git a/QuizzBattle/back/src/uploads/music.jpeg b/QuizzBattle/back/src/uploads/music.jpeg new file mode 100644 index 0000000..f010444 Binary files /dev/null and b/QuizzBattle/back/src/uploads/music.jpeg differ diff --git a/QuizzBattle/back/src/uploads/science.jpeg b/QuizzBattle/back/src/uploads/science.jpeg new file mode 100644 index 0000000..1ef8b08 Binary files /dev/null and b/QuizzBattle/back/src/uploads/science.jpeg differ diff --git a/QuizzBattle/back/src/uploads/society_and_culture.jpeg b/QuizzBattle/back/src/uploads/society_and_culture.jpeg new file mode 100644 index 0000000..5470230 Binary files /dev/null and b/QuizzBattle/back/src/uploads/society_and_culture.jpeg differ diff --git a/QuizzBattle/back/src/uploads/sport.avif b/QuizzBattle/back/src/uploads/sport.avif new file mode 100644 index 0000000..f4fca31 Binary files /dev/null and b/QuizzBattle/back/src/uploads/sport.avif differ diff --git a/QuizzBattle/back/src/uploads/sport_and_leisure.jpeg b/QuizzBattle/back/src/uploads/sport_and_leisure.jpeg new file mode 100644 index 0000000..723e9c1 Binary files /dev/null and b/QuizzBattle/back/src/uploads/sport_and_leisure.jpeg differ diff --git a/QuizzBattle/front/src/components/EditSurvey.vue b/QuizzBattle/front/src/components/EditSurvey.vue index 79234a8..15fcf36 100644 --- a/QuizzBattle/front/src/components/EditSurvey.vue +++ b/QuizzBattle/front/src/components/EditSurvey.vue @@ -1,6 +1,6 @@ @@ -124,11 +121,11 @@