Skip to content

Commit

Permalink
Merge pull request #169 from gouravmore/all-rig-0.1
Browse files Browse the repository at this point in the history 
All rig 0.1
  • Loading branch information
@gouravmore
gouravmore authored Jan 16, 2024
2 parents b9fbd44 + 61a27f7 commit dbb7892
Show file tree
Hide file tree
Showing 16 changed files with 699 additions and 281 deletions.
36 changes: 36 additions & 0 deletions .eslintrc.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
module.exports = {
"env": {
"browser": true,
"es2021": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended"
],
"overrides": [
{
"env": {
"node": true
},
"files": [
".eslintrc.{js,cjs}"
],
"parserOptions": {
"sourceType": "script"
}
}
],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"react"
],
"rules": {
'no-unused-vars': 'off',
'react/prop-types': 'off',
'no-redeclare': 'off',
'no-global-assign': 'off'
}
}
6 changes: 3 additions & 3 deletions .github/workflows/aws.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ jobs:
- name: Install Dependencies and Build
run: |
yarn install
yarn build
npm install
- name: Build Production
run: npm run build
- name: Deploy to S3 Bucket
run: |
aws s3 sync ./build s3://all-appliance/assets
333 changes: 165 additions & 168 deletions src/App.js
View file
Original file line number Diff line number Diff line change
@@ -1,172 +1,169 @@
import React, { useEffect, useState } from 'react';
import {
BrowserRouter,
HashRouter,
Routes,
Route,
Link,
} from 'react-router-dom';
import { initialize, end } from './services/telementryService';
import '@project-sunbird/telemetry-sdk/index.js';
import { startEvent } from './services/callTelemetryIntract';
import ContentCreate from './pages/content/ContentCreate';
import Contents from './pages/content/Contents';

//components
import Dots from './components/Spinner/Dots';

import StartV3 from './pages/ExploreAndLearn/Start/Start3';
import StartLearn3 from './pages/ExploreAndLearn/StartLearn/StartLearn';
import Score3 from './pages/ExploreAndLearn/Score/Score';
import Score4 from './pages/PlayAndLearn/Score';
import FingerprintJS from '@fingerprintjs/fingerprintjs';
import StartLearn4 from './pages/PlayAndLearn/StartLearn';

import Storylist from '../src/pages/Story/StoryList'
import Story from '../src/pages/Story/Story';
import Login from '../src/pages/Login';
import Header from './pages/Header';
import Results from './pages/Results';

import TestRigStory from './pages/Test-Rig-Two/Story/Story'
import Validate from './pages/Test-Rig-Two/Result/Validate';
import Discovery from './pages/Story/Discover';
import DiscoveryList from './pages/Story/DiscoveryList';
import Showcase from './pages/Story/Showcase';
import AppTimer from './components/AppTimer/AppTimer';

