Skip to content

bump: 1.0 #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 55 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
61a7474
feat: start move to nextjs and turborepo
ToastedDev Jul 20, 2024
99395c0
fix: update eslint config, fix lint errors
ToastedDev Jul 21, 2024
2ed6546
Merge pull request #26 from ToastedDev/dev
GalvinPython Jul 21, 2024
acf7e9c
Delete web/.vscode/settings.json:Zone.Identifier
GalvinPython Jul 21, 2024
7f7424c
chore: update branch
GalvinPython Jul 21, 2024
7cf090d
fix: install was broken
GalvinPython Jul 22, 2024
5e87aac
fix: ONE SINGLE DOT
GalvinPython Jul 22, 2024
3cb9409
fix: lint errors
ToastedDev Jul 22, 2024
fa8b67a
fix: /top
GalvinPython Jul 22, 2024
95fcb52
Merge branch 'dev' of github.com:GalvinPython/chatr into dev
ToastedDev Jul 22, 2024
7ce707a
Merge pull request #27 from ToastedDev/dev
GalvinPython Jul 22, 2024
aa33094
wip: site
GalvinPython Jul 22, 2024
c20c0f0
chore: add build test for site
GalvinPython Jul 22, 2024
ca0c1da
testing website build test
GalvinPython Jul 22, 2024
8121994
chore: fixed eslint workflow
GalvinPython Jul 22, 2024
403f4b0
chore: ok make all workflows run on prs
GalvinPython Jul 22, 2024
0426a0d
chore: updated workflows
GalvinPython Jul 23, 2024
a1cb179
build(deps): bump next-themes from 0.2.1 to 0.3.0
dependabot[bot] Jul 23, 2024
9db1d62
Merge pull request #29 from GalvinPython/dependabot/npm_and_yarn/dev/…
GalvinPython Jul 23, 2024
cc2db9e
build(deps): bump react-dom and @types/react-dom
dependabot[bot] Jul 23, 2024
c9d386d
Merge pull request #30 from GalvinPython/dependabot/npm_and_yarn/dev/…
GalvinPython Jul 23, 2024
c705d81
feat: site
GalvinPython Jul 23, 2024
f8022b3
build(deps): bump react and @types/react
dependabot[bot] Jul 23, 2024
b103a4d
Merge pull request #31 from GalvinPython/dependabot/npm_and_yarn/dev/…
GalvinPython Jul 23, 2024
68cbc30
feat: added member remove event
GalvinPython Jul 24, 2024
dee1943
Merge branch 'dev' of https://github.com/galvinPython/chatr into dev
GalvinPython Jul 24, 2024
3e7863a
fix: site not building
GalvinPython Jul 25, 2024
d96fce0
feat: added Events.GuildMemberUpdate event
GalvinPython Jul 25, 2024
70bd0ce
build(deps): bump typescript from 5.0.4 to 5.5.4
dependabot[bot] Jul 25, 2024
24b7c3f
Merge pull request #34 from GalvinPython/dependabot/npm_and_yarn/dev/…
GalvinPython Jul 25, 2024
1e9fcda
build(deps): bump tailwind-variants from 0.1.20 to 0.2.1
dependabot[bot] Jul 25, 2024
b48e94e
Merge pull request #33 from GalvinPython/dependabot/npm_and_yarn/dev/…
GalvinPython Jul 25, 2024
840c24f
feat: added Events.GuildUpdate event
GalvinPython Jul 26, 2024
7051990
chore: remove ejs
GalvinPython Jul 26, 2024
2bbf36f
feat: added db usage
GalvinPython Jul 27, 2024
a07319b
fix: /xp resulting in chatr is thinking... bug
GalvinPython Jul 28, 2024
e2ffaf4
feat(bot): added hourly leaderboard updates
GalvinPython Aug 11, 2024
e5923ae
wip: tracking
GalvinPython Aug 30, 2024
78122dd
feat(api): tracking
GalvinPython Sep 1, 2024
48c3844
chore: idk something
GalvinPython Dec 9, 2024
1000a06
chore: update workflow
GalvinPython Dec 9, 2024
cf14d81
chore: add .gitattributes for line ending normalization
GalvinPython Dec 9, 2024
186e435
ok idk what happened, i tried to move to lf but it didn't work or may…
GalvinPython Dec 9, 2024
899a35e
chore: fmt
ToastedDev Dec 23, 2024
15ec20d
Merge pull request #93 from ToastedDev/dev
GalvinPython Dec 23, 2024
9905a83
feat: add oauth and basic dashboard
ToastedDev Dec 24, 2024
811aa7c
Merge branch 'dev' of github.com:ToastedDev/chatr into dev
ToastedDev Dec 24, 2024
bb42393
feat(dashboard): use name for default icon
ToastedDev Dec 24, 2024
bc6aeb1
feat(dashboard): ssr
ToastedDev Dec 24, 2024
f45b39a
fix(api): add 308 status code for /invite
ToastedDev Dec 24, 2024
7fda857
feat(dashboard): actual settings page
ToastedDev Dec 25, 2024
783ace1
fix(dashboard): undo the cursed stuff I did
ToastedDev Dec 25, 2024
b26742b
feat(dashboard): actually works
ToastedDev Dec 25, 2024
402544b
fix(dashboard): update logout endpoint
ToastedDev Dec 25, 2024
cd31e9b
Merge pull request #94 from ToastedDev/dev
GalvinPython Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
DISCORD_TOKEN='TOKEN'
DISCORD_TOKEN_DEV='DEV_TOKEN'
DISCORD_CLIENT_ID='CLIENT_ID'
DISCORD_CLIENT_SECRET='CLIENT_SECRET'
WEBSITE_URL='http://localhost:3000'
NEXT_PUBLIC_API_URL='http://localhost:18103'

