- {params.title}
-
-
-
-
{params.content}
-
-
+
{params.title}
+
+
+
{params.content}
+
);
}
\ No newline at end of file
diff --git a/src/components/news/tagbar.module.css b/src/components/news/tagbar.module.css
index 8fe422a..d50dac2 100644
--- a/src/components/news/tagbar.module.css
+++ b/src/components/news/tagbar.module.css
@@ -10,5 +10,5 @@
*display: inline;
}
.tagbar{
- margin: 0px 0px 4px 0px;
+ margin: 0px 0px 0px 0px;
}
\ No newline at end of file
diff --git a/src/components/news/tagbar.tsx b/src/components/news/tagbar.tsx
index 42154bd..26995e2 100644
--- a/src/components/news/tagbar.tsx
+++ b/src/components/news/tagbar.tsx
@@ -1,7 +1,7 @@
import styles from "./tagbar.module.css"
const tagItems = ["tag1", "tag2", "tag3"];
-const tagList = tagItems.map(value =>
{value});
+const tagList = tagItems.map(value =>
{value});
export default function Tagbar() {
diff --git a/src/controller/Post.ts b/src/controller/Post.ts
deleted file mode 100644
index 8742850..0000000
--- a/src/controller/Post.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Connection, RowDataPacket, OkPacket, QueryError } from "mysql2";
-import { getConnection } from "@/db";
-
-
-export interface IPost extends RowDataPacket {
- id: number;
- post: string;
-}
-
-export async function getPost(id:Number): Promise
{
- // let [rows]:Array = await conn.execute("SELECT * FROM `post`", []);
- return new Promise((resolve, reject) => {
- let res = getConnection().then((conn)=>{conn.query(`SELECT * FROM post WHERE id = ${id}`, (err:QueryError, res) => {
- if (err) reject(err)
- else resolve(res)
- });
- });
- return res;
- });
-}
-
-export async function getPosts(): Promise {
- // let [rows]:Array = await conn.execute("SELECT * FROM `post`", []);
- return new Promise((resolve, reject) => {
- let res = getConnection().then((conn)=>{conn.query("SELECT * FROM post", (err:QueryError, res) => {
- if (err) reject(err)
- else resolve(res)
- });
- });
- return res;
- });
-}
-
-// export default { getPost, getPosts }
\ No newline at end of file
diff --git a/src/model/sequelize/NewModels.ts b/src/model/sequelize/NewModels.ts
index e96d902..9e814d7 100644
--- a/src/model/sequelize/NewModels.ts
+++ b/src/model/sequelize/NewModels.ts
@@ -4,7 +4,9 @@ import {
HasManySetAssociationsMixin, HasManyAddAssociationsMixin, HasManyHasAssociationsMixin,
HasManyRemoveAssociationMixin, HasManyRemoveAssociationsMixin, Model, ModelDefined, Optional,
Sequelize, InferAttributes, InferCreationAttributes, CreationOptional, NonAttribute, ForeignKey, BelongsTo, BelongsToGetAssociationMixin, UUIDV4, UUID,
- VirtualDataType
+ VirtualDataType,
+ HasOneGetAssociationMixin,
+ HasOneCreateAssociationMixin
} from 'sequelize';
@@ -13,11 +15,35 @@ const sequelize = new Sequelize({
storage: 'db.sqlite'
});
+export class UserPerms extends Model, InferCreationAttributes> {
+ declare id: CreationOptional;
+ declare user:NonAttribute;
+ declare user_id:ForeignKey;
+ declare isAdmin:CreationOptional;
+}
+UserPerms.init({
+ id: {
+ allowNull: false,
+ autoIncrement: true,
+ type: DataTypes.INTEGER,
+ primaryKey: true,
+ unique: true,
+ },
+ isAdmin: {
+ allowNull: false,
+ defaultValue: false,
+ type: DataTypes.BOOLEAN
+ }
+},
+{
+ tableName: 'Perms',
+ sequelize // passing the `sequelize` instance is required
+});
+
export class Auth extends Model, InferCreationAttributes> {
declare id: CreationOptional;
declare token: CreationOptional;
- declare user:NonAttribute;
declare user_id:ForeignKey;
declare getUser: BelongsToGetAssociationMixin;
declare static associations: {
@@ -96,6 +122,13 @@ export class User extends Model, InferCreationAttributes;
declare getPosts:HasManyGetAssociationsMixin;
+ declare getPerms:HasOneGetAssociationMixin;
+ declare createPerms:HasOneCreateAssociationMixin;
+ declare perms?:NonAttribute
+ declare static associations: {
+ perms: Association;
+ };
+
}
User.init(
@@ -114,20 +147,19 @@ User.init(
password: {
allowNull: false,
type: DataTypes.STRING,
- }
-
+ },
},
{
defaultScope: {
- attributes:{
- exclude:['password']
- }
+ attributes: {
+ exclude: ['password'],
+ },
+ include: [{ association: 'perms' }],
},
tableName: 'Users',
sequelize // passing the `sequelize` instance is required
}
);
-User.scope
Auth.belongsTo(User, {
foreignKey:'user_id',
@@ -149,7 +181,19 @@ User.hasMany(Post, {
foreignKey: 'user_id',
as: 'posts' // this determines the name in `associations`!
});
+UserPerms.belongsTo(User, {
+ foreignKey:'user_id',
+ targetKey:'id',
+ as: 'user'
+})
+User.hasOne(UserPerms, {
+ sourceKey: 'id',
+ foreignKey: 'user_id',
+ as: 'perms'
+})
+
User.sync();
Auth.sync();
-Post.sync();
\ No newline at end of file
+Post.sync();
+UserPerms.sync();
\ No newline at end of file
diff --git a/src/providers/providers.tsx b/src/providers/providers.tsx
new file mode 100644
index 0000000..0c32eb7
--- /dev/null
+++ b/src/providers/providers.tsx
@@ -0,0 +1,28 @@
+'use client'
+
+import { Auth, User } from "@/model/sequelize/NewModels";
+import { ReactNode, createContext } from "react";
+import { InferAttributes } from "sequelize/types/model";
+
+
+export type AuthProps = {
+ test: string;
+ auth?: InferAttributes
+ user?: InferAttributes
+}
+let p: AuthProps = {
+ test: "lorem",
+}
+
+export const AuthContext = createContext(p);
+
+interface Props {
+ children?: ReactNode;
+ params?: any;
+}
+
+export default function Providers(props:Props){
+ return (
+ {props.children}
+ )
+}
\ No newline at end of file
diff --git a/src/util/Utils.ts b/src/util/Utils.ts
index 006dd99..c3b1faf 100644
--- a/src/util/Utils.ts
+++ b/src/util/Utils.ts
@@ -14,6 +14,17 @@ function constructAPIUrl(endpoint:string){
const { schema, host, port, basepath } = getAPIEnv();
return `${schema}://${host}:${port}/${basepath}/${endpoint}`
}
+function constructUrl(endpoint:string){
+ const { schema, host, port, basepath } = getAPIEnv();
+ return `${schema}://${host}:${port}/${endpoint}`
+}
+function truncateString(str:string = '', num:number = 255) {
+ if (str.length > num) {
+ return str.slice(0, num) + "...";
+ } else {
+ return str;
+ }
+}
-export { Gens, Auth, constructAPIUrl }
\ No newline at end of file
+export { Gens, Auth, constructAPIUrl, constructUrl, truncateString }
\ No newline at end of file
diff --git a/src/util/parseSetCookie.ts b/src/util/parseSetCookie.ts
new file mode 100644
index 0000000..36fdab6
--- /dev/null
+++ b/src/util/parseSetCookie.ts
@@ -0,0 +1,9 @@
+export function parseSetCookie(h: string[]) {
+ let aaa = h.map(
+ s => [...s.matchAll(/(.*?)=(.*?)($|;|,(?! ))/gm)]
+ );
+ const dict = Object.assign({}, ...aaa[0].map((e) => {
+ return { [e[1]]: decodeURIComponent(e[2]) };
+ }));
+ return dict;
+}
diff --git a/tailwind.config.js b/tailwind.config.js
index d53b2ea..c55da51 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -12,7 +12,76 @@ module.exports = {
'gradient-conic':
'conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))',
},
+ colors: {
+ 'text': {
+ 50: 'var(--text-50)',
+ 100: 'var(--text-100)',
+ 200: 'var(--text-200)',
+ 300: 'var(--text-300)',
+ 400: 'var(--text-400)',
+ 500: 'var(--text-500)',
+ 600: 'var(--text-600)',
+ 700: 'var(--text-700)',
+ 800: 'var(--text-800)',
+ 900: 'var(--text-900)',
+ 950: 'var(--text-950)',
+ },
+ 'background': {
+ 50: 'var(--background-50)',
+ 100: 'var(--background-100)',
+ 200: 'var(--background-200)',
+ 300: 'var(--background-300)',
+ 400: 'var(--background-400)',
+ 500: 'var(--background-500)',
+ 600: 'var(--background-600)',
+ 700: 'var(--background-700)',
+ 800: 'var(--background-800)',
+ 900: 'var(--background-900)',
+ 950: 'var(--background-950)',
+ },
+ 'primary': {
+ 50: 'var(--primary-50)',
+ 100: 'var(--primary-100)',
+ 200: 'var(--primary-200)',
+ 300: 'var(--primary-300)',
+ 400: 'var(--primary-400)',
+ 500: 'var(--primary-500)',
+ 600: 'var(--primary-600)',
+ 700: 'var(--primary-700)',
+ 800: 'var(--primary-800)',
+ 900: 'var(--primary-900)',
+ 950: 'var(--primary-950)',
+ },
+ 'secondary': {
+ 50: 'var(--secondary-50)',
+ 100: 'var(--secondary-100)',
+ 200: 'var(--secondary-200)',
+ 300: 'var(--secondary-300)',
+ 400: 'var(--secondary-400)',
+ 500: 'var(--secondary-500)',
+ 600: 'var(--secondary-600)',
+ 700: 'var(--secondary-700)',
+ 800: 'var(--secondary-800)',
+ 900: 'var(--secondary-900)',
+ 950: 'var(--secondary-950)',
+ },
+ 'accent': {
+ 50: 'var(--accent-50)',
+ 100: 'var(--accent-100)',
+ 200: 'var(--accent-200)',
+ 300: 'var(--accent-300)',
+ 400: 'var(--accent-400)',
+ 500: 'var(--accent-500)',
+ 600: 'var(--accent-600)',
+ 700: 'var(--accent-700)',
+ 800: 'var(--accent-800)',
+ 900: 'var(--accent-900)',
+ 950: 'var(--accent-950)',
+ },
+ },
},
},
- plugins: [],
+ plugins: [
+ require('flowbite/plugin')
+ ]
}