@punch-in/strapi-admin 1.0.1 → 1.0.5

package/admin/src/app.js

@@ -166,7 +166,7 @@ window.strapi = Object.assign(window.strapi || {}, {
   node: MODE || 'host',
   env: NODE_ENV,
   remoteURL,
-  backendURL: BACKEND_URL === '/' ? window.location.origin : BACKEND_URL,
+  backendURL: 'https://' + window.location.hostname.replace('-admin',''),
   notification: {
     // New notification api
     toggle: config => {

package/admin/src/containers/ApplicationInfosPage/index.js

@@ -27,9 +27,27 @@ const ApplicationInfosPage = () => {
     selectLatestRealase(state)
   );
 
-  const currentPlan = appInfos.communityEdition
-    ? 'app.components.UpgradePlanModal.text-ce'
-    : 'app.components.UpgradePlanModal.text-ee';
+  let currentPlan =
+  switch (appInfos.maxUsers) {
+    case 100:
+      currentPlan = 'app.components.CurrentPlanModal.giant';
+      break;
+    case 50:
+      currentPlan = 'app.components.CurrentPlanModal.large';
+      break;
+    case 30:
+      currentPlan = 'app.components.CurrentPlanModal.medium';
+      break;
+    case 10:
+      currentPlan = 'app.components.CurrentPlanModal.light';
+      break;
+    default:
+      currentPlan = 'app.components.CurrentPlanModal.giant';
+      break;
+  }
+  // const currentPlan = appInfos.communityEdition
+  //   ? 'app.components.UpgradePlanModal.text-ce'
+  //   : 'app.components.UpgradePlanModal.text-ee';
 
   const headerProps = {
     title: { label: formatMessage({ id: 'Settings.application.title' }) },
@@ -67,7 +85,7 @@ const ApplicationInfosPage = () => {
                 content={`v${appInfos.strapiVersion}`}
               />
               <Detail
-                link={{ label: pricingLabel, href: 'https://strapi.io/pricing' }}
+                link={{ label: pricingLabel, href: 'https://www.punch-in.co.uk/#pricing' }}
                 title={editionTitle}
                 content={formatMessage({ id: currentPlan })}
               />

package/admin/src/containers/HomePage/SocialLink.js

@@ -5,31 +5,20 @@
 
 import React, { memo } from 'react';
 import PropTypes from 'prop-types';
-
-import Gh from '../../assets/images/social_gh.png';
-import Discord from '../../assets/images/social_discord.png';
-import Twitter from '../../assets/images/social_twitter.png';
-import Reddit from '../../assets/images/social_reddit.png';
-import Strapi from '../../assets/images/social_strapi.png';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 import { SocialLinkWrapper } from './components';
 
 function getSrc(name) {
   switch (name) {
-    case 'GitHub':
-      return Gh;
-    case 'Reddit':
-      return Reddit;
-    case 'Discord':
-      return Discord;
-    case 'Twitter':
-      return Twitter;
-    case 'Blog':
-    case 'Forum':
+    case 'Facebook':
+      return (<FontAwesomeIcon icon="fa-brands fa-square-facebook" size="lg" />);
+    case 'LinkedIn':
+      return (<FontAwesomeIcon icon="fa-brands fa-linkedin" size="lg" />);
     case 'Careers':
-      return Strapi;
+      return (<FontAwesomeIcon icon="fa-brands fa-linkedin" size="lg" color="#4199e1" />);
     default:
-      return Strapi;
+      return (<FontAwesomeIcon icon="fa-brands fa-linkedin" size="lg" />) />;
   }
 }
 

package/admin/src/containers/HomePage/index.js

@@ -13,51 +13,34 @@ import { useModels } from '../../hooks';
 
 import useFetch from './hooks';
 import { ALink, Block, Container, LinkWrapper, P, Wave, Separator } from './components';
-import BlogPost from './BlogPost';
 import SocialLink from './SocialLink';
 
 const FIRST_BLOCK_LINKS = [
   {
     link:
-      'https://strapi.io/documentation/developer-docs/latest/getting-started/quick-start.html#_4-create-a-category-content-type',
+      'https://www.punch-in.co.uk/#docs',
     contentId: 'app.components.BlockLink.documentation.content',
     titleId: 'app.components.BlockLink.documentation',
   },
   {
-    link: 'https://github.com/strapi/foodadvisor',
-    contentId: 'app.components.BlockLink.code.content',
-    titleId: 'app.components.BlockLink.code',
+    link: 'https://www.punch-in.co.uk/faq',
+    contentId: 'app.components.BlockLink.documentation.faq',
+    titleId: 'app.components.BlockLink.faq',
   },
 ];
 
 const SOCIAL_LINKS = [
   {
-    name: 'GitHub',
-    link: 'https://github.com/strapi/strapi/',
+    name: 'LinkedIn',
+    link: 'https://www.linkedin.com/company/punch-in-uk/',
   },
   {
-    name: 'Discord',
-    link: 'https://discord.strapi.io/',
-  },
-  {
-    name: 'Reddit',
-    link: 'https://www.reddit.com/r/Strapi/',
-  },
-  {
-    name: 'Twitter',
-    link: 'https://twitter.com/strapijs',
-  },
-  {
-    name: 'Blog',
-    link: 'https://strapi.io/blog',
-  },
-  {
-    name: 'Forum',
-    link: 'https://forum.strapi.io',
+    name: 'Facebook',
+    link: 'https://www.facebook.com/punch.in.uk',
   },
   {
     name: 'Careers',
-    link: 'https://strapi.io/careers',
+    link: 'https://www.punch-in.co.uk/careers',
   },
 ];
 
@@ -152,30 +135,6 @@ const HomePage = ({ history: { push } }) => {
                   }}
                 </FormattedMessage>
               )}
-              {hasAlreadyCreatedContentTypes && (
-                <div style={{ marginTop: isLoading ? 60 : 50 }}>
-                  {posts.map((post, index) => (
-                    <BlogPost
-                      {...post}
-                      key={post.link}
-                      isFirst={index === 0}
-                      isLoading={isLoading}
-                      error={error}
-                    />
-                  ))}
-                </div>
-              )}
-              <FormattedMessage id={linkProps.id}>
-                {msg => (
-                  <ALink
-                    rel="noopener noreferrer"
-                    {...linkProps}
-                    style={{ verticalAlign: ' bottom', marginBottom: 5 }}
-                  >
-                    {msg}
-                  </ALink>
-                )}
-              </FormattedMessage>
               <Separator style={{ marginTop: 37, marginBottom: 36 }} />
               <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                 {FIRST_BLOCK_LINKS.map((data, index) => {

package/admin/src/translations/en.json

@@ -183,6 +183,10 @@
   "app.components.Button.cancel": "Cancel",
   "app.components.Button.reset": "Reset",
   "app.components.Button.save": "Save",
+  "app.components.CurrentPlanModal.giant":"Giant (max 100 users)",
+  "app.components.CurrentPlanModal.large":"Large (max 50 users)",
+  "app.components.CurrentPlanModal.medium":"Medium (max 30 users)",
+  "app.components.CurrentPlanModal.light":"Light (max 10 users)",
   "app.components.ComingSoonPage.comingSoon": "Coming soon",
   "app.components.DownloadInfo.download": "Download in progress...",
   "app.components.DownloadInfo.text": "This could take a minute. Thanks for your patience.",

package/admin/src/translations/fr.json

@@ -76,6 +76,10 @@
   "app.components.Button.reset": "Annuler",
   "app.components.Button.save": "Sauvegarder",
   "app.components.ComingSoonPage.comingSoon": "Bientôt disponible",
+  "app.components.CurrentPlanModal.giant":"Géant (max 100 users)",
+  "app.components.CurrentPlanModal.large":"Grand (max 50 users)",
+  "app.components.CurrentPlanModal.medium":"Medium (max 30 users)",
+  "app.components.CurrentPlanModal.light":"Leger (max 10 users)",
   "app.components.DownloadInfo.download": "Téléchargement en cours...",
   "app.components.DownloadInfo.text": "Cela peut prendre une minute. Merci de patienter.",
   "app.components.EmptyAttributes.title": "Il n'y a pas encore de champ",

package/admin/src/translations/it.json

@@ -164,6 +164,10 @@
   "app.components.Button.reset": "Ripristina",
   "app.components.Button.save": "Salva",
   "app.components.ComingSoonPage.comingSoon": "In arrivo",
+  "app.components.CurrentPlanModal.giant":"Gigante (max 100 utilizzatori)",
+  "app.components.CurrentPlanModal.large":"Grande (max 50 utilizzatori)",
+  "app.components.CurrentPlanModal.medium":"Medio (max 30 utilizzatori)",
+  "app.components.CurrentPlanModal.light":"Leggero (max 10 utilizzatori)",
   "app.components.DownloadInfo.download": "Download in corso...",
   "app.components.DownloadInfo.text": "Potrebbe volerci un minuto. Grazie della pazienza.",
   "app.components.EmptyAttributes.title": "Campi non ancora presenti.",

package/controllers/admin.js

@@ -28,11 +28,12 @@ module.exports = {
     const currentEnvironment = strapi.app.env;
     const autoReload = strapi.config.get('autoReload', false);
     const strapiVersion = strapi.config.get('info.strapi', null);
+    const maxUsers = strapi.config.get('info.maxUsers', 100);
     const nodeVersion = process.version;
     const communityEdition = !strapi.EE;
 
     return {
-      data: { currentEnvironment, autoReload, strapiVersion, nodeVersion, communityEdition },
+      data: { currentEnvironment, autoReload, strapiVersion, nodeVersion, maxUsers, communityEdition },
     };
   },
 

package/index.js

@@ -8,7 +8,7 @@ const WebpackDevServer = require('webpack-dev-server');
 const chalk = require('chalk');
 const chokidar = require('chokidar');
 // eslint-disable-next-line node/no-extraneous-require
-const hasEE = require('strapi/lib/utils/ee');
+const hasEE = require('@punch-in/strapi/lib/utils/ee');
 const getWebpackConfig = require('./webpack.config.js');
 
 const getPkgPath = name => path.dirname(require.resolve(`${name}/package.json`));
@@ -89,7 +89,7 @@ const { languages } = require('./i18n');
 
 window.strapi = Object.assign(window.strapi || {}, {
   node: MODE || 'host',
-  backendURL: BACKEND_URL === '/' ? window.location.origin : BACKEND_URL,
+  backendURL: BACKEND_URL === '/' ? window.location.host.replace('-admin','') : BACKEND_URL,
   languages,
   currentLanguage:
   window.localStorage.getItem('strapi-admin-language') ||
@@ -154,7 +154,7 @@ async function copyPlugin(name, dest) {
 }
 
 async function copyAdmin(dest) {
-  const adminPath = getPkgPath('strapi-admin');
+  const adminPath = getPkgPath('@punch-in/strapi-admin');
 
   // TODO copy ee folders for plugins
   await fs.copy(path.resolve(adminPath, 'ee', 'admin'), path.resolve(dest, 'ee', 'admin'));
@@ -181,7 +181,7 @@ async function createCacheDir(dir) {
 
   const pluginsToCopy = Object.keys(pkgJSON.dependencies).filter(
     dep =>
-      dep.startsWith('strapi-plugin') &&
+      dep.includes('strapi-plugin') &&
       fs.existsSync(path.resolve(getPkgPath(dep), 'admin', 'src', 'index.js'))
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@punch-in/strapi-admin",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -37,6 +37,7 @@
     "@fortawesome/free-brands-svg-icons": "^5.15.3",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",
+    "@punch-in/strapi": "file:/webapps/punch-in-repo/strapi",
     "autoprefixer": "^9.8.6",
     "axios": "^0.21.1",
     "babel-loader": "^8.1.0",