@punch-in/strapi-admin 1.0.4 → 1.0.6

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/components/LeftMenu/LeftMenuFooter/Wrapper.js

@@ -1,10 +1,10 @@
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
-
+//background: ${props => props.theme.main.colors.strapi['blue-darker']};
 const Wrapper = styled.div`
   position: absolute;
   width: 100%;
-  background: ${props => props.theme.main.colors.strapi['blue-darker']};
+  background: rgb(0, 126, 255);
   bottom: 0;
   .poweredBy {
     width: 100%;
@@ -18,13 +18,14 @@ const Wrapper = styled.div`
     font-weight: 400;
     letter-spacing: 0.05rem;
     vertical-align: middle;
-    color: ${({ theme }) => theme.main.colors.strapi['gray-light']};
+    color: ${({ theme }) => theme.main.colors['white']};
   }
 `;
 
 const A = styled.a`
+  color: #FFF;
   &:hover {
-    color: #007bff;
+    color: rgb(255, 227, 0);
     text-decoration: underline;
   }
 `;

package/admin/src/components/LeftMenu/LeftMenuLink/A.js

@@ -31,7 +31,7 @@ const A = styled.a`
   }
 
   &.linkActive {
-    color: white !important;
+    color: ${props => props.theme.main.colors.leftMenu['link-visited']}; !important;
     border-left: 0.3rem solid ${props => props.theme.main.colors.strapi.blue};
   }
 `;

package/admin/src/components/LeftMenu/LeftMenuLinkSection/LeftMenuListLink.js

@@ -3,7 +3,6 @@ import styled from 'styled-components';
 const LeftMenuListLink = styled.div`
   max-height: 290px;
   margin-bottom: 19px;
