Skip to content
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

Prisma #693

Merged
merged 27 commits into from
Nov 11, 2023
Merged
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a2302d9
Merge branch 'main' of https://github.com/tripsit/TripBot into prisma
LunaUrsa Nov 5, 2023
7419ab2
Convert Learn command to prisma
LunaUrsa Nov 8, 2023
9fbffb2
Remove .vscode
LunaUrsa Nov 8, 2023
ae0d630
Add .vscode to gitignore
LunaUrsa Nov 8, 2023
58ebd2d
Make moodle client local
LunaUrsa Nov 8, 2023
dfff89d
Update packages
LunaUrsa Nov 8, 2023
d108d3e
Update readme
LunaUrsa Nov 8, 2023
9259da5
Minor update to API container
LunaUrsa Nov 8, 2023
183f259
Change how the package is imported for build time
LunaUrsa Nov 8, 2023
945f272
Cleanup of some prisma imports
LunaUrsa Nov 9, 2023
9d13250
Idk some kind of dependancy
LunaUrsa Nov 9, 2023
d90af81
Merge branch 'main' of https://github.com/tripsit/TripBot into prisma
LunaUrsa Nov 10, 2023
0e205b1
Remove that dependancy cuz it conflicts with the base os
LunaUrsa Nov 10, 2023
b9e3b75
Update github actions
LunaUrsa Nov 10, 2023
5ec833b
One more action update
LunaUrsa Nov 10, 2023
c39c87c
Few more updates
LunaUrsa Nov 10, 2023
a1ed55b
Readd code QL
LunaUrsa Nov 10, 2023
3532c1b
CodeQL ignore and memory increase
LunaUrsa Nov 10, 2023
06d99c0
REmove depenacny
LunaUrsa Nov 10, 2023
e2981ed
Add to gitignore
LunaUrsa Nov 10, 2023
64ff3f0
Ignore files in github actions
LunaUrsa Nov 10, 2023
366122c
=)
LunaUrsa Nov 10, 2023
b0be377
Remove moodle client files
LunaUrsa Nov 10, 2023
a8ceb33
Merge branch 'main' of https://github.com/tripsit/TripBot into prisma
LunaUrsa Nov 11, 2023
4af2cbb
Add logic for when moodle isnt up
LunaUrsa Nov 11, 2023
89b8e7b
Fix logging
LunaUrsa Nov 11, 2023
1e709fd
Merge branch 'main' of https://github.com/tripsit/TripBot into prisma
LunaUrsa Nov 11, 2023
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
Prev Previous commit
Next Next commit
Make moodle client local
  • Loading branch information
LunaUrsa committed Nov 8, 2023
commit 58ebd2d7f739fc57df8a13a5d8d4c28760c4383f
5 changes: 3 additions & 2 deletions src/global/commands/g.learn.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* eslint-disable max-len */
import { stripIndents } from 'common-tags';
import { PrismaClient as PrismaClientTripbot } from '@prisma/client';
// eslint-disable-next-line import/no-extraneous-dependencies
import { PrismaClient as PrismaClientMoodle } from '@prisma-moodle/client';
// import { PrismaClient as PrismaClientMoodle } from '@prisma-moodle/client';
// eslint-disable-next-line import/no-relative-packages
import { PrismaClient as PrismaClientMoodle } from '../../prisma/moodle/@prisma-moodle/client';

const moodleDb = new PrismaClientMoodle();
const tripbotDb = new PrismaClientTripbot();
1 change: 1 addition & 0 deletions src/prisma/moodle/@prisma-moodle/client/edge.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './index'
Loading