Merge branch 'master' of github.com:responsively-org/responsively-app…

… into feature/file-watcher
responsively-org · Aug 4, 2020 · e0e42de · e0e42de
2 parents 7cdfb31 + 0bd9419
commit e0e42de
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 69 deletions.
diff --git a/README.md b/README.md
diff --git a/desktop-app/app/components/ErrorBoundary/index.js b/desktop-app/app/components/ErrorBoundary/index.js
@@ -37,7 +37,8 @@ export default class ErrorBoundary extends React.Component {
           </div>
           <p style={{width: '80%', textAlign: 'center'}}>
             Please copy the contents in the above box and create an issue in the
-            github repo: https://github.com/manojVivek/responsively-app/issues
+            github repo:
+            https://github.com/responsively-org/responsively-app/issues
           </p>
         </Fragment>
       );

diff --git a/desktop-app/app/components/StatusBar/index.js b/desktop-app/app/components/StatusBar/index.js
@@ -67,7 +67,9 @@ const StatusBar = ({visible, zoomLevel}) => {
         <div
           className={cx(styles.text, styles.link)}
           onClick={() =>
-            shell.openExternal('https://github.com/manojVivek/responsively-app')
+            shell.openExternal(
+              'https://github.com/responsively-org/responsively-app'
+            )
           }
         >
           <Github width={14} className={styles.linkIcon} />
@@ -87,7 +89,7 @@ const StatusBar = ({visible, zoomLevel}) => {
           className={cx('roadMapLink', styles.text, styles.link)}
           onClick={() =>
             shell.openExternal(
-              'https://github.com/manojVivek/responsively-app/projects/12?fullscreen=true'
+              'https://github.com/responsively-org/responsively-app/projects/12?fullscreen=true'
             )
           }
         >

diff --git a/desktop-app/app/components/WebView/index.js b/desktop-app/app/components/WebView/index.js
@@ -792,7 +792,7 @@ class WebView extends Component {
                 <ScreenshotIcon height={18} color={iconsColor} />
               </div>
             </Tooltip>
-            <Tooltip title="Take Full Size Screenshot">
+            <Tooltip title="Take Full Page Screenshot">
               <div
                 className={cx(
                   styles.webViewToolbarIcons,

diff --git a/desktop-app/app/components/icons/Screenshot.js b/desktop-app/app/components/icons/Screenshot.js
@@ -5,17 +5,18 @@ export default ({width, height, color, padding, margin}) => (
     width={width}
     height={height}
     fill={color}
-    viewBox="0 0 78 91"
+    viewBox="0 0 100 100"
     xmlns="http://www.w3.org/2000/svg"
+    className="quickScreenshot"
   >
     <path
+      d="M35 28C34.2193 28.007 33.6091 28.4026 33.2812 28.9687L26.8438 40H14C9.6026 40 6 43.6026 6 48V86C6 90.3974 9.6026 94 14 94H76C80.3974 94 84 90.3974 84 86V48C84 43.6026 80.3974 40 76 40H63.1562L56.7188 28.9687C56.3641 28.3795 55.6877 27.9983 55 28H35ZM36.125 32H53.875L60.2812 43C60.6281 43.6007 61.3063 43.9953 62 44H76C78.2506 44 80 45.7494 80 48V86C80 88.2505 78.2506 90 76 90H14C11.7494 90 10 88.2505 10 86V48C10 45.7494 11.7494 44 14 44H28C28.6937 43.995 29.3719 43.6007 29.7188 43L36.125 32ZM45 50C36.1871 50 29 57.1871 29 66C29 74.8128 36.1871 82 45 82C53.8129 82 61 74.8128 61 66C61 57.1871 53.8129 50 45 50ZM45 54C51.6511 54 57 59.3489 57 66C57 72.6511 51.6511 78 45 78C38.3489 78 33 72.6511 33 66C33 59.3489 38.3489 54 45 54Z"
       fill={color}
-      d="M29 25C28.2193 25.007 27.6091 25.4026 27.2812 25.9687L20.8438 37H8C3.6026 37 0 40.6026 0 45V83C0 87.3974 3.6026 91 8 91H70C74.3974 91 78 87.3974 78 83V45C78 40.6026 74.3974 37 70 37H57.1562L50.7188 25.9687C50.3641 25.3795 49.6877 24.9983 49 25H29ZM30.125 29H47.875L54.2812 40C54.6281 40.6007 55.3063 40.9953 56 41H70C72.2506 41 74 42.7494 74 45V83C74 85.2505 72.2506 87 70 87H8C5.74944 87 4 85.2505 4 83V45C4 42.7494 5.74944 41 8 41H22C22.6937 40.995 23.3719 40.6007 23.7188 40L30.125 29ZM39 47C30.1871 47 23 54.1871 23 63C23 71.8128 30.1871 79 39 79C47.8129 79 55 71.8128 55 63C55 54.1871 47.8129 47 39 47ZM39 51C45.6511 51 51 56.3489 51 63C51 69.6511 45.6511 75 39 75C32.3489 75 27 69.6511 27 63C27 56.3489 32.3489 51 39 51Z"
     />
     <path
+      d="M59 27.6102L66.5758 5H84L73.3939 23.7119H80.9697L59 51L66.5758 27.6102H59Z"
       fill={color}
-      d="M60 15.5L65 1H76.5L69.5 13H74.5L60 30.5L65 15.5H60Z"
-      stroke="black"
+      stroke={color}
       strokeWidth="2"
       strokeLinejoin="round"
     />

diff --git a/desktop-app/app/menu.js b/desktop-app/app/menu.js
@@ -41,14 +41,16 @@ export default class MenuBuilder {
       {
         label: 'Open Source',
         click() {
-          shell.openExternal('https://github.com/manojVivek/responsively-app');
+          shell.openExternal(
+            'https://github.com/responsively-org/responsively-app'
+          );
         },
       },
       {
         label: 'Report Issues',
         click() {
           shell.openExternal(
-            'https://github.com/manojVivek/responsively-app/issues'
+            'https://github.com/responsively-org/responsively-app/issues'
           );
         },
       },
@@ -120,7 +122,7 @@ export default class MenuBuilder {
               dialog.showMessageBox(BrowserWindow.getAllWindows()[0], {
                 type: 'info',
                 title: 'Responsively',
-                message: 'There are currently no updates available',
+                message: 'The app is up to date! 🎉',
               });
             }
           });

diff --git a/desktop-app/app/settings/userPreferenceSettings.js b/desktop-app/app/settings/userPreferenceSettings.js
@@ -6,7 +6,7 @@ const path = require('path');
 
 class UserPreferenceSettings {
   getScreenShotSavePath = () =>
-    settings.get(USER_PREFERENCES).screenShotSavePath;
+    (settings.get(USER_PREFERENCES) || {}).screenShotSavePath;
   getDefaultScreenshotpath = () =>
     path.join(os.homedir(), `Desktop/Responsively-Screenshots`);
 }

diff --git a/desktop-app/package.json b/desktop-app/package.json
@@ -153,7 +153,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/manojVivek/responsively-app.git"
+    "url": "https://github.com/responsively-org/responsively-app.git"
   },
   "author": {
     "name": "Responsively",

diff --git a/website/pages/download.html b/website/pages/download.html
@@ -170,7 +170,7 @@
                   <a href="/#Features" class="nav-link" aria-expanded="false" aria-haspopup="true">Features</a>
                 </li>
                 <li class="nav-item">
-                  <a href="https://github.com/manojVivek/responsively-app/projects/12?fullscreen=true" class="nav-link" aria-expanded="false" aria-haspopup="true" target="_blank">RoadMap</a>
+                  <a href="https://github.com/responsively-org/responsively-app/projects/12?fullscreen=true" class="nav-link" aria-expanded="false" aria-haspopup="true" target="_blank">RoadMap</a>
                 </li>
               </ul>
             </div>
@@ -180,7 +180,7 @@
               target="_blank"><img
                 src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=200375&theme=light&period=daily"
                 alt="Responsively - Develop responsive web-apps 5x faster | Product Hunt Embed" height="38px" /></a>
-            <a href="https://github.com/manojVivek/responsively-app" target="_blank" class="nav-link ml-lg-2"
+            <a href="https://github.com/responsively-org/responsively-app" target="_blank" class="nav-link ml-lg-2"
               aria-expanded="false" aria-haspopup="true"><img
               class="icon bg-primary"
               src="assets/img/icons/social/github.svg"
@@ -264,7 +264,7 @@ <h2>Available for all major operating systems</h2>
 
   <div class="container text-center mt-1" id="instructions">
     <p><em>If you are a linux user, please follow the <a href="https://docs.appimage.org/introduction/quickstart.html#ref-how-to-run-appimage" target="_blank" rel=”nofollow” >instructions here</a> after downloading the <code>.AppImage</code> file.</em></p>
-    <p><em>Please feel free to contact us on <a href="https://github.com/manojVivek/responsively-app/issues" target="_blank">GitHub</a>, if you need any help.</em></p>
+    <p><em>Please feel free to contact us on <a href="https://github.com/responsively-org/responsively-app/issues" target="_blank">GitHub</a>, if you need any help.</em></p>
   </div>
   <div class="divider">
     <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="96px" viewBox="0 0 100 100" version="1.1" preserveAspectRatio="none" class="injected-svg" data-src="assets/img/dividers/divider-2.svg">
@@ -317,7 +317,7 @@ <h2>Available for all major operating systems</h2>
                 </a>
               </li>
               <li class="nav-item">
-                <a href="https://github.com/manojVivek/responsively-app" class="nav-link" target="_blank">
+                <a href="https://github.com/responsively-org/responsively-app" class="nav-link" target="_blank">
                   <img class="icon undefined" src="assets/img/icons/social/github.svg" alt="github social icon" data-inject-svg />
                 </a>
               </li>
@@ -493,7 +493,7 @@ <h2>Available for all major operating systems</h2>
     var tagName=JSON.parse(xmlHttp.responseText).tag_name;
     var versionName=tagName.substring(1);
 
-    var downloadURL='https://github.com/manojVivek/responsively-app/releases/download/'+tagName;
+    var downloadURL='https://github.com/responsively-org/responsively-app/releases/download/'+tagName;
     var linuxFileName='/ResponsivelyApp-'+versionName+'.AppImage';
     var macFileName='/ResponsivelyApp-'+versionName+'.dmg';
     var windowsFileName='/ResponsivelyApp-Setup-'+versionName+'.exe';

diff --git a/website/pages/index.html b/website/pages/index.html
@@ -171,7 +171,7 @@
                   <a href="/#Features" class="nav-link" aria-expanded="false" aria-haspopup="true">Features</a>
                 </li>
                 <li class="nav-item">
-                  <a href="https://github.com/manojVivek/responsively-app/projects/12?fullscreen=true" class="nav-link" aria-expanded="false" aria-haspopup="true" target="_blank">RoadMap</a>
+                  <a href="https://github.com/responsively-org/responsively-app/projects/12?fullscreen=true" class="nav-link" aria-expanded="false" aria-haspopup="true" target="_blank">RoadMap</a>
                 </li>
               </ul>
             </div>
@@ -181,7 +181,7 @@
               target="_blank"><img
                 src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=200375&theme=light&period=daily"
                 alt="Responsively - Develop responsive web-apps 5x faster | Product Hunt Embed" height="38px" /></a>
-            <a href="https://github.com/manojVivek/responsively-app" target="_blank" class="nav-link ml-lg-2"
+            <a href="https://github.com/responsively-org/responsively-app" target="_blank" class="nav-link ml-lg-2"
               aria-expanded="false" aria-haspopup="true"><img
               class="icon bg-primary"
               src="assets/img/icons/social/github.svg"
@@ -303,7 +303,7 @@ <h4>Open source</h4>
               Lets improve it together!<br />
               Your contributions are welcome
               <a
-                href="https://github.com/manojVivek/responsively-app"
+                href="https://github.com/responsively-org/responsively-app"
                 target="_blank"
                 >here</a
               >.
@@ -354,7 +354,7 @@ <h2 class="display-5 mx-xl-6">So let's use it wisely. 😎</h2>
               name="media"
             >
               <source
-                src="https://manojvivek.github.io/responsively-app/assets/video/mirrored-interactions.mp4"
+                src="https://responsively-org.github.io/responsively-app/assets/video/mirrored-interactions.mp4"
                 type="video/mp4"
               />
             </video>
@@ -384,7 +384,7 @@ <h3 class="h2">Mirrored Interactions</h3>
               name="media"
             >
               <source
-                src="https://manojvivek.github.io/responsively-app/assets/video/customizable-layouts.mp4"
+                src="https://responsively-org.github.io/responsively-app/assets/video/customizable-layouts.mp4"
                 type="video/mp4"
               />
             </video>
@@ -411,7 +411,7 @@ <h3 class="h2">Customizable Layout</h3>
               name="media"
             >
               <source
-                src="https://manojvivek.github.io/responsively-app/assets/video/elements-inspector.mp4"
+                src="https://responsively-org.github.io/responsively-app/assets/video/elements-inspector.mp4"
                 type="video/mp4"
               />
             </video>
@@ -440,7 +440,7 @@ <h3 class="h2">Awesome Elements Inspector</h3>
               name="media"
             >
               <source
-                src="https://manojvivek.github.io/responsively-app/assets/video/extensible-devices.mp4"
+                src="https://responsively-org.github.io/responsively-app/assets/video/extensible-devices.mp4"
                 type="video/mp4"
               />
             </video>
@@ -468,7 +468,7 @@ <h3 class="h2">Extensive Built-in Device Profiles</h3>
               name="media"
             >
               <source
-                src="https://manojvivek.github.io/responsively-app/assets/video/one-click-screenshot.mp4"
+                src="https://responsively-org.github.io/responsively-app/assets/video/one-click-screenshot.mp4"
                 type="video/mp4"
               />
             </video>
@@ -498,7 +498,7 @@ <h3 class="h2">One-Click Screenshot</h3>
               playsinline
               name="media"
             >
-              <source src="https://manojvivek.github.io/responsively-app/assets/video/hot-reloading.mp4" type="video/mp4" />
+              <source src="https://responsively-org.github.io/responsively-app/assets/video/hot-reloading.mp4" type="video/mp4" />
             </video>
           </div>
           <div class="col-lg-4 col-md-6" data-aos="fade-right">
@@ -574,7 +574,7 @@ <h4 class="display-3">See it in action</h4>
                 </a>
               </li>
               <li class="nav-item">
-                <a href="https://github.com/manojVivek/responsively-app" class="nav-link" target="_blank">
+                <a href="https://github.com/responsively-org/responsively-app" class="nav-link" target="_blank">
                   <img class="icon undefined" src="assets/img/icons/social/github.svg" alt="github social icon" data-inject-svg />
                 </a>
               </li>

diff --git a/website/pages/privacy-policy.html b/website/pages/privacy-policy.html
@@ -169,7 +169,7 @@
                   <a href="/#Features" class="nav-link" aria-expanded="false" aria-haspopup="true">Features</a>
                 </li>
                 <li class="nav-item">
-                  <a href="https://github.com/manojVivek/responsively-app/projects/12?fullscreen=true" class="nav-link" aria-expanded="false" aria-haspopup="true" target="_blank">RoadMap</a>
+                  <a href="https://github.com/responsively-org/responsively-app/projects/12?fullscreen=true" class="nav-link" aria-expanded="false" aria-haspopup="true" target="_blank">RoadMap</a>
                 </li>
               </ul>
             </div>
@@ -179,7 +179,7 @@
               target="_blank"><img
                 src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=200375&theme=light&period=daily"
                 alt="Responsively - Develop responsive web-apps 5x faster | Product Hunt Embed" height="38px" /></a>
-            <a href="https://github.com/manojVivek/responsively-app" target="_blank" class="nav-link ml-lg-2"
+            <a href="https://github.com/responsively-org/responsively-app" target="_blank" class="nav-link ml-lg-2"
               aria-expanded="false" aria-haspopup="true"><img
               class="icon bg-primary"
               src="assets/img/icons/social/github.svg"
@@ -250,7 +250,7 @@ <h2></h2>
                 <p></p>			
 
                 <h2>Contact Information</h2>
-                <p>If you have any questions about this Privacy Policy, please contact us by raising an issue at https://github.com/manojVivek/responsively-app/issues.</p>
+                <p>If you have any questions about this Privacy Policy, please contact us by raising an issue at https://github.com/responsively-org/responsively-app/issues.</p>
 
 
           </div>
@@ -271,7 +271,7 @@ <h2>Contact Information</h2>
                   Start building beautiful websites
                 </div>
                 <a
-                  href="https://github.com/manojVivek/responsively-app/releases"
+                  href="https://github.com/responsively-org/responsively-app/releases"
                   target="_blank"
                   class="btn btn-lg btn-white"
                 >
@@ -303,7 +303,7 @@ <h2>Contact Information</h2>
                 </a>
               </li>
               <li class="nav-item">
-                <a href="https://github.com/manojVivek/responsively-app" class="nav-link" target="_blank">
+                <a href="https://github.com/responsively-org/responsively-app" class="nav-link" target="_blank">
                   <img class="icon undefined" src="assets/img/icons/social/github.svg" alt="github social icon" data-inject-svg />
                 </a>
               </li>

diff --git a/website/pages/terms-and-conditions.html b/website/pages/terms-and-conditions.html
@@ -169,7 +169,7 @@
                   <a href="/#Features" class="nav-link" aria-expanded="false" aria-haspopup="true">Features</a>
                 </li>
                 <li class="nav-item">
-                  <a href="https://github.com/manojVivek/responsively-app/projects/12?fullscreen=true" class="nav-link" aria-expanded="false" aria-haspopup="true" target="_blank">RoadMap</a>
+                  <a href="https://github.com/responsively-org/responsively-app/projects/12?fullscreen=true" class="nav-link" aria-expanded="false" aria-haspopup="true" target="_blank">RoadMap</a>
                 </li>
               </ul>
             </div>
@@ -179,7 +179,7 @@
               target="_blank"><img
                 src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=200375&theme=light&period=daily"
                 alt="Responsively - Develop responsive web-apps 5x faster | Product Hunt Embed" height="38px" /></a>
-            <a href="https://github.com/manojVivek/responsively-app" target="_blank" class="nav-link ml-lg-2"
+            <a href="https://github.com/responsively-org/responsively-app" target="_blank" class="nav-link ml-lg-2"
               aria-expanded="false" aria-haspopup="true"><img
               class="icon bg-primary"
               src="assets/img/icons/social/github.svg"
@@ -281,7 +281,7 @@ <h2>Hyperlinking to our Content</h2>
 	site.</p>
 
 	<p>If you are among the organizations listed in paragraph 2 above and are interested in linking to our website,
-	you must notify us by raising an issue at https://github.com/manojVivek/responsively-app/issues.
+	you must notify us by raising an issue at https://github.com/responsively-org/responsively-app/issues.
 	Please include your name, your organization name, contact information (such as a phone number and/or e-mail
 	address) as well as the URL of your site, a list of any URLs from which you intend to link to our Web site,
 	and a list of the URL(s) on our site to which you would like to link. Allow 2-3 weeks for a response.</p>
@@ -334,7 +334,7 @@ <h2>Disclaimer</h2>
 <h2></h2>
 	<p></p>
 <h2>Contact Information</h2>
-<p>If you have any questions about this Privacy Policy, please contact us by raising an issue at https://github.com/manojVivek/responsively-app/issues.</p>
+<p>If you have any questions about this Privacy Policy, please contact us by raising an issue at https://github.com/responsively-org/responsively-app/issues.</p>
 
 
           </div>
@@ -355,7 +355,7 @@ <h2>Contact Information</h2>
                   Start building beautiful websites
                 </div>
                 <a
-                  href="https://github.com/manojVivek/responsively-app/releases"
+                  href="https://github.com/responsively-org/responsively-app/releases"
                   target="_blank"
                   class="btn btn-lg btn-white"
                 >
@@ -387,7 +387,7 @@ <h2>Contact Information</h2>
                 </a>
               </li>
               <li class="nav-item">
-                <a href="https://github.com/manojVivek/responsively-app" class="nav-link" target="_blank">
+                <a href="https://github.com/responsively-org/responsively-app" class="nav-link" target="_blank">
                   <img class="icon undefined" src="assets/img/icons/social/github.svg" alt="github social icon" data-inject-svg />
                 </a>
               </li>