-  margin-right: 25px;
   overflow: auto;
 `;
 

package/admin/src/containers/App/reducer.js

@@ -45,12 +45,12 @@ function appReducer(state = initialState, action) {
         return null;
       });
     case GET_INFOS_DATA_SUCCEEDED: {
-      if (action.data.strapiVersion !== state.get('strapiVersion')) {
-        console.error(
-          `It seems that the built version ${packageVersion} is different than your project's one (${action.data.strapiVersion})`
-        );
-        console.error('Please delete your `.cache` and `build` folders and restart your app');
-      }
+      // if (action.data.strapiVersion !== state.get('strapiVersion')) {
+      //   console.error(
+      //     `It seems that the built version ${packageVersion} is different than your project's one (${action.data.strapiVersion})`
+      //   );
+      //   console.error('Please delete your `.cache` and `build` folders and restart your app');
+      // }
 
       return (
         state

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

@@ -12,13 +12,13 @@ import { SocialLinkWrapper } from './components';
 function getSrc(name) {
   switch (name) {
     case 'Facebook':
-      return (<FontAwesomeIcon icon="fa-brands fa-square-facebook" size="lg" />);
+      return (<FontAwesomeIcon icon={['fab', 'facebook']} size="lg" />);
     case 'LinkedIn':
-      return (<FontAwesomeIcon icon="fa-brands fa-linkedin" size="lg" />);
+      return (<FontAwesomeIcon icon={['fab', 'linkedin']} size="lg" />);
     case 'Careers':
-      return (<FontAwesomeIcon icon="fa-brands fa-linkedin" size="lg" color="#4199e1" />);
+      return (<FontAwesomeIcon icon={['fab', 'linkedin']} size="lg" color="#4199e1" />);
     default:
-      return (<FontAwesomeIcon icon="fa-brands fa-linkedin" size="lg" />) />;
+      return (<FontAwesomeIcon icon={['fab', 'linkedin']} size="lg" />);
   }
 }
 
@@ -26,7 +26,7 @@ const SocialLink = ({ link, name }) => {
   return (
     <SocialLinkWrapper className="col-6">
       <a href={link} target="_blank" rel="noopener noreferrer">
-        <img src={getSrc(name)} alt={name} />
+        {getSrc(name)}
         <span>{name}</span>
       </a>
     </SocialLinkWrapper>

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

@@ -13,7 +13,6 @@ 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 = [
@@ -25,7 +24,7 @@ const FIRST_BLOCK_LINKS = [
   },
   {
     link: 'https://www.punch-in.co.uk/faq',
-    contentId: 'app.components.BlockLink.documentation.faq',
+    contentId: 'app.components.BlockLink.faq.content',
     titleId: 'app.components.BlockLink.faq',
   },
 ];
@@ -74,15 +73,7 @@ const HomePage = ({ history: { push } }) => {
     ? 'HomePage.greetings'
     : 'app.components.HomePage.welcome';
   const username = get(auth.getUserInfo(), 'firstname', '');
-  const linkProps = hasAlreadyCreatedContentTypes
-    ? {
-        id: 'app.components.HomePage.button.blog',
-        href: 'https://strapi.io/blog/',
-        onClick: () => {},
-        type: 'blog',
-        target: '_blank',
-      }
-    : {
+  const linkProps = {
         id: 'app.components.HomePage.create',
         href: '',
         onClick: handleClick,
@@ -162,17 +153,6 @@ const HomePage = ({ history: { push } }) => {
               <FormattedMessage id="app.components.HomePage.community.content">
                 {content => <P style={{ marginTop: 7, marginBottom: 0 }}>{content}</P>}
               </FormattedMessage>
-              <FormattedMessage id="HomePage.roadmap">
-                {msg => (
-                  <ALink
-                    rel="noopener noreferrer"
-                    href="https://portal.productboard.com/strapi/1-public-roadmap/tabs/2-under-consideration"
-                    target="_blank"
-                  >
-                    {msg}
-                  </ALink>
-                )}
-              </FormattedMessage>
 
               <Separator style={{ marginTop: 18 }} />
               <div

package/admin/src/containers/LeftMenu/Wrapper.js

@@ -14,7 +14,7 @@ const Wrapper = styled.div`
   left: 0;
   height: 100vh;
   width: ${props => props.theme.main.sizes.leftMenu.width};
-  background: ${props => props.theme.main.colors.strapi['blue-darker']};
+  background: ${props => props.theme.main.colors.strapi['light-blue-transparent']};
 
   /* scrollbar overrides */
   * {

package/admin/src/containers/LeftMenu/utils/generateModelsLinks.js

@@ -30,7 +30,7 @@ const generateLinks = (links, type, configurations = []) => {
       }
 
       return {
-        icon: 'circle',
+        icon: link.icon ?  link.icon : 'circle',
         destination: `/plugins/content-manager/${link.kind}/${link.uid}`,
         isDisplayed: true,
         label: link.info.label,

package/admin/src/themes/colors.js

@@ -34,8 +34,9 @@ const colors = {
     'background-alpha': 'rgba(14, 22, 34, 0.02)',
   },
   leftMenu: {
-    'link-hover': '#1c2431',
-    'link-color': '#919bae',
+    'link-hover': '#c6eaff',
+    'link-visited': '#950303',
+    'link-color': '#666e7d',
     'title-color': '#5b626f',
     'background-header-link': '#007eff',
   },
@@ -45,6 +46,7 @@ const colors = {
     'blue-darker': '#18202e',
     'blue-dark': '#151c2e',
     blue: '#0097f7',
+    'light-blue-transparent': '#0097f71c'
   },
 };
 

package/admin/src/translations/en.json

@@ -50,7 +50,7 @@
   "Documentation": "Documentation",
   "Email": "Email",
   "Files Upload": "Files Upload",
-  "HomePage.community": "Join the Community",
+  "HomePage.community": "Join Punch-in Community",
   "HomePage.greetings": "Hi {name}!",
   "HomePage.helmet.title": "Homepage",
   "HomePage.roadmap": "See our roadmap",
@@ -180,9 +180,15 @@
   "app.components.BlockLink.code.content": "Learn by testing real projects developed the community.",
   "app.components.BlockLink.documentation": "Read the documentation",
   "app.components.BlockLink.documentation.content": "Discover the concepts, reference guides and tutorials.",
+  "app.components.BlockLink.faq": "Read our FAQ",
+  "app.components.BlockLink.faq.content": "Get answers to the most frequent questions from our customers.",
   "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.",
@@ -212,7 +218,7 @@
   "app.components.LeftMenuFooter.documentation": "Documentation",
   "app.components.LeftMenuFooter.help": "Help",
   "app.components.LeftMenuFooter.poweredBy": "Powered by ",
-  "app.components.LeftMenuLinkContainer.collectionTypes": "Collection Types",
+  "app.components.LeftMenuLinkContainer.collectionTypes": "Data stores",
   "app.components.LeftMenuLinkContainer.configuration": "Configurations",
   "app.components.LeftMenuLinkContainer.general": "General",
   "app.components.LeftMenuLinkContainer.installNewPlugin": "Marketplace",

package/admin/src/translations/fr.json

@@ -43,7 +43,7 @@
   "Content Type Builder": "Content Types Builder",
   "Email": "E-mail",
   "Files Upload": "Téléversement de fichiers",
-  "HomePage.community": "Rejoignez la Communauté",
+  "HomePage.community": "Rejoignez la Communauté de Punch-in",
   "HomePage.greetings": "Bonjour {name}!",
   "HomePage.helmet.title": "Accueil",
   "HomePage.roadmap": "Voir la roadmap",
@@ -72,10 +72,16 @@
   "app.components.BlockLink.code.content": "Apprenez en testant les projets développés par la communauté.",
   "app.components.BlockLink.documentation": "Voir la documentation",
   "app.components.BlockLink.documentation.content": "Découvrez les concepts, guides et tutoriaux.",
+  "app.components.BlockLink.faq": "Lisez notre FAQ",
+  "app.components.BlockLink.faq.content": "Lisez réponses aux questions plus fréquentes de nos clients",
   "app.components.Button.cancel": "Annuler",
   "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",
@@ -101,6 +107,7 @@
   "app.components.InstallPluginPage.description": "Améliorez votre app sans efforts",
   "app.components.InstallPluginPage.helmet": "Marketplace - Plugins",
   "app.components.InstallPluginPage.title": "Marketplace - Plugins",
+  "app.components.LeftMenuLinkContainer.collectionTypes": "Base des donnés",
   "app.components.LeftMenuFooter.documentation": "Documentation",
   "app.components.LeftMenuFooter.help": "Aide",
   "app.components.LeftMenuFooter.poweredBy": "Propulsé par ",

package/admin/src/translations/it.json

@@ -47,7 +47,7 @@
   "Documentation": "Documentazione",
   "Email": "Email",
   "Files Upload": "Caricamento Files",
-  "HomePage.community": "Unisciti alla Community",
+  "HomePage.community": "Unisciti alla Community di Punch-in",
   "HomePage.greetings": "Ciao {name}!",
   "HomePage.helmet.title": "Homepage",
   "HomePage.roadmap": "Guarda la nostra roadmap",
@@ -160,10 +160,16 @@
   "app.components.BlockLink.code.content": "Impara testando progetti reali sviluppati dalla comunità.",
   "app.components.BlockLink.documentation": "Leggi la documentazione",
   "app.components.BlockLink.documentation.content": "Scopri funzionalità, guide di riferimento ed esercitazioni.",
+  "app.components.BlockLink.faq": "Sezione FAQ",
+  "app.components.BlockLink.faq.content": "Leggi le risposte alle domande più frequenti dei nostri clienti.",
   "app.components.Button.cancel": "Annulla",
   "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.",
@@ -192,7 +198,7 @@
   "app.components.LeftMenuFooter.documentation": "Documentazione",
   "app.components.LeftMenuFooter.help": "Supporto",
   "app.components.LeftMenuFooter.poweredBy": "Offerto da ",
-  "app.components.LeftMenuLinkContainer.collectionTypes": "Collezioni",
+  "app.components.LeftMenuLinkContainer.collectionTypes": "Base dati",
   "app.components.LeftMenuLinkContainer.configuration": "Configurazioni",
   "app.components.LeftMenuLinkContainer.general": "Generale",
   "app.components.LeftMenuLinkContainer.installNewPlugin": "Marketplace",

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

@@ -80,6 +80,9 @@ async function build({ dir, env, options, optimize }) {
 }
 
 async function createPluginsJs(plugins, localPlugins, dest) {
+  console.log(plugins);
+  console.log('============');
+  console.log(localPlugins);
   const content = `
 const injectReducer = require('./utils/injectReducer').default;
 const injectSaga = require('./utils/injectSaga').default;
@@ -89,7 +92,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') ||
@@ -105,8 +108,8 @@ window.strapi = Object.assign(window.strapi || {}, {
 module.exports = {
   ${plugins
     .map(name => {
-      const shortName = name.replace(/^strapi-plugin-/i, '');
-      const req = `require('../../plugins/${name}/admin/src').default`;
+      const shortName = name.replace(/^(strapi-plugin-|@punch-in\/strapi-plugin-)/i, '');
+      const req = `require('../../plugins/${name.replace('@punch-in/','')}/admin/src').default`;
       return `'${shortName}': ${req},`;
     })
     .join('\n')}
@@ -135,7 +138,7 @@ async function copyPlugin(name, dest) {
   const pkgFilePath = getPkgPath(name);
 
   const resolveDepPath = (...args) => path.resolve(pkgFilePath, ...args);
-  const resolveDest = (...args) => path.resolve(dest, 'plugins', name, ...args);
+  const resolveDest = (...args) => path.resolve(dest, 'plugins', name.replace('@punch-in/',''), ...args);
 
   const copy = (...args) => {
     return fs.copy(resolveDepPath(...args), resolveDest(...args));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@punch-in/strapi-admin",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -37,7 +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",
+    "@punch-in/strapi": "^1.0.5",
     "autoprefixer": "^9.8.6",
     "axios": "^0.21.1",
     "babel-loader": "^8.1.0",