Skip to content

Commit

Permalink
Merge pull request #77 from Terrabuzz/SAIF-Remove-Warnings-For-Vercel
Browse files Browse the repository at this point in the history
Saif remove warnings for vercel - testing with vercel
  • Loading branch information
Rubix982 authored Dec 2, 2020
2 parents 73d5e33 + 8b30b92 commit fedecbd
Show file tree
Hide file tree
Showing 25 changed files with 410 additions and 38,241 deletions.
5 changes: 4 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
data/
node_modules/*
serviceWorker.js
serviceWorker.js
client/src/serviceWorker.js
client/build/*
client/node_modules/*
19 changes: 15 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
module.exports = {
root: true,
env: {
browser: true,
commonjs: true,
es2021: true,
},
settings: {
react: {
version: '16.13.1',
},
},
extends: [
'airbnb-base',
'plugin:react/recommended',
'airbnb',
],
parserOptions: {
ecmaFeatures: {
jsx: true,
},
ecmaVersion: 12,
},
plugins: [
'react',
],
rules: {
'no-unused-vars': ['error', { argsIgnorePattern: 'next' }],
'no-console': 'off',
'import/no-cycle': [2, { maxDepth: 1 }],
'no-console': 0,
},
};
1 change: 1 addition & 0 deletions client/.eslintcache

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions client/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/serviceWorker.js
2 changes: 2 additions & 0 deletions client/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module.exports = {
root: true,
env: {
commonjs: true,
browser: true,
es6: true,
},
Expand Down Expand Up @@ -28,5 +29,6 @@ module.exports = {
'jsx-a11y/interactive-supports-focus': 'off',
'jsx-a11y/click-events-have-key-events': 'off',
'react/jsx-filename-extension': 'off',
'no-param-reassign': 0,
},
};
30,455 changes: 0 additions & 30,455 deletions client/package-lock.json

This file was deleted.

21 changes: 7 additions & 14 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"react": "^16.13.1",
"react-dom": "^16.13.1",
"@testing-library/jest-dom": "^5.11.6",
"@testing-library/react": "^11.2.2",
"@testing-library/user-event": "^12.3.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-router-dom": "^5.2.0",
"react-scripts": "3.4.3"
"react-scripts": "^4.0.1"
},
"scripts": {
"start": "react-scripts start",
Expand All @@ -32,12 +32,5 @@
"last 1 safari version"
]
},
"devDependencies": {
"eslint": "^6.6.0",
"eslint-config-airbnb": "^18.2.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.2.0"
}
"devDependencies": {}
}
2 changes: 1 addition & 1 deletion client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function App() {
<Route exact path="/first" component={FirstLogin} />
<Route exact path="/about" component={AboutUs} />
<Route exact path="/contact" component={Contact} />
<Route exact path="/first" component={FirstLogin} />
<Route exact path="/first" component={FirstLogin} />
<Route exact path="/search">
<SearchTypeProvider>
<Search />
Expand Down
236 changes: 142 additions & 94 deletions client/src/components/FirstLogin/MainContent.js
Original file line number Diff line number Diff line change
@@ -1,101 +1,149 @@
import React from 'react';
import ComponentStyling from '../../style/FirstLogin/MainContent.module.css';

const MainContent = ({ children, style }) => {
const MainContent = () => {
const activationArr = [];
for (let i = 0; i < 8; i += 1) activationArr[i] = false;

let activationArr = [];
for (let i = 0; i < 8; ++i)
activationArr[i] = false;

return (
<div className={ComponentStyling.content}>
<h1>Welcome!</h1>
<h2>This looks like your first login!</h2>
<h4>To get your started with your profile, let's go to some basic information</h4>
<form className={ComponentStyling.formlogin}>
<div className={`${ComponentStyling.FieldBox} ${ComponentStyling.Bio}`}>
<label>What should your biography look like?<span>( 200 characters max )</span></label>
<br />
<textarea
type="text"
name="biography"
aria-placeholder='I like sports! Or I’m a website designer!'
placeholder='I like sports! Or I’m a website designer!'
className={ComponentStyling.ForBioTextArea}
maxLength="200"
rows='4' cols='50'
autoFocus
></textarea>
</div>
<div className={`${ComponentStyling.FieldBox}`}>
<label>Activities</label>
<br />
<textarea
type="text"
name="activities"
placeholder="swimming, hiking, writing"
aria-placeholder='swimming, hiking, writing'
className={ComponentStyling.ForActivities}

maxLength="50"
></textarea>
</div>
<div className={`${ComponentStyling.FieldBox}`}>
<label>Interests</label>
<div className={ComponentStyling.GridSystemForInterests}>
<div className={ComponentStyling.OuterToggleInterest}>
<button type='button' className={activationArr[0] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`} onClick={() => {
console.log(activationArr[0]);
activationArr[0] = !activationArr[0];
console.log(activationArr[0]);
}}>#philosophy</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button type='button' className={activationArr[1] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`} onClick={() => {
activationArr[1] = !activationArr[1];
}}>#food</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button type='button' className={activationArr[2] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`} onClick={() => {
activationArr[2] = !activationArr[2];
}}>#fast</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button type='button' className={activationArr[3] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`} onClick={() => {
activationArr[3] = !activationArr[3];
}}>#web</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button type='button' className={activationArr[4] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`} onClick={() => {
activationArr[4] = !activationArr[4];
}}>#cloud</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button type='button' className={activationArr[5] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`} onClick={() => {
activationArr[5] = !activationArr[5];
}}>#humor</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button type='button' className={activationArr[6] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`} onClick={() => {
activationArr[6] = !activationArr[6];
}}>#football</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button type='button' className={activationArr[7] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`} onClick={() => {
activationArr[7] = !activationArr[7];
}}>#karachi</button>
</div>
</div>
</div>
<input
className={ComponentStyling.login}
type="button"
value="Submit!"
/>
</form>
return (
<div className={ComponentStyling.content}>
<h1>Welcome!</h1>
<h2>This looks like your first login!</h2>
<h4>To get your started with your profile, let&apos;s go to some basic information</h4>
<form className={ComponentStyling.formlogin}>
<div className={`${ComponentStyling.FieldBox} ${ComponentStyling.Bio}`}>
<label>
What should your biography look like?
<span>( 200 characters max )</span>
</label>
<br />
<textarea
type="text"
name="biography"
aria-placeholder="I like sports! Or I’m a website designer!"
placeholder="I like sports! Or I’m a website designer!"
className={ComponentStyling.ForBioTextArea}
maxLength="200"
rows="4"
cols="50"
/>
</div>
<div className={`${ComponentStyling.FieldBox}`}>
<label>Activities</label>
<br />
<textarea
type="text"
name="activities"
placeholder="swimming, hiking, writing"
aria-placeholder="swimming, hiking, writing"
className={ComponentStyling.ForActivities}
maxLength="50"
/>
</div>
<div className={`${ComponentStyling.FieldBox}`}>
<label>Interests</label>
<div className={ComponentStyling.GridSystemForInterests}>
<div className={ComponentStyling.OuterToggleInterest}>
<button
type="button"
className={activationArr[0] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`}
onClick={() => {
// console.log(activationArr[0]);
activationArr[0] = !activationArr[0];
// console.log(activationArr[0]);
}}
>
#philosophy
</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button
type="button"
className={activationArr[1] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`}
onClick={() => {
activationArr[1] = !activationArr[1];
}}
>
#food
</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button
type="button"
className={activationArr[2] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`}
onClick={() => {
activationArr[2] = !activationArr[2];
}}
>
#fast
</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button
type="button"
className={activationArr[3] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`}
onClick={() => {
activationArr[3] = !activationArr[3];
}}
>
#web
</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button
type="button"
className={activationArr[4] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`}
onClick={() => {
activationArr[4] = !activationArr[4];
}}
>
#cloud
</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button
type="button"
className={activationArr[5] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`}
onClick={() => {
activationArr[5] = !activationArr[5];
}}
>
#humor
</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button
type="button"
className={activationArr[6] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`}
onClick={() => {
activationArr[6] = !activationArr[6];
}}
>
#football
</button>
</div>
<div className={ComponentStyling.OuterToggleInterest}>
<button
type="button"
className={activationArr[7] ? `${ComponentStyling.AddColorToClickedButton}` : `${ComponentStyling.RemoveColorToClickedButton}`}
onClick={() => {
activationArr[7] = !activationArr[7];
}}
>
#karachi
</button>
</div>
</div>
</div>
// </div>
);
<input
className={ComponentStyling.login}
type="button"
value="Submit!"
/>
</form>
</div>
// </div>
);
};

export default MainContent;
export default MainContent;
22 changes: 8 additions & 14 deletions client/src/components/Login-Register-FP/template.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,21 @@ import ComponentStyling from '../../style/Login-Register-FP/template.module.css'
import { LeftAlign, RightAlign } from '../FlexAlignment';
import Logo from '../../assets/img/icon/Logo.svg';

const Template = ({ children, bgUrl, style }) => {

let backgroundImageStyling = {
backgroundRepeat: `no-repeat`,
const Template = ({ children, bgUrl }) => {
const backgroundImageStyling = {
backgroundRepeat: 'no-repeat',
MozBackgroundSize: 'cover',
WebkitBackgroundSize: 'cover',
OBackgroundSize: 'cover',
backgroundSize: 'cover',
width: 'cover',
height: 'cover'
}

if (bgUrl)
backgroundImageStyling.backgroundImage = `url(${bgUrl})`;
height: 'cover',
};

let LeftAlignStyle = {}
if (style)
LeftAlignStyle = style.LeftAlignStyle;
if (bgUrl) backgroundImageStyling.backgroundImage = `url(${bgUrl})`;

return (
<Container style={{ display: "grid", gridTemplateColumns: "50% 50%", overflow: "hidden" }}>
<Container style={{ display: 'grid', gridTemplateColumns: '50% 50%', overflow: 'hidden' }}>
<div className={ComponentStyling.leftContent}>
<LeftAlign>
<Link to="/">
Expand All @@ -45,7 +39,7 @@ const Template = ({ children, bgUrl, style }) => {
</div>
</RightAlign>
</div>
</Container >
</Container>
);
};

Expand Down
Loading

0 comments on commit fedecbd

Please sign in to comment.