-
Для вас не предусмотренно уровней
+ return (
);
}
return (<>
-
{task.title}
-
{task.text}
- {task.message == "invalid_code" ? (
Неверный код
) : null}
- {task.message == "old_code" ? (
Этот код уже вводился
) : null}
- {task.message == "next_level" ? (
Переход на новый уровень
) : null}
- {task.message == "ok_code" ? (
Код принят, ищите оставшиеся
) : null}
-
Коды:
-
- {task.codes.map(
- (c, idx) => - {c.description} {!!c.code ? (Принят {c.code}) : (Не введён)}
- )}
-
-
+
+
+
+
+
+
+ {task.message == "invalid_code" ? (
) : null}
+ {task.message == "old_code" ? (
) : null}
+ {task.message == "next_level" ? (
) : null}
+ {task.message == "ok_code" ? (
) : null}
+
+
);
}
\ No newline at end of file
diff --git a/frontend/src/pages/Index.jsx b/frontend/src/pages/Index.jsx
index 38638c8..9433c5f 100644
--- a/frontend/src/pages/Index.jsx
+++ b/frontend/src/pages/Index.jsx
@@ -1,73 +1,22 @@
-import { Button, Table } from "react-bootstrap";
-import { Link, useLoaderData } from "react-router-dom";
-import Markdown from "react-markdown";
-import moment from 'moment/min/moment-with-locales';
+import { useNavigate } from "react-router-dom";
import { UserProvider } from "../store/user";
+import { Typography, Button } from 'antd';
+import React from "react";
+
+const { Title, Text, Paragraph } = Typography;
export default () => {
- moment.locale('ru');
- const games = useLoaderData();
- const { user } = UserProvider.useContainer();
+ const {user} = UserProvider.useContainer();
+ const navigate = useNavigate();
return (<>
-
Доступные квесты
- {games && games.map(game => (
-
-
{game.title}
-
-
-
- |
- Тип
- |
-
- {game.type}
- |
-
- Опыт за квест
- |
-
- {game.points}
- |
-
-
- |
- Уровней
- |
-
- {game.taskCount}
- |
-
- Опубликовано
- |
-
- {moment(game.createdAt).fromNow()}
- |
-
-
- |
- Автор
- |
-
- {game.authors.map(a => {a.username})}
- |
-
-
- |
- {game.description}
-
- {user ? (<>
- {(!!user.games.find(x => x.id === game.id))
- ? (Вы уже прошли этот квест)
- : (Начать прохождение)}
- ): null}
-
-
- |
-
-
-
-
- ))}
- {!games ? (
Игр пока не анонсировано) : null}
+
NQuest
+
Привет! Это платформа для ARG игр.
+
Если ты попал сюда случайно, то скорее всего, для тебя здесь нет ничего интересного. А если ты знаешь зачем пришёл, то добро пожаловать!
+ {!user?(
+
+
+
+
+ ):(
)}
);
-}
\ No newline at end of file
+}
diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx
index 8c5f698..b6542d1 100644
--- a/frontend/src/pages/Login.jsx
+++ b/frontend/src/pages/Login.jsx
@@ -1,65 +1,93 @@
import { useEffect, useState } from "react";
-import { Form, Button, Row, Col } from "react-bootstrap";
import { UserProvider } from "../store/user";
import { useLocation, useNavigate } from "react-router-dom";
import { ajax } from "../utils/fetch";
+import { Alert, App, Button, Form, Input } from "antd";
export default () => {
- const {user, setUser} = UserProvider.useContainer();
- const {state} = useLocation()
- const [email, setEmail] = useState("");
- const [password, setPassword] = useState("");
+ const { user, setUser } = UserProvider.useContainer();
+ const { state } = useLocation()
const [error, setError] = useState(null);
const navigate = useNavigate();
+ const [form] = Form.useForm();
useEffect(() => {
if (user) {
navigate(state && state.from ? state.from : "/");
- }
+ }
}, [user])
- const onLogin = (e) => {
- e.preventDefault();
+ const onFinish = (values) => {
ajax("/api/user/login", {
- method: "POST",
- headers: {
- 'Accept': 'application/json',
- 'Content-Type': 'application/json'
- },
- body: JSON.stringify({ email, password })
- }).
+ method: "POST",
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify(values)
+ }).
then(setUser).
- catch(({ message }) => setError(message));
+ catch(({ message }) => setError("Проверьте e-mail и пароль"));
}
+
return (<>
Вход
-
+ {error ?
: null}
+
)
};
\ No newline at end of file
diff --git a/frontend/src/pages/Quests.jsx b/frontend/src/pages/Quests.jsx
new file mode 100644
index 0000000..db615c7
--- /dev/null
+++ b/frontend/src/pages/Quests.jsx
@@ -0,0 +1,60 @@
+import { Link, useLoaderData, useNavigate } from "react-router-dom";
+import Markdown from "react-markdown";
+import remarkGfm from 'remark-gfm';
+import moment from 'moment/min/moment-with-locales';
+import { UserProvider } from "../store/user";
+import { Avatar, List, Typography, Button, Space, Table, Card } from 'antd';
+import { FireTwoTone, BuildTwoTone } from '@ant-design/icons';
+import React from "react";
+
+const { Title } = Typography;
+
+export default () => {
+ moment.locale('ru');
+ const games = useLoaderData();
+ const { user } = UserProvider.useContainer();
+ const navigate = useNavigate();
+
+ return (<>
+
Квесты
+ {games.map(item => renderItem(user, navigate, item))}
+ {!games ? (
Квестов пока не анонсировано) : null}
+ );
+}
+
+
+const renderItem = (user, navigate, item) => {
+ const actions = [
+
Оп: {item.points},
+
Ур: {item.taskCount},
+ <>{moment(item.createdAt).fromNow()},
+ <>Автор(ы) {item.authors.map(a => a.username)},
+ ];
+
+
+ let questAction = (
Необходимо войти)
+
+ if (!!user) {
+ questAction = (!!user.games.find(x => x.id === item.id)
+ ?
Вы уже прошли этот квест
+ :
+ );
+ }
+
+ return (
+
+
+
+
+ {item.description}
+
+ {questAction}
+
+ )
+}
diff --git a/frontend/src/pages/Register.jsx b/frontend/src/pages/Register.jsx
index e920993..d98b119 100644
--- a/frontend/src/pages/Register.jsx
+++ b/frontend/src/pages/Register.jsx
@@ -1,89 +1,121 @@
import { useEffect, useState } from "react";
-import { Form, Button, Row, Col } from "react-bootstrap";
import { useNavigate } from "react-router-dom";
import { UserProvider } from "../store/user";
import { ajax } from "../utils/fetch";
+import { Alert, Button, Form, Input } from "antd";
export default () => {
const { user, setUser } = UserProvider.useContainer();
- const [username, setUsername] = useState("");
- const [email, setEmail] = useState("");
- const [password, setPassword] = useState("");
- const [password2, setPassword2] = useState("");
const [error, setError] = useState(null);
const navigate = useNavigate();
useEffect(() => {
user ? navigate("/") : null;
}, [user])
- const onRegister = (e) => {
- e.preventDefault();
+ const onFinish = (values) => {
ajax("/api/user/register", {
method: "POST",
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
},
- body: JSON.stringify({ username, email, password, password2 })
+ body: JSON.stringify(values)
}).
- then(setUser).
- catch(({ message }) => setError(message));
+ then(setUser).
+ catch(({ message }) => setError("Ошибка регистрации"));
}
return (<>
Регистрация
-
- );
+ {error ?
: null}
+
+ )
}
\ No newline at end of file
diff --git a/frontend/src/utils/fetch.js b/frontend/src/utils/fetch.js
index 2cdd4d1..910aa26 100644
--- a/frontend/src/utils/fetch.js
+++ b/frontend/src/utils/fetch.js
@@ -7,5 +7,4 @@ export const ajax = async (path, params) => {
return r
})
.then(r => r.json())
- .catch(() => null)
}
diff --git a/main.go b/main.go
index f71aa0a..48e825d 100644
--- a/main.go
+++ b/main.go
@@ -54,6 +54,7 @@ func main() {
&models.Task{},
&models.Solution{},
&models.Code{},
+ &models.File{},
); err != nil {
fmt.Fprintf(os.Stderr, "Error DB migration\n: %s", err)
os.Exit(1)
@@ -63,6 +64,7 @@ func main() {
userService := service.NewUser(db)
gameService := service.NewGame(db)
engineService := service.NewEngine(db)
+ uploadService := service.NewFile(db)
// --[ HTTP server ]--
@@ -130,6 +132,9 @@ func main() {
Admin: &controller.Admin{
GameService: gameService,
},
+ File: &controller.File{
+ FileService: uploadService,
+ },
}
codegen := e.Group("")
@@ -161,4 +166,5 @@ type serverRouter struct {
*controller.User
*controller.Engine
*controller.Admin
+ *controller.File
}
diff --git a/pkg/controller/admin.go b/pkg/controller/admin.go
index 62b7ace..5cd67bc 100644
--- a/pkg/controller/admin.go
+++ b/pkg/controller/admin.go
@@ -2,6 +2,7 @@ package controller
import (
"net/http"
+ "time"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
@@ -32,9 +33,15 @@ func (a *Admin) CreateGame(ctx echo.Context) error {
}
return ctx.JSON(http.StatusCreated, api.GameResponse{
- Id: game.ID,
- Title: game.Title,
+ Authors: make([]api.UserView, 0, len(game.Authors)),
+ CreatedAt: game.CreatedAt.Format(time.RFC3339),
Description: game.Description,
+ Icon: game.IconID,
+ Id: game.ID,
+ Points: game.Points,
+ TaskCount: len(game.Tasks),
+ Title: game.Title,
+ Type: api.MapGameTypeReverse(game.Type),
})
}
@@ -52,6 +59,7 @@ func (*Admin) mapCreateGameRequest(req *api.GameEditRequest, user *models.User)
Type: api.MapGameType(req.Type),
Tasks: make([]*models.Task, 0, len(req.Tasks)),
Points: req.Points,
+ IconID: req.Icon,
}
for order, te := range req.Tasks {
task := &models.Task{
diff --git a/pkg/controller/file.go b/pkg/controller/file.go
new file mode 100644
index 0000000..0e296c9
--- /dev/null
+++ b/pkg/controller/file.go
@@ -0,0 +1,50 @@
+package controller
+
+import (
+ "github.com/google/uuid"
+ "github.com/labstack/echo/v4"
+ "gitrepo.ru/neonxp/nquest/api"
+ "gitrepo.ru/neonxp/nquest/pkg/service"
+)
+
+type File struct {
+ FileService *service.File
+}
+
+// (POST /file/upload)
+func (u *File) UploadFile(c echo.Context) error {
+ // user := contextlib.GetUser(c)
+ fh, err := c.FormFile("file")
+ if err != nil {
+ return err
+ }
+ fo, err := fh.Open()
+ if err != nil {
+ return err
+ }
+
+ id, err := u.FileService.Upload(
+ c.Request().Context(),
+ fh.Filename,
+ fh.Header.Get("Content-Type"),
+ int(fh.Size),
+ fo,
+ )
+ if err != nil {
+ return err
+ }
+
+ return c.JSON(200, &api.UploadResponse{
+ Uuid: id,
+ })
+}
+
+// (GET /file/{uid})
+func (u *File) GetFile(c echo.Context, uid uuid.UUID) error {
+ f, err := u.FileService.GetFile(c.Request().Context(), uid)
+ if err != nil {
+ return err
+ }
+
+ return c.Blob(200, f.ContentType, f.Body)
+}
diff --git a/pkg/controller/game.go b/pkg/controller/game.go
index 6502c53..2a173ec 100644
--- a/pkg/controller/game.go
+++ b/pkg/controller/game.go
@@ -31,6 +31,7 @@ func (g *Game) GetGames(ctx echo.Context) error {
TaskCount: len(game.Tasks),
Authors: make([]api.UserView, 0, len(game.Authors)),
CreatedAt: game.CreatedAt.Format(time.RFC3339),
+ Icon: game.IconID,
}
for _, u := range game.Authors {
gv.Authors = append(gv.Authors, api.UserView{
diff --git a/pkg/models/file.go b/pkg/models/file.go
new file mode 100644
index 0000000..cf4138e
--- /dev/null
+++ b/pkg/models/file.go
@@ -0,0 +1,10 @@
+package models
+
+type File struct {
+ Model
+
+ Filename string
+ ContentType string
+ Size int
+ Body []byte `gorm:"type:bytea"`
+}
diff --git a/pkg/models/game.go b/pkg/models/game.go
index d375efd..7b60bc9 100644
--- a/pkg/models/game.go
+++ b/pkg/models/game.go
@@ -1,5 +1,7 @@
package models
+import "github.com/google/uuid"
+
type Game struct {
Model
@@ -10,6 +12,8 @@ type Game struct {
Authors []*User `gorm:"many2many:game_authors"`
Type GameType
Points int
+ Icon *File
+ IconID uuid.UUID
}
type GameType int
diff --git a/pkg/service/file.go b/pkg/service/file.go
new file mode 100644
index 0000000..9c48085
--- /dev/null
+++ b/pkg/service/file.go
@@ -0,0 +1,49 @@
+package service
+
+import (
+ "context"
+ "mime/multipart"
+
+ "github.com/google/uuid"
+ "gitrepo.ru/neonxp/nquest/pkg/models"
+ "gorm.io/gorm"
+)
+
+type File struct {
+ DB *gorm.DB
+}
+
+func NewFile(db *gorm.DB) *File {
+ return &File{
+ DB: db,
+ }
+}
+
+func (u *File) Upload(
+ ctx context.Context,
+ filename string,
+ contentType string,
+ size int,
+ r multipart.File,
+) (uuid.UUID, error) {
+ buf := make([]byte, size)
+ if _, err := r.Read(buf); err != nil {
+ return uuid.UUID{}, err
+ }
+
+ file := &models.File{
+ Model: models.Model{ID: uuid.New()},
+ Filename: filename,
+ ContentType: contentType,
+ Size: size,
+ Body: buf,
+ }
+
+ return file.ID, u.DB.WithContext(ctx).Create(file).Error
+}
+
+func (u *File) GetFile(ctx context.Context, uid uuid.UUID) (*models.File, error) {
+ f := new(models.File)
+
+ return f, u.DB.WithContext(ctx).First(f, uid).Error
+}
diff --git a/pkg/service/user.go b/pkg/service/user.go
index d57f25e..794d2c2 100644
--- a/pkg/service/user.go
+++ b/pkg/service/user.go
@@ -85,6 +85,8 @@ func (s *User) Login(ctx context.Context, email, password string) (*models.User,
nemail := normalizer.NewNormalizer().Normalize(email)
err := s.DB.
WithContext(ctx).
+ Preload("Games", `Finish = true`).
+ Preload("Games.Game").
Where("email = ?", nemail).
First(u).
Error
diff --git a/requests.http b/requests.http
index b763010..3696404 100644
--- a/requests.http
+++ b/requests.http
@@ -33,14 +33,15 @@ POST http://localhost:8000/api/games
Content-Type: application/json
{
- "title": "Тестовая игра 2",
- "description": "Описание тестовой игры",
+ "icon": "f343919a-b068-4d72-ade5-bbb84db0bec9",
+ "title": "Тестовая игра 7",
+ "description": "A paragraph with *emphasis* and **strong importance**.\n\n> A block quote with ~strikethrough~ and a URL: https://reactjs.org.\n\n* Lists\n* [ ] todo\n* [x] done\n\nA table:\n\n\n| a | b |\n| - | - |\n",
"type": "city",
"points": 500,
"tasks": [
{
"title": "Задание 1",
- "text": "Текст первого задания.\n\n*Коды: `nq1111`*",
+ "text": "A paragraph with *emphasis* and **strong importance**.\n\n> A block quote with ~strikethrough~ and a URL: https://reactjs.org.\n\n* Lists\n* [ ] todo\n* [x] done\n\nA table:\n\n\n| a | b |\n| - | - |\n",
"codes": [
{
"description": "1+",
@@ -233,4 +234,22 @@ Content-Type: application/json
{
"code": "NQ3333"
-}
\ No newline at end of file
+}
+
+
+###
+
+POST http://localhost:8000/api/file/upload
+Content-Type: multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW
+
+
+------WebKitFormBoundary7MA4YWxkTrZu0gW
+Content-Disposition: form-data; name="file"; filename="icon.jpg"
+Content-Type: image/jpg
+
+< /home/neonxp/logo.jpg
+------WebKitFormBoundary7MA4YWxkTrZu0gW--
+
+###
+
+GET http://localhost:8000/api/file/f343919a-b068-4d72-ade5-bbb84db0bec9
\ No newline at end of file