teonbrooks.com / BrainWaves
An easy-to-use platform for EEG experimentation in the classroom
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fixed UI layout issues in CustomDesignComponent

super man a1963932 05d36dff

+10 -11
-4
app/app.global.css
··· 188 188 189 189 /* rc-slider-related styles */ 190 190 191 - .rc-slider-with-marks { 192 - width: 150px; 193 - } 194 - 195 191 .rc-slider-rail { 196 192 background-color: #cccccc !important; 197 193 }
+3 -3
app/components/DesignComponent/CustomDesignComponent.js
··· 286 286 className={styles.contentGrid} 287 287 > 288 288 <Grid.Column stretched verticalAlign="middle"> 289 - <Image as={Segment} basic centered src={researchQuestionImage} /> 289 + <Image as={Segment} basic centered src={researchQuestionImage} className={styles.overviewImage} /> 290 290 <Form> 291 291 <Form.TextArea 292 292 autoHeight ··· 306 306 </Form> 307 307 </Grid.Column> 308 308 <Grid.Column stretched verticalAlign="middle"> 309 - <Image as={Segment} basic centered src={hypothesisImage} /> 309 + <Image as={Segment} basic centered src={hypothesisImage} className={styles.overviewImage} /> 310 310 <Form> 311 311 <Form.TextArea 312 312 autoHeight ··· 326 326 </Form> 327 327 </Grid.Column> 328 328 <Grid.Column verticalAlign="middle"> 329 - <Image as={Segment} basic centered src={methodsImage} /> 329 + <Image as={Segment} basic centered src={methodsImage} className={styles.overviewImage} /> 330 330 <Form> 331 331 <Form.TextArea 332 332 autoHeight
+4
app/components/styles/common.css
··· 25 25 height: 75%; 26 26 } 27 27 28 + .overviewImage { 29 + height: 140px !important; 30 + } 31 + 28 32 .inputDiv { 29 33 margin: 15px; 30 34 }
+3 -4
app/utils/eeg/muse.js
··· 7 7 addSignalQuality 8 8 } from "@neurosity/pipes"; 9 9 import { release } from "os"; 10 + import { MUSE_SERVICE, MuseClient, zipSamples } from "muse-js" 11 + import { from } from "rxjs" 10 12 import { parseMuseSignalQuality } from "./pipes"; 11 13 import { 12 14 MUSE_SAMPLING_RATE, 13 15 MUSE_CHANNELS, 14 16 PLOTTING_INTERVAL 15 17 } from "../../constants/constants"; 16 - import { MUSE_SERVICE, MuseClient, zipSamples } from "muse-js" 17 - import { from } from "rxjs" 18 - 19 18 20 19 const INTER_SAMPLE_INTERVAL = -(1 / 256) * 1000; 21 20 22 21 let bluetooth = {} 23 22 let client = {}; 24 - if (process.platform != "win32" || release().split(".")[0] >= 10) { 23 + if (process.platform !== "win32" || release().split(".")[0] >= 10) { 25 24 // Just returns the client object from Muse JS 26 25 bluetooth = require("bleat").webbluetooth; 27 26 client = new MuseClient();