Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6e92e7e
feat: Update knex > 2.4.0
saifookhan May 21, 2023
d17f093
feat: add yarn file and update package.json with lock files v14.19.1
saifookhan May 22, 2023
488c1f5
Update knex types
saifookhan May 22, 2023
75efffa
Merge pull request #1 from saifookhan/feat/vulnerability-fix
saifookhan May 23, 2023
cb6255d
feat: update webpack version
saifookhan May 23, 2023
c228cd2
Merge pull request #2 from saifookhan/feat/vulnerability-fix
saifookhan May 24, 2023
24a73dc
feat: update with sharp build
saifookhan May 24, 2023
946bf04
add built files with dist and lib
saifookhan May 24, 2023
27afa07
revert to node 14 with build files
saifookhan May 25, 2023
bcd6c3d
revert to node 14 with build files
saifookhan May 25, 2023
24ca6c6
downgrade file-type version
saifookhan May 25, 2023
c96f9c5
type change from moduke to commonjs
saifookhan May 25, 2023
cf40823
unify target to es6 and module to commonjs
saifookhan May 25, 2023
a73b4ee
move require to imports
saifookhan May 25, 2023
7689a4d
remove module from package.json
saifookhan May 26, 2023
afcdd8b
update tsconfig => module: commonjs, target es17
saifookhan May 26, 2023
ab0f6d8
fix: typings error
hananhamzaFFW May 30, 2023
6411e38
temp: paths experiment
hananhamzaFFW May 30, 2023
edcb321
temp: paths experiment
hananhamzaFFW May 30, 2023
fcb23b9
fix: specify npm branch
hananhamzaFFW May 30, 2023
1de31b4
fix: update package version
hananhamzaFFW May 30, 2023
1dc478c
fix: type issues
hananhamzaFFW May 30, 2023
05b6101
fix: types import
hananhamzaFFW May 30, 2023
445914f
fix: remove `type` keyword
hananhamzaFFW May 30, 2023
b077f2f
fix: remove export *
hananhamzaFFW May 30, 2023
c783e26
fix image upload issue
saifookhan May 30, 2023
98b16da
media upload fix
saifookhan May 31, 2023
4de7e54
bump sharp version from 0.31 to 0.32.6
saifookhan Nov 29, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
*.schema.json
coverage/
cypress/screenshots/
dist/
etc/
lib/
node_modules/
uploads/
.idea/
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14
24,045 changes: 23,984 additions & 61 deletions client/package-lock.json

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions client/src/common/EditURLRedirect.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState } from "react";
import { Model, NavigationItem } from "../../../typings";
import { Redirect, RouteComponentProps } from "react-router";
import { Redirect, RouteComponentProps } from "react-router-dom";
import { parse } from "qs";
import pathMatch from "path-match";
import basePath from "../basePath";
Expand All @@ -17,21 +17,20 @@ export type Props = RouteComponentProps & {
navigation?: NavigationItem[];
};

const findPathInNavigation = (model: Model) => (
found: string,
navigationItem: NavigationItem
): string => {
if (found) {
return found;
}
if ("items" in navigationItem) {
return navigationItem.items.reduce(findPathInNavigation(model), "");
}
if (navigationItem.model === model.name) {
return navigationItem.path;
}
return "";
};
const findPathInNavigation =
(model: Model) =>
(found: string, navigationItem: NavigationItem): string => {
if (found) {
return found;
}
if ("items" in navigationItem) {
return navigationItem.items.reduce(findPathInNavigation(model), "");
}
if (navigationItem.model === model.name) {
return navigationItem.path;
}
return "";
};

const EditURLRedirect: React.FC<Props> = ({
contentModels,
Expand Down
21 changes: 5 additions & 16 deletions client/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,21 @@
{
"include": [
"../typings/**.*",
"./typings/**.*",
"./src/**.*"
],
"exclude": [
"../node_modules/**/*"
],
"include": ["../typings/**.*", "./typings/**.*", "./src/**.*"],
"exclude": ["../node_modules/**/*"],
"compilerOptions": {
"strict": true,
"noImplicitAny": false,
"outDir": "lib",
"rootDir": "src",
"jsx": "preserve",
"target": "es5",
"target": "es2017",
"sourceMap": true,
"module": "esnext",
"skipLibCheck": true,
"moduleResolution": "node",
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"forceConsistentCasingInFileNames": true,
"lib": [
"es6",
"es2017.object",
"dom",
"esnext.asynciterable"
],
"lib": ["es6", "es2017.object", "dom", "esnext.asynciterable"],
"allowJs": true,
"resolveJsonModule": true,
"isolatedModules": true,
Expand Down
Loading