Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/continuous-deployment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Continuous Deployment
on:
push:
branches:
- master
- develop
jobs:
deploy:
name: Deploy
runs-on: ubuntu-latest
env:
SOURCE_DIR: "build/"
AWS_REGION: "us-east-1"
AWS_ACCESS_KEY_ID: ${{ secrets.STAGING_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_AWS_SECRET_ACCESS_KEY }}
steps:
- uses: actions/checkout@v1
- name: Install dependencies
run: yarn
- name: Build
run: yarn build
- name: Deploy staging
if: github.ref == 'refs/heads/develop'
uses: jakejarvis/s3-sync-action@v0.5.0
with:
args: --acl public-read --follow-symlinks --delete
env:
AWS_S3_BUCKET: ${{ secrets.STAGING_AWS_S3_BUCKET }}
- name: Deploy production
if: github.ref == 'refs/heads/master'
uses: jakejarvis/s3-sync-action@v0.5.0
with:
args: --acl public-read --follow-symlinks --delete
env:
AWS_S3_BUCKET: ${{ secrets.PRODUCTION_AWS_S3_BUCKET }}

14 changes: 14 additions & 0 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Continuous Integration
on: [pull_request]
jobs:
buildAndTest:
name: Build and Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Install Dependencies
run: yarn
- name: Build
run: yarn build
- name: Test
run: yarn test --watchAll=false
1 change: 1 addition & 0 deletions client/.eslintcache
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"C:\\Users\\mohit\\OneDrive\\Desktop\\AllNotes\\client\\src\\index.js":"1","C:\\Users\\mohit\\OneDrive\\Desktop\\AllNotes\\client\\src\\reportWebVitals.js":"2","C:\\Users\\mohit\\OneDrive\\Desktop\\AllNotes\\client\\src\\App.js":"3","C:\\Users\\mohit\\OneDrive\\Desktop\\AllNotes\\client\\src\\components\\splashscreen.js":"4"},{"size":517,"mtime":1616002842817,"results":"5","hashOfConfig":"6"},{"size":375,"mtime":1616002842819,"results":"7","hashOfConfig":"6"},{"size":550,"mtime":1616079763162,"results":"8","hashOfConfig":"6"},{"size":258,"mtime":1616086467845,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"12"},"1r8njg7",{"filePath":"13","messages":"14","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"12"},{"filePath":"15","messages":"16","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"17","messages":"18","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"C:\\Users\\mohit\\OneDrive\\Desktop\\AllNotes\\client\\src\\index.js",[],["19","20"],"C:\\Users\\mohit\\OneDrive\\Desktop\\AllNotes\\client\\src\\reportWebVitals.js",[],"C:\\Users\\mohit\\OneDrive\\Desktop\\AllNotes\\client\\src\\App.js",[],"C:\\Users\\mohit\\OneDrive\\Desktop\\AllNotes\\client\\src\\components\\splashscreen.js",[],{"ruleId":"21","replacedBy":"22"},{"ruleId":"23","replacedBy":"24"},"no-native-reassign",["25"],"no-negated-in-lhs",["26"],"no-global-assign","no-unsafe-negation"]
15,804 changes: 15,804 additions & 0 deletions client/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion client/src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@
to {
transform: rotate(360deg);
}
}
}
34 changes: 23 additions & 11 deletions client/src/App.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
import logo from './logo.svg';
import './App.css';
import React , {useEffect,useState} from 'react';
import LoadingMessage from './components/splashscreen';
import "./App.css";

function App() {
return (
<div className="App">
<header className="App-header">
<h1>Hello, All-Notes :)</h1>
const [loading,setLoading]= useState(true)

</header>
</div>
);
}
useEffect(()=>{
setTimeout(()=>{
setLoading(false)
},6000)
},[])
return (

<div className="App">
{
loading ? <LoadingMessage /> : null
}
<header className="App-header">
<h1>Hello, All-Notes :)</h1>

</header>
</div>
);
}

export default App;
export default App;
8 changes: 8 additions & 0 deletions client/src/components/splashscreen.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
.splash-screen {
width: 100%;
height: 100%;
align-items: center;
justify-content: center;
}


Comment on lines +7 to +8
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove extra lines of code and add a new line at the EOF

12 changes: 12 additions & 0 deletions client/src/components/splashscreen.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react';
import './splashscreen.css';

function LoadingMessage() {
return (
<div className="splash-screen">
<img src="./img/splash-screen.gif" alt="splash-screen" />
</div>
);
}

export default LoadingMessage;
1 change: 0 additions & 1 deletion design/Logo-design

This file was deleted.