-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into django-4.2
- Loading branch information
Showing
14 changed files
with
129 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
peachjam/migrations/0149_relationship_subject_selectors.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| # Generated by Django 3.2.25 on 2024-07-26 11:23 | ||
|
|
||
| from django.db import migrations, models | ||
|
|
||
|
|
||
| class Migration(migrations.Migration): | ||
|
|
||
| dependencies = [ | ||
| ("peachjam", "0148_alter_judgment_auto_assign_details"), | ||
| ] | ||
|
|
||
| operations = [ | ||
| migrations.AddField( | ||
| model_name="relationship", | ||
| name="subject_selectors", | ||
| field=models.JSONField(null=True, verbose_name="subject selectors"), | ||
| ), | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,67 @@ | ||
| const { VueLoaderPlugin } = require('vue-loader'); | ||
| const { sentryWebpackPlugin } = require('@sentry/webpack-plugin'); | ||
|
|
||
| const peachJamConfig = { | ||
| mode: 'development', | ||
| resolve: { | ||
| alias: { | ||
| vue: '@vue/runtime-dom' | ||
| module.exports = (env, argv) => { | ||
| return [{ | ||
| mode: 'development', | ||
| resolve: { | ||
| alias: { | ||
| vue: '@vue/runtime-dom' | ||
| }, | ||
| modules: [ | ||
| './node_modules' | ||
| ], | ||
| extensions: ['.tsx', '.ts', '.js'] | ||
| }, | ||
| entry: { | ||
| app: './peachjam/js/app.ts', | ||
| 'pdf.worker': 'pdfjs-dist/build/pdf.worker.entry' | ||
| }, | ||
| modules: [ | ||
| './node_modules' | ||
| ], | ||
| extensions: ['.tsx', '.ts', '.js'] | ||
| }, | ||
| entry: { | ||
| app: './peachjam/js/app.ts', | ||
| 'pdf.worker': 'pdfjs-dist/build/pdf.worker.entry' | ||
| }, | ||
| module: { | ||
| rules: [ | ||
| { | ||
| test: /\.vue$/, | ||
| use: [ | ||
| { | ||
| loader: 'vue-loader', | ||
| options: { | ||
| compilerOptions: { | ||
| isCustomElement: tag => tag.startsWith('la-') | ||
| module: { | ||
| rules: [ | ||
| { | ||
| test: /\.vue$/, | ||
| use: [ | ||
| { | ||
| loader: 'vue-loader', | ||
| options: { | ||
| compilerOptions: { | ||
| isCustomElement: tag => tag.startsWith('la-') | ||
| } | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| test: /\.tsx?$/, | ||
| use: 'ts-loader', | ||
| exclude: /node_modules/ | ||
| }, | ||
| { | ||
| test: /\.css$/, | ||
| use: ['vue-style-loader', 'css-loader'] | ||
| }, | ||
| { | ||
| test: /\.scss$/, | ||
| use: ['vue-style-loader', 'css-loader', 'sass-loader'] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| test: /\.tsx?$/, | ||
| use: 'ts-loader', | ||
| exclude: /node_modules/ | ||
| }, | ||
| { | ||
| test: /\.css$/, | ||
| use: ['vue-style-loader', 'css-loader'] | ||
| }, | ||
| { | ||
| test: /\.scss$/, | ||
| use: ['vue-style-loader', 'css-loader', 'sass-loader'] | ||
| } | ||
| ] | ||
| }, | ||
| output: { | ||
| filename: '[name]-prod.js', | ||
| path: __dirname + '/peachjam/static/js' | ||
| }, | ||
| devtool: 'source-map', | ||
| plugins: [ | ||
| new VueLoaderPlugin(), | ||
| sentryWebpackPlugin({ | ||
| disable: argv.mode !== 'production', | ||
| authToken: process.env.SENTRY_AUTH_TOKEN, | ||
| org: 'lawsafrica', | ||
| project: 'lii', | ||
| telemetry: false | ||
| }) | ||
| ] | ||
| }, | ||
| output: { | ||
| filename: '[name]-prod.js', | ||
| path: __dirname + '/peachjam/static/js' | ||
| }, | ||
| devtool: 'source-map', | ||
| plugins: [ | ||
| new VueLoaderPlugin(), | ||
| sentryWebpackPlugin({ | ||
| authToken: process.env.SENTRY_AUTH_TOKEN, | ||
| org: 'lawsafrica', | ||
| project: 'lii', | ||
| telemetry: false | ||
| }) | ||
| ] | ||
| }; | ||
| }]; | ||
| } | ||
|
|
||
| module.exports = [peachJamConfig]; |