@punch-in/strapi-admin 1.0.5 → 1.0.7

package/admin/src/components/Header/index.js

@@ -12,11 +12,11 @@ const Header = styled.div`
   height: ${props => props.theme.main.sizes.header.height};
 
   position: fixed;
-  z-index: 1040;
+  z-index: -10;
   left: ${props => props.theme.main.sizes.leftMenu.width};
 
   box-shadow: 0 1px 2px 0 rgba(40, 42, 49, 0.16);
-  background-color: ${props => props.theme.main.colors.white};
+  background-color: ${props => props.theme.main.colors.leftMenu['background-header-link']};};
 
   line-height: ${props => props.theme.main.sizes.header.height};
 `;

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/LeftMenuHeader/Wrapper.js

@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
 
-import Logo from '../../../assets/images/logo-strapi.png';
+import Logo from '../../../assets/images/punch-in-logo-inverted.png';
 
 const Wrapper = styled.div`
   background-color: ${(props) =>

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/components/NavTopRightWrapper/index.js

@@ -5,7 +5,9 @@ const NavTopRightWrapper = styled.div`
   top: 0;
   right: 0;
   display: flex;
-  z-index: 1050;
+  background-color: #007eff;
+  color: #fff;
+  z-index: 1;
 `;
 
 export default NavTopRightWrapper;

package/admin/src/containers/Admin/Logout/components.js

@@ -24,11 +24,13 @@ const Wrapper = styled.div`
       text-align: right;
       cursor: pointer;
       transition: background 0.2s ease-out;
+      background-color: #007eff;
+      color: #fff;
 
       &:hover,
       &:focus,
       &:active {
-        color: #333740;
+        color: #007eff;
         background-color: #fafafb !important;
         z-index: 9;
       }

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

