smallfixes/#127 A few fixes

kas-elvirov · kas-elvirov · commit 17703eb57c6d · 2021-05-31T22:40:40.000+03:00
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
-APP_VERSION=8.2.57
+APP_VERSION=8.2.58
 PAYPAL_URL=https://www.paypal.me/ArtemSolovev
 OPENCOLLECTIVE_URL=https://opencollective.com/artem-solovev
diff --git a/manifest.json b/manifest.json
@@ -5,7 +5,7 @@
     "short_name": "__MSG_shortName__",
     "author": "__MSG_author__",
     "description": "__MSG_description__",
-    "version": "8.2.57",
+    "version": "8.2.58",
     "browser_action": {
         "default_icon": "img/icon128.png",
         "default_popup": "index.html",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gloc",
-  "version": "8.2.57",
+  "version": "8.2.58",
   "description": "Browser extension - counts locs on GitHub pages",
   "authors": [
     "Artem Vadimovich Solovev <artem.solovev.lse@gmail.com> (https://github.com/artem-solovev)"
diff --git a/src/modules/Popup/components/Header/index.tsx b/src/modules/Popup/components/Header/index.tsx
@@ -32,11 +32,7 @@ export default class PopupPage extends React.PureComponent {
                         variant={'h5'}
                     >
                         {github}
-                    </Typography>
-
-                    <Typography
-                        variant={'h5'}
-                    >
+                        &nbsp;
                         {gloc}
                     </Typography>
 
diff --git a/src/modules/Popup/components/_Footer/Footer.tsx b/src/modules/Popup/components/_Footer/Footer.tsx
@@ -1,5 +1,7 @@
+/* eslint-disable */
+
 import * as React from 'react';
-// import Iframe from 'react-iframe';
+import Iframe from 'react-iframe';
 
 import { colors } from '../../../../theme/colors';
 import {
@@ -27,11 +29,10 @@ export default class Footer extends React.PureComponent {
 						<Column>
 							<Row>
 								<Center>
-									{/* <Iframe
+									<Iframe
 										src='https://ghbtns.com/github-btn.html?user=artem-solovev&repo=gloc&type=star&count=true'
-										url=''
 										{...decorationProps.githubFrame}
-									/> */}
+									/>
 								</Center>
 							</Row>
 
diff --git a/src/modules/Popup/components/_Footer/decorationProps.ts b/src/modules/Popup/components/_Footer/decorationProps.ts
@@ -1,8 +1,11 @@
+import { IIframe } from 'react-iframe/types';
+
 export const decorationProps = {
     githubFrame: {
-        scrolling: 0,
+        scrolling: 'no',
         width: '84px',
         height: '19px',
         align: 'middle',
-    },
+        url: 'https://ghbtns.com/github-btn.html?user=artem-solovev&repo=gloc&type=star&count=true',
+    } as IIframe,
 };
diff --git a/src/modules/Popup/index.tsx b/src/modules/Popup/index.tsx
@@ -1,26 +1,17 @@
 import * as React from 'react';
 
-import Grid from '@material-ui/core/Grid';
+import { Header } from './components/_Header/index';
+import { Footer } from './components/_Footer/index';
+import { Body } from './components/_Body/index';
 
 export default class PopupPage extends React.PureComponent {
 	render() {
 		return (
-			<Grid
-				container
-				direction="column"
-			>
-				<Grid item>
-					header
-				</Grid>
-
-				<Grid item>
-					header
-				</Grid>
-
-				<Grid item>
-					header
-				</Grid>
-			</Grid>
+			<React.Fragment>
+				<Header />
+				<Body />
+				<Footer />
+			</React.Fragment>
 		);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "gloc",`
`3`		`- "version": "8.2.57",`
	`3`	`+ "version": "8.2.58",`
`4`	`4`	`"description": "Browser extension - counts locs on GitHub pages",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Artem Vadimovich Solovev <artem.solovev.lse@gmail.com> (https://github.com/artem-solovev)"`