NTO/boilerplate
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: new nto-cli version changes

Browse Source 
# Conflicts:
#	frontend/src/author/AuthorScheme.vue
#	frontend/src/post/PostScheme.vue
#	internal/models/models.go
This commit is contained in:
Goga Coder
2025-03-09 13:22:15 +07:00
parent 3288577dc1
commit 6e9b2c61fc
5 changed files with 126 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
frontend/src/author/AuthorScheme.vue
View File

@@ -1,24 +1,21 @@
<script setup lang="ts"> <script setup lang="ts">
import Table from '../table/Table.vue' import Table from "../table/Table.vue";
import {onMounted, reactive} from 'vue' import { onMounted, reactive } from "vue";
import {getDefaultValues} from '../utils/structs/defaults.util' import { getDefaultValues } from "../utils/structs/defaults.util";
import Service from './author.service.ts' import Service from "./author.service.ts";
import type {Scheme} from '../types/scheme.type' import type { Scheme } from "../types/scheme.type";
import {Author} from '../../bindings/app/internal/services' import { Author } from "../../bindings/app/internal/services";
import PostService from '../post/post.service.ts' import PostService from "../post/post.service.ts";
const postService = new PostService();
const postService = new PostService const service = new Service();
const service = new Service
onMounted(async () => { onMounted(async () => {
(scheme as any).Posts.type!.nested!.values = await postService.readAll() (scheme as any).Posts.type!.nested!.values = await postService.readAll();
}) });
const scheme: Scheme<Author> = reactive({ const scheme: Scheme<Author> = reactive({
entityId: "AuthorId",
Id: { Id: {
hidden: true, hidden: true,
type: { type: {
@@ -39,19 +36,17 @@ const scheme: Scheme<Author> = reactive({
type: { type: {
nested: { nested: {
values: [], values: [],
field: ['Text'] field: [""],
}, },
}, },
}, },
});
}) const getDefaults = () => getDefaultValues(scheme);
const getDefaults = () => getDefaultValues(scheme)
</script> </script>
<template> <template>
<main class="w-screen h-screen"> <main class="w-screen h-screen">
<Table :scheme :service :getDefaults></Table> <Table :scheme :service :getDefaults></Table>
</main> </main>
</template> </template>

51
frontend/src/author/author.service.ts
View File

@@ -1,29 +1,36 @@
import { GetAll, Create, Delete, GetById, Update, Count } from "../../bindings/app/internal/services/authorservice.ts" import {
import type { Author } from "../../bindings/app/internal/services" GetAll,
import type { IService } from "../types/service.type.ts" Create,
Delete,
GetById,
Update,
Count,
} from "../../bindings/app/internal/services/authorservice.ts";
import type { Author } from "../../bindings/app/internal/services";
import type { IService } from "../types/service.type.ts";
export default class AuthorService implements IService<Author> { export default class AuthorService implements IService<Author> {
async read(id: number) { async read(id: number) {
return await GetById(id) as Author return (await GetById(id)) as Author;
} }
async readAll() { async readAll() {
return await GetAll() as Author[] return (await GetAll()) as Author[];
} }
async create(item: Author) { async create(item: Author) {
await Create(item) await Create(item);
} }
async delete(id: number) { async delete(id: number) {
return await Delete(id) return await Delete(id);
} }
async update(item: Author) { async update(item: Author) {
await Update(item) await Update(item);
} }
async count() { async count() {
return await Count() return await Count();
} }
} }

94
frontend/src/post/PostScheme.vue
View File

@@ -1,77 +1,73 @@
<script setup lang="ts"> <script setup lang="ts">
import Table from '../table/Table.vue' import Table from "../table/Table.vue";
import { onMounted, reactive } from 'vue' import { onMounted, reactive } from "vue";
import { getDefaultValues } from '../utils/structs/defaults.util' import { getDefaultValues } from "../utils/structs/defaults.util";
import Service from './post.service.ts' import Service from "./post.service.ts";
import type { Scheme } from '../types/scheme.type' import type { Scheme } from "../types/scheme.type";
import { Post } from '../../bindings/app/internal/services' import { Post } from "../../bindings/app/internal/services";
import AuthorService from '../author/author.service.ts' import AuthorService from "../author/author.service.ts";
const authorService = new AuthorService const authorService = new AuthorService();
const service = new Service();
const service = new Service
onMounted(async () => { onMounted(async () => {
(scheme as any).Author.type!.nested!.values = await authorService.readAll();
(scheme as any).Author.type!.nested!.values = await authorService.readAll() });
})
const scheme: Scheme<Post> = reactive({ const scheme: Scheme<Post> = reactive({
entityId: 'PostId',
Id: { Id: {
hidden: true, hidden: true,
type: { type: {
primitive: "number", primitive: "number",
},
}, },
},
Text: { Text: {
russian: "Текст", russian: "Текст",
type: { type: {
primitive: "string", primitive: "string",
},
}, },
},
Deadline: { Deadline: {
russian: "Дедлайн", russian: "Дедлайн",
type: { date: true,
primitive: "number", type: {
primitive: "number",
},
}, },
},
CreatedAt: { CreatedAt: {
hidden: true, date: true,
type: { type: {
primitive: "number", primitive: "number",
},
}, },
},
AuthorId: { AuthorId: {
type: { hidden: true,
primitive: "number", type: {
primitive: "number",
},
}, },
},
Author: { Author: {
russian: "Автор", russian: "Автор",
type: { type: {
nested: { nested: {
values: [], values: [],
field: ['Name'] field: ["Name"],
}, },
},
}, },
}, });
})
const getDefaults = () => getDefaultValues(scheme)
const getDefaults = () => getDefaultValues(scheme);
</script> </script>
<template> <template>
<main class="w-screen h-screen"> <main class="w-screen h-screen">
<Table :scheme :service :getDefaults></Table> <Table :scheme :service :getDefaults></Table>
</main> </main>
</template> </template>

51
frontend/src/post/post.service.ts
View File

@@ -1,29 +1,36 @@
import { GetAll, Create, Delete, GetById, Update, Count } from "../../bindings/app/internal/services/postservice.ts" import {
import type { Post } from "../../bindings/app/internal/services" GetAll,
import type { IService } from "../types/service.type.ts" Create,
Delete,
GetById,
Update,
Count,
} from "../../bindings/app/internal/services/postservice.ts";
import type { Post } from "../../bindings/app/internal/services";
import type { IService } from "../types/service.type.ts";
export default class PostService implements IService<Post> { export default class PostService implements IService<Post> {
async read(id: number) { async read(id: number) {
return await GetById(id) as Post return (await GetById(id)) as Post;
} }
async readAll() { async readAll() {
return await GetAll() as Post[] return (await GetAll()) as Post[];
} }
async create(item: Post) { async create(item: Post) {
await Create(item) await Create(item);
} }
async delete(id: number) { async delete(id: number) {
return await Delete(id) return await Delete(id);
} }
async update(item: Post) { async update(item: Post) {
await Update(item) await Update(item);
} }
async count() { async count() {
return await Count() return await Count();
} }
} }

18
internal/models/models.go
View File

@@ -6,17 +6,15 @@ var Entities = []any{
type Post struct { type Post struct {
Id uint `gorm:"primaryKey" ui:"hidden"` Id uint `gorm:"primaryKey" ui:"hidden"`
Text string `displayName:"Текст" ui:"label=Текст"` Text string `displayName:"Текст" ui:"label:Текст"`
Deadline int64 `ui:"label=Дедлайн"` Deadline int64 `ui:"label:Дедлайн;datatype:datetime;"`
CreatedAt int64 `gorm:"autoCreateTime" ui:"hidden"` CreatedAt int64 `gorm:"autoCreateTime" ui:"readonly;datatype:datetime;"`
AuthorId uint AuthorId uint `ui:"hidden"`
Author Author `ui:"label=Автор, data=Author, field=[Name]" gorm:"constraint:OnUpdate:CASCADE;OnDelete:CASCADE"` Author Author `ui:"label:Автор; field:Name;"`
} }
type Author struct { type Author struct {
Id uint `gorm:"primaryKey" ui:"hidden"` Id uint `gorm:"primaryKey" ui:"hidden"`
Name string `ui:"label=Имя"` Name string `ui:"label:Имя;"`
Posts []Post `ui:"label=Посты, data=Post, field=[Text]" gorm:"constraint:OnUpdate:CASCADE;OnDelete:CASCADE"` Posts []Post `ui:"label:Посты; field:Text;"`
} }
// TODO: correct processing the semicolon (get attention to quotes)