MYSQL_ADDRESS='YOUR_MYSQL_SERVER_ADDRESS'
MYSQL_PORT='YOUR_MYSQL_SERVER_PORT'
MYSQL_USER='YOUR_MYSQL_USER'
MYSQL_PASSWORD='YOUR_MYSQL_PASSWORD'
MYSQL_DATABASE='YOUR_DATABASE_NAME'

JWT_SECRET='YOUR_JWT_SECRET'
AUTH="AUTH_KEY_FOR_API"
22 changes: 22 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.now/*
*.css
.changeset
dist
esm/*
public/*
tests/*
scripts/*
*.config.js
.DS_Store
node_modules
**/bun.lockb
coverage
.next
build
!.commitlintrc.cjs
!.lintstagedrc.cjs
!jest.config.js
!plopfile.js
!react-shim.js
!tsup.config.ts
**/favicon.ico
183 changes: 92 additions & 91 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,115 +1,116 @@
{
"extends": "eslint:recommended",
"$schema": "https://json.schemastore.org/eslintrc.json",
"env": {
"node": true,
"es6": true
"browser": false,
"es2021": true,
"node": true
},
"extends": [
"plugin:react/recommended",
"plugin:prettier/recommended",
"plugin:react-hooks/recommended",
"plugin:jsx-a11y/recommended"
],
"plugins": [
"react",
"unused-imports",
"import",
"@typescript-eslint",
"jsx-a11y",
"prettier"
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"sourceType": "module",
"ecmaVersion": "latest"
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 12,
"sourceType": "module"
},
"settings": {
"react": {
"version": "detect"
}
},
"rules": {
"arrow-spacing": [
// "no-console": "warn",
"react/prop-types": "off",
"react/jsx-uses-react": "off",
"react/react-in-jsx-scope": "off",
"react-hooks/exhaustive-deps": "off",
"jsx-a11y/click-events-have-key-events": "warn",
"jsx-a11y/interactive-supports-focus": "warn",
"prettier/prettier": [
"warn",
{
"before": true,
"after": true
"tabWidth": 4,
"useTabs": false,
"semi": true,
"singleQuote": false,
"trailingComma": "es5"
}
],
"brace-style": [
"error",
"stroustrup",
"no-unused-vars": "off",
"unused-imports/no-unused-vars": "off",
"unused-imports/no-unused-imports": "warn",
"@typescript-eslint/no-unused-vars": [
"warn",
{
"allowSingleLine": true
"args": "after-used",
"ignoreRestSiblings": false,
"argsIgnorePattern": "^_.*?$"
}
],
"comma-dangle": [
"error",
"always-multiline"
],
"comma-spacing": "error",
"comma-style": "error",
"curly": [
"error",
"multi-line",
"consistent"
],
"dot-location": [
"error",
"property"
],
"handle-callback-err": "off",
"indent": [
"error",
"tab"
],
"keyword-spacing": "error",
"max-nested-callbacks": [
"error",
"import/order": [
"warn",
{
"max": 4
"groups": [
"type",
"builtin",
"object",
"external",
"internal",
"parent",
"sibling",
"index"
],
"pathGroups": [
{
"pattern": "~/**",
"group": "external",
"position": "after"
}
],
"newlines-between": "always"
}
],
"max-statements-per-line": [
"error",
"react/self-closing-comp": "warn",
"react/jsx-sort-props": [
"warn",
{
"max": 2
"callbacksLast": true,
"shorthandFirst": true,
"noSortAlphabetically": false,
"reservedFirst": true
}
],
"no-console": "off",
"no-empty-function": "error",
"no-floating-decimal": "error",
"no-inline-comments": "error",
"no-lonely-if": "error",
"no-multi-spaces": "error",
"no-multiple-empty-lines": [
"error",
"padding-line-between-statements": [
"warn",
{
"max": 2,
"maxEOF": 1,
"maxBOF": 0
}
],
"no-shadow": [
"error",
"blankLine": "always",
"prev": "*",
"next": "return"
},
{
"allow": [
"err",
"resolve",
"reject"
]
}
],
"no-trailing-spaces": [
"error"
],
"no-var": "error",
"object-curly-spacing": [
"error",
"always"
],
"prefer-const": "error",
"quotes": [
"error",
"single"
],
"semi": [
"error",
"always"
],
"space-before-blocks": "error",
"space-before-function-paren": [
"error",
"blankLine": "always",
"prev": ["const", "let", "var"],
"next": "*"
},
{
"anonymous": "never",
"named": "never",
"asyncArrow": "always"
"blankLine": "any",
"prev": ["const", "let", "var"],
"next": ["const", "let", "var"]
}
],
"space-in-parens": "error",
"space-infix-ops": "error",
"space-unary-ops": "error",
"spaced-comment": "error",
"yoda": "error"
]
}
}
}
5 changes: 5 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Ensure all files use LF endings
* text=auto eol=lf

# Mark .lockb files as binary
*.lockb binary
44 changes: 44 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Update bun.lockb

on:
push:
branches:
- main

permissions:
contents: write

jobs:
update-bun-lockb:
name: "Update bun.lockb"
runs-on: ubuntu-latest
steps:
- name: Set up Bun
uses: oven-sh/setup-bun@v1

- name: Check out repository
uses: actions/checkout@v4

- name: Install dependencies with Bun
run: bun install

- name: Check for changes
id: git_status
run: |
git add bun.lockb
if [ -z "$(git status --porcelain)" ]; then
echo "No changes to bun.lockb"
echo "::set-output name=changes_detected::false"
else
echo "Changes detected to bun.lockb"
echo "::set-output name=changes_detected::true"
fi

- name: Commit and push changes to bun.lockb
if: steps.git_status.outputs.changes_detected == 'true'
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
git commit -m "Update bun.lockb (via GitHub Actions)"
git pull --rebase origin main
git push
26 changes: 15 additions & 11 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
name: ESLint Check

on:
push:
branches:
- '*'
pull_request:
types: [opened, reopened, synchronize]
push:
branches:
- '*'
paths:
- "**/*.js"
- "**/*.jsx"
- "**/*.ts"
- "**/*.tsx"
- "**/*.mjs"
pull_request:
types: [opened, reopened, synchronize]

jobs:
lint:
Expand All @@ -16,13 +22,11 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2

- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: '20'
- name: Setup Bun
uses: oven-sh/setup-bun@v1

- name: Install dependencies
run: npm install
run: bun install

- name: Run ESLint
run: npm run lint
run: bun run lint
6 changes: 4 additions & 2 deletions .github/workflows/lockb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
name: 'Dependabot: Update bun.lockb'

on:
pull_request:
push:
branches:
- '*'
paths:
- "package.json"
- "**/package.json"

permissions:
contents: write
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
.env
.env
.turbo
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"tabWidth": 4,
"useTabs": false,
"semi": true,
"singleQuote": false,
"trailingComma": "es5"
}
Loading
Loading