Merge pull request #84 from DarshitJain04/master

Some minor changes and changed version in package.json

README.md

@@ -1,35 +1,36 @@
-[<img src="https://developer.chrome.com/webstore/images/ChromeWebStore_BadgeWBorder_v2_496x150.png">](https://chrome.google.com/webstore/detail/auto-join-chrome-extensio/djlpjopjnkojimgiaefgbenbbkkknnln?hl=en)
+[<img src="assets/chrome web store medium.png" alt="Meet Scheduler">](https://chrome.google.com/webstore/detail/auto-join-chrome-extensio/djlpjopjnkojimgiaefgbenbbkkknnln?hl=en)
 
-We are all fed up of keeping track of google meet links for our lectures. This chrome extension tries to make your life a bit easy!
-You just have to select the slot and the course and this extension opens the link at the given time ( you can customize the start time ) and also lets you auto join it!
+We are all fed up of keeping track of google meet/ zoom links for our meetings. This chrome extension makes your life easy!
+You just have to select the slot and the course (or add link and time in the `Custom` Tab) and this extension opens the link at the given time ( you can customize the start time ) and also lets you auto join it!😉
 
 ## Tech stack
 
 React JS has been used for the frontend and the backend workflow is established using `chrome.storage` and `chrome.alarms`
 
 ## Description
 
-![extension](https://user-images.githubusercontent.com/56914284/94225771-922b6380-ff13-11ea-8733-d9362716f82a.png)
-![extension3](https://user-images.githubusercontent.com/56914284/94226000-18e04080-ff14-11ea-8b3f-ba17f7a8cc88.png)
+<img src="assets/students form.png" alt="Students Form">
+<img src="assets/custom form.png" alt="Custom Form">
 
-- To add an alarm, select the slot and the course from the list and click on `Add Alarm`
-  - You can even add a custom link and time in the `Custom` tab
-- The toggle besides the heading is a switch for the extension. If you turn it off, no alarms will ring.
+- To add an alarm, select the slot and the course from the list and click on `Add Alarm` (IITJ Students)
+- You can even add a custom link and time in the `Custom` tab
+- The toggle on the top is a switch for the extension. If you turn it off, no alarms will ring.
 
-![upcoming](https://user-images.githubusercontent.com/56914284/94802096-a9cb8600-0404-11eb-9f15-843afc8f32ec.png)
-![upcoming2](https://user-images.githubusercontent.com/56914284/94802106-ad5f0d00-0404-11eb-92e5-65cd306cb416.png)
+<img src="assets/alarms.png" alt="Alarms List">
+<img src="assets/upcoming alarms 2.png" alt="Upcoming Alarms">
 
-- This tab shows you the upcoming alarms
+- The `Alarm` tab shows a list of all the alarms
+
+- The `Upcoming` tab shows you the upcoming alarms
   - If you want to uregently join the meeting, just click on the course code given in the list. It will take you to the meeting!
   - If you want to silent an alarm or don't want it to ring because of some reasons, click on the `tick mark` on the left to turn it off/on.
 
-![extension4](https://user-images.githubusercontent.com/56914284/94226383-192d0b80-ff15-11ea-89bc-d709a6bedaa1.png)
-
-- The most important thing for the auto join feature to work is the `Auth User` and the `Auto Join` toggle in the <b>Settings</b> tab
+<img src="assets/settings.png" alt="Settings">
 
-  ![accounts2](https://user-images.githubusercontent.com/56914284/94233534-aa0be300-ff25-11ea-96de-c153750028a0.jpeg)
+- The most important thing for the auto join feature to work is the `User Account` and the `Auto Join` toggle in the <b>Settings</b> tab
+  <img src="assets/accounts.jpeg" alt="Accounts">
 
-  - The image shows some of the accounts a user might have registered in chrome. To use the <b>auto join</b> feature, the user must see the index of his/ her IITJ account and select that number in the `Auth User` dropdown list. Here, the index shown is 2 and therefore 2 is selected in the `Auth User` dropdown list.
+  - The image above shows some of the accounts a user might have registered in chrome. To use the <b>auto join</b> feature, the user must see the index of his/ her IITJ account (or whichever account they need to use to join the meeting) and select that number in the `User Account` dropdown list. Here, the index shown is 2 and therefore 2 is selected in the `User Account` dropdown list.
   - If the Auto Join switch is turned off in the Settings tab, alarm will ring and the link will get opened but it won't auto join the meeting for you.
 
 - You can even customize the start time according to you. By default the start time is set to 30 seconds before the lecture time. One can change it to anything according to his/ her convenience.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "meet-scheduler",
-  "version": "2.1.6",
-  "description": "A chrome extension that lets you auto join your google meet links",
+  "version": "2.1.7",
+  "description": "A chrome extension that lets you auto join your google meet/ zoom links",
   "license": "MIT",
   "repository": {
     "type": "git",

src/pages/Popup/Popup.jsx

@@ -38,10 +38,10 @@ class Popup extends Component {
 
   render() {
     var pannel;
-    if (this.state.tab == 0) pannel = <AddAlarmForm />;
-    if (this.state.tab == 1) pannel = <Alarmview />;
-    if (this.state.tab == 2) pannel = <AlarmUp />;
-    if (this.state.tab == 3) pannel = <Settings />;
+    if (this.state.tab === 0) pannel = <AddAlarmForm />;
+    if (this.state.tab === 1) pannel = <Alarmview />;
+    if (this.state.tab === 2) pannel = <AlarmUp />;
+    if (this.state.tab === 3) pannel = <Settings />;
     return (
       <div>
         <Grid
@@ -51,7 +51,7 @@ class Popup extends Component {
           alignItems="center"
           spacing={1}
         >
-          <h1 style={{ marginRight: '10px' }}>Auto Join</h1>
+          <h1 style={{ marginRight: '10px' }}>Meet Scheduler</h1>
           <Switch
             color="primary"
             name="checkedA"

src/pages/Popup/components/AlarmUp.jsx

@@ -294,7 +294,12 @@ class Alarmview extends Component {
               <div
                 style={{ padding: '1rem', textAlign: 'center', width: '100%' }}
               >
-                <Typography>No alarms</Typography>
+                <Typography>
+                  Done for the day{' '}
+                  <span role="img" aria-label="wink">
+                    😉
+                  </span>
+                </Typography>
               </div>
             )}
           </AccordionDetails>
@@ -324,7 +329,12 @@ class Alarmview extends Component {
               <div
                 style={{ padding: '1rem', textAlign: 'center', width: '100%' }}
               >
-                <Typography>No alarms</Typography>
+                <Typography>
+                  Done for the day{' '}
+                  <span role="img" aria-label="wink">
+                    😉
+                  </span>
+                </Typography>
               </div>
             )}
           </AccordionDetails>
@@ -354,7 +364,12 @@ class Alarmview extends Component {
               <div
                 style={{ padding: '1rem', textAlign: 'center', width: '100%' }}
               >
-                <Typography>No alarms</Typography>
+                <Typography>
+                  Done for the day{' '}
+                  <span role="img" aria-label="wink">
+                    😉
+                  </span>
+                </Typography>
               </div>
             )}
           </AccordionDetails>

src/pages/Popup/components/CustomForm.jsx

@@ -34,12 +34,12 @@ class AddAlarmForm extends Component {
   constructor() {
     super();
     this.state = {
+      selectedName: '',
       selectedLink: '',
+      selectedTime: '',
       Linkerror: false,
       Dateerror: false,
-      selectedTime: '',
       Nameerror: false,
-      selectedName: '',
       buttonDisabled: true,
       slots: [
         { count: 0, label: 'Once' },
@@ -53,7 +53,7 @@ class AddAlarmForm extends Component {
   handleNameChange = async (event) => {
     var val = event.target.value;
     var error = false;
-    if (val == '') {
+    if (val === '') {
       error = true;
     }
     await this.setState({
@@ -66,7 +66,11 @@ class AddAlarmForm extends Component {
   handleLinkChange = async (event) => {
     var val = event.target.value;
     var error = false;
-    if ((!val.match('https://meet.google.com/[a-zA-Z0-9?&=]+') && !val.match('https://zoom.us/+')) || val == '') {
+    if (
+      (!val.match('https://meet.google.com/[a-zA-Z0-9?&=]+') &&
+        !val.match('https://zoom.us/+')) ||
+      val === ''
+    ) {
       error = true;
     }
     await this.setState({
@@ -81,7 +85,7 @@ class AddAlarmForm extends Component {
     var d = new Date(val);
     var error = false;
     console.log(val, d);
-    if (val == '' || d < new Date()) {
+    if (val === '' || d < new Date()) {
       error = true;
     }
     await this.setState({
@@ -100,9 +104,9 @@ class AddAlarmForm extends Component {
       !this.state.Linkerror &&
       !this.state.Dateerror &&
       !this.state.Nameerror &&
-      this.state.selectedLink != '' &&
-      this.state.selectedTime != '' &&
-      this.state.selectedName != ''
+      this.state.selectedLink !== '' &&
+      this.state.selectedTime !== '' &&
+      this.state.selectedName !== ''
     ) {
       this.setState({ buttonDisabled: false });
     } else {
@@ -112,8 +116,12 @@ class AddAlarmForm extends Component {
 
   ClearForm = () => {
     this.setState({
+      selectedName: '',
       selectedLink: '',
       selectedTime: '',
+      Linkerror: false,
+      Dateerror: false,
+      Nameerror: false,
       buttonDisabled: true,
     });
   };

src/pages/Popup/components/Settings.jsx

@@ -68,7 +68,12 @@ class Settings extends Component {
   checkInput = () => {
     var Min = this.state.selectedMin.toString();
     var Sec = this.state.selectedSec.toString();
-    if (!/[^0-9]/.test(Min) && Min != '' && !/[^0-9]/.test(Sec) && Sec != '') {
+    if (
+      !/[^0-9]/.test(Min) &&
+      Min !== '' &&
+      !/[^0-9]/.test(Sec) &&
+      Sec !== ''
+    ) {
       this.setState({ buttonDisabled: false });
     } else {
       this.setState({ buttonDisabled: true });
@@ -156,7 +161,7 @@ class Settings extends Component {
         >
           <InputLabel id="demo-controlled-open-select-label">
             {' '}
-            Auth User
+            User Account
           </InputLabel>
           <Select
             labelId="demo-controlled-open-select-label"
@@ -195,7 +200,7 @@ class Settings extends Component {
                 color="primary"
               />
             }
-            label="Auto Join Class"
+            label="Auto Join"
           />
         </center>
         <center>