Merge pull request #144 from OpenIPC/dev

Dev

Author: flyrouter

src/sites/main/pages/about/our-groups/constants/our-groups.ts

@@ -1,5 +1,5 @@
 export const ourGroupsConstants = {
-  h1: 'Our groups',
+  h1: 'Our Telegram',
   p1: 'We strongly suggest you to install a native [Telegram Messenger](https://telegram.org/) for your platform and use our Telegram groups.',
   warnBanner: 'Please note, you will have to pass a test from our Welcome Bot upon joining a group. The test is a simple as answerring two questions. If you missed the test and find out that you cannot post to the group, leave the group and re-join it again. Watch closely for the Welcome Bot message, click the message and answer the questions.',
   chats: [

src/sites/main/pages/about/our-team/constants/our-team.ts

@@ -52,21 +52,6 @@ export const IPCCoreConstants: TeamProps['members'] = [
       }
     ],
   },
-  {
-    imgSrc: 'https://avatars.githubusercontent.com/u/21039610',
-    name: 'John',
-    bio: 'Linux, Coupler, Builder',
-    socials: [
-      {
-        link: 'https://github.com/p0i5k/',
-        icon: 'Github',
-      },
-      {
-        link: 'https://t.me/p0i5k',
-        icon: 'Telegram',
-      }
-    ],
-  },
   {
     imgSrc: 'https://avatars.githubusercontent.com/u/40539574',
     name: 'Hirrolot',
@@ -97,36 +82,6 @@ export const IPCCoreConstants: TeamProps['members'] = [
       }
     ],
   },
-  {
-    imgSrc: 'https://avatars.githubusercontent.com/u/436625',
-    name: 'chertov',
-    bio: 'Mini Streamer',
-    socials: [
-      {
-        link: 'https://github.com/chertov/',
-        icon: 'Github',
-      },
-      {
-        link: 'https://t.me/mAX3773',
-        icon: 'Telegram',
-      }
-    ],
-  },
-  {
-    imgSrc: 'https://avatars.githubusercontent.com/u/2909755',
-    name: 'SSharshunov',
-    bio: 'The ex researcher',
-    socials: [
-      {
-        link: 'https://github.com/SSharshunov/',
-        icon: 'Github',
-      },
-      {
-        link: 'https://t.me/USSSSSH',
-        icon: 'Telegram',
-      }
-    ],
-  },
   {
     imgSrc: 'https://avatars.githubusercontent.com/u/94921687',
     name: 'Ystinia',
@@ -142,21 +97,6 @@ export const IPCCoreConstants: TeamProps['members'] = [
       }
     ],
   },
-  {
-    imgSrc: 'https://avatars.githubusercontent.com/u/49194169',
-    name: 'Median Trading Ltd.',
-    bio: 'Production and sale of Equipment',
-    socials: [
-      {
-        link: 'https://github.com/ser177/',
-        icon: 'Github',
-      },
-      {
-        link: 'https://t.me/ser177',
-        icon: 'Telegram',
-      }
-    ],
-  },
   {
     imgSrc: 'https://avatars.githubusercontent.com/u/131543271',
     name: 'Alex',
@@ -202,6 +142,21 @@ export const IPCCoreConstants: TeamProps['members'] = [
       }
     ],
   },
+  {
+    imgSrc: 'https://avatars.githubusercontent.com/u/55500552',
+    name: 'keyldev',
+    bio: 'Software Engineer, Android and .NET Application Developer',
+    socials: [
+      {
+        link: 'https://github.com/keyldev/',
+        icon: 'Github',
+      },
+      {
+        link: 'https://t.me/keyldev',
+        icon: 'Telegram',
+      }
+    ],
+  },
   {
     imgSrc: 'https://avatars.githubusercontent.com/u/47976944',
     name: 'JimSmith',
@@ -262,6 +217,81 @@ export const IPCCoreConstants: TeamProps['members'] = [
       }
     ],
   },
+  {
+    imgSrc: 'https://avatars.githubusercontent.com/u/21039610',
+    name: 'John',
+    bio: 'Linux, Coupler, Builder',
+    socials: [
+      {
+        link: 'https://github.com/p0i5k/',
+        icon: 'Github',
+      },
+      {
+        link: 'https://t.me/p0i5k',
+        icon: 'Telegram',
+      }
+    ],
+  },
+  {
+    imgSrc: 'https://avatars.githubusercontent.com/u/49194169',
+    name: 'Median Trading Ltd.',
+    bio: 'Production and sale of Equipment',
+    socials: [
+      {
+        link: 'https://github.com/ser177/',
+        icon: 'Github',
+      },
+      {
+        link: 'https://t.me/ser177',
+        icon: 'Telegram',
+      }
+    ],
+  },
+  {
+    imgSrc: 'https://avatars.githubusercontent.com/u/183216891',
+    name: 'Vixand',
+    bio: 'Distribution and promotion IPCam',
+    socials: [
+      {
+        link: 'https://github.com/vixand/',
+        icon: 'Github',
+      },
+      {
+        link: 'https://t.me/ktotud',
+        icon: 'Telegram',
+      }
+    ],
+  },
+  {
+    imgSrc: 'https://avatars.githubusercontent.com/u/436625',
+    name: 'chertov',
+    bio: 'Mini Streamer',
+    socials: [
+      {
+        link: 'https://github.com/chertov/',
+        icon: 'Github',
+      },
+      {
+        link: 'https://t.me/mAX3773',
+        icon: 'Telegram',
+      }
+    ],
+  },
+  {
+    imgSrc: 'https://avatars.githubusercontent.com/u/2909755',
+    name: 'SSharshunov',
+    bio: 'The ex researcher',
+    socials: [
+      {
+        link: 'https://github.com/SSharshunov/',
+        icon: 'Github',
+      },
+      {
+        link: 'https://t.me/USSSSSH',
+        icon: 'Telegram',
+      }
+    ],
+  },
   {
     imgSrc: 'https://avatars.githubusercontent.com/u/37488',
     name: 'themactep',

src/sites/main/pages/support-open-source/constants/support-open-source.ts

@@ -6,7 +6,7 @@ export const supportOpenSourceConstants = {
   },
   part2: {
     h2_1: 'Price of the Firmware',
-    p1: 'The right to use the OpenIPC firmware and its components is granted to all users free of charge and only for personal, non-commercial purposes. If you are interested in using OpenIPC for your business projects, please contact [our team](/our-team).',
+    p1: 'The right to use OpenIPC firmware and its components is, in most cases, granted to all users free of charge for personal and non-commercial purposes. If you are interested in using OpenIPC for your business projects, please contact [our team](/our-team) for details, as some firmware components may have a licence different from [MIT](https://opensource.org/licenses/MIT).',
     h2_2: 'Contribute',
     p2: 'Open Source is about sharing, creating something great together, and contributing to the greater good! Whenever you do make an improvement that you think someone else could benefit from, please contribute it back to the project.',
     p3: 'If you\'ve ever been curious or confused about something in the project, faced a problem and couldn\'t find the answer, someone else probably still is, too. Help them by sharing your thoughts, insights and discoveries. There are many ways to contribute to the project, and here are a few examples:',