@@ -277,11 +277,11 @@ export class Admin extends React.Component {
                       <InstalledPluginsPage />
                     </CheckPagePermissions>
                   </Route>
-                  <Route path="/marketplace">
+                  {/*<Route path="/marketplace">
                     <CheckPagePermissions permissions={adminPermissions.marketplace.main}>
                       <MarketplacePage />
                     </CheckPagePermissions>
-                  </Route>
+                  </Route> */}
                   <Route
                     path={`${SETTINGS_BASE_URL || '/settings'}/:settingId`}
                     component={SettingsPage}

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,7 +27,7 @@ const ApplicationInfosPage = () => {
     selectLatestRealase(state)
   );
 
-  let currentPlan =
+  let currentPlan;
   switch (appInfos.maxUsers) {
     case 100:
       currentPlan = 'app.components.CurrentPlanModal.giant';

package/admin/src/containers/AuthPage/components/Box/Wrapper.js

@@ -3,11 +3,11 @@ import styled from 'styled-components';
 const Wrapper = styled.div`
   margin: auto;
   width: 41.6rem;
-  padding: 20px 30px 25px 30px;
-  border-radius: ${({ theme }) => theme.main.sizes.borderRadius};
-  border-top: 2px solid ${({ theme }) => theme.main.colors.mediumBlue};
-  background-color: ${({ theme }) => theme.main.colors.white};
-  box-shadow: 0 2px 4px 0 ${({ theme }) => theme.main.colors.darkGrey};
+  padding: 20px 30px 25px;
+  border-radius: 2px;
+  border-top: 2px solid rgb(183 219 255);
+  background-color: rgb(255, 255, 255);
+  box-shadow: rgb(181 193 213) 3px 5px 4px 2px;
 `;
 
 export default Wrapper;

package/admin/src/containers/AuthPage/components/Logo/Img.js

@@ -1,7 +1,6 @@
 import styled from 'styled-components';
 
 const Img = styled.img`
-  height: 40px;
 `;
 
 export default Img;

package/admin/src/containers/AuthPage/components/Logo/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import LogoStrapi from '../../../../assets/images/logo_strapi.png';
+import LogoStrapi from '../../../../assets/images/logo.png';
 import Img from './Img';
 
 const Logo = () => <Img src={LogoStrapi} alt="strapi-logo" />;

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/hooks.js

@@ -12,36 +12,7 @@ const useFetch = () => {
   useEffect(() => {
     const CancelToken = axios.CancelToken;
     const source = CancelToken.source();
-
-    const fetchData = async () => {
-      try {
-        const { data } = await axios.get(
-          'https://strapi.io/api/blog-posts?_limit=2&_sort=publishedAt:desc',
-          {
-            cancelToken: source.token,
-          }
-        );
-
-        const posts = data.reduce((acc, curr) => {
-          acc.push({
-            title: curr.seo.metaTitle,
-            link: curr.slug,
-            content: curr.seo.metaDescription,
-          });
-
-          return acc;
-        }, []);
-
-        setState({ isLoading: false, posts, error: false });
-      } catch (err) {
-        if (isMounted.current) {
-          setState({ isLoading: false, error: true, posts: [] });
-        }
-      }
-    };
-
-    fetchData();
-
+    setState({ isLoading: false, error: true, posts: [] });
     return () => {
       isMounted.current = false;
       source.cancel('abort');

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

@@ -24,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',
   },
 ];
@@ -73,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,
@@ -161,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/index.js

@@ -47,6 +47,16 @@ const LeftMenu = ({ shouldUpdateStrapi, version, plugins, setUpdateMenu }) => {
       <Loader show={isLoading} />
       <LeftMenuHeader />
       <LinksContainer>
+        {pluginsSectionLinks.length > 0 && (
+          <LeftMenuLinksSection
+            section="plugins"
+            name="plugins"
+            links={pluginsSectionLinks}
+            location={location}
+            searchable={false}
+            emptyLinksListMessage="app.components.LeftMenuLinkContainer.noPluginsInstalled"
+          />
+        )}
         {filteredCollectionTypeLinks.length > 0 && (
           <LeftMenuLinksSection
             section="collectionType"
@@ -66,16 +76,6 @@ const LeftMenu = ({ shouldUpdateStrapi, version, plugins, setUpdateMenu }) => {
           />
         )}
 
-        {pluginsSectionLinks.length > 0 && (
-          <LeftMenuLinksSection
-            section="plugins"
-            name="plugins"
-            links={pluginsSectionLinks}
-            location={location}
-            searchable={false}
-            emptyLinksListMessage="app.components.LeftMenuLinkContainer.noPluginsInstalled"
-          />
-        )}
         {generalSectionLinks.length > 0 && (
           <LeftMenuLinksSection
             section="general"

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/containers/LocaleToggle/Wrapper.js

@@ -41,7 +41,7 @@ const Wrapper = styled.div`
   .localeDropdownContent {
     -webkit-font-smoothing: antialiased;
     span {
-      color: #333740;
+      color: #FFF;
       font-size: 13px;
       font-family: Lato;
       font-weight: 500;

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

@@ -43,7 +43,7 @@ export function PluginDispatcher(props) {
 
   return (
     <div>
-      <PageTitle title={`Strapi - ${name}`} />
+      <PageTitle title={`Punch-in - ${name}`} />
       <ErrorBoundary FallbackComponent={ErrorFallback}>
         <PluginEntryComponent
           {...props}

package/admin/src/index.html

@@ -6,7 +6,7 @@
   <!-- Make the page mobile compatible -->
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="mobile-web-app-capable" content="yes">
-  <title>Strapi Admin</title>
+  <title>Punch-in Admin Portal</title>
 </head>
 <body>
 <!-- The app hooks into this div -->

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': '#00458f',
+    '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

@@ -5,7 +5,7 @@
   "Auth.form.button.forgot-password": "Send Email",
   "Auth.form.button.go-home": "GO BACK HOME",
   "Auth.form.button.login": "Log in",
-  "Auth.form.button.login.strapi": "LOG IN VIA STRAPI",
+  "Auth.form.button.login.strapi": "LOG IN VIA Punch-in",
   "Auth.form.button.login.providers.see-more": "See more",
   "Auth.form.button.login.providers.error": "We cannot connect you through the selected provider.",
   "Auth.form.button.register": "LET'S START",
@@ -50,12 +50,12 @@
   "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",
   "HomePage.welcome.congrats": "Congrats!",
-  "HomePage.welcome.congrats.content": "You are logged in as the first administrator. To discover the powerful features provided by Strapi,",
+  "HomePage.welcome.congrats.content": "You are logged in as the first administrator. To discover the powerful features provided by Punch-in,",
   "HomePage.welcome.congrats.content.bold": "we recommend you to create your first Collection-Type.",
   "Media Library": "Media Library",
   "New entry": "New entry",
@@ -74,7 +74,7 @@
   "Settings.application.description": "See your project's details",
   "Settings.application.link-pricing": "See all pricing",
   "Settings.application.link-upgrade": "Upgrade your project",
-  "Settings.application.strapi-version": "STRAPI VERSION",
+  "Settings.application.strapi-version": "Punch-in VERSION",
   "Settings.application.node-version": "NODE VERSION",
   "Settings.application.edition-title": "CURRENT PLAN",
   "Settings.PageTitle": "Settings - {name}",
@@ -180,6 +180,8 @@
   "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",
@@ -198,7 +200,7 @@
   "app.components.HomePage.welcome": "Welcome on board!",
   "app.components.HomePage.welcome.again": "Welcome ",
   "app.components.HomePage.welcomeBlock.content": "We are happy to have you as part of the community. We are constantly looking for feedback so feel free to send us DM on ",
-  "app.components.HomePage.welcomeBlock.content.again": "We hope you are making progress on your project... Feel free to read the latest news about Strapi. We are giving our best to improve the product based on your feedback.",
+  "app.components.HomePage.welcomeBlock.content.again": "We hope you are making progress on your project... Feel free to read the latest news about Punch-in. We are giving our best to improve the product based on your feedback.",
   "app.components.HomePage.welcomeBlock.content.issues": "issues.",
   "app.components.HomePage.welcomeBlock.content.raise": " or raise ",
   "app.components.ImgPreview.hint": "Drag & drop your file into this area or {browse} for a file to upload",
@@ -211,28 +213,28 @@
   "app.components.InstallPluginPage.Download.description": "It might take a few seconds to download and install the plugin.",
   "app.components.InstallPluginPage.Download.title": "Downloading...",
   "app.components.InstallPluginPage.description": "Extend your app effortlessly.",
-  "app.components.InstallPluginPage.helmet": "Marketplace - Plugins",
-  "app.components.InstallPluginPage.title": "Marketplace - Plugins",
+  "app.components.InstallPluginPage.helmet": "Marketplace - Modules",
+  "app.components.InstallPluginPage.title": "Marketplace - Modules",
   "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",
-  "app.components.LeftMenuLinkContainer.listPlugins": "Plugins",
+  "app.components.LeftMenuLinkContainer.listPlugins": "Modules",
   "app.components.LeftMenuLinkContainer.noPluginsInstalled": "No plugins installed yet",
-  "app.components.LeftMenuLinkContainer.plugins": "Plugins",
+  "app.components.LeftMenuLinkContainer.plugins": "Modules",
   "app.components.LeftMenuLinkContainer.settings": "Settings",
   "app.components.LeftMenuLinkContainer.singleTypes": "Single Types",
   "app.components.ListPluginsPage.deletePlugin.description": "It might take a few seconds to uninstall the plugin.",
   "app.components.ListPluginsPage.deletePlugin.title": "Uninstalling",
   "app.components.ListPluginsPage.description": "List of the installed plugins in the project.",
   "app.components.ListPluginsPage.helmet.title": "List plugins",
-  "app.components.ListPluginsPage.title": "Plugins",
+  "app.components.ListPluginsPage.title": "Modules",
   "app.components.Logout.logout": "Logout",
   "app.components.Logout.profile": "Profile",
-  "app.components.MarketplaceBanner": "Discover plugins built by the community, and many more awesome things to kickstart your project, on Strapi Awesome.",
+  "app.components.MarketplaceBanner": "Discover plugins built by the community, and many more awesome things to kickstart your project, on Punch-in Awesome.",
   "app.components.MarketplaceBanner.image.alt": "a strapi rocket logo",
   "app.components.MarketplaceBanner.link": "Check it out now",
   "app.components.NotFoundPage.back": "Back to homepage",
@@ -254,7 +256,7 @@
   "app.components.UpgradePlanModal.text-ce": "Community Edition",
   "app.components.UpgradePlanModal.text-ee": "Enterprise Edition",
   "app.components.UpgradePlanModal.text-power": "Unlock the full power",
-  "app.components.UpgradePlanModal.text-strapi": "of Strapi by upgrading your plan to the",
+  "app.components.UpgradePlanModal.text-strapi": "of Punch-in by upgrading your plan to the",
   "app.components.Users.MagicLink.connect": "Send this link to the user for them to connect.",
   "app.components.Users.MagicLink.connect.sso": "Send this link to the user, the first login can be made via a SSO provider",
   "app.components.Users.ModalCreateBody.block-title.details": "Details",
@@ -297,7 +299,7 @@
   "app.utils.select-all": "Select all",
   "app.utils.unpublish": "Unpublish",
   "component.Input.error.validation.integer": "The value must be an integer",
-  "components.AutoReloadBlocker.description": "Run Strapi with one of the following commands:",
+  "components.AutoReloadBlocker.description": "Run Punch-in with one of the following commands:",
   "components.AutoReloadBlocker.header": "Reload feature is required for this plugin.",
   "components.ErrorBoundary.title": "Something went wrong...",
   "components.FilterOptions.FILTER_TYPES.=": "is",
@@ -372,7 +374,7 @@
   "notification.permission.not-allowed-read": "You are not allowed to see this document",
   "notification.success.delete": "The item has been deleted",
   "notification.success.saved": "Saved",
-  "notification.version.update.message": "A new version of Strapi is available!",
+  "notification.version.update.message": "A new version of Punch-in is available!",
   "notification.version.update.link": "See more",
   "request.error.model.unknown": "This model doesn't exist"
 }

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,6 +72,8 @@
   "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",
@@ -103,17 +105,18 @@
   "app.components.InstallPluginPage.Download.description": "L'installation d'un plugin peut prendre quelques secondes.",
   "app.components.InstallPluginPage.Download.title": "Téléchargement en cours...",
   "app.components.InstallPluginPage.description": "Améliorez votre app sans efforts",
-  "app.components.InstallPluginPage.helmet": "Marketplace - Plugins",
-  "app.components.InstallPluginPage.title": "Marketplace - Plugins",
+  "app.components.InstallPluginPage.helmet": "Marketplace - Modules",
+  "app.components.InstallPluginPage.title": "Marketplace - Modules",
+  "app.components.LeftMenuLinkContainer.collectionTypes": "Base des donnés",
   "app.components.LeftMenuFooter.documentation": "Documentation",
   "app.components.LeftMenuFooter.help": "Aide",
   "app.components.LeftMenuFooter.poweredBy": "Propulsé par ",
   "app.components.LeftMenuLinkContainer.configuration": "Configurations",
   "app.components.LeftMenuLinkContainer.general": "Général",
   "app.components.LeftMenuLinkContainer.installNewPlugin": "Marketplaces",
-  "app.components.LeftMenuLinkContainer.listPlugins": "Plugins",
+  "app.components.LeftMenuLinkContainer.listPlugins": "Modules",
   "app.components.LeftMenuLinkContainer.noPluginsInstalled": "Aucun plugin installé",
-  "app.components.LeftMenuLinkContainer.plugins": "Plugins",
+  "app.components.LeftMenuLinkContainer.plugins": "Modules",
   "app.components.LeftMenuLinkContainer.settings": "Paramètres",
   "app.components.Users.MagicLink.connect": "Envoyez ce lien à l'utilisateur pour qu'il se connecte.",
   "app.components.Users.ModalCreateBody.block-title.details": "Détails",
@@ -129,7 +132,7 @@
   "app.components.Users.SortPicker.sortby.username_desc": "Nom d'utilisateur (Z à A)",
   "app.components.ListPluginsPage.description": "Liste des plugins installés dans le projet.",
   "app.components.ListPluginsPage.helmet.title": "List plugins",
-  "app.components.ListPluginsPage.title": "Plugins",
+  "app.components.ListPluginsPage.title": "Modules",
   "app.components.Logout.logout": "Se déconnecter",
   "app.components.Logout.profile": "Profil",
   "app.components.NotFoundPage.back": "Retourner à la page d'accueil",

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,6 +160,8 @@
   "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",
@@ -191,25 +193,25 @@
   "app.components.InstallPluginPage.Download.description": "Il download e l'installazione del plugin potrebbero richiedere qualche secondo.",
   "app.components.InstallPluginPage.Download.title": "Scaricando...",
   "app.components.InstallPluginPage.description": "Estendi la tua app senza sforzi.",
-  "app.components.InstallPluginPage.helmet": "Marketplace - Plugins",
-  "app.components.InstallPluginPage.title": "Marketplace - Plugins",
+  "app.components.InstallPluginPage.helmet": "Marketplace - Moduli",
+  "app.components.InstallPluginPage.title": "Marketplace - Moduli",
   "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",
-  "app.components.LeftMenuLinkContainer.listPlugins": "Plugins",
+  "app.components.LeftMenuLinkContainer.listPlugins": "Moduli",
   "app.components.LeftMenuLinkContainer.noPluginsInstalled": "Nessun plugin ancora installato",
-  "app.components.LeftMenuLinkContainer.plugins": "Plugins",
+  "app.components.LeftMenuLinkContainer.plugins": "Moduli",
   "app.components.LeftMenuLinkContainer.settings": "Impostazioni",
   "app.components.LeftMenuLinkContainer.singleTypes": "Entità singole",
   "app.components.ListPluginsPage.deletePlugin.description": "L'installazione del plugin potrebbe richiedere qualche secondo.",
   "app.components.ListPluginsPage.deletePlugin.title": "Disinstalla",
   "app.components.ListPluginsPage.description": "Lista dei plugin installati nel progetto.",
   "app.components.ListPluginsPage.helmet.title": "Lista plugin",
-  "app.components.ListPluginsPage.title": "Plugins",
+  "app.components.ListPluginsPage.title": "Moduli",
   "app.components.Logout.logout": "Disconnetti",
   "app.components.Logout.profile": "Profilo",
   "app.components.NotFoundPage.back": "Torna alla home",

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;
@@ -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.5",
+  "version": "1.0.7",
   "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",