function App() {
let ranonce = false;
const [isLoggedIn, setIsLoggedIn] = useState(false);


useEffect(() => {
if(localStorage.getItem('virtualID')){
setIsLoggedIn(true);
}

const setFp = async () => {
const fp = await FingerprintJS.load();

const { visitorId } = await fp.get();

localStorage.setItem('did', visitorId);
initService();
};

setFp();
const initService = () => {


if (localStorage.getItem('fpDetails_v2') !== null) {
let fpDetails_v2 = localStorage.getItem('fpDetails_v2');
var did = fpDetails_v2.result;
} else {
var did = localStorage.getItem('did');
}

initialize({
context: {
mode: process.env.REACT_APP_MODE, // To identify preview used by the user to play/edit/preview
authToken: '', // Auth key to make api calls
did: did, // Unique id to identify the device or browser
uid: 'anonymous',
channel: process.env.REACT_APP_CHANNEL, // Unique id of the channel(Channel ID)
env: process.env.REACT_APP_env,

pdata: {
// optional
id: process.env.REACT_APP_id, // Producer ID. For ex: For sunbird it would be "portal" or "genie"
ver: process.env.REACT_APP_ver, // Version of the App
pid: process.env.REACT_APP_pid, // Optional. In case the component is distributed, then which instance of that component
import React, { useEffect, useState } from 'react';
import {
BrowserRouter,
HashRouter,
Routes,
Route,
Link,
} from 'react-router-dom';
import { initialize, end } from './services/telementryService';
import '@project-sunbird/telemetry-sdk/index.js';
import { startEvent } from './services/callTelemetryIntract';
import ContentCreate from './pages/content/ContentCreate';
import Contents from './pages/content/Contents';

//components
import Dots from './components/Spinner/Dots';

import StartV3 from './pages/ExploreAndLearn/Start/Start3';
import StartLearn3 from './pages/ExploreAndLearn/StartLearn/StartLearn';
import Score3 from './pages/ExploreAndLearn/Score/Score';
import Score4 from './pages/PlayAndLearn/Score';
import FingerprintJS from '@fingerprintjs/fingerprintjs';
import StartLearn4 from './pages/PlayAndLearn/StartLearn';

import Storylist from '../src/pages/Story/StoryList'
import Story from '../src/pages/Story/Story';
import Login from '../src/pages/Login';
import Header from './pages/Header';
import Results from './pages/Results';

import TestRigStory from './pages/Test-Rig-Two/Story/Story'
import Validate from './pages/Test-Rig-Two/Result/Validate';
import Discovery from './pages/Story/Discover';
import DiscoveryList from './pages/Story/DiscoveryList';
import Showcase from './pages/Story/Showcase';
import AppTimer from './components/AppTimer/AppTimer';
import { fetchPointerApi } from './utils/api/PointerApi';

function App() {
let ranonce = false;
const [isLoggedIn, setIsLoggedIn] = useState(localStorage.getItem('virtualID') ? true : false);

useEffect(() => {
const setFp = async () => {
const fp = await FingerprintJS.load();

const { visitorId } = await fp.get();

localStorage.setItem('did', visitorId);
initService();
};

setFp();
const initService = () => {


if (localStorage.getItem('fpDetails_v2') !== null) {
let fpDetails_v2 = localStorage.getItem('fpDetails_v2');
var did = fpDetails_v2.result;
} else {
var did = localStorage.getItem('did');
}

initialize({
context: {
mode: process.env.REACT_APP_MODE, // To identify preview used by the user to play/edit/preview
authToken: '', // Auth key to make api calls
did: did, // Unique id to identify the device or browser
uid: 'anonymous',
channel: process.env.REACT_APP_CHANNEL, // Unique id of the channel(Channel ID)
env: process.env.REACT_APP_env,

pdata: {
// optional
id: process.env.REACT_APP_id, // Producer ID. For ex: For sunbird it would be "portal" or "genie"
ver: process.env.REACT_APP_ver, // Version of the App
pid: process.env.REACT_APP_pid, // Optional. In case the component is distributed, then which instance of that component
},
tags: [
// Defines the tags data
'',
],
timeDiff: 0, // Defines the time difference// Defines the object roll up data
host: process.env.REACT_APP_host, // Defines the from which domain content should be load
endpoint: process.env.REACT_APP_endpoint,
apislug: process.env.REACT_APP_apislug,
},
tags: [
// Defines the tags data
'',
],
timeDiff: 0, // Defines the time difference// Defines the object roll up data
host: process.env.REACT_APP_host, // Defines the from which domain content should be load
endpoint: process.env.REACT_APP_endpoint,
apislug: process.env.REACT_APP_apislug,
},
config: {},
// tslint:disable-next-line:max-line-length
metadata: {},
});
if (!ranonce) {

config: {},
// tslint:disable-next-line:max-line-length
metadata: {},
});
if (!ranonce) {

if (localStorage.getItem('contentSessionId') === null) {
startEvent();
}

ranonce = true;
}
};

}, []);
useEffect(() => {
const cleanup = () => {
if (localStorage.getItem('contentSessionId') === null) {
startEvent();
end({});
}

ranonce = true;
}
};
};

window.addEventListener('beforeunload', cleanup);

return () => {
window.removeEventListener('beforeunload', cleanup);
};
}, []);


}, []);
useEffect(() => {
const cleanup = () => {
if (localStorage.getItem('contentSessionId') === null) {
end({});
}
};

window.addEventListener('beforeunload', cleanup);

return () => {
window.removeEventListener('beforeunload', cleanup);
};
}, []);

const [timer, setTimer] = useState(0);

return (
<HashRouter>

<Link to={'/exploreandlearn/score'} id="link_score_proto3" className="hide">
score
</Link>

<Link to={'/playandlearn/score'} id="link_score_proto4" className="hide">
score
</Link>
<AppTimer timer={timer} setTimer={setTimer} isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn}/>
<Routes>
<Route path="/content" element={<Contents />} />
<Route path="/content/add" element={<ContentCreate />} />
<Route path="/content/:id" element={<ContentCreate />} />

<Route path={'/'} exact element={<StartV3/>} />
{/* <Route path={'/*'} element={<StartV3/>} /> */}
<Route path={'/exploreandlearn/score'} element={<Score3/>} />
<Route path="/exploreandlearn" element={<StartV3/>} />
<Route path={'/exploreandlearn/startlearn'} element={<StartLearn3/>} />

<Route path={'/playandlearn/score'} element={<Score4/>} />
<Route path="/playandlearn" element={<StartLearn4/>} />
<Route path={'/playandlearn/startlearn'} element={<StartLearn4/>} />

{/* Story Section */}
<Route path={'/storylist'} element={<Storylist/>} />
<Route path={'storylist/story/:slug'} element={<Story/>} />
<Route path={'discoverylist/discovery/:slug'} element={<Discovery/>} />
<Route path={'discoverylist'} element={<DiscoveryList/>} />
{/* <Route path={'/result'} element={<Result/>} /> */}
<Route path={'Login'} element={<Login timer={timer} setTimer={setTimer} setIsLoggedIn={setIsLoggedIn} />}/>
<Route path={'Header'} element={<Header/>}/>
<Route path={'Results'} element={<Results/>}/>

{/* Test Rig 2 */}

<Route path={'practice'} element={<TestRigStory/>} />
{/* <Route path={'Header'} element={<Header/>}/> */}
<Route path={'validate'} element={<Validate/>}/>
<Route path={'showcase'} element={<Showcase/>}/>

</Routes>
<Dots />
</HashRouter>
);
}

export default App;


return (
<HashRouter>

<Link to={'/exploreandlearn/score'} id="link_score_proto3" className="hide">
score
</Link>

<Link to={'/playandlearn/score'} id="link_score_proto4" className="hide">
score
</Link>
<AppTimer isLoggedIn={isLoggedIn} setIsLoggedIn={setIsLoggedIn}/>
<Routes>
<Route path="/content" element={<Contents />} />
<Route path="/content/add" element={<ContentCreate />} />
<Route path="/content/:id" element={<ContentCreate />} />

<Route path={'/'} exact element={<StartV3/>} />
{/* <Route path={'/*'} element={<StartV3/>} /> */}
<Route path={'/exploreandlearn/score'} element={<Score3/>} />
<Route path="/exploreandlearn" element={<StartV3/>} />
<Route path={'/exploreandlearn/startlearn'} element={<StartLearn3/>} />

<Route path={'/playandlearn/score'} element={<Score4/>} />
<Route path="/playandlearn" element={<StartLearn4/>} />
<Route path={'/playandlearn/startlearn'} element={<StartLearn4/>} />

{/* Story Section */}
<Route path={'/storylist'} element={<Storylist/>} />
<Route path={'storylist/story/:slug'} element={<Story/>} />
<Route path={'discoverylist/discovery/:slug'} element={<Discovery/>} />
<Route path={'discoverylist'} element={<DiscoveryList/>} />
{/* <Route path={'/result'} element={<Result/>} /> */}
<Route path={'Login'} element={<Login setIsLoggedIn={setIsLoggedIn} />}/>
<Route path={'Header'} element={<Header/>}/>
<Route path={'Results'} element={<Results/>}/>

{/* Test Rig 2 */}

<Route path={'practice'} element={<TestRigStory/>} />
{/* <Route path={'Header'} element={<Header/>}/> */}
<Route path={'validate'} element={<Validate/>}/>
<Route path={'showcase'} element={<Showcase/>}/>

</Routes>
<Dots />
</HashRouter>
);
}

export default App;
Binary file added src/assests/Images/Points.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit dbb7892

Please sign in to comment.