Skip to content

Commit

Permalink
Merge branch 'staging' of github.com:trackit/trackflix-cms into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
mezzLMC committed Nov 2, 2023
2 parents 8d09944 + bc5ed24 commit d0a41d4
Show file tree
Hide file tree
Showing 9 changed files with 128 additions and 11,574 deletions.
2 changes: 1 addition & 1 deletion config/middlewares.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default [
{
name: 'strapi::favicon',
config: {
path: './public/img/favicon.ico'
path: './src/admin/extensions/trackit.png'
},
},
'strapi::public',
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@strapi/plugin-i18n": "4.12.0",
"@strapi/plugin-users-permissions": "4.12.0",
"@strapi/strapi": "4.12.0",
"async_hooks": "^1.0.0",
"chart.js": "^4.3.3",
"codemirror": "^6.0.1",
"crypto": "^1.0.1",
Expand All @@ -44,6 +45,7 @@
"eslint-plugin-formatjs": "^4.10.3",
"koa-send": "^5.0.1",
"koa-sendfile": "^3.0.0",
"mini-svg-data-uri": "^1.4.4",
"os": "^0.1.2",
"patch-package": "^8.0.0",
"path": "^0.12.7",
Expand Down
121 changes: 0 additions & 121 deletions patches/@strapi+admin+4.12.5.patch

This file was deleted.

123 changes: 123 additions & 0 deletions src/admin/app.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
const TrackItLogo = require('./extensions/trackit.png');

export const lightThemeColors = {
colors: {
alternative100: '#f6ecfc',
alternative200: '#e0c1f4',
alternative500: '#ac73e6',
alternative600: '#9736e8',
alternative700: '#8312d1',
buttonNeutral0: '#ffffff',
danger100: '#fcecea',
danger200: '#f5c0b8',
danger500: '#ee5e52',
danger600: '#d02b20',
danger700: '#b72b1a',
neutral0: '#ffffff',
neutral100: '#f6f6f9',
neutral1000: '#181826',
neutral150: '#eaeaef',
neutral200: '#dcdce4',
neutral300: '#c0c0cf',
neutral400: '#a5a5ba',
neutral500: '#8e8ea9',
neutral600: '#666687',
neutral700: '#4a4a6a',
neutral800: '#32324d',
neutral900: '#212134',
primary100: '# fcedee',
primary200: '#FB7477',
primary500: '#FA6163',
primary600: '#F94044',
primary700: '#F9393C',
buttonPrimary500: '#FA6163',
buttonPrimary600: '#F94044',
secondary100: '#eaf5ff',
secondary200: '#b8e1ff',
secondary500: '#66b7f1',
secondary600: '#0c75af',
secondary700: '#006096',
success100: '#eafbe7',
success200: '#c6f0c2',
success500: '#5cb176',
success600: '#328048',
success700: '#2f6846',
warning100: '#fdf4dc',
warning200: '#fae7b9',
warning500: '#f29d41',
warning600: '#d9822f',
warning700: '#be5d01',
},
};

export const darkThemeColors = {
colors: {
alternative100: '#181826',
alternative200: '#4a4a6a',
alternative500: '#ac73e6',
alternative600: '#ac73e6',
alternative700: '#e0c1f4',
buttonNeutral0: '#ffffff',
danger100: '#181826',
danger200: '#4a4a6a',
danger500: '#ee5e52',
danger600: '#ee5e52',
danger700: '#ee5e52',
neutral0: '#212134',
neutral100: '#181826',
neutral1000: '#ffffff',
neutral150: '#32324d',
neutral200: '#4a4a6a',
neutral300: '#666687',
neutral400: '#a5a5ba',
neutral500: '#c0c0cf',
neutral600: '#a5a5ba',
neutral700: '#eaeaef',
neutral800: '#ffffff',
neutral900: '#ffffff',
primary100: '#181826',
primary200: '#FB7477',
primary500: '#FA6163',
primary600: '#F94044',
primary700: '#F9393C',
buttonPrimary500: '#FA6163',
buttonPrimary600: '#F94044',
secondary100: '#181826',
secondary200: '#4a4a6a',
secondary500: '#66b7f1',
secondary600: '#66b7f1',
secondary700: '#b8e1ff',
success100: '#181826',
success200: '#4a4a6a',
success500: '#5cb176',
success600: '#5cb176',
success700: '#c6f0c2',
warning100: '#181826',
warning200: '#4a4a6a',
warning500: '#f29d41',
},
};

export default {
config: {
auth: {
logo: TrackItLogo,
},
menu: {
logo: TrackItLogo,
},
head: {
favicon: TrackItLogo,
},
theme: {
light: lightThemeColors,
dark: darkThemeColors,
},
notifications: {
releases: false
},
locales: [],
},
bootstrap(app) {
},
};
88 changes: 0 additions & 88 deletions src/admin/app.tsx

This file was deleted.

Binary file added src/admin/extensions/trackit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"name": "Apache 2.0",
"url": "https://www.apache.org/licenses/LICENSE-2.0.html"
},
"x-generation-date": "2023-10-16T08:50:56.131Z"
"x-generation-date": "2023-10-26T10:09:45.026Z"
},
"x-strapi-config": {
"path": "/documentation",
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit d0a41d4

Please sign in to comment.