Skip to content
Merged
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
6 changes: 4 additions & 2 deletions client/App.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
import React from 'react';

// importing child components
import MainContainer from './src/containers/MainContainer/MainContainer.jsx';

const App = () => (
<div id="app">
<div id='app'>
<MainContainer />
</div>
);

export default App;
export default App;
69 changes: 48 additions & 21 deletions client/src/components/AddSnippet/AddSnippet.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
import React, { useState } from 'react';

// importing child components
import SaveModal from '../../components/AddSnippet/SaveModal.jsx';
import TagInput from '../../components/ui/TagInput/TagInput';

// importing external functionality
import CodeMirror from '@uiw/react-codemirror';
import { markdown, markdownLanguage } from '@codemirror/lang-markdown';
import { languages } from '@codemirror/language-data';
import { langs } from '@uiw/codemirror-extensions-langs';
import styles from './AddSnippet.module.scss';
import React, { useState } from 'react';
import SaveModal from '../../components/AddSnippet/SaveModal.jsx';
import TagInput from '../../components/ui/TagInput/TagInput';

// importing utils
import Modal from 'react-bootstrap/Modal';
import Button from 'react-bootstrap/Button';

// importing styles
import styles from './AddSnippet.module.scss';

// importing data
import { LANGUAGES } from '../../data/data.js';

const AddSnippet = ({ closeModal }) => {
Expand Down Expand Up @@ -47,11 +57,14 @@ const AddSnippet = ({ closeModal }) => {
console.log(err);
console.log('failed saving snippet');
});
<<<<<<< HEAD
=======

// setTitle('');
// setLanguage('');
// setComments('');
// setStoredCode('');
>>>>>>> dev
}

// wrapper function for setTags to send to TagInput
Expand All @@ -60,18 +73,21 @@ const AddSnippet = ({ closeModal }) => {
}

return (
<div className="modalBackground">
<div className="modalContainer modal show">
<div className='modalBackground'>
<div className='modalContainer modal show'>
<Modal
className={styles.modal}
show={true}
onHide={() => closeModal(false)}
size="xl"
aria-labelledby="contained-modal-title-vcenter"
centered
>
size='xl'
aria-labelledby='contained-modal-title-vcenter'
centered>
<Modal.Header className={styles.header}>
<<<<<<< HEAD
<Modal.Title className='col-12 text-center'>
=======
<Modal.Title className="col-12 text-center">
>>>>>>> dev
Add a snippet
</Modal.Title>
</Modal.Header>
Expand All @@ -84,18 +100,22 @@ const AddSnippet = ({ closeModal }) => {
value={title}
onChange={(e) => {
setTitle(e.target.value);
<<<<<<< HEAD
}}></input>
{error && <span className='error'>Title is required!</span>}
=======
}}
></input>
{error && <span className="error">Title is required!</span>}
>>>>>>> dev
<br />
<br />

<label>Language: </label>
<select
className={styles.language}
value={language}
onChange={(e) => setLanguage(e.target.value)}
>
onChange={(e) => setLanguage(e.target.value)}>
{LANGUAGES.map((language) => (
<option key={language} value={language}>
{language}
Expand All @@ -111,25 +131,32 @@ const AddSnippet = ({ closeModal }) => {
value={comments}
onChange={(e) => {
setComments(e.target.value);
}}
></input>
}}></input>
<br />
<br />

<label>Tags: </label>
<TagInput className={styles.tags} onChange={setTagsWrapper} />
<hr />

<h5 className="px-2">Enter code:</h5>
<h5 className='px-2'>Enter code:</h5>
<CodeMirror
className={styles.editor}
height="500px"
id="storedCode"
height='500px'
id='storedCode'
// value={storedCode}
extensions={[langs.tsx()]}
placeholder={
"const sayHi = () => {\n console.log('Hello World!)\n}"
}
<<<<<<< HEAD
onChange={(e) => setStoredCode(e)}></CodeMirror>
</div>

<Modal.Footer>
{openModal && <SaveModal />}
<Button variant='secondary' onClick={() => closeModal(false)}>
=======
onChange={(e) => setStoredCode(e)}
></CodeMirror>
{/* <input
Expand All @@ -144,13 +171,13 @@ const AddSnippet = ({ closeModal }) => {
<Modal.Footer>
{openModal && <SaveModal closeModal={setOpenModal} />}
<Button variant="secondary" onClick={() => closeModal(false)}>
>>>>>>> dev
Close
</Button>
<Button
variant="primary"
className="saveButton"
onClick={handleSubmit}
>
variant='primary'
className='saveButton'
onClick={handleSubmit}>
Save
</Button>
</Modal.Footer>
Expand Down
10 changes: 2 additions & 8 deletions client/src/components/AddSnippet/SaveModal.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import React, { useState} from 'react';
import Modal from 'react-bootstrap/Modal';
import React from 'react';

function SaveModal() {

return (
<div>
You have successfully saved a snippet!
</div>
)
return <div>You have successfully saved a snippet!</div>;
}

export default SaveModal;
Loading